releases 4.10.6

x-extends · Jan 16, 2025 · a889b61 · a889b61
1 parent 8c5eed1
commit a889b61
Show file tree

Hide file tree

Showing 38 changed files with 1,536 additions and 1,239 deletions.
diff --git a/examples/views/table/TableTest2.vue b/examples/views/table/TableTest2.vue
@@ -9,6 +9,7 @@
       resizable
       show-footer
       highlight-hover-row
+      size="mini"
       height="400"
       ref="tableRef"
       id="bbbbb"
@@ -31,12 +32,12 @@
       <vxe-column field="checkbox" type="checkbox" title="ID" width="140" drag-sort></vxe-column>
       <vxe-colgroup field="group1" title="分组1">
         <vxe-colgroup field="group2" title="分组2">
-          <vxe-column type="expand" field="role" title="Role" drag-sort>
+          <vxe-column type="expand" field="role" title="Role"  drag-sort>
             <template #content="{ row }">
               <div>{{ row.name }}</div>
             </template>
           </vxe-column>
-          <vxe-column field="name" title="Name" drag-sort sortable></vxe-column>
+          <vxe-column field="name" title="Name" width="100" drag-sort sortable></vxe-column>
         </vxe-colgroup>
       </vxe-colgroup>
       <vxe-column field="sex11" title="<span style='color:red;'>Sex222</span>" type="html" drag-sort></vxe-column>
@@ -143,7 +144,7 @@ onMounted(() => {
       { id: 10007, name: 'Test7', role: 'Test', sex: '0', age: 29, address: 'test abc' },
       { id: 10008, name: 'Test8', role: 'Develop', sex: '0', age: 35, address: 'test abc' },
       { id: 10009, name: 'Test9', role: 'Test', sex: '1', age: 21, address: 'test abc' },
-      { id: 10010, name: 'Test10', role: 'Develop', sex: '0', age: 28, address: 'test abc' },
+      { id: 10010, name: 'Test10 Test10 Test10 Test10 Test10 Test10', role: 'Develop', sex: '0', age: 28, address: 'test abc' },
       { id: 10011, name: 'Test11', role: 'Test', sex: '0', age: 29, address: 'test abc' },
       { id: 10012, name: 'Test12', role: 'Develop', sex: '1', age: 27, address: 'test abc' },
       { id: 10013, name: 'Test13', role: 'Test', sex: '0', age: 24, address: 'test abc' },

diff --git a/examples/views/table/TableTest3.vue b/examples/views/table/TableTest3.vue
@@ -10,7 +10,7 @@
       height="400"
       ref="tableRef"
       id="aaaa"
-      :row-config="{useKey: true}"
+      :row-config="rowConfig"
       :column-config="{useKey: true}"
       :column-drag-config="{isCrossDrag:true,isToChildDrag:true,isSelfToChildDrag:true}"
       :print-config="{}"
@@ -21,7 +21,7 @@
       :expand-config="{iconOpen: 'vxe-icon-question-circle-fill', iconClose: 'vxe-icon-question-circle-fill'}"
       :checkbox-config="{labelField: 'id', highlight: true, range: true}"
       :data="demo1.tableData">
-      <vxe-column field="seq" type="seq" width="60"></vxe-column>
+      <vxe-column field="seq" type="seq" width="60" row-resize></vxe-column>
       <vxe-column field="checkbox" type="checkbox" title="ID" width="140"></vxe-column>
       <vxe-colgroup title="分组1" field="g1">
         <vxe-column type="expand" field="role" title="Role">
@@ -47,7 +47,7 @@
 
 <script lang="ts" setup>
 import { onMounted, ref, reactive, nextTick } from 'vue'
-import { VxeColumnPropTypes, VxeTableInstance, VxeToolbarInstance } from '../../../types'
+import { VxeColumnPropTypes, VxeTableInstance, VxeToolbarInstance, VxeTablePropTypes } from '../../../types'
 
 interface RowVO {
   [key: string]: any
@@ -56,6 +56,11 @@ interface RowVO {
 const tableRef = ref<VxeTableInstance<RowVO>>()
 const toolbarRef = ref<VxeToolbarInstance>()
 
+const rowConfig = reactive<VxeTablePropTypes.RowConfig>({
+  useKey: true,
+  resizable: true
+})
+
 const demo1 = reactive({
   loading: false,
   tableData: [] as any[],

diff --git a/examples/views/table/TableTest8.vue b/examples/views/table/TableTest8.vue
@@ -189,5 +189,5 @@ const loadData = (rowSize: number) => {
   }, 350)
 }
 
-loadData(20)
+loadData(18)
 </script>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.10.6-beta.9",
+  "version": "4.10.6-beta.15",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^4.3.71"
+    "vxe-pc-ui": "^4.3.74"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

diff --git a/packages/grid/src/grid.ts b/packages/grid/src/grid.ts
@@ -17,7 +17,7 @@ const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents,
 
 const tableComponentPropKeys = Object.keys(tableComponentProps as any)
 
-const tableComponentMethodKeys: (keyof VxeTableMethods)[] = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'openTooltip', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect']
+const tableComponentMethodKeys: (keyof VxeTableMethods)[] = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'setSort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'getCustomStoreData', 'openTooltip', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect']
 
 const gridComponentEmits: VxeGridEmits = [
   ...tableComponentEmits,

diff --git a/packages/locale/lang/ar-EG.ts b/packages/locale/lang/ar-EG.ts
@@ -77,7 +77,8 @@ export default {
       customRestore: 'استعادة الافتراضي',
       maxFixedCol: 'لا يمكن أن يتجاوز الحد الأقصى لعدد الأعمدة المجمدة {0}',
       dragTip: 'نقل: {0}',
-      resizeColTip: '{0} Pixels'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

diff --git a/packages/locale/lang/de-DE.ts b/packages/locale/lang/de-DE.ts
@@ -78,7 +78,8 @@ export default
       customRestore: 'Standard wiederherstellen',
       maxFixedCol: 'Die maximale Anzahl eingefrorener Spalten darf {0} nicht überschreiten.',
       dragTip: 'Umzug: {0}',
-      resizeColTip: '{0} Pixels'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: 'Bitte wählen Sie mindestens einen Datensatz aus!',

diff --git a/packages/locale/lang/en-US.ts b/packages/locale/lang/en-US.ts
@@ -77,7 +77,8 @@ export default {
       customRestore: 'Restore default',
       maxFixedCol: 'The maximum number of frozen columns cannot exceed {0}',
       dragTip: 'Move: {0}',
-      resizeColTip: '{0} Pixels'
+      resizeColTip: 'Width: {0} Pixels',
+      resizeRowTip: 'Height: {0} Pixels'
     },
     grid: {
       selectOneRecord: 'Please select at least one record!',

diff --git a/packages/locale/lang/es-ES.ts b/packages/locale/lang/es-ES.ts
@@ -77,7 +77,8 @@ export default {
       customRestore: 'Restore',
       maxFixedCol: 'The maximum number of Freeze columns cannot exceed {0}',
       dragTip: 'Moving: {0}',
-      resizeColTip: '{0} Pixels'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: '¡Seleccione al menos un registro!',

diff --git a/packages/locale/lang/fr-FR.ts b/packages/locale/lang/fr-FR.ts
@@ -77,7 +77,8 @@ export default {
       customRestore: 'Restaurer les valeurs par défaut',
       maxFixedCol: 'Le nombre maximum de colonnes gelées ne peut pas dépasser {0}',
       dragTip: 'Déplacer : {0}',
-      resizeColTip: '{0} Pixels'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

diff --git a/packages/locale/lang/hu-HU.ts b/packages/locale/lang/hu-HU.ts
@@ -77,7 +77,8 @@ export default {
       customRestore: 'Alapértelmezés visszaállítása',
       maxFixedCol: 'A rögzített oszlopok maximális száma nem haladhatja meg a következőt: {0}',
       dragTip: '移动：{0}',
-      resizeColTip: '{0} Pixels'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: 'Kérjük, válasszon legalább egy rekordot!',

diff --git a/packages/locale/lang/hy-AM.ts b/packages/locale/lang/hy-AM.ts
@@ -77,7 +77,8 @@ export default {
       customRestore: '恢复默认',
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个',
       dragTip: '移动：{0}',
-      resizeColTip: '{0} Pixels'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

diff --git a/packages/locale/lang/it-IT.ts b/packages/locale/lang/it-IT.ts
@@ -77,7 +77,8 @@ export default {
       customRestore: 'Ripristina impostazione predefinita',
       maxFixedCol: 'Il numero massimo di colonne bloccate non può superare {0}',
       dragTip: 'Sposta: {0}',
-      resizeColTip: '{0} Pixels'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: 'Seleziona almeno un record!',

diff --git a/packages/locale/lang/ja-JP.ts b/packages/locale/lang/ja-JP.ts
@@ -77,7 +77,8 @@ export default {
       customRestore: 'リセット',
       maxFixedCol: '最大固定列数が {0} です。',
       dragTip: '移动：{0}',
-      resizeColTip: '{0} Pixels'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: '1つ以上のレコードを選択してください',

diff --git a/packages/locale/lang/ko-KR.ts b/packages/locale/lang/ko-KR.ts
@@ -77,7 +77,8 @@ export default {
       customRestore: '기본값으로 복원',
       maxFixedCol: '최대 고정 열 수는 {0}을(를) 초과할 수 없습니다.',
       dragTip: '이동: {0}',
-      resizeColTip: '{0} 픽셀'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: '최소한 하나의 레코드를 선택해주세요!',

diff --git a/packages/locale/lang/nb-NO.ts b/packages/locale/lang/nb-NO.ts
@@ -77,7 +77,8 @@ export default {
       customRestore: 'Gjenopprett standard',
       maxFixedCol: 'Maksimalt antall frosne kolonner kan ikke overstige {0}',
       dragTip: 'Flytt: {0}',
-      resizeColTip: '{0} Pixels'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

diff --git a/packages/locale/lang/pt-BR.ts b/packages/locale/lang/pt-BR.ts
@@ -77,7 +77,8 @@ export default {
       customRestore: 'Restore',
       maxFixedCol: 'The maximum number of Freeze columns cannot exceed {0}',
       dragTip: '移动：{0}',
-      resizeColTip: '{0} Pixels'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: 'Por favor, selecione pelo menos um registro!',

diff --git a/packages/locale/lang/ru-RU.ts b/packages/locale/lang/ru-RU.ts
@@ -77,7 +77,8 @@ export default {
       customRestore: 'Восстановить настройки по умолчанию',
       maxFixedCol: 'Максимальное количество замороженных столбцов не может превышать {0}.',
       dragTip: 'Переместить: {0}',
-      resizeColTip: '{0} Pixels'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: 'Пожалуйста, выберите хотя бы одну запись!',

diff --git a/packages/locale/lang/th-TH.ts b/packages/locale/lang/th-TH.ts
@@ -77,7 +77,8 @@ export default {
       customRestore: 'คืนค่าเริ่มต้น',
       maxFixedCol: 'จำนวนคอลัมน์ที่ตรึงไว้สูงสุดต้องไม่เกิน {0}',
       dragTip: 'ย้าย: {0}',
-      resizeColTip: '{0} Pixels'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: 'โปรดเลือกอย่างน้อยหนึ่งรายการ!',

diff --git a/packages/locale/lang/ug-CN.ts b/packages/locale/lang/ug-CN.ts
@@ -77,7 +77,8 @@ export default {
       customRestore: 'ئەسلىگە قايتۇرۇش',
       maxFixedCol: 'توڭلىتىشقا بولىدىغان ئەڭ چوڭ قۇر سانى  {0} دانە',
       dragTip: 'يۆتكەش：{0}',
-      resizeColTip: '{0} Pixels'
+      resizeColTip: '宽：{0} 像素',
+      resizeRowTip: '高：{0} 像素'
     },
     grid: {
       selectOneRecord: 'كەم بولغاندا بىر تال ئۇچۇر تاللاڭ',