vxe-table 4.12.0-beta.27 → 4.12.0-beta.28

package/es/table/module/edit/hook.js

@@ -320,6 +320,7 @@ hooks.add('tableEditModule', {
             return nextTick().then(() => $xeTable.updateCellAreas());
         };
         const handleEditActive = (params, evnt, isFocus, isPos) => {
+            const $xeGrid = $xeTable.xeGrid;
             const { editConfig, mouseConfig } = props;
             const { editStore, tableColumn } = reactData;
             const editOpts = computeEditOpts.value;
@@ -336,7 +337,7 @@ hooks.add('tableEditModule', {
                     if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
                         // 判断是否禁用编辑
                         let type = 'edit-disabled';
-                        if (!beforeEditMethod || beforeEditMethod(Object.assign(Object.assign({}, params), { $table: $xeTable, $grid: $xeTable.xegrid }))) {
+                        if (!beforeEditMethod || beforeEditMethod(Object.assign(Object.assign({}, params), { $table: $xeTable, $grid: $xeGrid }))) {
                             if (mouseConfig) {
                                 $xeTable.clearSelected();
                                 if ($xeTable.clearCellAreas) {
@@ -365,7 +366,7 @@ hooks.add('tableEditModule', {
                                     $xeTable.handleFocus(params, evnt);
                                 }
                                 if (afterEditMethod) {
-                                    afterEditMethod(Object.assign(Object.assign({}, params), { $table: $xeTable, $grid: $xeTable.xegrid }));
+                                    afterEditMethod(Object.assign(Object.assign({}, params), { $table: $xeTable, $grid: $xeGrid }));
                                 }
                             });
                         }

package/es/table/module/export/export-panel.js

@@ -139,6 +139,7 @@ export default defineComponent({
             }
         };
         const renderVN = () => {
+            const $xeGrid = $xeTable.xeGrid;
             const { defaultOptions, storeData } = props;
             const { isAll: isAllChecked, isIndeterminate: isAllIndeterminate } = reactData;
             const { hasTree, hasMerge, isPrint, hasColgroup, columns } = storeData;
@@ -216,7 +217,7 @@ export default defineComponent({
                     default: () => {
                         const params = {
                             $table: $xeTable,
-                            $grid: $xeTable.xegrid,
+                            $grid: $xeGrid,
                             options: defaultOptions,
                             columns,
                             params: defaultOptions.params
@@ -460,7 +461,7 @@ export default defineComponent({
                     footer() {
                         const params = {
                             $table: $xeTable,
-                            $grid: $xeTable.xegrid,
+                            $grid: $xeGrid,
                             options: defaultOptions,
                             columns,
                             params: defaultOptions.params

package/es/table/module/export/import-panel.js

@@ -76,6 +76,7 @@ export default defineComponent({
             });
         };
         const renderVN = () => {
+            const $xeGrid = $xeTable.xeGrid;
             const { defaultOptions, storeData } = props;
             const selectName = computeSelectName.value;
             const hasFile = computeHasFile.value;
@@ -110,7 +111,7 @@ export default defineComponent({
                     default: () => {
                         const params = {
                             $table: $xeTable,
-                            $grid: $xeTable.xegrid,
+                            $grid: $xeGrid,
                             options: defaultOptions,
                             params: defaultOptions.params
                         };
@@ -186,7 +187,7 @@ export default defineComponent({
                     footer() {
                         const params = {
                             $table: $xeTable,
-                            $grid: $xeTable.xegrid,
+                            $grid: $xeGrid,
                             options: defaultOptions,
                             params: defaultOptions.params
                         };

package/es/table/module/menu/hook.js

@@ -280,10 +280,11 @@ hooks.add('tableMenuModule', {
              * 快捷菜单点击事件
              */
             ctxMenuLinkEvent(evnt, menu) {
+                const $xeGrid = $xeTable.xeGrid;
                 // 如果一级菜单有配置 code 则允许点击，否则不能点击
                 if (!menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
                     const gMenuOpts = menus.get(menu.code);
-                    const params = Object.assign({}, internalData._currMenuParams, { menu, $table: $xeTable, $grid: $xeTable.xegrid, $event: evnt });
+                    const params = Object.assign({}, internalData._currMenuParams, { menu, $table: $xeTable, $grid: $xeGrid, $event: evnt });
                     const tmMethod = gMenuOpts ? (gMenuOpts.tableMenuMethod || gMenuOpts.menuMethod) : null;
                     if (tmMethod) {
                         tmMethod(params, evnt);

package/es/table/module/validator/hook.js

@@ -353,6 +353,7 @@ hooks.add('tableValidatorModule', {
              *  trigger=blur|change 触发方式（除非特殊场景，否则默认为空就行）
              */
             validCellRules(validType, row, column, val) {
+                const $xeGrid = $xeTable.xeGrid;
                 const { editRules } = props;
                 const { field } = column;
                 const errorRules = [];
@@ -375,7 +376,7 @@ hooks.add('tableValidatorModule', {
                                         columnIndex: $xeTable.getColumnIndex(column),
                                         field: column.field,
                                         $table: $xeTable,
-                                        $grid: $xeTable.xegrid
+                                        $grid: $xeGrid
                                     };
                                     let customValid;
                                     if (XEUtils.isString(validator)) {

package/es/table/src/body.js

@@ -77,6 +77,7 @@ export default defineComponent({
          * 渲染列
          */
         const renderTdColumn = (seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) => {
+            const $xeGrid = $xeTable.xeGrid;
             const { fullAllDataRowIdData, visibleColumn } = tableInternalData;
             const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
             const { tableData, dragRow, overflowX, currentColumn, scrollXLoad, scrollYLoad, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, mergeList, editStore, isAllOverflow, validErrorMaps } = tableReactData;
@@ -131,7 +132,7 @@ export default defineComponent({
             const tdAttrs = { colid };
             const cellParams = {
                 $table: $xeTable,
-                $grid: $xeTable.xegrid,
+                $grid: $xeGrid,
                 isEdit: false,
                 seq,
                 rowid,
@@ -581,6 +582,7 @@ export default defineComponent({
         });
         const renderVN = () => {
             const { slots } = tableContext;
+            const $xeGrid = $xeTable.xeGrid;
             const { fixedColumn, fixedType, tableColumn } = props;
             const { spanMethod, footerSpanMethod, mouseConfig } = tableProps;
             const { isGroup, tableData, isRowLoading, isColLoading, overflowX, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn, dragRow, dragCol } = tableReactData;
@@ -661,7 +663,7 @@ export default defineComponent({
             let emptyContent;
             const emptySlot = slots ? slots.empty : null;
             if (emptySlot) {
-                emptyContent = $xeTable.callSlot(emptySlot, { $table: $xeTable, $grid: $xeTable.xegrid });
+                emptyContent = $xeTable.callSlot(emptySlot, { $table: $xeTable, $grid: $xeGrid });
             }
             else {
                 const compConf = emptyOpts.name ? renderer.get(emptyOpts.name) : null;

package/es/table/src/columnInfo.js

@@ -7,10 +7,10 @@ const { getI18n, formats } = VxeUI;
 export class ColumnInfo {
     /* eslint-disable @typescript-eslint/no-use-before-define */
     constructor($xeTable, _vm, { renderHeader, renderCell, renderFooter, renderData } = {}) {
-        const $xeGrid = $xeTable.xegrid;
+        const tableProps = $xeTable.props;
+        const $xeGrid = $xeTable.xeGrid;
         const formatter = _vm.formatter;
         const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
-        const { props: tableProps } = $xeTable;
         const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
         if (_vm.type && types.indexOf(_vm.type) === -1) {
             warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);

package/es/table/src/footer.js

@@ -49,6 +49,7 @@ export default defineComponent({
         const refFooterTFoot = ref();
         const refFooterXSpace = ref();
         const renderRows = (tableColumn, footerTableData, row, $rowIndex, _rowIndex) => {
+            const $xeGrid = $xeTable.xeGrid;
             const { fixedType } = props;
             const { resizable: allResizable, border, footerCellClassName, footerCellStyle, footerAlign: allFooterAlign, footerSpanMethod, align: allAlign, columnKey, showFooterOverflow: allColumnFooterOverflow } = tableProps;
             const { scrollXLoad, scrollYLoad, overflowX, currentColumn, mergeFooterList } = tableReactData;
@@ -84,7 +85,7 @@ export default defineComponent({
                 const itemIndex = _columnIndex;
                 const cellParams = {
                     $table: $xeTable,
-                    $grid: $xeTable.xegrid,
+                    $grid: $xeGrid,
                     row,
                     rowIndex: _rowIndex,
                     _rowIndex,

package/es/table/src/header.js

@@ -33,6 +33,7 @@ export default defineComponent({
             headerColumn.value = isGroup ? convertHeaderColumnToRows(props.tableGroupColumn) : [];
         };
         const renderRows = (isGroup, isOptimizeMode, cols, $rowIndex) => {
+            const $xeGrid = $xeTable.xeGrid;
             const { fixedType } = props;
             const { resizable: allResizable, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, mouseConfig } = tableProps;
             const { currentColumn, dragCol, scrollXLoad, scrollYLoad, overflowX } = tableReactData;
@@ -66,7 +67,7 @@ export default defineComponent({
                 }
                 const columnIndex = $xeTable.getColumnIndex(column);
                 const _columnIndex = $xeTable.getVTColumnIndex(column);
-                const cellParams = { $table: $xeTable, $grid: $xeTable.xegrid, $rowIndex, column, columnIndex, $columnIndex, _columnIndex, firstFilterOption, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, hasFilter };
+                const cellParams = { $table: $xeTable, $grid: $xeGrid, $rowIndex, column, columnIndex, $columnIndex, _columnIndex, firstFilterOption, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, hasFilter };
                 const thAttrs = {
                     colid,
                     colspan: column.colSpan > 1 ? column.colSpan : null,

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.12.0-beta.27";
+export const version = "4.12.0-beta.28";
 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${"4.12.0-beta.27"}`;
+const version = `table v${"4.12.0-beta.28"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.12.0-beta.27";
+const version = "4.12.0-beta.28";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3587,7 +3587,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.12.0-beta.27"}`;
+const log_version = `table v${"4.12.0-beta.28"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3608,12 +3608,10 @@ class ColumnInfo {
     renderFooter,
     renderData
   } = {}) {
-    const $xeGrid = $xeTable.xegrid;
+    const tableProps = $xeTable.props;
+    const $xeGrid = $xeTable.xeGrid;
     const formatter = _vm.formatter;
     const visible = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.visible) ? _vm.visible : true;
-    const {
-      props: tableProps
-    } = $xeTable;
     const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
     if (_vm.type && types.indexOf(_vm.type) === -1) {
       warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
@@ -6347,6 +6345,7 @@ const renderType = 'body';
      * 渲染列
      */
     const renderTdColumn = (seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) => {
+      const $xeGrid = $xeTable.xeGrid;
       const {
         fullAllDataRowIdData,
         visibleColumn
@@ -6464,7 +6463,7 @@ const renderType = 'body';
       };
       const cellParams = {
         $table: $xeTable,
-        $grid: $xeTable.xegrid,
+        $grid: $xeGrid,
         isEdit: false,
         seq,
         rowid,
@@ -6973,6 +6972,7 @@ const renderType = 'body';
       const {
         slots
       } = tableContext;
+      const $xeGrid = $xeTable.xeGrid;
       const {
         fixedColumn,
         fixedType,
@@ -7077,7 +7077,7 @@ const renderType = 'body';
       if (emptySlot) {
         emptyContent = $xeTable.callSlot(emptySlot, {
           $table: $xeTable,
-          $grid: $xeTable.xegrid
+          $grid: $xeGrid
         });
       } else {
         const compConf = emptyOpts.name ? body_renderer.get(emptyOpts.name) : null;
@@ -7235,6 +7235,7 @@ const header_renderType = 'header';
       headerColumn.value = isGroup ? convertHeaderColumnToRows(props.tableGroupColumn) : [];
     };
     const renderRows = (isGroup, isOptimizeMode, cols, $rowIndex) => {
+      const $xeGrid = $xeTable.xeGrid;
       const {
         fixedType
       } = props;
@@ -7302,7 +7303,7 @@ const header_renderType = 'header';
         const _columnIndex = $xeTable.getVTColumnIndex(column);
         const cellParams = {
           $table: $xeTable,
-          $grid: $xeTable.xegrid,
+          $grid: $xeGrid,
           $rowIndex,
           column,
           columnIndex,
@@ -7701,6 +7702,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
     const refFooterTFoot = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refFooterXSpace = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const renderRows = (tableColumn, footerTableData, row, $rowIndex, _rowIndex) => {
+      const $xeGrid = $xeTable.xeGrid;
       const {
         fixedType
       } = props;
@@ -7768,7 +7770,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         const itemIndex = _columnIndex;
         const cellParams = {
           $table: $xeTable,
-          $grid: $xeTable.xegrid,
+          $grid: $xeGrid,
           row,
           rowIndex: _rowIndex,
           _rowIndex,
@@ -8871,6 +8873,7 @@ const {
       }, panel_getI18n('vxe.custom.cstmDragTarget', [dragCol && dragCol.type !== 'html' ? dragCol.getTitle() : '']))])])]);
     };
     const renderSimplePanel = () => {
+      const $xeGrid = $xeTable.xeGrid;
       const {
         customStore
       } = props;
@@ -8916,7 +8919,7 @@ const {
       }
       const params = {
         $table: $xeTable,
-        $grid: $xeTable.xegrid,
+        $grid: $xeGrid,
         columns: customColumnList,
         isAllChecked,
         isAllIndeterminate,
@@ -9073,6 +9076,7 @@ const {
       }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])]) : null] : []);
     };
     const renderPopupPanel = () => {
+      const $xeGrid = $xeTable.xeGrid;
       const {
         customStore
       } = props;
@@ -9125,7 +9129,7 @@ const {
       const isAllIndeterminate = customStore.isIndeterminate;
       const params = {
         $table: $xeTable,
-        $grid: $xeTable.xegrid,
+        $grid: $xeGrid,
         columns: customColumnList,
         isAllChecked,
         isAllIndeterminate,
@@ -9736,6 +9740,7 @@ const {
       });
     };
     const renderVN = () => {
+      const $xeGrid = $xeTable.xeGrid;
       const {
         defaultOptions,
         storeData
@@ -9772,7 +9777,7 @@ const {
         default: () => {
           const params = {
             $table: $xeTable,
-            $grid: $xeTable.xegrid,
+            $grid: $xeGrid,
             options: defaultOptions,
             params: defaultOptions.params
           };
@@ -9810,7 +9815,7 @@ const {
         footer() {
           const params = {
             $table: $xeTable,
-            $grid: $xeTable.xegrid,
+            $grid: $xeGrid,
             options: defaultOptions,
             params: defaultOptions.params
           };
@@ -10031,6 +10036,7 @@ const {
       }
     };
     const renderVN = () => {
+      const $xeGrid = $xeTable.xeGrid;
       const {
         defaultOptions,
         storeData
@@ -10116,7 +10122,7 @@ const {
         default: () => {
           const params = {
             $table: $xeTable,
-            $grid: $xeTable.xegrid,
+            $grid: $xeGrid,
             options: defaultOptions,
             columns,
             params: defaultOptions.params
@@ -10257,7 +10263,7 @@ const {
         footer() {
           const params = {
             $table: $xeTable,
-            $grid: $xeTable.xegrid,
+            $grid: $xeGrid,
             options: defaultOptions,
             columns,
             params: defaultOptions.params
@@ -12118,13 +12124,14 @@ menu_hook_hooks.add('tableMenuModule', {
        * 快捷菜单点击事件
        */
       ctxMenuLinkEvent(evnt, menu) {
+        const $xeGrid = $xeTable.xeGrid;
         // 如果一级菜单有配置 code 则允许点击，否则不能点击
         if (!menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
           const gMenuOpts = hook_menus.get(menu.code);
           const params = Object.assign({}, internalData._currMenuParams, {
             menu,
             $table: $xeTable,
-            $grid: $xeTable.xegrid,
+            $grid: $xeGrid,
             $event: evnt
           });
           const tmMethod = gMenuOpts ? gMenuOpts.tableMenuMethod || gMenuOpts.menuMethod : null;
@@ -12635,6 +12642,7 @@ edit_hook_hooks.add('tableEditModule', {
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => $xeTable.updateCellAreas());
     };
     const handleEditActive = (params, evnt, isFocus, isPos) => {
+      const $xeGrid = $xeTable.xeGrid;
       const {
         editConfig,
         mouseConfig
@@ -12670,7 +12678,7 @@ edit_hook_hooks.add('tableEditModule', {
             if (!beforeEditMethod || beforeEditMethod({
               ...params,
               $table: $xeTable,
-              $grid: $xeTable.xegrid
+              $grid: $xeGrid
             })) {
               if (mouseConfig) {
                 $xeTable.clearSelected();
@@ -12702,7 +12710,7 @@ edit_hook_hooks.add('tableEditModule', {
                   afterEditMethod({
                     ...params,
                     $table: $xeTable,
-                    $grid: $xeTable.xegrid
+                    $grid: $xeGrid
                   });
                 }
               });
@@ -16166,6 +16174,7 @@ validator_hook_hooks.add('tableValidatorModule', {
        *  trigger=blur|change 触发方式（除非特殊场景，否则默认为空就行）
        */
       validCellRules(validType, row, column, val) {
+        const $xeGrid = $xeTable.xeGrid;
         const {
           editRules
         } = props;
@@ -16197,7 +16206,7 @@ validator_hook_hooks.add('tableValidatorModule', {
                     columnIndex: $xeTable.getColumnIndex(column),
                     field: column.field,
                     $table: $xeTable,
-                    $grid: $xeTable.xegrid
+                    $grid: $xeGrid
                   };
                   let customValid;
                   if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(validator)) {
@@ -16413,7 +16422,7 @@ core_.VxeUI.hooks.add('tableCustomModule', {
     const {
       refElem
     } = $xeTable.getRefMaps();
-    const $xeGrid = $xeTable.xegrid;
+    const $xeGrid = $xeTable.xeGrid;
     const calcMaxHeight = () => {
       const {
         customStore