vxe-table 3.21.13 → 3.21.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.21.13",
+  "version": "3.21.15",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -68,7 +68,7 @@
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
     "vue-template-compiler": "2.6.14",
-    "vxe-pc-ui": "3.14.35"
+    "vxe-pc-ui": "3.15.1"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/locale/lang/ar-EG.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/de-DE.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/en-US.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0}',
       monthLabel: '{0}'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/es-ES.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/fr-FR.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/hu-HU.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/hy-AM.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/id-ID.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/it-IT.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/ja-JP.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/ko-KR.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/ms-MY.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/nb-NO.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/pt-BR.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

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

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/th-TH.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

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

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/uk-UA.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/uz-UZ.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '¥'
     },

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

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

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

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '¥'
     },

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

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '¥'
     },

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

@@ -80,7 +80,7 @@ function insertTreeRow ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
       }
       pChilds[funcName](item)
       pMapChilds[funcName](item)
-      const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: pChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
+      const rest = { row: item, rowid, _seq: -1, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: pChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
       fullDataRowIdData[rowid] = rest
       fullAllDataRowIdData[rowid] = rest
     } else {
@@ -89,7 +89,7 @@ function insertTreeRow ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
       }
       afterFullData[funcName](item)
       tableFullTreeData[funcName](item)
-      const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: tableFullTreeData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
+      const rest = { row: item, rowid, _seq: -1, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: tableFullTreeData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
       fullDataRowIdData[rowid] = rest
       fullAllDataRowIdData[rowid] = rest
     }
@@ -144,7 +144,7 @@ function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
     } else {
       newRecords.forEach(item => {
         const rowid = getRowid($xeTable, item)
-        const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
+        const rest = { row: item, rowid, _seq: -1, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
         fullDataRowIdData[rowid] = rest
         fullAllDataRowIdData[rowid] = rest
         afterFullData.unshift(item)
@@ -173,7 +173,7 @@ function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
       } else {
         newRecords.forEach(item => {
           const rowid = getRowid($xeTable, item)
-          const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
+          const rest = { row: item, rowid, _seq: -1, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
           fullDataRowIdData[rowid] = rest
           fullAllDataRowIdData[rowid] = rest
           afterFullData.push(item)
@@ -211,7 +211,7 @@ function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
           })
           XEUtils.eachTree(treeRecords, (item) => {
             const rowid = getRowid($xeTable, item)
-            const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
+            const rest = { row: item, rowid, _seq: -1, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
             if (item[childrenField]) {
               item[mapChildrenField] = item[childrenField]
             }

package/packages/table/render/index.ts

@@ -894,14 +894,14 @@ function handleSetTreeSelectValue (renderOpts: VxeGlobalRendererHandles.RenderTa
  */
 renderer.mixin({
   input: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: nativeEditRender,
     renderTableDefault: nativeEditRender,
     renderTableFilter: nativeFilterRender,
     tableFilterDefaultMethod: handleInputFilterMethod
   },
   textarea: {
-    tableAutoFocus: 'textarea',
+    tableAutoFocus: true,
     renderTableEdit: nativeEditRender
   },
   select: {
@@ -946,7 +946,7 @@ renderer.mixin({
     tableExportMethod: handleExportSelectMethod
   },
   VxeInput: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultEditRender,
     renderTableCell (h, renderOpts, params) {
       const { props = {} } = renderOpts
@@ -986,7 +986,7 @@ renderer.mixin({
     }
   },
   VxeNumberInput: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultEditRender,
     renderTableCell: handleNumberCell,
     renderTableFooter (h, renderOpts, params) {
@@ -1037,7 +1037,7 @@ renderer.mixin({
     }
   },
   VxeDatePicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultEditRender,
     renderTableCell (h, renderOpts, params) {
       const props = renderOpts.props || {}
@@ -1063,7 +1063,7 @@ renderer.mixin({
     tableFilterDefaultMethod: handleFilterMethod
   },
   VxeDateRangePicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: VxeGlobalRendererHandles.RenderEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
       const { startField, endField } = renderOpts
       const { $table, row, column } = params
@@ -1167,7 +1167,7 @@ renderer.mixin({
     }
   },
   VxeTextarea: {
-    tableAutoFocus: 'textarea',
+    tableAutoFocus: true,
     renderTableDefault: defaultEditRender,
     renderTableEdit: defaultEditRender
   },
@@ -1189,7 +1189,7 @@ renderer.mixin({
     }
   },
   VxeSelect: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultSelectEditRender,
     renderTableDefault: defaultSelectEditRender,
     renderTableCell (h, renderOpts, params) {
@@ -1311,7 +1311,7 @@ renderer.mixin({
     tableExportMethod: handleExportSelectMethod
   },
   VxeTreeSelect: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultTableOrTreeSelectEditRender,
     renderTableCell (h, renderOpts, params) {
       const { options, optionGroups } = renderOpts
@@ -1373,8 +1373,36 @@ renderer.mixin({
     tableCellPasteMethod: handleSetTreeSelectValue,
     tableExportMethod: handleExportTreeSelectMethod
   },
+  VxeCascader: {
+    tableAutoFocus: true,
+    renderTableEdit: defaultTableOrTreeSelectEditRender,
+    renderTableCell (h, renderOpts, params) {
+      const { options, optionGroups } = renderOpts
+      const { $table, row, column } = params
+      const opSize = options ? options.length : null
+      const ogSize = optionGroups ? optionGroups.length : null
+      const { cellResult } = $table.effectCellData(row, column, {
+        key: 'render_table_cell',
+        isChanged ({ oldValue, cellValue }) {
+          return oldValue && oldValue[0] === cellValue && oldValue[1] === opSize && oldValue[2] === ogSize
+        },
+        setValue ({ cellValue }) {
+          return [cellValue, opSize, ogSize]
+        },
+        getResult ({ cellValue }) {
+          return handleTreeSelectCellValue(cellValue, renderOpts)
+        }
+      })
+      // const cellResult = getTreeSelectCellValue(renderOpts, params)
+      return getCellLabelVNs(h, renderOpts, params, cellResult)
+    },
+    tableCellFormatter: handleFormatTreeSelect,
+    tableCellCopyMethod: handleFormatTreeSelect,
+    tableCellPasteMethod: handleSetTreeSelectValue,
+    tableExportMethod: handleExportTreeSelectMethod
+  },
   VxeTableSelect: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultTableOrTreeSelectEditRender,
     renderTableCell (h, renderOpts, params) {
       const { options, optionGroups } = renderOpts
@@ -1402,7 +1430,7 @@ renderer.mixin({
     tableExportMethod: handleExportTreeSelectMethod
   },
   VxeColorPicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit (h, renderOpts, params: VxeGlobalRendererHandles.RenderTableEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
       const { row, column } = params
       const { options } = renderOpts
@@ -1430,7 +1458,7 @@ renderer.mixin({
     }
   },
   VxeIconPicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit (h, renderOpts, params: VxeGlobalRendererHandles.RenderTableEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
       const { row, column } = params
       const { options } = renderOpts
@@ -1526,7 +1554,7 @@ renderer.mixin({
 
   // 以下已废弃
   $input: {
-    tableAutoFocus: '.vxe-input--inner',
+    tableAutoFocus: 'input',
     renderTableEdit: oldEditRender,
     renderTableCell (h, renderOpts, params) {
       const { props = {} } = renderOpts
@@ -1553,7 +1581,7 @@ renderer.mixin({
     tableFilterDefaultMethod: handleInputFilterMethod
   },
   $textarea: {
-    tableAutoFocus: '.vxe-textarea--inner'
+    tableAutoFocus: 'textarea'
   },
   $button: {
     renderTableDefault: oldButtonEditRender
@@ -1562,7 +1590,7 @@ renderer.mixin({
     renderTableDefault: oldButtonsEditRender
   },
   $select: {
-    tableAutoFocus: '.vxe-input--inner',
+    tableAutoFocus: 'input',
     renderTableEdit: oldSelectEditRender,
     renderTableDefault: oldSelectEditRender,
     renderTableCell (h, renderOpts, params) {
@@ -1584,13 +1612,13 @@ renderer.mixin({
     tableExportMethod: handleExportSelectMethod
   },
   $radio: {
-    tableAutoFocus: '.vxe-radio--input'
+    tableAutoFocus: 'input'
   },
   $checkbox: {
-    tableAutoFocus: '.vxe-checkbox--input'
+    tableAutoFocus: 'input'
   },
   $switch: {
-    tableAutoFocus: '.vxe-switch--button',
+    tableAutoFocus: 'button',
     renderTableEdit: oldEditRender,
     renderTableDefault: oldEditRender
   }