@idooel/components 0.0.2-beta.16 → 0.0.2-beta.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idooel/components",
-  "version": "0.0.2-beta.16",
+  "version": "0.0.2-beta.18",
   "description": "",
   "private": false,
   "main": "dist/@idooel/components.umd.js",

package/packages/business-components/modal-import/src/index.vue

@@ -18,7 +18,7 @@
         您可以请点击上方按钮查看任务进度或关闭弹框
       </div>
     </div>
-    <div v-if="!isFileEmpty && statusList.length > 0 && mode === 'sync'" class="ele-modal-import__errors">
+    <div v-if="!isFileEmpty && mode === 'sync'" class="ele-modal-import__errors">
       <template v-if="statusList.length > 0">
           <div v-for="(value, idx) in statusList" :key="idx">
             {{ value.message }}
@@ -126,8 +126,8 @@ export default {
       const ctx = { _route: this.$route.query, route: this.$route, ...payloads }
       return parseFieldMap(fieldMap, ctx)
     },
-    buildErrorList (dataSrouce = []) {
-      const ret = dataSrouce.map(item => {
+    buildErrorList (dataSource = []) {
+      const ret = dataSource.map(item => {
         if (type.isStr(item)) {
           return {
             statusCode: '0',
@@ -154,7 +154,7 @@ export default {
       net[requestType.toLowerCase()](url, formData , { headers: { 'Content-Type': 'multipart/form-data' } }).then(resp => {
         const { code, data } = resp
         if (code !== '2000') {
-          this.innerErrorList = this.buildErrorList(data)
+          this.innerErrorList = this.buildErrorList(data || [])
         }  else {
           this.innerErrorList = []
         }

package/packages/models/tree-table-model/src/index.vue

@@ -388,6 +388,7 @@ export default {
     }
   },
   async created () {
+    // onSearch会初始化请求表格数据，所以不需要在这里请求表格数据
     // 确保全局数据池已初始化
     if (!window.__idooel_data_pool__) {
       console.error('Global data pool not initialized. Please check if runtime-context/globalDataPool.js is properly imported.')
@@ -430,21 +431,20 @@ export default {
       this.defaultExpandedKeys = [defaultTreeNode[this.mapFields.key]]
       this.defaultSelectedKeys = [defaultTreeNode[this.mapFields.key]]
       this.currentTreeNodeData = defaultTreeNode
-    }
-    
-    const { params = {}, fieldMap = {}, overrideInit = false } = this.tableMeta
-    const currentRowData = this.getCurrentRowData()
-    const ctx = { 
-      ...this.currentTreeNodeData, 
-      _route: this.$route.query, 
-      currentRowData: currentRowData
-    }
-    
-    const initQuerys = Object.assign({}, params, parseFieldMap(fieldMap, ctx))
-    if (overrideInit) {
-      this.$emit(RESERVE_EVENT_NAMES.INIT, { ...this.exposed })
-    } else {
-      this.tableData = await this.requestTableData(initQuerys)
+      const { params = {}, fieldMap = {}, overrideInit = false } = this.tableMeta
+      const currentRowData = this.getCurrentRowData()
+      const ctx = { 
+        ...this.currentTreeNodeData, 
+        _route: this.$route.query, 
+        currentRowData: currentRowData
+      }
+      
+      const initQuerys = Object.assign({}, params, parseFieldMap(fieldMap, ctx))
+      if (overrideInit) {
+        this.$emit(RESERVE_EVENT_NAMES.INIT, { ...this.exposed })
+      } else {
+        this.tableData = await this.requestTableData(initQuerys)
+      }
     }
   },
   methods: {
@@ -639,6 +639,7 @@ export default {
       if (overrideInit) {
         this.$emit(RESERVE_EVENT_NAMES.TREE_CHANGE, { ...this.exposed })
       } else {
+        if (this.showTree) return
         this.tableData = await this.requestTableData()
       }
     },
@@ -671,8 +672,7 @@ export default {
     },
     async requestTableData (props = {}) {
       const { url, requestType = 'GET', page = {} } = this.tableMeta
-      const { pageSize = 10 } = page
-      this.tableQuerys = Object.assign(this.tableQuerys, { currentPage: 1, pageSize }, props)
+      this.tableQuerys = Object.assign(this.tableQuerys, { currentPage: this.tableQuerys.currentPage || 1, pageSize: this.tableQuerys.pageSize || 10 }, props)
       this.$emit(RESERVE_EVENT_NAMES.WATCH, { ...this.exposed })
       this.loading = true
       const ret = await net[requestType.toLowerCase()](
@@ -706,6 +706,24 @@ export default {
       const modelTableContainerRef = this.$refs[this.modelTableContainerRef]
       const { height } = modelTableContainerRef.getBoundingClientRect()
       this.treeWrapperHeight = height
+    },
+    async keepAliveRefresh () {
+      // 重新计算表格高度（应对窗口大小变化）
+      this.$nextTick(() => {
+        this.calculateTableHeight()
+        if (this.showTree) {
+          this.calculateTreeHeight()
+        }
+      })
+      // 刷新列表数据
+      const { overrideInit = false } = this.tableMeta
+      if (overrideInit) {
+        // 如果使用自定义初始化模式，触发 INIT 事件
+        this.$emit(RESERVE_EVENT_NAMES.INIT, { ...this.exposed })
+      } else {
+        // 使用当前查询参数刷新表格数据
+        await this.requestTableData(this.tableQuerys)
+      }
     }
   },
   mounted () {
@@ -739,23 +757,7 @@ export default {
     }
   },
   async activated () {
-    // 重新计算表格高度（应对窗口大小变化）
-    this.$nextTick(() => {
-      this.calculateTableHeight()
-      if (this.showTree) {
-        this.calculateTreeHeight()
-      }
-    })
-    
-    // 刷新列表数据
-    const { overrideInit = false } = this.tableMeta
-    if (overrideInit) {
-      // 如果使用自定义初始化模式，触发 INIT 事件
-      this.$emit(RESERVE_EVENT_NAMES.INIT, { ...this.exposed })
-    } else {
-      // 使用当前查询参数刷新表格数据
-      await this.requestTableData()
-    }
+    await this.keepAliveRefresh()
   }
 }
 </script>