vxe-table 4.12.0-beta.1 → 4.12.0-beta.2

package/packages/table/src/table.ts

@@ -1366,14 +1366,12 @@ export default defineComponent({
         errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
       }
 
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (htmlColumn) {
-          if (!columnOpts.useKey) {
-            errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html'])
-          }
-          if (!rowOpts.useKey) {
-            errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html'])
-          }
+      if (htmlColumn) {
+        if (!columnOpts.useKey) {
+          errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html'])
+        }
+        if (!rowOpts.useKey) {
+          errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html'])
         }
       }
 
@@ -2632,12 +2630,12 @@ export default defineComponent({
           rExpandLazyLoadedMaps[rowid] = row
           reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps
           loadMethod({ $table: $xeTable, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) }).then(() => {
-            const rExpandedMaps = { ...reactData.rowExpandedMaps }
+            const rowTempExpandedMaps = { ...reactData.rowExpandedMaps }
             if (rowRest) {
               rowRest.expandLoaded = true
             }
-            rExpandedMaps[rowid] = row
-            reactData.rowExpandedMaps = rExpandedMaps
+            rowTempExpandedMaps[rowid] = row
+            reactData.rowExpandedMaps = rowTempExpandedMaps
           }).catch(() => {
             if (rowRest) {
               rowRest.expandLoaded = false
@@ -2786,28 +2784,26 @@ export default defineComponent({
       if (treeConfig) {
         if (transform) {
           // 树结构自动转换
-          if (process.env.VUE_APP_VXE_ENV === 'development') {
-            if (!treeOpts.rowField) {
-              errLog('vxe.error.reqProp', ['tree-config.rowField'])
-            }
-            if (!treeOpts.parentField) {
-              errLog('vxe.error.reqProp', ['tree-config.parentField'])
-            }
-            if (!childrenField) {
-              errLog('vxe.error.reqProp', ['tree-config.childrenField'])
-            }
-            if (!treeOpts.mapChildrenField) {
-              errLog('vxe.error.reqProp', ['tree-config.mapChildrenField'])
-            }
-            if (childrenField === treeOpts.mapChildrenField) {
-              errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField'])
-            }
-            // fullData.forEach(row => {
-            //   if (row[treeOpts.children] && row[treeOpts.children].length) {
-            //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
-            //   }
-            // })
+          if (!treeOpts.rowField) {
+            errLog('vxe.error.reqProp', ['tree-config.rowField'])
+          }
+          if (!treeOpts.parentField) {
+            errLog('vxe.error.reqProp', ['tree-config.parentField'])
+          }
+          if (!childrenField) {
+            errLog('vxe.error.reqProp', ['tree-config.childrenField'])
+          }
+          if (!treeOpts.mapChildrenField) {
+            errLog('vxe.error.reqProp', ['tree-config.mapChildrenField'])
           }
+          if (childrenField === treeOpts.mapChildrenField) {
+            errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField'])
+          }
+          // fullData.forEach(row => {
+          //   if (row[treeOpts.children] && row[treeOpts.children].length) {
+          //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
+          //   }
+          // })
           treeData = XEUtils.toArrayTree(fullData, {
             key: treeOpts.rowField,
             parentKey: treeOpts.parentField,
@@ -2873,16 +2869,14 @@ export default defineComponent({
           //   }
           // }
 
-          if (process.env.VUE_APP_VXE_ENV === 'development') {
-            if (!(props.height || props.maxHeight)) {
-              errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}'])
-            }
-            // if (!props.showOverflow) {
-            //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
-            // }
-            if (props.spanMethod) {
-              warnLog('vxe.error.scrollErrProp', ['table.span-method'])
-            }
+          if (!(props.height || props.maxHeight)) {
+            errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}'])
+          }
+          // if (!props.showOverflow) {
+          //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
+          // }
+          if (props.spanMethod) {
+            warnLog('vxe.error.scrollErrProp', ['table.span-method'])
           }
         }
 
@@ -3886,23 +3880,6 @@ export default defineComponent({
         }
         return tableMethods.createData(records).then((rows) => isArr ? rows : rows[0])
       },
-      // toOriginalRecords (rows: any[]) {
-      //   const { treeConfig } = props
-      //   const treeOpts = computeTreeOpts.value
-      //   const { transform, mapChildrenField } = treeOpts
-      //   const rowkey = getRowkey($xeTable)
-      //   if (treeConfig) {
-      //     if (transform) {
-      //       return []
-      //     }
-      //     return []
-      //   }
-      //   return rows.map(item => {
-      //     const obj = Object.assign({}, item)
-      //     delete obj.rowkey
-      //     return obj
-      //   })
-      // },
       /**
        * 还原数据
        * 如果不传任何参数，则还原整个表格
@@ -3911,8 +3888,10 @@ export default defineComponent({
        * 如果还额外传了 field 则还原指定的单元格数据
        */
       revertData (rows: any, field) {
-        const { keepSource } = props
-        const { tableSourceData, sourceDataRowIdData } = internalData
+        const { keepSource, treeConfig } = props
+        const { fullAllDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData
+        const treeOpts = computeTreeOpts.value
+        const { transform } = treeOpts
         if (!keepSource) {
           if (process.env.VUE_APP_VXE_ENV === 'development') {
             warnLog('vxe.error.reqProp', ['keep-source'])
@@ -3927,9 +3906,10 @@ export default defineComponent({
         } else {
           targetRows = XEUtils.toArray($xeTable.getUpdateRecords())
         }
+        let reDelFlag = false
         if (targetRows.length) {
           targetRows.forEach((row: any) => {
-            if (!tableMethods.isInsertByRow(row)) {
+            if (!$xeTable.isInsertByRow(row)) {
               const rowid = getRowid($xeTable, row)
               const oRow = sourceDataRowIdData[rowid]
               if (oRow && row) {
@@ -3938,14 +3918,38 @@ export default defineComponent({
                 } else {
                   XEUtils.destructuring(row, XEUtils.clone(oRow, true))
                 }
+                if ($xeTable.isRemoveByRow(row)) {
+                  const rowRest = fullAllDataRowIdData[rowid]
+                  if (rowRest) {
+                    const reRow = rowRest.row
+                    tableFullData.unshift(reRow)
+                    afterFullData.unshift(reRow)
+                    reDelFlag = true
+                  }
+                }
               }
             }
           })
         }
         if (rows) {
-          return nextTick()
+          if (reDelFlag) {
+            $xeTable.updateFooter()
+            $xeTable.cacheRowMap(false)
+            $xeTable.handleTableData(treeConfig && transform)
+            if (!(treeConfig && transform)) {
+              $xeTable.updateAfterDataIndex()
+            }
+            $xeTable.checkSelectionStatus()
+            if (reactData.scrollYLoad) {
+              $xeTable.updateScrollYSpace()
+            }
+          }
+          return nextTick().then(() => {
+            $xeTable.updateCellAreas()
+            return $xeTable.recalculate()
+          })
         }
-        return tableMethods.reloadData(tableSourceData)
+        return $xeTable.reloadData(tableSourceData)
       },
       /**
        * 清空单元格内容
@@ -4060,6 +4064,11 @@ export default defineComponent({
         const rowid = getRowid($xeTable, row)
         return !!editStore.insertMaps[rowid]
       },
+      isRemoveByRow (row) {
+        const { editStore } = reactData
+        const rowid = getRowid($xeTable, row)
+        return !!editStore.removeMaps[rowid]
+      },
       /**
        * 删除所有新增的临时数据
        * @returns
@@ -6843,14 +6852,15 @@ export default defineComponent({
        */
       cacheRowMap () {
         const { treeConfig } = props
-        const treeOpts = computeTreeOpts.value
+        const { treeExpandedMaps } = reactData
         const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData
+        const treeOpts = computeTreeOpts.value
         const childrenField = treeOpts.children || treeOpts.childrenField
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
         const rowkey = getRowkey($xeTable)
-        const isLazy = treeConfig && treeOpts.lazy
-        const fullAllDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
+        const fullAllDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = { ...fullAllDataRowIdData } // 存在已删除数据
         const fullDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
+        const treeTempExpandedMaps = { ...treeExpandedMaps }
         const handleRow = (row: any, index: number, items: any, path?: any[], parentRow?: any, nodes?: any[]) => {
           let rowid = getRowid($xeTable, row)
           const seq = treeConfig && path ? toTreePathSeq(path) : index + 1
@@ -6859,13 +6869,24 @@ export default defineComponent({
             rowid = getRowUniqueId()
             XEUtils.set(row, rowkey, rowid)
           }
-          if (isLazy && row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
-            row[childrenField] = null
+          if (treeConfig && treeOpts.lazy) {
+            const treeExpRest = treeExpandedMaps[rowid]
+            if (row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
+              row[childrenField] = null
+            }
+            if (treeExpRest) {
+              if (!row[childrenField] || !row[childrenField].length) {
+                delete treeTempExpandedMaps[rowid]
+              }
+            }
           }
           let rowRest = fullAllDataRowIdData[rowid]
           if (!rowRest) {
             rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
           }
+          rowRest.treeLoaded = false
+          rowRest.expandLoaded = false
+
           rowRest.row = row
           rowRest.items = items
           rowRest.parent = parentRow
@@ -6874,13 +6895,14 @@ export default defineComponent({
           fullDataRowIdMaps[rowid] = rowRest
           fullAllDataRowIdMaps[rowid] = rowRest
         }
-        internalData.fullDataRowIdData = fullDataRowIdMaps
-        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps
         if (treeConfig) {
           XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField })
         } else {
           tableFullData.forEach(handleRow)
         }
+        internalData.fullDataRowIdData = fullDataRowIdMaps
+        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps
+        reactData.treeExpandedMaps = treeTempExpandedMaps
       },
       cacheSourceMap (fullData) {
         const { treeConfig } = props
@@ -9454,18 +9476,16 @@ export default defineComponent({
     }
 
     // 检测对应模块是否安装
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
-        ($xeTable as any)[name] = function () {
-          errLog('vxe.error.reqModule', ['VxeTableExportModule'])
-        }
-      })
-      'clearValidate,fullValidate,validate'.split(',').forEach(name => {
-        ($xeTable as any)[name] = function () {
-          errLog('vxe.error.reqModule', ['VxeTableValidatorModule'])
-        }
-      })
-    }
+    'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
+      ($xeTable as any)[name] = function () {
+        errLog('vxe.error.reqModule', ['VxeTableExportModule'])
+      }
+    })
+    'clearValidate,fullValidate,validate'.split(',').forEach(name => {
+      ($xeTable as any)[name] = function () {
+        errLog('vxe.error.reqModule', ['VxeTableValidatorModule'])
+      }
+    })
 
     Object.assign($xeTable, tableMethods, tablePrivateMethods)
 
@@ -10473,23 +10493,21 @@ export default defineComponent({
       tablePrivateMethods.preventEvent(null, 'unmounted', { $table: $xeTable })
     })
 
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      nextTick(() => {
-        if (props.loading) {
-          if (!VxeUILoadingComponent && !slots.loading) {
-            errLog('vxe.error.reqComp', ['vxe-loading'])
-          }
+    nextTick(() => {
+      if (props.loading) {
+        if (!VxeUILoadingComponent && !slots.loading) {
+          errLog('vxe.error.reqComp', ['vxe-loading'])
         }
-        if ((props.showOverflow === true || props.showOverflow === 'tooltip') ||
+      }
+      if ((props.showOverflow === true || props.showOverflow === 'tooltip') ||
           (props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip') ||
           (props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip') ||
           props.tooltipConfig || props.editRules) {
-          if (!VxeUITooltipComponent) {
-            errLog('vxe.error.reqComp', ['vxe-tooltip'])
-          }
+        if (!VxeUITooltipComponent) {
+          errLog('vxe.error.reqComp', ['vxe-tooltip'])
         }
-      })
-    }
+      }
+    })
 
     provide('$xeColgroup', null)
     provide('$xeTable', $xeTable)

package/packages/toolbar/src/toolbar.ts

@@ -210,9 +210,7 @@ export default defineComponent({
             if (tCommandMethod) {
               tCommandMethod(params)
             } else {
-              if (process.env.VUE_APP_VXE_ENV === 'development') {
-                errLog('vxe.error.notCommands', [code])
-              }
+              errLog('vxe.error.notCommands', [code])
             }
           }
           $xeToolbar.dispatchEvent('button-click', params, evnt)
@@ -235,9 +233,7 @@ export default defineComponent({
             if (tCommandMethod) {
               tCommandMethod(params)
             } else {
-              if (process.env.VUE_APP_VXE_ENV === 'development') {
-                errLog('vxe.error.notCommands', [code])
-              }
+              errLog('vxe.error.notCommands', [code])
             }
           }
           $xeToolbar.dispatchEvent('tool-click', params, evnt)
@@ -598,25 +594,21 @@ export default defineComponent({
         warnLog('vxe.error.notFunc', ['queryMethod'])
       }
       const customOpts = computeCustomOpts.value
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (customOpts.isFooter) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter'])
-        }
-        if (customOpts.showFooter) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter'])
-        }
-        if (customOpts.immediate) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate'])
-        }
-        if (customOpts.trigger) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger'])
-        }
+      if (customOpts.isFooter) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter'])
       }
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (props.refresh || props.import || props.export || props.print || props.zoom) {
-          if (!VxeUIButtonComponent) {
-            errLog('vxe.error.reqComp', ['vxe-button'])
-          }
+      if (customOpts.showFooter) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter'])
+      }
+      if (customOpts.immediate) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate'])
+      }
+      if (customOpts.trigger) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger'])
+      }
+      if (props.refresh || props.import || props.export || props.print || props.zoom) {
+        if (!VxeUIButtonComponent) {
+          errLog('vxe.error.reqComp', ['vxe-button'])
         }
       }
     })