vxe-table 3.11.9 → 3.11.12

package/packages/table/module/edit/mixin.ts

@@ -49,20 +49,34 @@ function insertTreeRow (_vm: any, newRecords: any[], isAppend: any) {
 }
 
 function handleInsertRowAt (_vm: any, records: any[], row: any, isInsertNextRow?: any) {
-  const { tableFullTreeData, mergeList, afterFullData, editStore, tableFullData, treeConfig, fullDataRowIdData, fullAllDataRowIdData, treeOpts } = _vm
+  const $xeTable = _vm
+  const props = $xeTable
+  const reactData = $xeTable
+  const internalData = $xeTable
+
+  const { treeConfig } = props
+  const { mergeList, editStore } = reactData
+  const { tableFullTreeData, afterFullData, tableFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData
+  const treeOpts = $xeTable.computeTreeOpts
   const { transform, rowField, mapChildrenField } = treeOpts
   const childrenField = treeOpts.children || treeOpts.childrenField
   if (!XEUtils.isArray(records)) {
     records = [records]
   }
-  const newRecords = _vm.defineField(records.map(record => Object.assign(treeConfig && transform ? { [mapChildrenField]: [], [childrenField]: [] } : {}, record)))
+  const newRecords: any[] = _vm.defineField(records.map(record => Object.assign(treeConfig && transform ? { [mapChildrenField]: [], [childrenField]: [] } : {}, record)))
   if (XEUtils.eqNull(row)) {
   // 如果为虚拟树
     if (treeConfig && transform) {
       insertTreeRow(_vm, newRecords, false)
     } else {
-      afterFullData.unshift(...newRecords)
-      tableFullData.unshift(...newRecords)
+      newRecords.forEach(item => {
+        const rowid = getRowid($xeTable, item)
+        const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: afterFullData, parent: null, level: 0, height: 0 }
+        fullDataRowIdData[rowid] = rest
+        fullAllDataRowIdData[rowid] = rest
+        afterFullData.push(item)
+        tableFullData.push(item)
+      })
       // 刷新单元格合并
       mergeList.forEach((mergeItem: any) => {
         const { row: mergeRowIndex } = mergeItem
@@ -77,8 +91,14 @@ function handleInsertRowAt (_vm: any, records: any[], row: any, isInsertNextRow?
       if (treeConfig && transform) {
         insertTreeRow(_vm, newRecords, true)
       } else {
-        afterFullData.push(...newRecords)
-        tableFullData.push(...newRecords)
+        newRecords.forEach(item => {
+          const rowid = getRowid($xeTable, item)
+          const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: afterFullData, parent: null, level: 0, height: 0 }
+          fullDataRowIdData[rowid] = rest
+          fullAllDataRowIdData[rowid] = rest
+          afterFullData.push(item)
+          tableFullData.push(item)
+        })
         // 刷新单元格合并
         mergeList.forEach((mergeItem: any) => {
           const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
@@ -170,12 +190,11 @@ function handleInsertRowAt (_vm: any, records: any[], row: any, isInsertNextRow?
       }
     }
   }
-  const { insertList, insertMaps } = editStore
-  newRecords.forEach((newRow: any) => {
-    const rowid = getRowid(_vm, newRow)
+  const { insertMaps } = editStore
+  newRecords.forEach(newRow => {
+    const rowid = getRowid($xeTable, newRow)
     insertMaps[rowid] = newRow
   })
-  insertList.unshift(...newRecords)
   _vm.cacheRowMap()
   _vm.updateScrollYStatus()
   _vm.handleTableData(treeConfig && transform)
@@ -230,10 +249,19 @@ export default {
      * 如果为空则删除所有
      */
     _remove (rows: any[]) {
-      const { afterFullData, tableFullData, tableFullTreeData, treeConfig, mergeList, editStore, checkboxOpts, selectCheckboxMaps, isInsertByRow, treeOpts } = this
+      const $xeTable = this
+      const props = $xeTable
+      const reactData = $xeTable
+      const internalData = $xeTable
+
+      const { treeConfig } = props
+      const { mergeList, editStore, selectCheckboxMaps } = reactData
+      const { tableFullTreeData, afterFullData, tableFullData } = internalData
+      const checkboxOpts = $xeTable.computeCheckboxOpts
+      const treeOpts = $xeTable.computeTreeOpts
       const { transform, mapChildrenField } = treeOpts
       const childrenField = treeOpts.children || treeOpts.childrenField
-      const { actived, removeList, insertList, insertMaps } = editStore
+      const { actived, removeList, insertMaps } = editStore
       const { checkField } = checkboxOpts
       let delList: any[] = []
       if (!rows) {
@@ -243,7 +271,7 @@ export default {
       }
       // 如果是新增，则保存记录
       rows.forEach(row => {
-        if (!isInsertByRow(row)) {
+        if (!$xeTable.isInsertByRow(row)) {
           removeList.push(row)
         }
       })
@@ -307,27 +335,25 @@ export default {
         }
       }
       // 如果当前行被激活编辑，则清除激活状态
-      if (actived.row && this.findRowIndexOf(rows, actived.row) > -1) {
-        this.clearEdit()
+      if (actived.row && $xeTable.findRowIndexOf(rows, actived.row) > -1) {
+        $xeTable.clearEdit()
       }
       // 从新增中移除已删除的数据
       rows.forEach((row: any) => {
-        const rowid = getRowid(this, row)
-        const iIndex = this.findRowIndexOf(insertList, row)
-        if (iIndex > -1) {
-          insertList.splice(iIndex, 1)
+        const rowid = getRowid($xeTable, row)
+        if (insertMaps[rowid]) {
+          delete insertMaps[rowid]
         }
-        delete insertMaps[rowid]
       })
-      this.handleTableData(treeConfig && transform)
+      $xeTable.updateFooter()
+      $xeTable.cacheRowMap()
+      $xeTable.handleTableData(treeConfig && transform)
       if (!(treeConfig && transform)) {
-        this.updateAfterDataIndex()
+        $xeTable.updateAfterDataIndex()
       }
-      this.updateFooter()
-      this.cacheRowMap()
-      this.checkSelectionStatus()
-      if (this.scrollYLoad) {
-        this.updateScrollYSpace()
+      $xeTable.checkSelectionStatus()
+      if (reactData.scrollYLoad) {
+        $xeTable.updateScrollYSpace()
       }
       return this.$nextTick().then(() => {
         this.updateCellAreas()
@@ -387,11 +413,15 @@ export default {
      * 获取新增的临时数据
      */
     _getInsertRecords () {
-      const { fullAllDataRowIdData } = this
-      const insertList = this.editStore.insertList as any[]
+      const $xeTable = this
+      const reactData = $xeTable
+      const internalData = $xeTable
+
+      const { editStore } = reactData
+      const { fullAllDataRowIdData } = internalData
+      const { insertMaps } = editStore
       const insertRecords: any[] = []
-      insertList.forEach(row => {
-        const rowid = getRowid(this, row)
+      XEUtils.each(insertMaps, (row, rowid) => {
         if (fullAllDataRowIdData[rowid]) {
           insertRecords.push(row)
         }

package/packages/table/module/export/import-panel.ts

@@ -72,7 +72,7 @@ export default {
   render (this: any, h: CreateElement) {
     const $xeTable = this.$xeTable
 
-    const { hasFile, parseTypeLabel, defaultOptions, storeData, selectName } = this
+    const { hasFile, loading, parseTypeLabel, defaultOptions, storeData, selectName } = this
     const slots = defaultOptions.slots || {}
     const topSlot = slots.top
     const bottomSlot = slots.bottom
@@ -95,7 +95,7 @@ export default {
         maskClosable: true,
         showMaximize: true,
         resize: true,
-        loading: this.loading
+        loading
       },
       on: {
         input (value: any) {
@@ -218,7 +218,7 @@ export default {
                   h('vxe-button', {
                     props: {
                       status: 'primary',
-                      disabled: !hasFile
+                      disabled: !hasFile || loading
                     },
                     on: {
                       click: this.importEvent

package/packages/table/src/body.ts

@@ -381,18 +381,6 @@ function renderRows (h: CreateElement, _vm: any, $xeTable: any, fixedType: any,
         $xeTable.clearHoverRow()
       }
     }
-    // 拖拽行事件
-    if (rowOpts.drag) {
-      trOn.dragstart = (evnt: DragEvent) => {
-        $xeTable.handleRowDragDragstartEvent(evnt)
-      }
-      trOn.dragover = (evnt: DragEvent) => {
-        $xeTable.handleRowDragDragoverEvent(evnt)
-      }
-      trOn.dragend = (evnt: DragEvent) => {
-        $xeTable.handleRowDragDragendEvent(evnt)
-      }
-    }
     const rowid = getRowid($xeTable, row)
     const rest = fullAllDataRowIdData[rowid]
     const rowLevel = rest ? rest.level : 0
@@ -412,6 +400,18 @@ function renderRows (h: CreateElement, _vm: any, $xeTable: any, fixedType: any,
       rowChildren = row[childrenField]
       isExpandTree = rowChildren && rowChildren.length && !!treeExpandedMaps[rowid]
     }
+    // 拖拽行事件
+    if (rowOpts.drag && !rowLevel) {
+      trOn.dragstart = (evnt: DragEvent) => {
+        $xeTable.handleRowDragDragstartEvent(evnt)
+      }
+      trOn.dragover = (evnt: DragEvent) => {
+        $xeTable.handleRowDragDragoverEvent(evnt)
+      }
+      trOn.dragend = (evnt: DragEvent) => {
+        $xeTable.handleRowDragDragendEvent(evnt)
+      }
+    }
     const trClass = [
       'vxe-body--row',
       treeConfig ? `row--level-${rowLevel}` : '',

package/packages/table/src/columnInfo.ts

@@ -13,6 +13,7 @@ export class ColumnInfo {
     const proxyOpts = $xegrid ? $xegrid.proxyOpts : null
     const formatter = _vm.formatter
     const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true
+    const tableProps = $xetable
 
     if (process.env.VUE_APP_VXE_ENV === 'development') {
       const types = ['seq', 'checkbox', 'radio', 'expand', 'html']
@@ -29,7 +30,8 @@ export class ColumnInfo {
         warnLog('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render'])
       }
       if (_vm.type === 'expand') {
-        if ($xetable.treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
+        const { treeConfig } = tableProps
+        if (treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
           errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand'])
         }
       }

package/packages/table/src/methods.ts

@@ -663,7 +663,7 @@ const Methods = {
    * @param {Array} datas 数据
    */
   loadTableData (datas: any) {
-    const { keepSource, treeConfig, treeOpts, editStore, scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop, scrollYLoad: oldScrollYLoad, sXOpts, sYOpts } = this
+    const { keepSource, showOverflow, treeConfig, treeOpts, editStore, scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop, scrollYLoad: oldScrollYLoad, sXOpts, sYOpts } = this
     const childrenField = treeOpts.children || treeOpts.childrenField
     let treeData = []
     let fullData = datas ? datas.slice(0) : []
@@ -707,7 +707,6 @@ const Methods = {
     scrollYStore.endIndex = 1
     scrollXStore.startIndex = 0
     scrollXStore.endIndex = 1
-    editStore.insertList = []
     editStore.insertMaps = {}
     editStore.removeList = []
     editStore.removeMaps = {}
@@ -725,8 +724,15 @@ const Methods = {
     if (keepSource) {
       this.cacheSourceMap(fullData)
     }
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      if (sYLoad) {
+    if (sYLoad) {
+      if (showOverflow) {
+        const errColumn = this.tableFullColumn.find((column: any) => column.showOverflow === false)
+        if (errColumn) {
+          errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+        }
+      }
+
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         if (!(this.height || this.maxHeight)) {
           errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}'])
         }
@@ -1558,14 +1564,19 @@ const Methods = {
   isInsertByRow (row: any) {
     const { editStore } = this
     const rowid = getRowid(this, row)
-    return editStore.insertList.length && editStore.insertMaps[rowid]
+    return !!editStore.insertMaps[rowid]
   },
   /**
    * 删除所有新增的临时数据
    * @returns
    */
   removeInsertRow () {
-    return this.remove(this.editStore.insertList)
+    const $xeTable = this
+    const reactData = $xeTable
+
+    const { editStore } = reactData
+    editStore.insertMaps = {}
+    return $xeTable.remove($xeTable.getInsertRecords())
   },
   /**
    * 检查行或列数据是否发生改变
@@ -5097,6 +5108,8 @@ const Methods = {
               oldIndex: oafIndex
             }
           }, evnt)
+
+          $xeTable.saveCustomStore('update:sort')
         }).catch(() => {
         })
       }
@@ -5683,7 +5696,7 @@ const Methods = {
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
     const rowid = getRowid(this, row)
     if (lazy && row[hasChildField] && !treeExpandLazyLoadedMaps[rowid]) {
-      this.clearTreeExpandLoaded(row).then(() => {
+      return this.clearTreeExpandLoaded(row).then(() => {
         return this.handleAsyncTreeExpandChilds(row)
       }).then(() => {
         if (transform) {

package/packages/table/src/table.ts

@@ -339,7 +339,6 @@ export default {
           row: null,
           column: null
         },
-        insertList: [],
         insertMaps: {},
         removeList: [],
         removeMaps: {}

package/styles/components/table.scss

@@ -1288,7 +1288,7 @@
     position: absolute;
     top: 0;
     left: 0;
-    z-index: 9;
+    z-index: 11;
     pointer-events: none;
   }
   .vxe-cell--drag-handle {