Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/components/Search/src/Search.vue

@@ -102,13 +102,13 @@ const setVisible = () => {
 }
 const Search = ref()
 onMounted(() => {
-  nextTick(() => {
-    console.log(4)
-    console.log(Search.value.offsetHeight)
-    wsCache.set('SearchoffsetHeight', Search.value.offsetHeight)
-    console.log(wsCache.get('SearchoffsetHeight'))
-    console.log(4)
-  })
+  // nextTick(() => {
+  //   console.log(4)
+  //   console.log(Search.value.offsetHeight)
+  //   wsCache.set('SearchoffsetHeight', Search.value.offsetHeight)
+  //   console.log(wsCache.get('SearchoffsetHeight'))
+  //   console.log(4)
+  // })
 })
 </script>
 

src/components/Table/src/Table.vue

@@ -9,7 +9,8 @@ import { set } from 'lodash-es'
 import { Pagination, TableColumn, TableSetPropsType, TableSlotDefault } from '@/types/table'
 import { useCache } from '@/hooks/web/useCache'
 const { wsCache } = useCache()
-let SearchoffsetHeight =(wsCache.get('SearchoffsetHeight') + 310 )+'px'
+
+    
 
 export default defineComponent({
   // eslint-disable-next-line vue/no-reserved-component-names
@@ -17,7 +18,6 @@ export default defineComponent({
   props: {
     pageSize: propTypes.number.def(10),
     currentPage: propTypes.number.def(1),
-    height: propTypes.string.def('calc(100vh  - '+SearchoffsetHeight+')'),
     // 是否多选
     selection: propTypes.bool.def(false),
     // 是否所有的超出隐藏，优先级低于schema中的showOverflowTooltip,
@@ -293,7 +293,6 @@ export default defineComponent({
           // @ts-ignore
           ref={elTableRef}
           data={unref(getProps).data}
-          height={unref(getProps).height}
           onSelection-change={selectionChange}
           onSort-change={sortChange}
           {...unref(getBindValue)}