vxe-table 4.7.65 → 4.7.67

package/packages/locale/lang/ru-RU.ts

@@ -306,7 +306,9 @@ export default {
       reUpload: '重新上传',
       uploadProgress: '上传中 {0}%',
       uploadErr: '上传失败',
-      uploadSuccess: '上传成功'
+      uploadSuccess: '上传成功',
+      moreBtnText: '更多（{0}）',
+      viewItemTitle: '点击查看'
     },
     formDesign: {
       formName: '表单名称',
@@ -337,6 +339,7 @@ export default {
         group: {
           base: '基础控件',
           layout: '布局控件',
+          system: '系统控件',
           advanced: '高级控件'
         },
         copyTitle: '副本_{0}',

package/packages/locale/lang/vi-VN.ts

@@ -306,7 +306,9 @@ export default {
       reUpload: '重新上传',
       uploadProgress: '上传中 {0}%',
       uploadErr: '上传失败',
-      uploadSuccess: '上传成功'
+      uploadSuccess: '上传成功',
+      moreBtnText: '更多（{0}）',
+      viewItemTitle: '点击查看'
     },
     formDesign: {
       formName: '表单名称',
@@ -337,6 +339,7 @@ export default {
         group: {
           base: '基础控件',
           layout: '布局控件',
+          system: '系统控件',
           advanced: '高级控件'
         },
         copyTitle: '副本_{0}',

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

@@ -306,7 +306,9 @@ export default {
       reUpload: '重新上传',
       uploadProgress: '上传中 {0}%',
       uploadErr: '上传失败',
-      uploadSuccess: '上传成功'
+      uploadSuccess: '上传成功',
+      moreBtnText: '更多（{0}）',
+      viewItemTitle: '点击查看'
     },
     formDesign: {
       formName: '表单名称',
@@ -337,6 +339,7 @@ export default {
         group: {
           base: '基础控件',
           layout: '布局控件',
+          system: '系统控件',
           advanced: '高级控件'
         },
         copyTitle: '副本_{0}',

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

@@ -304,7 +304,9 @@ export default {
       reUpload: '重新上传',
       uploadProgress: '上传中 {0}%',
       uploadErr: '上传失败',
-      uploadSuccess: '上传成功'
+      uploadSuccess: '上传成功',
+      moreBtnText: '更多（{0}）',
+      viewItemTitle: '點擊查看'
     },
     formDesign: {
       formName: '表單名稱',
@@ -335,6 +337,7 @@ export default {
         group: {
           base: '基础控件',
           layout: '布局控件',
+          system: '系統控件',
           advanced: '高级控件'
         },
         copyTitle: '副本_{0}',

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

@@ -5,7 +5,7 @@ import { addClass, removeClass } from '../../../ui/src/dom'
 import { errLog } from '../../../ui/src/log'
 import XEUtils from 'xe-utils'
 
-import type { VxeModalComponent, VxeDrawerComponent, VxeButtonComponent, VxeRadioGroupComponent, VxeTooltipComponent, VxeInputComponent } from 'vxe-pc-ui'
+import type { VxeModalComponent, VxeDrawerComponent, VxeButtonComponent, VxeRadioGroupComponent, VxeTooltipComponent, VxeInputComponent, VxeButtonEvents } from 'vxe-pc-ui'
 import type { VxeTableDefines, VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods, VxeColumnPropTypes } from '../../../../types'
 
 const { getI18n, getIcon } = VxeUI
@@ -55,7 +55,7 @@ export default defineComponent({
       }, 300)
     }
 
-    const confirmCustomEvent = (evnt: Event) => {
+    const confirmCustomEvent: VxeButtonEvents.Click = ({ $event }) => {
       const { customColumnList } = reactData
       const customOpts = computeCustomOpts.value
       const { allowVisible, allowSort, allowFixed, allowResizable } = customOpts
@@ -82,11 +82,11 @@ export default defineComponent({
         }
       })
       $xeTable.closeCustom()
-      $xeTable.emitCustomEvent('confirm', evnt)
+      $xeTable.emitCustomEvent('confirm', $event)
       $xeTable.saveCustomStore('confirm')
     }
 
-    const cancelCustomEvent = (evnt: Event) => {
+    const cancelCustomEvent: VxeButtonEvents.Click = ({ $event }) => {
       const { customStore } = props
       const { customColumnList } = reactData
       const { oldSortMaps, oldFixedMaps, oldVisibleMaps } = customStore
@@ -112,7 +112,7 @@ export default defineComponent({
         }
       }, { children: 'children' })
       $xeTable.closeCustom()
-      $xeTable.emitCustomEvent('cancel', evnt)
+      $xeTable.emitCustomEvent('cancel', $event)
     }
 
     const handleResetCustomEvent = (evnt: Event) => {
@@ -121,7 +121,7 @@ export default defineComponent({
       $xeTable.emitCustomEvent('reset', evnt)
     }
 
-    const resetCustomEvent = (evnt: Event) => {
+    const resetCustomEvent: VxeButtonEvents.Click = ({ $event }) => {
       if (VxeUI.modal) {
         VxeUI.modal.confirm({
           content: getI18n('vxe.custom.cstmConfirmRestore'),
@@ -129,11 +129,11 @@ export default defineComponent({
           escClosable: true
         }).then(type => {
           if (type === 'confirm') {
-            handleResetCustomEvent(evnt)
+            handleResetCustomEvent($event)
           }
         })
       } else {
-        handleResetCustomEvent(evnt)
+        handleResetCustomEvent($event)
       }
     }
 
@@ -185,7 +185,7 @@ export default defineComponent({
     //   }
     // }
 
-    const allCustomEvent = () => {
+    const allOptionEvent = () => {
       const { customStore } = props
       const { customColumnList } = reactData
       const customOpts = computeCustomOpts.value
@@ -435,7 +435,7 @@ export default defineComponent({
                       'is--indeterminate': isAllIndeterminate
                     }],
                     title: getI18n('vxe.table.allTitle'),
-                    onClick: allCustomEvent
+                    onClick: allOptionEvent
                   }, [
                     h('span', {
                       class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
@@ -678,7 +678,7 @@ export default defineComponent({
                             'is--indeterminate': isAllIndeterminate
                           }],
                           title: getI18n('vxe.table.allTitle'),
-                          onClick: allCustomEvent
+                          onClick: allOptionEvent
                         }, [
                           h('span', {
                             class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
@@ -697,7 +697,8 @@ export default defineComponent({
                         VxeUITooltipComponent
                           ? h(VxeUITooltipComponent, {
                             enterable: true,
-                            content: getI18n('vxe.custom.setting.sortHelpTip')
+                            content: getI18n('vxe.custom.setting.sortHelpTip'),
+                            popupClassName: 'vxe-table--ignore-clear'
                           }, {
                             default: () => {
                               return h('i', {

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

@@ -764,25 +764,26 @@ hooks.add('tableEditModule', {
         const { editRender } = column
         if (isEnableConf(editRender)) {
           const compRender = renderer.get(editRender.name)
-          let { autofocus, autoselect } = editRender
+          let autoFocus = editRender.autofocus || editRender.autoFocus
+          let autoSelect = editRender.autoSelect || editRender.autoselect
           let inputElem
-          if (!autofocus && compRender) {
-            autofocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autofocus
+          if (!autoFocus && compRender) {
+            autoFocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autofocus
           }
-          if (!autoselect && compRender) {
-            autoselect = compRender.tableAutoSelect || compRender.autoselect
+          if (!autoSelect && compRender) {
+            autoSelect = compRender.tableAutoSelect || compRender.autoselect
           }
           // 如果指定了聚焦 class
-          if (XEUtils.isFunction(autofocus)) {
-            inputElem = autofocus(params)
-          } else if (autofocus) {
-            inputElem = cell.querySelector(autofocus)
+          if (XEUtils.isFunction(autoFocus)) {
+            inputElem = autoFocus(params)
+          } else if (autoFocus) {
+            inputElem = cell.querySelector(autoFocus)
             if (inputElem) {
               inputElem.focus()
             }
           }
           if (inputElem) {
-            if (autoselect) {
+            if (autoSelect) {
               inputElem.select()
             } else {
               // 保持一致行为，光标移到末端

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

@@ -294,7 +294,7 @@ hooks.add('tableExportModule', {
       return row[childrenField] && row[childrenField].length
     }
 
-    const getSeq = (row: any, $rowIndex: any, column: any, $columnIndex: any) => {
+    const getSeq = (cellValue: any, row: any, $rowIndex: any, column: any, $columnIndex: any) => {
       const seqOpts = computeSeqOpts.value
       const seqMethod = seqOpts.seqMethod || column.seqMethod
       if (seqMethod) {
@@ -307,7 +307,7 @@ hooks.add('tableExportModule', {
           $columnIndex
         })
       }
-      return $xeTable.getRowSeq(row)
+      return cellValue
     }
 
     function getHeaderTitle (opts: any, column: any) {
@@ -363,9 +363,11 @@ hooks.add('tableExportModule', {
                 cellValue = bodyExportMethod({ $table: $xeTable, row, column, options: opts })
               } else {
                 switch (column.type) {
-                  case 'seq':
-                    cellValue = mode === 'all' ? path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('') : getSeq(row, $rowIndex, column, $columnIndex)
+                  case 'seq': {
+                    const seqVal = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('')
+                    cellValue = mode === 'all' ? seqVal : getSeq(seqVal, row, $rowIndex, column, $columnIndex)
                     break
+                  }
                   case 'checkbox':
                     cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row))
                     item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : ''
@@ -419,9 +421,11 @@ hooks.add('tableExportModule', {
             cellValue = exportLabelMethod({ $table: $xeTable, row, column, options: opts })
           } else {
             switch (column.type) {
-              case 'seq':
-                cellValue = mode === 'all' ? $rowIndex + 1 : getSeq(row, $rowIndex, column, $columnIndex)
+              case 'seq': {
+                const seqValue = $rowIndex + 1
+                cellValue = mode === 'all' ? seqValue : getSeq(seqValue, row, $rowIndex, column, $columnIndex)
                 break
+              }
               case 'checkbox':
                 cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row))
                 item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : ''

package/packages/table/render/index.ts

@@ -436,14 +436,14 @@ function oldFilterRender (renderOpts: any, params: any) {
 
 function handleFilterMethod ({ option, row, column }: any) {
   const { data } = option
-  const cellValue = XEUtils.get(row, column.property)
+  const cellValue = XEUtils.get(row, column.field)
   /* eslint-disable eqeqeq */
   return cellValue == data
 }
 
 function handleInputFilterMethod ({ option, row, column }: any) {
   const { data } = option
-  const cellValue = XEUtils.get(row, column.property)
+  const cellValue = XEUtils.get(row, column.field)
   /* eslint-disable eqeqeq */
   return XEUtils.toValueString(cellValue).indexOf(data) > -1
 }
@@ -501,7 +501,7 @@ function oldSelectEditRender (renderOpts: any, params: any) {
 
 function getSelectCellValue (renderOpts: any, { row, column }: any) {
   const { options, optionGroups, optionProps = {}, optionGroupProps = {} } = renderOpts
-  const cellValue = XEUtils.get(row, column.property)
+  const cellValue = XEUtils.get(row, column.field)
   let selectItem: any
   const labelProp = optionProps.label || 'label'
   const valueProp = optionProps.value || 'value'
@@ -536,7 +536,7 @@ function handleExportSelectMethod (params: any) {
 
 function getTreeSelectCellValue (renderOpts: any, { row, column }: any) {
   const { options, optionProps = {} } = renderOpts
-  const cellValue = XEUtils.get(row, column.property)
+  const cellValue = XEUtils.get(row, column.field)
   const labelProp = optionProps.label || 'label'
   const valueProp = optionProps.value || 'value'
   const childrenProp = optionProps.children || 'children'
@@ -564,23 +564,23 @@ function handleExportTreeSelectMethod (params: any) {
  */
 renderer.mixin({
   input: {
-    autofocus: 'input',
-    renderEdit: nativeEditRender,
-    renderDefault: nativeEditRender,
-    renderFilter: nativeFilterRender,
-    defaultFilterMethod: handleInputFilterMethod
+    tableAutoFocus: 'input',
+    renderTableEdit: nativeEditRender,
+    renderTableDefault: nativeEditRender,
+    renderTableFilter: nativeFilterRender,
+    tableFilterDefaultMethod: handleInputFilterMethod
   },
   textarea: {
-    autofocus: 'textarea',
-    renderEdit: nativeEditRender
+    tableAutoFocus: 'textarea',
+    renderTableEdit: nativeEditRender
   },
   select: {
-    renderEdit: nativeSelectEditRender,
-    renderDefault: nativeSelectEditRender,
-    renderCell (renderOpts, params) {
+    renderTableEdit: nativeSelectEditRender,
+    renderTableDefault: nativeSelectEditRender,
+    renderTableCell (renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params))
     },
-    renderFilter (renderOpts, params) {
+    renderTableFilter (renderOpts, params) {
       const { column } = params
       return column.filters.map((option, oIndex) => {
         return h('select', {
@@ -592,17 +592,17 @@ renderer.mixin({
         renderOpts.optionGroups ? renderNativeOptgroups(renderOpts, params, renderNativeOptions) : renderNativeOptions(renderOpts.options, renderOpts, params))
       })
     },
-    defaultFilterMethod: handleFilterMethod,
-    exportMethod: handleExportSelectMethod
+    tableFilterDefaultMethod: handleFilterMethod,
+    tableExportMethod: handleExportSelectMethod
   },
   VxeInput: {
-    autofocus: 'input',
-    renderEdit: defaultEditRender,
-    renderCell (renderOpts, params) {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultEditRender,
+    renderTableCell (renderOpts, params) {
       const { props = {} } = renderOpts
       const { row, column } = params
       const digits = props.digits || getConfig().input?.digits || 2
-      let cellValue = XEUtils.get(row, column.property)
+      let cellValue = XEUtils.get(row, column.field)
       if (cellValue) {
         switch (props.type) {
           case 'date':
@@ -619,18 +619,18 @@ renderer.mixin({
       }
       return getCellLabelVNs(renderOpts, params, cellValue)
     },
-    renderDefault: defaultEditRender,
-    renderFilter: defaultFilterRender,
-    defaultFilterMethod: handleInputFilterMethod
+    renderTableDefault: defaultEditRender,
+    renderTableFilter: defaultFilterRender,
+    tableFilterDefaultMethod: handleInputFilterMethod
   },
   VxeNumberInput: {
-    autofocus: 'input',
-    renderEdit: defaultEditRender,
-    renderCell (renderOpts, params) {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultEditRender,
+    renderTableCell (renderOpts, params) {
       const { props = {} } = renderOpts
       const { row, column } = params
       const digits = props.digits || getConfig().numberInput?.digits || 2
-      let cellValue = XEUtils.get(row, column.property)
+      let cellValue = XEUtils.get(row, column.field)
       if (cellValue) {
         switch (props.type) {
           case 'float':
@@ -640,17 +640,17 @@ renderer.mixin({
       }
       return getCellLabelVNs(renderOpts, params, cellValue)
     },
-    renderDefault: defaultEditRender,
-    renderFilter: defaultFilterRender,
-    defaultFilterMethod: handleInputFilterMethod
+    renderTableDefault: defaultEditRender,
+    renderTableFilter: defaultFilterRender,
+    tableFilterDefaultMethod: handleInputFilterMethod
   },
   VxeDatePicker: {
-    autofocus: 'input',
-    renderEdit: defaultEditRender,
-    renderCell (renderOpts, params) {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultEditRender,
+    renderTableCell (renderOpts, params) {
       const { props = {} } = renderOpts
       const { row, column } = params
-      let cellValue = XEUtils.get(row, column.property)
+      let cellValue = XEUtils.get(row, column.field)
       if (cellValue) {
         switch (props.type) {
           case 'date':
@@ -664,18 +664,18 @@ renderer.mixin({
       }
       return getCellLabelVNs(renderOpts, params, cellValue)
     },
-    renderDefault: defaultEditRender,
-    renderFilter: defaultFilterRender,
-    defaultFilterMethod: handleFilterMethod
+    renderTableDefault: defaultEditRender,
+    renderTableFilter: defaultFilterRender,
+    tableFilterDefaultMethod: handleFilterMethod
   },
   VxeTextarea: {
-    autofocus: 'VxeTextarea'
+    tableAutoFocus: 'VxeTextarea'
   },
   VxeButton: {
-    renderDefault: buttonCellRender
+    renderTableDefault: buttonCellRender
   },
   VxeButtonGroup: {
-    renderDefault (renderOpts, params) {
+    renderTableDefault (renderOpts, params) {
       const { options } = renderOpts
       return [
         h(getDefaultComponent(renderOpts), {
@@ -687,13 +687,13 @@ renderer.mixin({
     }
   },
   VxeSelect: {
-    autofocus: 'input',
-    renderEdit: defaultSelectEditRender,
-    renderDefault: defaultSelectEditRender,
-    renderCell (renderOpts, params) {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultSelectEditRender,
+    renderTableDefault: defaultSelectEditRender,
+    renderTableCell (renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params))
     },
-    renderFilter (renderOpts, params) {
+    renderTableFilter (renderOpts, params) {
       const { column } = params
       const { options, optionProps, optionGroups, optionGroupProps } = renderOpts
       return column.filters.map((option, oIndex) => {
@@ -705,35 +705,46 @@ renderer.mixin({
         })
       })
     },
-    defaultFilterMethod: handleFilterMethod,
-    exportMethod: handleExportSelectMethod
+    tableFilterDefaultMethod: handleFilterMethod,
+    tableExportMethod: handleExportSelectMethod
   },
   VxeTreeSelect: {
-    autofocus: 'input',
-    renderEdit: defaultTreeSelectEditRender,
-    renderCell (renderOpts, params) {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultTreeSelectEditRender,
+    renderTableCell (renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params))
     },
-    exportMethod: handleExportTreeSelectMethod
+    tableExportMethod: handleExportTreeSelectMethod
+  },
+  VxeIconPicker: {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultEditRender,
+    renderTableCell (renderOpts, params) {
+      const { row, column } = params
+      const cellValue = XEUtils.get(row, column.field)
+      return h('i', {
+        class: cellValue
+      })
+    }
   },
   VxeRadioGroup: {
-    renderDefault: radioAndCheckboxEditRender
+    renderTableDefault: radioAndCheckboxEditRender
   },
   VxeCheckboxGroup: {
-    renderDefault: radioAndCheckboxEditRender
+    renderTableDefault: radioAndCheckboxEditRender
   },
   VxeSwitch: {
-    autofocus: 'button',
-    renderEdit: defaultEditRender,
-    renderDefault: defaultEditRender
+    tableAutoFocus: 'button',
+    renderTableEdit: defaultEditRender,
+    renderTableDefault: defaultEditRender
   },
   VxeUpload: {
-    renderEdit: defaultEditRender,
-    renderCell: defaultEditRender,
-    renderDefault: defaultEditRender
+    renderTableEdit: defaultEditRender,
+    renderTableCell: defaultEditRender,
+    renderTableDefault: defaultEditRender
   },
   VxeImage: {
-    renderDefault (renderOpts, params) {
+    renderTableDefault (renderOpts, params) {
       const { row, column } = params
       const { props } = renderOpts
       const cellValue = getCellValue(row, column)
@@ -747,7 +758,7 @@ renderer.mixin({
     }
   },
   VxeImageGroup: {
-    renderDefault (renderOpts, params) {
+    renderTableDefault (renderOpts, params) {
       const { row, column } = params
       const { props } = renderOpts
       const cellValue = getCellValue(row, column)
@@ -763,13 +774,13 @@ renderer.mixin({
 
   // 以下已废弃
   $input: {
-    autofocus: '.vxe-input--inner',
-    renderEdit: oldEditRender,
-    renderCell (renderOpts, params) {
+    tableAutoFocus: '.vxe-input--inner',
+    renderTableEdit: oldEditRender,
+    renderTableCell (renderOpts, params) {
       const { props = {} } = renderOpts
       const { row, column } = params
       const digits = props.digits || getConfig().input?.digits || 2
-      let cellValue = XEUtils.get(row, column.property)
+      let cellValue = XEUtils.get(row, column.field)
       if (cellValue) {
         switch (props.type) {
           case 'date':
@@ -785,27 +796,27 @@ renderer.mixin({
       }
       return getCellLabelVNs(renderOpts, params, cellValue)
     },
-    renderDefault: oldEditRender,
-    renderFilter: oldFilterRender,
-    defaultFilterMethod: handleInputFilterMethod
+    renderTableDefault: oldEditRender,
+    renderTableFilter: oldFilterRender,
+    tableFilterDefaultMethod: handleInputFilterMethod
   },
   $textarea: {
-    autofocus: '.vxe-textarea--inner'
+    tableAutoFocus: '.vxe-textarea--inner'
   },
   $button: {
-    renderDefault: oldButtonEditRender
+    renderTableDefault: oldButtonEditRender
   },
   $buttons: {
-    renderDefault: oldButtonsEditRender
+    renderTableDefault: oldButtonsEditRender
   },
   $select: {
-    autofocus: '.vxe-input--inner',
-    renderEdit: oldSelectEditRender,
-    renderDefault: oldSelectEditRender,
-    renderCell (renderOpts, params) {
+    tableAutoFocus: '.vxe-input--inner',
+    renderTableEdit: oldSelectEditRender,
+    renderTableDefault: oldSelectEditRender,
+    renderTableCell (renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params))
     },
-    renderFilter (renderOpts, params) {
+    renderTableFilter (renderOpts, params) {
       const { column } = params
       const { options, optionProps, optionGroups, optionGroupProps } = renderOpts
       return column.filters.map((option, oIndex) => {
@@ -817,19 +828,19 @@ renderer.mixin({
         })
       })
     },
-    defaultFilterMethod: handleFilterMethod,
-    exportMethod: handleExportSelectMethod
+    tableFilterDefaultMethod: handleFilterMethod,
+    tableExportMethod: handleExportSelectMethod
   },
   $radio: {
-    autofocus: '.vxe-radio--input'
+    tableAutoFocus: '.vxe-radio--input'
   },
   $checkbox: {
-    autofocus: '.vxe-checkbox--input'
+    tableAutoFocus: '.vxe-checkbox--input'
   },
   $switch: {
-    autofocus: '.vxe-switch--button',
-    renderEdit: oldEditRender,
-    renderDefault: oldEditRender
+    tableAutoFocus: '.vxe-switch--button',
+    renderTableEdit: oldEditRender,
+    renderTableDefault: oldEditRender
   }
   // 以上已废弃
 })