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

.editorconfig

@@ -1,12 +1,19 @@
 root = true
-[*.{js,ts,vue}]
-charset = utf-8 # 设置文件字符集为 utf-8
-end_of_line = lf # 控制换行类型(lf | cr | crlf)
-insert_final_newline = true # 始终在文件末尾插入一个新行
-indent_style = space # 缩进风格（tab | space）
-indent_size = 2 # 缩进大小
-max_line_length = 100 # 最大行长度
-
-[*.md] # 仅 md 文件适用以下规则
-max_line_length = off # 关闭最大行长度限制
-trim_trailing_whitespace = false # 关闭末尾空格修剪
+
+[*]
+charset=utf-8
+end_of_line=lf
+insert_final_newline=true
+indent_style=space
+indent_size=2
+max_line_length = 100
+
+[*.{yml,yaml,json}]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab

src/components/Detail/src/Detail.vue

@@ -203,8 +203,8 @@ const remarksSubmitScuess = async (remark) => {
 }
 // 获取变更记录
 const getChangeRecordList = async () => {
-  remarksData.data.tableId = '1679654720693248010'
-  remarksData.remarksList = await DetailApi.getChangeRecordPage(remarksData.data)
+  // remarksData.data.tableId = '1679654720693248010'
+  changeRecordData.changeRecordList = await DetailApi.getChangeRecordPage(remarksData.data)
 }
 </script>
 <style lang="scss">

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)}