imatrix-ui 2.9.5-dw → 2.9.7-dw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.5-dw",
+  "version": "2.9.7-dw",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/packages/super-grid/src/super-grid.vue

@@ -1346,51 +1346,86 @@ export default {
           gridParams.options.subTableData &&
           gridParams.options.subTableData.length > 0
         ) {
-          this.hasLoadData = false
-          gridParams.loaded = true
-          let subTableData = []
-          // 如果有子表数据，则展示传递的子表数据
-          if (isHasOptionFunction('gridDataLoaded', this.code)) {
-            const gridData = gridParams.options.gridDataLoaded.call(this, {
-              gridData: gridParams.options.subTableData,
-              columns: gridParams.columns
-            })
-            if (gridData) {
-              subTableData = gridData
-              this.hasLoadData = true
-            } else {
-              subTableData = gridParams.options.subTableData
-              this.hasLoadData = true
-            }
+          this.packageSubTableData(gridParams, gridParams.options.subTableData)
+        } else {
+          const isCanRefreshTableData = this.canRefreshTableData(gridParams)
+          if (isCanRefreshTableData) {
+            // 可以刷新表格记录
+            return this.fetchListData(searchParam, isSearch, parentRowIds, resove)
           } else {
-            subTableData = gridParams.options.subTableData
+            // 子表无记录时不需要刷新子表记录。表示是新建或修改时子表无记录，且不需要刷新子表。
+            if (
+              this.isSubTableEmpty(gridParams)
+            ){
+              // 表示是新建表单时，子表记录集合是空数组
+              console.log('子表无记录----code=', this.code, gridParams)
+              const subTableData = []
+              this.packageSubTableData(gridParams,subTableData)
+            }
             this.hasLoadData = true
+            gridParams.loaded = true
           }
-          if (subTableData) {
-            // 子表时所有记录的所有字段设置默认值null，优化子表编辑时性能
-            subTableData.forEach(item => {
-              this.setColumnsDefaultValue(gridParams.allColumns, item)
-            })
-          }
-          if (this.pagination && this.isSubTableShowPage === true) {
-            // 表示子表需要显示分页
-            this.subTableData = subTableData
-            // 更新记录总条数
-            this.pagination.total = this.subTableData.length
-            gridParams.subTableData = this.subTableData
-            this.gridData = this.getSubTableGridData(this.subTableData)
-          } else {
-            this.gridData = subTableData
-          }
-          gridParams.gridData = this.gridData
-          // 完成深拷贝，复制一份对象，行编辑时使用
-          gridParams.orgGridData = [].concat(
-            JSON.parse(JSON.stringify(this.gridData))
-          )
+        }
+      }
+    },
+    isSubTableEmpty (gridParams) {
+      return gridParams.options && gridParams.options.isFormSubTable &&
+      ((gridParams.options.subTableData === undefined || gridParams.options.subTableData === null) ||
+      gridParams.options.subTableData.length === 0)
+    },
+    packageSubTableData(gridParams, initSubTableData) {
+      this.hasLoadData = false
+      gridParams.loaded = true
+      let subTableData = []
+      // 如果有子表数据，则展示传递的子表数据
+      if (isHasOptionFunction('gridDataLoaded', this.code)) {
+        const gridData = gridParams.options.gridDataLoaded.call(this, {
+          gridData: initSubTableData,
+          columns: gridParams.columns
+        })
+        if (gridData) {
+          subTableData = gridData
+          this.hasLoadData = true
         } else {
-          return this.fetchListData(searchParam, isSearch, parentRowIds, resove)
+          subTableData = initSubTableData
+          this.hasLoadData = true
         }
+      } else {
+        subTableData = initSubTableData
+        this.hasLoadData = true
+      }
+      if (subTableData) {
+        // 子表时所有记录的所有字段设置默认值null，优化子表编辑时性能
+        subTableData.forEach(item => {
+          this.setColumnsDefaultValue(gridParams.allColumns, item)
+        })
+      }
+      if (this.pagination && this.isSubTableShowPage === true) {
+        // 表示子表需要显示分页
+        this.subTableData = subTableData
+        // 更新记录总条数
+        this.pagination.total = this.subTableData.length
+        gridParams.subTableData = this.subTableData
+        this.gridData = this.getSubTableGridData(this.subTableData)
+      } else {
+        this.gridData = subTableData
+      }
+      gridParams.gridData = this.gridData
+      // 完成深拷贝，复制一份对象，行编辑时使用
+      gridParams.orgGridData = [].concat(
+        JSON.parse(JSON.stringify(this.gridData))
+      )
+    },
+    canRefreshTableData (gridParams) {
+      let isCanRefreshTableData = false
+      if (gridParams.options && !gridParams.options.isFormSubTable) {
+        // 如果不是子表时
+        isCanRefreshTableData = true
+      } else if (gridParams.options && gridParams.options.isFormSubTable && gridParams.options.canRrefreshSubtableData !== undefined && gridParams.options.canRrefreshSubtableData === true) {
+        // 是子表，且配置了子表无记录时更新子表记录集合
+        isCanRefreshTableData = true
       }
+      return isCanRefreshTableData
     },
     getSubTableGridData(subTableData) {
       let gridData = subTableData
@@ -2017,6 +2052,7 @@ export default {
     handleSizeChange(val) {
       if (!this.options || !this.options.isPageShow) {
         // console.log(`每页 ${val} 条`)
+        this.currentPage = 1
         this.pageSize = val
         this.changePage()
       }