vxe-table 4.9.30 → 4.9.32

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

@@ -10,7 +10,7 @@ import type { TableEditMethods, TableEditPrivateMethods } from '../../../../type
 
 const { getConfig, renderer, hooks, getI18n } = VxeUI
 
-const tableEditMethodKeys: (keyof TableEditMethods)[] = ['insert', 'insertAt', 'insertNextAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getEditRecord', 'getActiveRecord', 'getSelectedCell', 'clearEdit', 'clearActived', 'clearSelected', 'isEditByRow', 'isActiveByRow', 'setEditRow', 'setActiveRow', 'setEditCell', 'setActiveCell', 'setSelectCell']
+const tableEditMethodKeys: (keyof TableEditMethods)[] = ['insert', 'insertAt', 'insertNextAt', 'insertChild', 'insertChildAt', 'insertChildNextAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getEditRecord', 'getActiveRecord', 'getSelectedCell', 'clearEdit', 'clearActived', 'clearSelected', 'isEditByRow', 'isActiveByRow', 'setEditRow', 'setActiveRow', 'setEditCell', 'setActiveCell', 'setSelectCell']
 
 hooks.add('tableEditModule', {
   setupTable ($xeTable) {
@@ -104,7 +104,7 @@ hooks.add('tableEditModule', {
       })
     }
 
-    const handleInsertRowAt = (records: any, row: any, isInsertNextRow?: boolean) => {
+    const handleInsertRowAt = (records: any, targetRow: any, isInsertNextRow?: boolean) => {
       const { treeConfig } = props
       const { mergeList, editStore } = reactData
       const { tableFullTreeData, afterFullData, tableFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData
@@ -115,7 +115,7 @@ hooks.add('tableEditModule', {
         records = [records]
       }
       const newRecords: any[] = reactive($xeTable.defineField(records.map((record: any) => Object.assign(treeConfig && transform ? { [mapChildrenField]: [], [childrenField]: [] } : {}, record))))
-      if (XEUtils.eqNull(row)) {
+      if (XEUtils.eqNull(targetRow)) {
         // 如果为虚拟树
         if (treeConfig && transform) {
           insertTreeRow(newRecords, false)
@@ -137,7 +137,7 @@ hooks.add('tableEditModule', {
           })
         }
       } else {
-        if (row === -1) {
+        if (targetRow === -1) {
           // 如果为虚拟树
           if (treeConfig && transform) {
             insertTreeRow(newRecords, true)
@@ -161,7 +161,7 @@ hooks.add('tableEditModule', {
         } else {
           // 如果为虚拟树
           if (treeConfig && transform) {
-            const matchMapObj = XEUtils.findTree(tableFullTreeData, item => row[rowField] === item[rowField], { children: mapChildrenField })
+            const matchMapObj = XEUtils.findTree(tableFullTreeData, item => targetRow[rowField] === item[rowField], { children: mapChildrenField })
             if (matchMapObj) {
               const { parent: parentRow } = matchMapObj
               const parentMapChilds = parentRow ? parentRow[mapChildrenField] : tableFullTreeData
@@ -191,7 +191,7 @@ hooks.add('tableEditModule', {
 
               // 源
               if (parentRow) {
-                const matchObj = XEUtils.findTree(tableFullTreeData, item => row[rowField] === item[rowField], { children: childrenField })
+                const matchObj = XEUtils.findTree(tableFullTreeData, item => targetRow[rowField] === item[rowField], { children: childrenField })
                 if (matchObj) {
                   const parentChilds = matchObj.items
                   let targetIndex = matchObj.index
@@ -213,12 +213,12 @@ hooks.add('tableEditModule', {
             }
             let afIndex = -1
             // 如果是可视索引
-            if (XEUtils.isNumber(row)) {
-              if (row < afterFullData.length) {
-                afIndex = row
+            if (XEUtils.isNumber(targetRow)) {
+              if (targetRow < afterFullData.length) {
+                afIndex = targetRow
               }
             } else {
-              afIndex = $xeTable.findRowIndexOf(afterFullData, row)
+              afIndex = $xeTable.findRowIndexOf(afterFullData, targetRow)
             }
             // 如果是插入指定行的下一行
             if (isInsertNextRow) {
@@ -228,7 +228,7 @@ hooks.add('tableEditModule', {
               throw new Error(getI18n('vxe.error.unableInsert'))
             }
             afterFullData.splice(afIndex, 0, ...newRecords)
-            tableFullData.splice($xeTable.findRowIndexOf(tableFullData, row), 0, ...newRecords)
+            tableFullData.splice($xeTable.findRowIndexOf(tableFullData, targetRow), 0, ...newRecords)
             // 刷新单元格合并
             mergeList.forEach((mergeItem: any) => {
               const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
@@ -268,6 +268,21 @@ hooks.add('tableEditModule', {
       })
     }
 
+    const handleInsertChildRowAt = (records: any, parentRow: any, targetRow: any, isInsertNextRow?: boolean) => {
+      const { treeConfig } = props
+      const treeOpts = computeTreeOpts.value
+      const { transform, rowField, parentField } = treeOpts
+      if (treeConfig && transform) {
+        if (!XEUtils.isArray(records)) {
+          records = [records]
+        }
+        return handleInsertRowAt(records.map((item: any) => Object.assign({}, item, { [parentField]: parentRow[rowField] })), targetRow, isInsertNextRow)
+      } else {
+        errLog('vxe.error.errProp', ['tree-config.treeConfig=false', 'tree-config.treeConfig=true'])
+      }
+      return Promise.resolve({ row: null, rows: [] })
+    }
+
     const handleClearEdit = (evnt: Event | null, targetRow?: any) => {
       const { mouseConfig } = props
       const { editStore } = reactData
@@ -316,7 +331,7 @@ hooks.add('tableEditModule', {
        *
        * @param {*} records
        */
-      insert (records: any) {
+      insert (records) {
         return handleInsertRowAt(records, null)
       },
       /**
@@ -325,13 +340,22 @@ hooks.add('tableEditModule', {
        * 如果 row 为 -1 则从插入到底部，如果为树结构，则插入到目标节点底部
        * 如果 row 为有效行则插入到该行的位置，如果为树结构，则有插入到效的目标节点该行的位置
        * @param {Object/Array} records 新的数据
-       * @param {Row} row 指定行
+       * @param {Row} targetRow 指定行
        */
-      insertAt (records: any, row: any) {
-        return handleInsertRowAt(records, row)
+      insertAt (records, targetRow) {
+        return handleInsertRowAt(records, targetRow)
+      },
+      insertNextAt (records, targetRow) {
+        return handleInsertRowAt(records, targetRow, true)
+      },
+      insertChild (records, parentRow) {
+        return handleInsertChildRowAt(records, parentRow, null)
+      },
+      insertChildAt (records, parentRow, targetRow) {
+        return handleInsertChildRowAt(records, parentRow, targetRow)
       },
-      insertNextAt (records: any, row: any) {
-        return handleInsertRowAt(records, row, true)
+      insertChildNextAt (records, parentRow, targetRow) {
+        return handleInsertChildRowAt(records, parentRow, targetRow, true)
       },
       /**
        * 删除指定行数据

package/packages/table/module/export/hook.ts

@@ -2,7 +2,7 @@ import { inject, nextTick } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../../ui'
 import { isColumnInfo, mergeBodyMethod, getCellValue } from '../../src/util'
-import { parseFile, formatText } from '../../../ui/src/utils'
+import { parseFile, formatText, eqEmptyValue } from '../../../ui/src/utils'
 import { createHtmlPage, getExportBlobByContent } from './util'
 import { warnLog, errLog } from '../../../ui/src/log'
 
@@ -320,6 +320,10 @@ hooks.add('tableExportModule', {
       return XEUtils.isBoolean(cellValue) ? (cellValue ? 'TRUE' : 'FALSE') : cellValue
     }
 
+    const toStringValue = (cellValue: any) => {
+      return eqEmptyValue(cellValue) ? '' : `${cellValue}`
+    }
+
     const getBodyLabelData = (opts: any, columns: any[], datas: any[]) => {
       const { isAllExpand, mode } = opts
       const { treeConfig } = props
@@ -347,7 +351,7 @@ hooks.add('tableExportModule', {
               _expand: hasRowChild && $xeTable.isTreeExpandByRow(row)
             }
             columns.forEach((column, $columnIndex) => {
-              let cellValue: string | number | boolean = ''
+              let cellValue: string | number | boolean | null = ''
               const renderOpts = column.editRender || column.cellRender
               let bodyExportMethod = column.exportMethod || columnOpts.exportMethod
               if (!bodyExportMethod && renderOpts && renderOpts.name) {
@@ -382,7 +386,7 @@ hooks.add('tableExportModule', {
                     if (opts.original) {
                       cellValue = getCellValue(row, column)
                     } else {
-                      cellValue = `${$xeTable.getCellLabel(row, column)}`
+                      cellValue = $xeTable.getCellLabel(row, column)
                       if (column.type === 'html') {
                         htmlCellElem.innerHTML = cellValue
                         cellValue = htmlCellElem.innerText.trim()
@@ -395,7 +399,7 @@ hooks.add('tableExportModule', {
                     }
                 }
               }
-              item[column.id] = XEUtils.toValueString(cellValue)
+              item[column.id] = toStringValue(cellValue)
             })
             expandMaps.set(row, 1)
             rest.push(Object.assign(item, row))
@@ -408,7 +412,7 @@ hooks.add('tableExportModule', {
           _row: row
         }
         columns.forEach((column, $columnIndex) => {
-          let cellValue: string | number | boolean = ''
+          let cellValue: string | number | boolean | null = ''
           const renderOpts = column.editRender || column.cellRender
           let bodyExportMethod = column.exportMethod || columnOpts.exportMethod
           if (!bodyExportMethod && renderOpts && renderOpts.name) {
@@ -440,7 +444,7 @@ hooks.add('tableExportModule', {
                 if (opts.original) {
                   cellValue = getCellValue(row, column)
                 } else {
-                  cellValue = `${$xeTable.getCellLabel(row, column)}`
+                  cellValue = $xeTable.getCellLabel(row, column)
                   if (column.type === 'html') {
                     htmlCellElem.innerHTML = cellValue
                     cellValue = htmlCellElem.innerText.trim()
@@ -453,7 +457,7 @@ hooks.add('tableExportModule', {
                 }
             }
           }
-          item[column.id] = XEUtils.toValueString(cellValue)
+          item[column.id] = toStringValue(cellValue)
         })
         return item
       })

package/packages/table/module/filter/panel.ts

@@ -198,11 +198,13 @@ export default defineComponent({
     const renderVN = () => {
       const { filterStore } = props
       const { initStore } = tableReactData
-      const { column } = filterStore
+      const { visible, multiple, column } = filterStore
       const filterRender = column ? column.filterRender : null
       const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
       const filterClassName = compConf ? (compConf.tableFilterClassName || compConf.filterClassName) : ''
       const params = Object.assign({}, tableInternalData._currFilterParams, { $panel, $table: $xeTable })
+      const filterOpts = computeFilterOpts.value
+      const { destroyOnClose } = filterOpts
       return h('div', {
         class: [
           'vxe-table--filter-wrapper',
@@ -210,12 +212,12 @@ export default defineComponent({
           getPropClass(filterClassName, params),
           {
             'is--animat': $xeTable.props.animat,
-            'is--multiple': filterStore.multiple,
-            'is--active': filterStore.visible
+            'is--multiple': multiple,
+            'is--active': visible
           }
         ],
         style: filterStore.style
-      }, initStore.filter && column ? renderOptions(filterRender, compConf).concat(renderFooters()) : [])
+      }, initStore.filter && (destroyOnClose ? visible : true) && column ? renderOptions(filterRender, compConf).concat(renderFooters()) : [])
     }
 
     return renderVN

package/packages/table/src/table.ts

@@ -4924,18 +4924,25 @@ export default defineComponent({
         const rowRest = fullAllDataRowIdData[getRowid($xeTable, row)]
         return rowRest && !!rowRest.treeLoaded
       },
-      clearTreeExpandLoaded (row) {
+      clearTreeExpandLoaded (rows: any) {
         const { treeExpandedMaps } = reactData
         const { fullAllDataRowIdData } = internalData
         const treeOpts = computeTreeOpts.value
-        const { transform, lazy } = treeOpts
-        const rowid = getRowid($xeTable, row)
-        const rowRest = fullAllDataRowIdData[rowid]
-        if (lazy && rowRest) {
-          rowRest.treeLoaded = false
-          if (treeExpandedMaps[rowid]) {
-            delete treeExpandedMaps[rowid]
+        const { transform } = treeOpts
+        if (rows) {
+          if (!XEUtils.isArray(rows)) {
+            rows = [rows]
           }
+          rows.forEach((row: any) => {
+            const rowid = getRowid($xeTable, row)
+            const rowRest = fullAllDataRowIdData[rowid]
+            if (rowRest) {
+              rowRest.treeLoaded = false
+              if (treeExpandedMaps[rowid]) {
+                delete treeExpandedMaps[rowid]
+              }
+            }
+          })
         }
         if (transform) {
           handleVirtualTreeToList()

package/packages/ui/index.ts

@@ -111,6 +111,7 @@ VxeUI.setConfig({
     filterConfig: {
       // remote: false,
       // filterMethod: null,
+      // destroyOnClose: false,
       showIcon: true
     },
     treeConfig: {

package/styles/components/table.scss

@@ -78,17 +78,6 @@
       .vxe-ico-picker {
         width: 100%;
       }
-      .vxe-cell--tree-node {
-        .vxe-input,
-        .vxe-textarea,
-        .vxe-select,
-        .vxe-tree-select,
-        .vxe-date-picker,
-        .vxe-number-input,
-        .vxe-ico-picker {
-          width: 100%;
-        }
-      }
     }
   }
 }
@@ -110,6 +99,9 @@
         width: 100%;
       }
       & > .vxe-cell--tree-node {
+        .vxe-default-input,
+        .vxe-default-textarea,
+        .vxe-default-select,
         .vxe-input,
         .vxe-textarea,
         .vxe-select,
@@ -138,17 +130,6 @@
   & > .vxe-ico-picker {
     width: 100%;
   }
-  & > .vxe-cell--tree-node {
-    .vxe-input,
-    .vxe-textarea,
-    .vxe-select,
-    .vxe-tree-select,
-    .vxe-date-picker,
-    .vxe-number-input,
-    .vxe-ico-picker {
-      width: 100%;
-    }
-  }
 }
 .vxe-cell,
 .vxe-table--filter-template {