vxe-table 3.13.17 → 3.14.0-beta.1

package/packages/table/src/table.ts

@@ -1374,28 +1374,28 @@ export default {
     const exportOpts = $xeTable.computeExportOpts
     const importOpts = $xeTable.computeImportOpts
 
-    if (this.rowId) {
+    if (props.rowId) {
       warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
     }
-    if (this.rowKey) {
+    if (props.rowKey) {
       warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey'])
     }
-    if (this.columnKey) {
+    if (props.columnKey) {
       warnLog('vxe.error.delProp', ['column-id', 'column-config.useKey'])
     }
-    if (!(this.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || this.treeOpts.expandRowKeys)) {
+    if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
       warnLog('vxe.error.reqProp', ['row-config.keyField'])
     }
-    if (this.editConfig && editOpts.showStatus && !this.keepSource) {
+    if (props.editConfig && editOpts.showStatus && !props.keepSource) {
       warnLog('vxe.error.reqProp', ['keep-source'])
     }
-    if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(this.rowKey || rowOpts.useKey) || !showOverflow)) {
+    if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
       warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow'])
     }
-    if (treeConfig && !treeOpts.transform && this.stripe) {
+    if (treeConfig && !treeOpts.transform && props.stripe) {
       warnLog('vxe.error.noTree', ['stripe'])
     }
-    if (this.showFooter && !(this.footerMethod || this.footerData)) {
+    if (props.showFooter && !(props.footerMethod || props.footerData)) {
       warnLog('vxe.error.reqProp', ['footer-data | footer-method'])
     }
     if (rowOpts.height) {
@@ -1418,31 +1418,31 @@ export default {
     }
     // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
     if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), importOpts.types)) {
-      warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type: string) => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')])
+      warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')])
     }
     if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(XEUtils.keys(exportOpts._typeMaps), exportOpts.types)) {
-      warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter((type: string) => XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)).join(',') || XEUtils.keys(exportOpts._typeMaps).join(',')])
+      warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)).join(',') || XEUtils.keys(exportOpts._typeMaps).join(',')])
     }
 
-    if (!this.id) {
-      if ((this.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
+    if (!props.id) {
+      if ((props.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
         errLog('vxe.error.reqProp', ['id'])
       }
     }
-    if (this.treeConfig && this.checkboxOpts.range) {
+    if (treeConfig && checkboxOpts.range) {
       errLog('vxe.error.noTree', ['checkbox-config.range'])
     }
-    if (this.rowOpts.height && !this.showOverflow) {
+    if (rowOpts.height && !this.showOverflow) {
       warnLog('vxe.error.notProp', ['table.show-overflow'])
     }
-    if (!this.handleMousedownCellAreaEvent) {
-      if (this.areaConfig) {
+    if (!$xeTable.handleCellAreaMousedownEvent) {
+      if (props.areaConfig) {
         warnLog('vxe.error.notProp', ['area-config'])
       }
-      if (this.clipConfig) {
+      if (props.clipConfig) {
         warnLog('vxe.error.notProp', ['clip-config'])
       }
-      if (this.fnrConfig) {
+      if (props.fnrConfig) {
         warnLog('vxe.error.notProp', ['fnr-config'])
       }
       if (mouseOpts.area) {
@@ -1453,21 +1453,30 @@ export default {
     if (treeConfig && rowOpts.drag && !treeOpts.transform) {
       warnLog('vxe.error.notSupportProp', ['column-config.drag', 'tree-config.transform=false', 'tree-config.transform=true'])
     }
-    if (this.dragConfig) {
+    if (props.dragConfig) {
       warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config'])
     }
-    if (this.treeConfig && treeOpts.children) {
+    if (props.treeConfig && treeOpts.children) {
       warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField'])
     }
-    if (this.treeConfig && treeOpts.line) {
+    if (props.treeConfig && treeOpts.line) {
       warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine'])
     }
     if (mouseOpts.area && mouseOpts.selected) {
       warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected'])
     }
-    if (mouseOpts.area && (this.treeConfig && !treeOpts.transform)) {
+    if (mouseOpts.area && (props.treeConfig && !treeOpts.transform)) {
       errLog('vxe.error.noTree', ['mouse-config.area'])
     }
+    if (props.editConfig && editOpts.activeMethod) {
+      warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod'])
+    }
+    if (props.treeConfig && checkboxOpts.isShiftKey) {
+      errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey'])
+    }
+    if (checkboxOpts.halfField) {
+      warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField'])
+    }
 
     // 在 v3.0 中废弃 context-menu
     if (this.contextMenu) {
@@ -1500,27 +1509,18 @@ export default {
     if (this.emptyRender && !XEUtils.isObject(this.emptyRender)) {
       warnLog('vxe.error.errProp', [`table.empty-render=${this.emptyRender}`, 'table.empty-render={}'])
     }
-    if (this.editConfig && this.editOpts.activeMethod) {
-      warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod'])
-    }
-    if (this.treeConfig && this.checkboxOpts.isShiftKey) {
-      errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey'])
-    }
-    if (this.checkboxOpts.halfField) {
-      warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField'])
-    }
 
     // 检查是否有安装需要的模块
-    if (this.editConfig && !this._insert) {
+    if (props.editConfig && !$xeTable.insert) {
       errLog('vxe.error.reqModule', ['Edit'])
     }
-    if (this.editRules && !this._validate) {
+    if (props.editRules && !$xeTable.validate) {
       errLog('vxe.error.reqModule', ['Validator'])
     }
-    if ((this.checkboxOpts.range || this.keyboardConfig || this.mouseConfig) && !this.handleCellMousedownEvent) {
+    if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.handleCellMousedownEvent) {
       errLog('vxe.error.reqModule', ['Keyboard'])
     }
-    if ((this.printConfig || this.importConfig || this.exportConfig) && !this._exportData) {
+    if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
       errLog('vxe.error.reqModule', ['Export'])
     }
 
@@ -1544,15 +1544,15 @@ export default {
       this.handleInitDefaults()
       this.updateStyle()
     })
-    globalEvents.on(this, 'paste', this.handleGlobalPasteEvent)
-    globalEvents.on(this, 'copy', this.handleGlobalCopyEvent)
-    globalEvents.on(this, 'cut', this.handleGlobalCutEvent)
-    globalEvents.on(this, 'mousedown', this.handleGlobalMousedownEvent)
-    globalEvents.on(this, 'blur', this.handleGlobalBlurEvent)
-    globalEvents.on(this, 'mousewheel', this.handleGlobalMousewheelEvent)
-    globalEvents.on(this, 'keydown', this.handleGlobalKeydownEvent)
-    globalEvents.on(this, 'resize', this.handleGlobalResizeEvent)
-    globalEvents.on(this, 'contextmenu', this.handleGlobalContextmenuEvent)
+    globalEvents.on($xeTable, 'paste', this.handleGlobalPasteEvent)
+    globalEvents.on($xeTable, 'copy', this.handleGlobalCopyEvent)
+    globalEvents.on($xeTable, 'cut', this.handleGlobalCutEvent)
+    globalEvents.on($xeTable, 'mousedown', this.handleGlobalMousedownEvent)
+    globalEvents.on($xeTable, 'blur', this.handleGlobalBlurEvent)
+    globalEvents.on($xeTable, 'mousewheel', this.handleGlobalMousewheelEvent)
+    globalEvents.on($xeTable, 'keydown', this.handleGlobalKeydownEvent)
+    globalEvents.on($xeTable, 'resize', this.handleGlobalResizeEvent)
+    globalEvents.on($xeTable, 'contextmenu', this.handleGlobalContextmenuEvent)
     $xeTable.preventEvent(null, 'created')
   },
   mounted () {
@@ -1638,15 +1638,17 @@ export default {
     this.preventEvent(null, 'beforeDestroy')
   },
   destroyed () {
-    globalEvents.off(this, 'paste')
-    globalEvents.off(this, 'copy')
-    globalEvents.off(this, 'cut')
-    globalEvents.off(this, 'mousedown')
-    globalEvents.off(this, 'blur')
-    globalEvents.off(this, 'mousewheel')
-    globalEvents.off(this, 'keydown')
-    globalEvents.off(this, 'resize')
-    globalEvents.off(this, 'contextmenu')
+    const $xeTable = this
+
+    globalEvents.off($xeTable, 'paste')
+    globalEvents.off($xeTable, 'copy')
+    globalEvents.off($xeTable, 'cut')
+    globalEvents.off($xeTable, 'mousedown')
+    globalEvents.off($xeTable, 'blur')
+    globalEvents.off($xeTable, 'mousewheel')
+    globalEvents.off($xeTable, 'keydown')
+    globalEvents.off($xeTable, 'resize')
+    globalEvents.off($xeTable, 'contextmenu')
     this.preventEvent(null, 'destroyed')
   },
   render (h: CreateElement) {