vxe-table 4.7.64 → 4.7.66

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

@@ -1,7 +1,3 @@
-/**
- * 已废弃
- * @deprecated
- */
 export default {
   vxe: {
     base: {
@@ -23,7 +19,7 @@ export default {
       useErr: '安裝 "{0}" 模組時發生錯誤，可能順序不正確，依賴的模組需要在Table之前安裝',
       barUnableLink: '工具欄無法關聯表格',
       expandContent: '展開行的插槽應該是 “content”，請檢查是否正確',
-      reqComp: '缺少 "{0}" 組件，请检查是否正确安装',
+      reqComp: '缺少 "{0}" 組件，请检查是否正确安装。 https://vxeui.com/#/start/useGlobal',
       reqModule: '缺少 "{0}" 模組',
       reqProp: '缺少必要的 "{0}" 參數，可能會導致出現錯誤',
       emptyProp: '參數 "{0}" 不允許為空',
@@ -53,6 +49,7 @@ export default {
       emptyText: '暫無資料',
       allTitle: '全選/取消',
       seqTitle: '序号',
+      actionTitle: '操作',
       confirmFilter: '篩選',
       resetFilter: '重置',
       allFilter: '全部',
@@ -307,28 +304,30 @@ export default {
       reUpload: '重新上传',
       uploadProgress: '上传中 {0}%',
       uploadErr: '上传失败',
-      uploadSuccess: '上传成功'
+      uploadSuccess: '上传成功',
+      moreBtnText: '更多（{0}）',
+      viewItemTitle: '點擊查看'
     },
     formDesign: {
-      formName: '表单名称',
-      defFormTitle: '未命名的表单',
-      widgetPropTab: '控件属性',
-      widgetFormTab: '表单属性',
+      formName: '表單名稱',
+      defFormTitle: '未命名的表單',
+      widgetPropTab: '控件屬性',
+      widgetFormTab: '表單屬性',
       styleSetting: {
-        btn: '样式设置',
-        title: '表单的样式设置',
-        layoutTitle: '控件布局',
-        verticalLayout: '上下布局',
-        horizontalLayout: '横向布局',
-        styleTitle: '标题样式',
-        boldTitle: '标题加粗',
+        btn: '樣式設置',
+        title: '表單的樣式設置',
+        layoutTitle: '控件佈局',
+        verticalLayout: '上下佈局',
+        horizontalLayout: '橫向佈局',
+        styleTitle: '標題樣式',
+        boldTitle: '標題加粗',
         fontBold: '加粗',
-        fontNormal: '常规',
-        colonTitle: '显示冒号',
-        colonVisible: '显示',
-        colonHidden: '隐藏',
-        alignTitle: '对齐方式',
-        widthTitle: '标题宽度',
+        fontNormal: '常規',
+        colonTitle: '顯示冒號',
+        colonVisible: '顯示',
+        colonHidden: '隱藏',
+        alignTitle: '對齊方式',
+        widthTitle: '標題寬度',
         alignLeft: '居左',
         alignRight: '居右',
         unitPx: '像素',
@@ -338,91 +337,101 @@ export default {
         group: {
           base: '基础控件',
           layout: '布局控件',
+          system: '系統控件',
           advanced: '高级控件'
         },
         copyTitle: '副本_{0}',
         component: {
-          input: '输入框',
+          input: '輸入框',
           textarea: '文本域',
-          select: '下拉选择',
+          select: '下拉選擇',
           row: '一行多列',
-          title: '文本',
+          title: '標題',
+          text: '文本',
           subtable: '子表',
           VxeSwitch: '是/否',
-          VxeInput: '输入框',
-          VxeNumberInput: '数字',
+          VxeInput: '輸入框',
+          VxeNumberInput: '數字',
           VxeDatePicker: '日期',
           VxeTextarea: '文本域',
-          VxeSelect: '下拉选择',
-          VxeTreeSelect: '树形选择',
-          VxeRadioGroup: '单选框',
-          VxeCheckboxGroup: '复选框',
+          VxeSelect: '下拉選擇',
+          VxeTreeSelect: '樹形選擇',
+          VxeRadioGroup: '單選框',
+          VxeCheckboxGroup: '複選框',
           VxeUploadFile: '文件',
-          VxeUploadImage: '图片'
+          VxeUploadImage: '圖片'
         }
       },
       widgetProp: {
-        name: '控件名称',
+        name: '控件名稱',
         placeholder: '控件提示',
-        required: '必填校验',
-        multiple: '允许多选',
+        required: '必填校驗',
+        multiple: '允許多選',
         displaySetting: {
-          name: '显示设置',
-          pc: '电脑端',
-          mobile: '手机端',
-          visible: '显示',
-          hidden: '隐藏'
+          name: '顯示設置',
+          pc: '電腦端',
+          mobile: '手機端',
+          visible: '顯示',
+          hidden: '隱藏'
         },
         dataSource: {
-          name: '数据源',
-          defValue: '选项{0}',
-          addOption: '添加选项',
-          batchEditOption: '批量编辑',
-          batchEditTip: '每行对应一个选项，支持从表格、Excel、WPS 中直接复制粘贴。',
-          batchEditSubTip: '每行对应一个选项，如果是分组，子项可以是空格或制表键开头，支持从表格、Excel、WPS 中直接复制粘贴。',
-          buildOption: '生成选项'
+          name: '數據源',
+          defValue: '選項{0}',
+          addOption: '添加選項',
+          batchEditOption: '批量編輯',
+          batchEditTip: '每行對應一個選項，支持從表格、Excel、WPS 中直接複製粘貼。',
+          batchEditSubTip: '每行對應一個選項，如果是分組，子項可以是空格或製表鍵開頭，支持從表格、Excel、WPS 中直接複製粘貼。',
+          buildOption: '生成選項'
         },
         rowProp: {
-          colSize: '列数',
+          colSize: '列數',
           col2: '两列',
           col3: '三列',
           col4: '四列',
           col6: '六列',
-          layout: '布局'
+          layout: '佈局'
         },
         textProp: {
           name: '内容',
-          alignTitle: '对齐方式',
+          alignTitle: '對齊方式',
           alignLeft: '居左',
           alignCenter: '居中',
           alignRight: '居右',
-          colorTitle: '字体颜色',
-          sizeTitle: '字体大小',
-          boldTitle: '字体加粗',
-          fontNormal: '常规',
+          colorTitle: '字體顏色',
+          sizeTitle: '字體大小',
+          boldTitle: '字體加粗',
+          fontNormal: '常規',
           fontBold: '加粗'
         },
         subtableProp: {
-          seqTitle: '序号',
-          showSeq: '显示序号',
-          showCheckbox: '允许多选',
-          errSubDrag: '子表不支持该控件，请使用其他控件'
+          seqTitle: '序號',
+          showSeq: '顯示序號',
+          showCheckbox: '允許多選',
+          errSubDrag: '子表不支持該控件，請使用其他控件'
         },
         uploadProp: {
           uploadProp: {
-            limitFileCount: '文件数量限制',
+            limitFileCount: '文件數量限制',
             limitFileSize: '文件大小限制',
-            multiFile: '允许上传多个文件',
-            limitImgCount: '图片数量限制',
-            limitImgSize: '图片大小限制',
-            multiImg: '允许上传多张图片'
+            multiFile: '允許上傳多個文件',
+            limitImgCount: '圖片數量限制',
+            limitImgSize: '圖片大小限制',
+            multiImg: '允許上傳多張圖片'
           }
         }
       }
     },
     listDesign: {
-      fieldSettingTab: '字段设置',
-      listSettingTab: '列表设置'
+      fieldSettingTab: '字段設置',
+      listSettingTab: '列表設置',
+      activeBtn: {
+        ActionButtonUpdate: '編輯',
+        ActionButtonDelete: '刪除'
+      }
+    },
+    text: {
+      copySuccess: '已複製到剪貼板',
+      copyError: '當前環境不支持該操作'
     },
 
     /**

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) : ''