vxe-table 3.11.36 → 3.11.38-beta.0

package/es/table/src/footer.js

@@ -19,7 +19,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
 }
 function renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex) {
     const { $parent: $xetable, fixedType } = _vm;
-    const { $listeners: tableListeners, footerCellClassName, footerCellStyle, footerAlign: allFooterAlign, mergeFooterList, footerSpanMethod, align: allAlign, scrollXLoad, columnKey, columnOpts, showFooterOverflow: allColumnFooterOverflow, currentColumn, overflowX, scrollbarWidth, tooltipOpts } = $xetable;
+    const { $listeners: tableListeners, footerCellClassName, footerCellStyle, footerAlign: allFooterAlign, mergeFooterList, footerSpanMethod, align: allAlign, scrollXLoad, columnKey, columnOpts, showFooterOverflow: allColumnFooterOverflow, currentColumn, overflowX, scrollYLoad, scrollbarWidth, tooltipOpts } = $xetable;
     return tableColumn.map((column, $columnIndex) => {
         const { type, showFooterOverflow, footerAlign, align, footerClassName, editRender, cellRender } = column;
         const renderOpts = editRender || cellRender;
@@ -128,7 +128,7 @@ function renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIn
             attrs,
             style: footerCellStyle ? (XEUtils.isFunction(footerCellStyle) ? footerCellStyle(cellParams) : footerCellStyle) : null,
             on: tfOns,
-            key: columnKey || columnOpts.useKey || columnOpts.drag ? column.id : $columnIndex
+            key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag ? column.id : $columnIndex
         }, [
             h('div', {
                 class: ['vxe-cell', {
@@ -158,6 +158,7 @@ function renderHeads(h, _vm, footerTableData) {
         const rowParams = { $table: $xetable, row, _rowIndex, $rowIndex, fixed: fixedType, type: renderType };
         if (columnOpts.drag && columnDragOpts.animation) {
             return h('transition-group', {
+                key: $rowIndex,
                 props: {
                     tag: 'tr',
                     name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
@@ -170,6 +171,7 @@ function renderHeads(h, _vm, footerTableData) {
             }, renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex));
         }
         return h('tr', {
+            key: $rowIndex,
             class: [
                 'vxe-footer--row',
                 footerRowClassName ? XEUtils.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''

package/es/table/src/header.js

@@ -9,7 +9,7 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
     const $xeTable = _vm.$parent;
     const $xeGrid = $xeTable.xegrid;
     const { fixedType } = _vm;
-    const { resizable: allResizable, border, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, currentColumn, scrollXLoad, overflowX, scrollbarWidth, mouseConfig, columnOpts } = $xeTable;
+    const { resizable: allResizable, border, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, currentColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, mouseConfig, columnOpts } = $xeTable;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
     const { disabledMethod: dragDisabledMethod } = columnDragOpts;
     return cols.map((column, $columnIndex) => {
@@ -81,7 +81,7 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
             attrs: thAttrs,
             style: headerCellStyle ? (XEUtils.isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle) : null,
             on: thOns,
-            key: columnKey || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
+            key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
         }, [
             h('div', {
                 class: ['vxe-cell', {
@@ -125,6 +125,7 @@ function renderHeads(h, _vm, headerGroups) {
         const params = { $table: $xeTable, $rowIndex, fixed: fixedType, type: cellType };
         if (columnOpts.drag && columnDragOpts.animation) {
             return h('transition-group', {
+                key: $rowIndex,
                 props: {
                     tag: 'tr',
                     name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
@@ -137,6 +138,7 @@ function renderHeads(h, _vm, headerGroups) {
             }, renderRows(h, _vm, cols, $rowIndex));
         }
         return h('tr', {
+            key: $rowIndex,
             class: [
                 'vxe-header--row',
                 headerRowClassName ? XEUtils.isFunction(headerRowClassName) ? headerRowClassName(params) : headerRowClassName : ''

package/es/table/src/methods.js

@@ -6728,7 +6728,7 @@ const Methods = {
         const internalData = $xeTable;
         const { lyTimeout, lyRunTime, scrollYStore } = internalData;
         const { visibleSize } = scrollYStore;
-        const fpsTime = Math.min(80, Math.floor(visibleSize * 2));
+        const fpsTime = Math.min(80, Math.floor(visibleSize));
         if (lyTimeout) {
             clearTimeout(lyTimeout);
         }

package/es/table/src/table.js

@@ -708,8 +708,10 @@ export default {
             }
             return false;
         },
-        tableBorder() {
-            const { border } = this;
+        computeTableBorder() {
+            const $xeTable = this;
+            const props = $xeTable;
+            const { border } = props;
             if (border === true) {
                 return 'full';
             }
@@ -1160,11 +1162,12 @@ export default {
         const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
         const $xeTable = this;
         const $xeGrid = $xeTable.$xeGrid;
-        const { _e, $scopedSlots, tId, isCalcColumn, tableData, tableColumn, tableGroupColumn, isGroup, loading, stripe, showHeader, height, tableBorder, treeOpts, treeConfig, mouseConfig, mouseOpts, areaOpts, computeSize, validOpts, showFooter, overflowX, overflowY, scrollXLoad, scrollYLoad, scrollbarHeight, highlightCell, highlightHoverRow, highlightHoverColumn, editConfig, validTipOpts, initStore, columnStore, filterStore, customStore, ctxMenuStore, ctxMenuOpts, footerTableData, columnOpts, rowOpts, checkboxOpts, loadingOpts, resizableOpts, editRules } = $xeTable;
+        const { _e, $scopedSlots, tId, isCalcColumn, tableData, tableColumn, tableGroupColumn, isGroup, loading, stripe, showHeader, height, treeOpts, treeConfig, mouseConfig, mouseOpts, areaOpts, computeSize, validOpts, showFooter, overflowX, overflowY, scrollXLoad, scrollYLoad, scrollbarHeight, highlightCell, highlightHoverRow, highlightHoverColumn, editConfig, validTipOpts, initStore, columnStore, filterStore, customStore, ctxMenuStore, ctxMenuOpts, footerTableData, columnOpts, rowOpts, checkboxOpts, loadingOpts, resizableOpts, editRules } = $xeTable;
         const { leftList, rightList } = columnStore;
         const loadingSlot = $scopedSlots.loading;
         const currLoading = this._isLoading || loading;
         const vSize = computeSize;
+        const tableBorder = $xeTable.computeTableBorder;
         const virtualScrollBars = $xeTable.computeVirtualScrollBars;
         const isArea = mouseConfig && mouseOpts.area;
         const tableStyle = $xeTable.computeTableStyle;

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.11.36";
+export const version = "3.11.38-beta.0";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.11.36"}`;
+const version = `table v${"3.11.38-beta.0"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.36";
+const version = "3.11.38-beta.0";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2793,7 +2793,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.36"}`;
+const log_version = `table v${"3.11.38-beta.0"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -12918,7 +12918,7 @@ const Methods = {
     const {
       visibleSize
     } = scrollYStore;
-    const fpsTime = Math.min(80, Math.floor(visibleSize * 2));
+    const fpsTime = Math.min(80, Math.floor(visibleSize));
     if (lyTimeout) {
       clearTimeout(lyTimeout);
     }
@@ -14070,7 +14070,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
       'col--valid-error': !!errorValidItem,
       'col--current': currentColumn === column
     }, getClass(compCellClassName, params), getClass(className, params), getClass(allCellClassName, params)],
-    key: columnKey || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? column.id : $columnIndex,
+    key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? column.id : $columnIndex,
     attrs,
     style: Object.assign({
       height: cellHeight
@@ -14094,6 +14094,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     expandOpts,
     editOpts,
     treeExpandedMaps,
+    scrollXLoad,
     scrollYLoad,
     rowExpandedMaps,
     radioOpts,
@@ -14208,7 +14209,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         rowid
       },
       style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowStyle) ? rowStyle(params) : rowStyle : null,
-      key: rowKey || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex,
+      key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex,
       nativeOn: trOn
     }, tdVNs) : h('tr', {
       class: trClass,
@@ -14216,7 +14217,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         rowid
       },
       style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowStyle) ? rowStyle(params) : rowStyle : null,
-      key: rowKey || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex,
+      key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex,
       on: trOn
     }, tdVNs));
     // 如果行被展开了
@@ -14722,6 +14723,7 @@ const header_renderRows = (h, _vm, cols, $rowIndex) => {
     align: allAlign,
     currentColumn,
     scrollXLoad,
+    scrollYLoad,
     overflowX,
     scrollbarWidth,
     mouseConfig,
@@ -14820,7 +14822,7 @@ const header_renderRows = (h, _vm, cols, $rowIndex) => {
       attrs: thAttrs,
       style: headerCellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle : null,
       on: thOns,
-      key: columnKey || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
+      key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
     }, [h('div', {
       class: ['vxe-cell', {
         'c--title': showTitle,
@@ -14868,6 +14870,7 @@ function renderHeads(h, _vm, headerGroups) {
     };
     if (columnOpts.drag && columnDragOpts.animation) {
       return h('transition-group', {
+        key: $rowIndex,
         props: {
           tag: 'tr',
           name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
@@ -14877,6 +14880,7 @@ function renderHeads(h, _vm, headerGroups) {
       }, header_renderRows(h, _vm, cols, $rowIndex));
     }
     return h('tr', {
+      key: $rowIndex,
       class: ['vxe-header--row', headerRowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerRowClassName) ? headerRowClassName(params) : headerRowClassName : ''],
       style: headerRowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(headerRowStyle) ? headerRowStyle(params) : headerRowStyle : null
     }, header_renderRows(h, _vm, cols, $rowIndex));
@@ -15210,6 +15214,7 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     showFooterOverflow: allColumnFooterOverflow,
     currentColumn,
     overflowX,
+    scrollYLoad,
     scrollbarWidth,
     tooltipOpts
   } = $xetable;
@@ -15339,7 +15344,7 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
       attrs,
       style: footerCellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerCellStyle) ? footerCellStyle(cellParams) : footerCellStyle : null,
       on: tfOns,
-      key: columnKey || columnOpts.useKey || columnOpts.drag ? column.id : $columnIndex
+      key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag ? column.id : $columnIndex
     }, [h('div', {
       class: ['vxe-cell', {
         'c--title': showTitle,
@@ -15378,6 +15383,7 @@ function footer_renderHeads(h, _vm, footerTableData) {
     };
     if (columnOpts.drag && columnDragOpts.animation) {
       return h('transition-group', {
+        key: $rowIndex,
         props: {
           tag: 'tr',
           name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
@@ -15387,6 +15393,7 @@ function footer_renderHeads(h, _vm, footerTableData) {
       }, footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex));
     }
     return h('tr', {
+      key: $rowIndex,
       class: ['vxe-footer--row', footerRowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''],
       style: footerRowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle : null
     }, footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex));
@@ -23823,10 +23830,12 @@ function handleUupdateResize(_vm) {
       }
       return false;
     },
-    tableBorder() {
+    computeTableBorder() {
+      const $xeTable = this;
+      const props = $xeTable;
       const {
         border
-      } = this;
+      } = props;
       if (border === true) {
         return 'full';
       }
@@ -24325,7 +24334,6 @@ function handleUupdateResize(_vm) {
       stripe,
       showHeader,
       height,
-      tableBorder,
       treeOpts,
       treeConfig,
       mouseConfig,
@@ -24365,6 +24373,7 @@ function handleUupdateResize(_vm) {
     const loadingSlot = $scopedSlots.loading;
     const currLoading = this._isLoading || loading;
     const vSize = computeSize;
+    const tableBorder = $xeTable.computeTableBorder;
     const virtualScrollBars = $xeTable.computeVirtualScrollBars;
     const isArea = mouseConfig && mouseOpts.area;
     const tableStyle = $xeTable.computeTableStyle;
@@ -27417,7 +27426,7 @@ function defaultSelectEditRender(h, renderOpts, params) {
     on: getEditOns(renderOpts, params)
   })];
 }
-function defaultTreeSelectEditRender(h, renderOpts, params) {
+function defaultTableOrTreeSelectEditRender(h, renderOpts, params) {
   const {
     row,
     column
@@ -27758,7 +27767,7 @@ render_renderer.mixin({
   },
   VxeTreeSelect: {
     tableAutoFocus: 'input',
-    renderTableEdit: defaultTreeSelectEditRender,
+    renderTableEdit: defaultTableOrTreeSelectEditRender,
     renderTableCell(h, renderOpts, params) {
       return getCellLabelVNs(h, renderOpts, params, getTreeSelectCellValue(renderOpts, params));
     },
@@ -27766,15 +27775,64 @@ render_renderer.mixin({
   },
   VxeTableSelect: {
     tableAutoFocus: 'input',
-    renderTableEdit: defaultTreeSelectEditRender,
+    renderTableEdit: defaultTableOrTreeSelectEditRender,
     renderTableCell(h, renderOpts, params) {
       return getCellLabelVNs(h, renderOpts, params, getTreeSelectCellValue(renderOpts, params));
     },
     tableExportMethod: handleExportTreeSelectMethod
   },
+  VxeColorPicker: {
+    tableAutoFocus: 'input',
+    renderTableEdit(h, renderOpts, params) {
+      const {
+        row,
+        column
+      } = params;
+      const {
+        options
+      } = renderOpts;
+      const cellValue = getCellValue(row, column);
+      return [h(getDefaultComponent(renderOpts), {
+        props: getCellEditProps(renderOpts, params, cellValue, {
+          colors: options
+        }),
+        on: getEditOns(renderOpts, params)
+      })];
+    },
+    renderTableCell(h, renderOpts, params) {
+      const {
+        row,
+        column
+      } = params;
+      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      return h('span', {
+        class: 'vxe-color-picker--readonly'
+      }, [h('div', {
+        class: 'vxe-color-picker--readonly-color',
+        style: {
+          backgroundColor: cellValue
+        }
+      })]);
+    }
+  },
   VxeIconPicker: {
     tableAutoFocus: 'input',
-    renderTableEdit: defaultEditRender,
+    renderTableEdit(h, renderOpts, params) {
+      const {
+        row,
+        column
+      } = params;
+      const {
+        options
+      } = renderOpts;
+      const cellValue = getCellValue(row, column);
+      return [h(getDefaultComponent(renderOpts), {
+        props: getCellEditProps(renderOpts, params, cellValue, {
+          icons: options
+        }),
+        on: getEditOns(renderOpts, params)
+      })];
+    },
     renderTableCell(h, renderOpts, params) {
       const {
         row,
@@ -28347,6 +28405,11 @@ const Toolbar = VxeToolbar;
     empty: {
       defText: '暂无数据'
     },
+    colorPicker: {
+      clear: '清除',
+      confirm: '确认',
+      copySuccess: '已复制到剪贴板：{0}'
+    },
     formDesign: {
       formName: '表单名称',
       defFormTitle: '未命名的表单',
@@ -28539,6 +28602,10 @@ const Toolbar = VxeToolbar;
             cell: '单元格',
             value: '值'
           },
+          body: {
+            row: '行：{0}',
+            col: '列：{0}'
+          },
           empty: '(空值)',
           reError: '无效的正则表达式',
           recordCount: '已找到 {0} 个单元格',