vxe-table 3.11.21 → 3.11.23

package/packages/locale/lang/zh-CN.ts

@@ -47,6 +47,8 @@ export default {
       notExp: '该浏览器不支持导入/导出功能',
       impFields: '导入失败，请检查字段名和数据格式是否正确',
       treeNotImp: '树表格不支持导入',
+      treeCrossDrag: '只能拖拽第一层级的数据',
+      treeDragChild: '父级数据不能拖拽到自己的子级中',
       reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {

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

@@ -67,6 +67,7 @@ export default {
           column.visible = column.renderVisible
         }
       })
+      reactData.isCustomStatus = true
       reactData.isDragColMove = true
       setTimeout(() => {
         reactData.isDragColMove = false
@@ -101,7 +102,11 @@ export default {
       return $xeTable.$nextTick()
     },
     _resetCustom (options: any) {
-      const { collectColumn, customOpts } = this
+      const $xeTable = this
+      const reactData = $xeTable
+      const internalData = $xeTable
+
+      const { collectColumn, customOpts } = internalData
       const { checkMethod } = customOpts
       const opts = Object.assign({
         visible: true,
@@ -124,8 +129,9 @@ export default {
         }
         column.renderResizeWidth = column.renderWidth
       })
-      this.saveCustomStore('reset')
-      return this.handleCustom()
+      reactData.isCustomStatus = false
+      $xeTable.saveCustomStore('reset')
+      return $xeTable.handleCustom()
     },
     _toggleCustomAllCheckbox () {
       const { customStore } = this

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

@@ -28,11 +28,17 @@ function updateDropHint (_vm: any, evnt: any) {
 const renderSimplePanel = (h: CreateElement, _vm: any) => {
   const VxeUIButtonComponent = VxeUI.getComponent<VxeButtonComponent>('VxeButton')
 
+  const props = _vm
+
   const $xeTable = _vm.$xeTable
-  const { _e, customStore, dragColumn } = _vm
-  const { customColumnList, customOpts, isMaxFixedColumn } = $xeTable
+  const reactData = $xeTable
+
+  const { customStore } = props
+  const { isCustomStatus, customColumnList } = reactData
+  const customOpts = $xeTable.computeCustomOpts
   const { maxHeight } = customStore
   const { checkMethod, visibleMethod, allowVisible, allowSort, allowFixed, trigger, placement } = customOpts
+  const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn
   const slots = customOpts.slots || {}
   const headerSlot = slots.header
   const topSlot = slots.top
@@ -41,19 +47,21 @@ const renderSimplePanel = (h: CreateElement, _vm: any) => {
   const footerSlot = slots.footer
   const colVNs: any[] = []
   const customWrapperOns: any = {}
+  const isAllChecked = customStore.isAll
+  const isAllIndeterminate = customStore.isIndeterminate
+  const dragColumn = _vm.dragColumn
   // hover 触发
   if (trigger === 'hover') {
     customWrapperOns.mouseenter = _vm.handleWrapperMouseenterEvent
     customWrapperOns.mouseleave = _vm.handleWrapperMouseleaveEvent
   }
-  const isAllChecked = customStore.isAll
-  const isAllIndeterminate = customStore.isIndeterminate
   const params = {
     $table: $xeTable,
     $grid: $xeTable.xegrid,
     columns: customColumnList,
     isAllChecked,
-    isAllIndeterminate
+    isAllIndeterminate,
+    isCustomStatus
   }
   XEUtils.eachTree(customColumnList, (column, index, items, path, parent) => {
     const isVisible = visibleMethod ? visibleMethod({ column }) : true
@@ -102,7 +110,7 @@ const renderSimplePanel = (h: CreateElement, _vm: any) => {
                 class: ['vxe-checkbox--icon', isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
               })
             ])
-            : _e(),
+            : renderEmptyElement($xeTable),
           allowSort && column.level === 1
             ? h('div', {
               class: 'vxe-table-custom--sort-option'
@@ -126,7 +134,7 @@ const renderSimplePanel = (h: CreateElement, _vm: any) => {
                 })
               ])
             ])
-            : _e(),
+            : renderEmptyElement($xeTable),
           column.type === 'html'
             ? h('div', {
               key: '1',
@@ -175,7 +183,7 @@ const renderSimplePanel = (h: CreateElement, _vm: any) => {
                 }
               })
             ])
-            : _e()
+            : renderEmptyElement($xeTable)
         ])
       )
     }
@@ -272,7 +280,8 @@ const renderSimplePanel = (h: CreateElement, _vm: any) => {
                   h(VxeUIButtonComponent, {
                     props: {
                       mode: 'text',
-                      content: customOpts.resetButtonText || getI18n('vxe.table.customRestore')
+                      content: customOpts.resetButtonText || getI18n('vxe.table.customRestore'),
+                      disabled: !isCustomStatus
                     },
                     on: {
                       click: _vm.resetCustomEvent
@@ -298,7 +307,7 @@ const renderSimplePanel = (h: CreateElement, _vm: any) => {
                       }
                     }),
                   customOpts.immediate
-                    ? _e()
+                    ? renderEmptyElement($xeTable)
                     : h(VxeUIButtonComponent, {
                       props: {
                         mode: 'text',
@@ -324,15 +333,24 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
   const VxeUITooltipComponent = VxeUI.getComponent<VxeTooltipComponent>('VxeTooltip')
   const $xeTableCustomPanel = _vm
 
+  const props = _vm
+
   const $xeTable = _vm.$xeTable
-  const { _e, customStore } = _vm
-  const { resizable: allResizable, customOpts, customColumnList, columnOpts, isMaxFixedColumn } = $xeTable
+  const tableProps = $xeTable
+  const reactData = $xeTable
+
+  const { customStore } = props
+  const { resizable: allResizable } = tableProps
+  const { isCustomStatus, customColumnList } = reactData
+  const customOpts = $xeTable.computeCustomOpts
   const { mode, modalOptions, drawerOptions, allowVisible, allowSort, allowFixed, allowResizable, checkMethod, visibleMethod } = customOpts
+  const columnOpts = $xeTable.computeColumnOpts
   const { maxFixedSize } = columnOpts
   const resizableOpts = $xeTable.computeResizableOpts
   const { minWidth: reMinWidth, maxWidth: reMaxWidth } = resizableOpts
   const modalOpts = Object.assign({}, modalOptions)
   const drawerOpts = Object.assign({}, drawerOptions)
+  const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn
   const slots = customOpts.slots || {}
   const headerSlot = slots.header
   const topSlot = slots.top
@@ -342,12 +360,14 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
   const trVNs: VNode[] = []
   const isAllChecked = customStore.isAll
   const isAllIndeterminate = customStore.isIndeterminate
+  const dragColumn = _vm.dragColumn
   const params = {
     $table: $xeTable,
     $grid: $xeTable.xegrid,
     columns: customColumnList,
     isAllChecked,
-    isAllIndeterminate
+    isAllIndeterminate,
+    isCustomStatus
   }
   XEUtils.eachTree(customColumnList, (column, index, items, path, parent) => {
     const isVisible = visibleMethod ? visibleMethod({ column }) : true
@@ -418,7 +438,7 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
                 })
               ])
             ])
-            : _e(),
+            : renderEmptyElement($xeTable),
           allowSort
             ? h('td', {
               class: 'vxe-table-custom-popup--column-item col--sort'
@@ -444,7 +464,7 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
                 ])
                 : h('span', '-')
             ])
-            : _e(),
+            : renderEmptyElement($xeTable),
           h('td', {
             class: 'vxe-table-custom-popup--column-item col--name'
           }, [
@@ -491,7 +511,7 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
                     : renderEmptyElement($xeTableCustomPanel)
                   )
             ])
-            : _e(),
+            : renderEmptyElement($xeTable),
           allowFixed
             ? h('td', {
               class: 'vxe-table-custom-popup--column-item col--fixed'
@@ -517,7 +537,7 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
                   }
                 })
             ])
-            : _e()
+            : renderEmptyElement($xeTable)
         ])
       )
     }
@@ -545,12 +565,12 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
                 ? h('col', {
                   class: 'vxe-table-custom-popup--table-col-seq'
                 })
-                : _e(),
+                : renderEmptyElement($xeTable),
               allowSort
                 ? h('col', {
                   class: 'vxe-table-custom-popup--table-col-sort'
                 })
-                : _e(),
+                : renderEmptyElement($xeTable),
               h('col', {
                 class: 'vxe-table-custom-popup--table-col-title'
               }),
@@ -558,12 +578,12 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
                 ? h('col', {
                   class: 'vxe-table-custom-popup--table-col-width'
                 })
-                : _e(),
+                : renderEmptyElement($xeTable),
               allowFixed
                 ? h('col', {
                   class: 'vxe-table-custom-popup--table-col-fixed'
                 })
-                : _e()
+                : renderEmptyElement($xeTable)
             ]),
             h('thead', {}, [
               h('tr', {}, [
@@ -590,7 +610,7 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
                       }, getI18n('vxe.toolbar.customAll'))
                     ])
                   ])
-                  : _e(),
+                  : renderEmptyElement($xeTable),
                 allowSort
                   ? h('th', {}, [
                     h('span', {
@@ -613,14 +633,14 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
                       })
                       : renderEmptyElement($xeTableCustomPanel)
                   ])
-                  : _e(),
+                  : renderEmptyElement($xeTable),
                 h('th', {}, getI18n('vxe.custom.setting.colTitle')),
                 allowResizable
                   ? h('th', {}, getI18n('vxe.custom.setting.colResizable'))
-                  : _e(),
+                  : renderEmptyElement($xeTable),
                 allowFixed
                   ? h('th', {}, getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize]))
-                  : _e()
+                  : renderEmptyElement($xeTable)
               ])
             ]),
             h('transition-group', {
@@ -640,7 +660,7 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
         h('div', {
           ref: 'dragHintElemRef',
           class: 'vxe-table-custom-popup--drag-hint'
-        }, getI18n('vxe.custom.cstmDragTarget', [_vm.dragColumn ? _vm.dragColumn.getTitle() : '']))
+        }, getI18n('vxe.custom.cstmDragTarget', [dragColumn ? dragColumn.getTitle() : '']))
       ])
     },
     footer: () => {
@@ -652,7 +672,8 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
       }, [
         h(VxeUIButtonComponent, {
           props: {
-            content: customOpts.resetButtonText || getI18n('vxe.custom.cstmRestore')
+            content: customOpts.resetButtonText || getI18n('vxe.custom.cstmRestore'),
+            disabled: !isCustomStatus
           },
           on: {
             click: _vm.resetCustomEvent

package/packages/table/render/index.ts

@@ -617,17 +617,36 @@ renderer.mixin({
     renderTableCell (h, renderOpts, params) {
       const { props = {} } = renderOpts
       const { row, column } = params
-      const digits = props.digits || getConfig().numberInput?.digits || 2
+      const { type } = props
       let cellValue = XEUtils.get(row, column.field)
       if (cellValue) {
-        switch (props.type) {
-          case 'float':
-            cellValue = XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits)
-            break
+        if (type === 'float') {
+          const digits = props.digits || getConfig().numberInput.digits || 1
+          cellValue = XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits)
+        } else if (type === 'amount') {
+          const digits = props.digits || getConfig().numberInput.digits || 2
+          cellValue = XEUtils.commafy(XEUtils.toNumber(cellValue), { digits })
         }
       }
       return getCellLabelVNs(h, renderOpts, params, cellValue)
     },
+    renderTableFooter (h, renderOpts, params) {
+      const { props = {} } = renderOpts
+      const { row, column, _columnIndex } = params
+      const { type } = props
+      // 兼容老模式
+      const cellValue = XEUtils.isArray(row) ? row[_columnIndex] : XEUtils.get(row, column.field)
+      if (XEUtils.isNumber(cellValue)) {
+        if (type === 'float') {
+          const digits = props.digits || getConfig().numberInput.digits || 1
+          return XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits)
+        } else if (type === 'amount') {
+          const digits = props.digits || getConfig().numberInput.digits || 2
+          return XEUtils.commafy(XEUtils.toNumber(cellValue), { digits })
+        }
+      }
+      return getFuncText(cellValue, 1)
+    },
     renderTableDefault: defaultEditRender,
     renderTableFilter: defaultFilterRender,
     tableFilterDefaultMethod: handleInputFilterMethod

package/packages/table/src/body.ts

@@ -407,12 +407,12 @@ function renderRows (h: CreateElement, _vm: any, $xeTable: any, fixedType: any,
     if (editConfig) {
       isNewRow = $xeTable.isInsertByRow(row)
     }
-    if (treeConfig && !scrollYLoad && !treeOpts.transform) {
+    if (treeConfig && !scrollYLoad && !transform) {
       rowChildren = row[childrenField]
       isExpandTree = rowChildren && rowChildren.length && !!treeExpandedMaps[rowid]
     }
     // 拖拽行事件
-    if (rowOpts.drag && !rowLevel) {
+    if (rowOpts.drag && (!treeConfig || transform)) {
       trOn.dragstart = (evnt: DragEvent) => {
         $xeTable.handleRowDragDragstartEvent(evnt)
       }

package/packages/table/src/cell.ts

@@ -83,11 +83,17 @@ function renderCellBaseVNs (h: CreateElement, params: any, content: any) {
   const { treeConfig, dragConfig } = tableProps
   const rowOpts = $table.computeRowOpts
   const rowDragOpts = $table.computeRowDragOpts
-  const { showIcon, visibleMethod } = rowDragOpts
+  const { showIcon, isCrossDrag, visibleMethod } = rowDragOpts
   const rVisibleMethod = visibleMethod || (dragConfig ? dragConfig.rowVisibleMethod : null)
   const vns: any[] = XEUtils.isArray(content) ? content : [content]
   if (dragSort && rowOpts.drag && ((showIcon || (dragConfig ? dragConfig.showRowIcon : false)) && (!rVisibleMethod || rVisibleMethod(params)))) {
-    if (!treeConfig || !level) {
+    if (treeConfig) {
+      if (isCrossDrag || !level) {
+        vns.unshift(
+          renderCellDragIcon(h, params)
+        )
+      }
+    } else {
       vns.unshift(
         renderCellDragIcon(h, params)
       )

package/packages/table/src/header.ts

@@ -49,7 +49,7 @@ const renderRows = (h: CreateElement, _vm: any, cols: VxeTableDefines.ColumnInfo
       thOns.mousedown = (evnt: any) => $xetable.triggerHeaderCellMousedownEvent(evnt, params)
     }
     // 拖拽行事件
-    if (columnOpts.drag && !column.parentId) {
+    if (columnOpts.drag) {
       thOns.dragstart = $xetable.handleHeaderCellDragDragstartEvent
       thOns.dragend = $xetable.handleHeaderCellDragDragendEvent
       thOns.dragover = $xetable.handleHeaderCellDragDragoverEvent