vxe-table 3.17.10 → 3.18.0-beta.1

package/es/table/module/custom/panel.js

@@ -110,6 +110,7 @@ const renderSimplePanel = (h, _vm) => {
     const tableProps = $xeTable;
     const tableReactData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const { customStore } = props;
     const { treeConfig, rowGroupConfig, aggregateConfig } = tableProps;
     const { isCustomStatus, customColumnList } = tableReactData;
@@ -138,6 +139,7 @@ const renderSimplePanel = (h, _vm) => {
     const params = {
         $table: $xeTable,
         $grid: $xeGrid,
+        $gantt: $xeGantt,
         columns: customColumnList,
         isAllChecked,
         isAllIndeterminate,
@@ -430,6 +432,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
     const tableProps = $xeTable;
     const tableReactData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const { customStore } = props;
     const { treeConfig, rowGroupConfig, aggregateConfig, resizable: allResizable } = tableProps;
     const { isCustomStatus, customColumnList } = tableReactData;
@@ -457,6 +460,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
     const params = {
         $table: $xeTable,
         $grid: $xeGrid,
+        $gantt: $xeGantt,
         columns: customColumnList,
         isAllChecked,
         isAllIndeterminate,

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

@@ -79,6 +79,7 @@ export default {
     render(h) {
         const $xeTable = this.$xeTable;
         const $xeGrid = $xeTable.$xeGrid;
+        const $xeGantt = $xeTable.$xeGantt;
         const { _e, checkedAll, isAll: isAllChecked, isIndeterminate: isAllIndeterminate, showSheet, supportMerge, supportStyle, defaultOptions, storeData } = this;
         const { hasTree, hasMerge, isPrint, hasColgroup, columns } = storeData;
         const { isHeader } = defaultOptions;
@@ -160,6 +161,7 @@ export default {
                     const params = {
                         $table: $xeTable,
                         $grid: $xeGrid,
+                        $gantt: $xeGantt,
                         options: defaultOptions,
                         columns,
                         params: defaultOptions.params
@@ -443,6 +445,7 @@ export default {
                     const params = {
                         $table: $xeTable,
                         $grid: $xeGrid,
+                        $gantt: $xeGantt,
                         options: defaultOptions,
                         columns,
                         params: defaultOptions.params

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

@@ -63,6 +63,7 @@ export default {
     render(h) {
         const $xeTable = this.$parent;
         const $xeGrid = $xeTable.$xeGrid;
+        const $xeGantt = $xeTable.$xeGantt;
         const { hasFile, loading, parseTypeLabel, defaultOptions, storeData, selectName } = this;
         const slots = defaultOptions.slots || {};
         const topSlot = slots.top;
@@ -98,6 +99,7 @@ export default {
                     const params = {
                         $table: $xeTable,
                         $grid: $xeGrid,
+                        $gantt: $xeGantt,
                         options: defaultOptions,
                         params: defaultOptions.params
                     };
@@ -187,6 +189,7 @@ export default {
                     const params = {
                         $table: $xeTable,
                         $grid: $xeGrid,
+                        $gantt: $xeGantt,
                         options: defaultOptions,
                         params: defaultOptions.params
                     };

package/es/table/module/export/mixin.js

@@ -204,10 +204,12 @@ function getBodyLabelData($xeTable, opts, columns, datas) {
     });
 }
 function getExportData($xeTable, opts) {
+    const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const { columns, dataFilterMethod } = opts;
     let datas = opts.data;
     if (dataFilterMethod) {
-        datas = datas.filter((row, index) => dataFilterMethod({ $table: $xeTable, row, $rowIndex: index }));
+        datas = datas.filter((row, index) => dataFilterMethod({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, row, $rowIndex: index }));
     }
     return getBodyLabelData($xeTable, opts, columns, datas);
 }
@@ -243,8 +245,10 @@ function getFooterCellValue($xeTable, opts, row, column) {
     return XEUtils.get(row, column.field);
 }
 function getFooterData($xeTable, opts, footerTableData) {
+    const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const { footerFilterMethod } = opts;
-    return footerFilterMethod ? footerTableData.filter((items, index) => footerFilterMethod({ $table: $xeTable, items, $rowIndex: index })) : footerTableData;
+    return footerFilterMethod ? footerTableData.filter((items, index) => footerFilterMethod({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, items, $rowIndex: index })) : footerTableData;
 }
 function getCsvCellTypeLabel(column, cellValue) {
     if (cellValue) {
@@ -566,10 +570,11 @@ function clearColumnConvert(columns) {
 }
 function handleExport($xeTable, opts) {
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const { remote, columns, colgroups, exportMethod, afterExportMethod } = opts;
     return new Promise(resolve => {
         if (remote) {
-            const params = { options: opts, $table: $xeTable, $grid: $xeGrid };
+            const params = { options: opts, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt };
             resolve(exportMethod ? exportMethod(params) : params);
         }
         else {
@@ -582,7 +587,7 @@ function handleExport($xeTable, opts) {
         clearColumnConvert(columns);
         if (!opts.print) {
             if (afterExportMethod) {
-                afterExportMethod({ status: true, options: opts, $table: $xeTable, $grid: $xeGrid });
+                afterExportMethod({ status: true, options: opts, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt });
             }
         }
         return Object.assign({ status: true }, params);
@@ -590,7 +595,7 @@ function handleExport($xeTable, opts) {
         clearColumnConvert(columns);
         if (!opts.print) {
             if (afterExportMethod) {
-                afterExportMethod({ status: false, options: opts, $table: $xeTable, $grid: $xeGrid });
+                afterExportMethod({ status: false, options: opts, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt });
             }
         }
         const params = { status: false };
@@ -930,6 +935,8 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
     const { treeConfig, showHeader, showFooter } = props;
     const { initStore, isGroup, footerTableData, exportStore, exportParams } = reactData;
     const { collectColumn, mergeBodyList, mergeFooterList } = internalData;
@@ -937,7 +944,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     const hasTree = treeConfig;
     const customOpts = $xeTable.computeCustomOpts;
     const selectRecords = $xeTable.getCheckboxRecords();
-    const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : {};
+    const proxyOpts = $xeGGWrapper ? $xeGGWrapper.computeProxyOpts : {};
     const hasFooter = !!footerTableData.length;
     const hasMerge = !!(mergeBodyList.length || mergeFooterList.length);
     const defOpts = Object.assign({
@@ -1014,7 +1021,8 @@ function handleExportAndPrint($xeTable, options, isPrint) {
             exportParams.filename = filename({
                 options: defOpts,
                 $table: $xeTable,
-                $grid: $xeGrid
+                $grid: $xeGrid,
+                $gantt: $xeGantt
             });
         }
         else {
@@ -1026,7 +1034,8 @@ function handleExportAndPrint($xeTable, options, isPrint) {
             exportParams.sheetName = sheetName({
                 options: defOpts,
                 $table: $xeTable,
-                $grid: $xeGrid
+                $grid: $xeGrid,
+                $gantt: $xeGantt
             });
         }
         else {
@@ -1111,12 +1120,13 @@ export default {
             const internalData = $xeTable;
             const $xeGrid = $xeTable.$xeGrid;
             const $xeGantt = $xeTable.$xeGantt;
+            const $xeGGWrapper = $xeGrid || $xeGantt;
             const { treeConfig, showHeader, showFooter } = props;
             const { isGroup } = reactData;
             const { tableFullColumn, afterFullData, afterTreeFullData, collectColumn, mergeBodyList, mergeFooterList } = internalData;
             const exportOpts = $xeTable.computeExportOpts;
             const treeOpts = $xeTable.computeTreeOpts;
-            const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : {};
+            const proxyOpts = $xeGGWrapper ? $xeGGWrapper.computeProxyOpts : {};
             const hasMerge = !!(mergeBodyList.length || mergeFooterList.length);
             const opts = Object.assign({
                 message: true,
@@ -1223,14 +1233,14 @@ export default {
                 }, {
                     children: 'childNodes',
                     mapChildren: '_children'
-                }), (column, index) => isColumnInfo(column) && (!columnFilterMethod || columnFilterMethod({ $table: $xeTable, column: column, $columnIndex: index })), {
+                }), (column, index) => isColumnInfo(column) && (!columnFilterMethod || columnFilterMethod({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, column: column, $columnIndex: index })), {
                     children: '_children',
                     mapChildren: 'childNodes',
                     original: true
                 });
             }
             else {
-                groups = XEUtils.searchTree(isGroup ? collectColumn : tableFullColumn, (column, index) => column.visible && (!columnFilterMethod || columnFilterMethod({ $table: $xeTable, column, $columnIndex: index })), { children: 'children', mapChildren: 'childNodes', original: true });
+                groups = XEUtils.searchTree(isGroup ? collectColumn : tableFullColumn, (column, index) => column.visible && (!columnFilterMethod || columnFilterMethod({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, column, $columnIndex: index })), { children: 'children', mapChildren: 'childNodes', original: true });
             }
             // 获取所有列
             const cols = [];
@@ -1248,7 +1258,8 @@ export default {
                     handleOptions.filename = filename({
                         options: opts,
                         $table: $xeTable,
-                        $grid: $xeGrid
+                        $grid: $xeGrid,
+                        $gantt: $xeGantt
                     });
                 }
                 else {
@@ -1263,7 +1274,8 @@ export default {
                     handleOptions.sheetName = sheetName({
                         options: opts,
                         $table: $xeTable,
-                        $grid: $xeGrid
+                        $grid: $xeGrid,
+                        $gantt: $xeGantt
                     });
                 }
                 else {
@@ -1284,7 +1296,7 @@ export default {
             }
             if (!handleOptions.print) {
                 if (beforeExportMethod) {
-                    beforeExportMethod({ options: handleOptions, $table: $xeTable, $grid: $xeGrid });
+                    beforeExportMethod({ options: handleOptions, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt });
                 }
             }
             if (!handleOptions.data) {
@@ -1298,12 +1310,12 @@ export default {
                     }
                 }
                 else if (mode === 'all') {
-                    if (!$xeGrid) {
+                    if (!$xeGGWrapper) {
                         errLog('vxe.error.errProp', ['all', 'mode=current,selected']);
                     }
-                    if ($xeGrid && !handleOptions.remote) {
-                        const gridReactData = $xeGrid;
-                        const proxyOpts = $xeGrid.computeProxyOpts;
+                    if ($xeGGWrapper && !handleOptions.remote) {
+                        const gridReactData = $xeGGWrapper;
+                        const proxyOpts = $xeGGWrapper.computeProxyOpts;
                         const { sortData } = gridReactData;
                         const { beforeQueryAll, afterQueryAll, ajax = {} } = proxyOpts;
                         const resConfigs = proxyOpts.response || proxyOpts.props || {};
@@ -1393,10 +1405,12 @@ export default {
         _print(options) {
             const $xeTable = this;
             const $xeGrid = $xeTable.$xeGrid;
+            const $xeGantt = $xeTable.$xeGantt;
+            const printOpts = $xeTable.computePrintOpts;
             const opts = Object.assign({
                 original: false
                 // beforePrintMethod
-            }, this.printOpts, options, {
+            }, printOpts, options, {
                 type: 'html',
                 download: false,
                 remote: false,
@@ -1409,7 +1423,8 @@ export default {
                     printTitle = sheetName({
                         options: opts,
                         $table: $xeTable,
-                        $grid: $xeGrid
+                        $grid: $xeGrid,
+                        $gantt: $xeGantt
                     });
                 }
                 else {
@@ -1434,7 +1449,9 @@ export default {
                                         html,
                                         content: html,
                                         options: opts,
-                                        $table: $xeTable
+                                        $table: $xeTable,
+                                        $grid: $xeGrid,
+                                        $gantt: $xeGantt
                                     });
                                 }
                                 : undefined
@@ -1452,7 +1469,9 @@ export default {
                                             html,
                                             content: html,
                                             options: opts,
-                                            $table: $xeTable
+                                            $table: $xeTable,
+                                            $grid: $xeGrid,
+                                            $gantt: $xeGantt
                                         });
                                     }
                                     : undefined

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

@@ -60,6 +60,7 @@ export default {
         handleGlobalContextmenuEvent(evnt) {
             const $xeTable = this;
             const $xeGrid = $xeTable.$xeGrid;
+            const $xeGantt = $xeTable.$xeGantt;
             const internalData = $xeTable;
             const { $refs, tId, editStore, menuConfig, contextMenu, ctxMenuStore, ctxMenuOpts, mouseConfig, mouseOpts } = this;
             const { selected } = editStore;
@@ -72,7 +73,7 @@ export default {
                 }
                 if (internalData._keyCtx) {
                     const type = 'body';
-                    const params = { type, $grid: $xeGrid, $table: this, keyboard: true, columns: this.visibleColumn.slice(0), $event: evnt };
+                    const params = { type, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, keyboard: true, columns: this.visibleColumn.slice(0), $event: evnt };
                     // 如果开启单元格区域
                     if (mouseConfig && mouseOpts.area) {
                         const activeArea = this.getActiveCellArea();
@@ -100,7 +101,7 @@ export default {
                         // target=td|th，直接向上找 table 去匹配即可
                         return target.parentNode.parentNode.parentNode.getAttribute('xid') === tId;
                     });
-                    const params = { type: layout, $grid: $xeGrid, $table: this, columns: this.visibleColumn.slice(0), $event: evnt };
+                    const params = { type: layout, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, columns: this.visibleColumn.slice(0), $event: evnt };
                     if (columnTargetNode.flag) {
                         const cell = columnTargetNode.targetElem;
                         const column = this.getColumnNode(cell).item;
@@ -263,10 +264,11 @@ export default {
         ctxMenuLinkEvent(evnt, menu) {
             const $xeTable = this;
             const $xeGrid = $xeTable.$xeGrid;
+            const $xeGantt = $xeTable.$xeGantt;
             // 如果一级菜单有配置 code 则允许点击，否则不能点击
             if (!menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
                 const gMenuOpts = menus.get(menu.code);
-                const params = Object.assign({ menu, $grid: $xeGrid, $table: this, $event: evnt }, this.ctxMenuStore.args);
+                const params = Object.assign({ menu, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, $event: evnt }, this.ctxMenuStore.args);
                 if (gMenuOpts && gMenuOpts.menuMethod) {
                     gMenuOpts.menuMethod(params, evnt);
                 }

package/es/table/src/body.js

@@ -60,6 +60,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, treeConfig, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
     const { tableData, tableColumn, dragRow, overflowX, overflowY, currentColumn, scrollXLoad, scrollYLoad, mergeBodyFlag, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, editStore, isAllOverflow, validErrorMaps } = tableReactData;
     const { fullAllDataRowIdData, fullColumnIdData, mergeBodyCellMaps, visibleColumn, afterFullData, mergeBodyList, scrollXStore, scrollYStore } = tableInternalData;
@@ -116,6 +117,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     const cellParams = {
         $table: $xeTable,
         $grid: $xeGrid,
+        $gantt: $xeGantt,
         isEdit: false,
         seq,
         rowid,
@@ -417,6 +419,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, treeConfig } = tableProps;
     const { hasFixedColumn, treeExpandedFlag, scrollXLoad, scrollYLoad, isAllOverflow, rowExpandedFlag, expandColumn, selectRadioRow, pendingRowFlag, rowExpandHeightFlag, isRowGroupStatus } = tableReactData;
     const { fullAllDataRowIdData, fullColumnIdData, treeExpandedMaps, pendingRowMaps, rowExpandedMaps } = tableInternalData;
@@ -562,6 +565,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
                 const expandParams = {
                     $grid: $xeGrid,
                     $table: $xeTable,
+                    $gantt: $xeGantt,
                     seq,
                     column: expandColumn,
                     columnIndex,
@@ -666,6 +670,7 @@ export default {
         const tableReactData = $xeTable;
         const tableInternalData = $xeTable;
         const $xeGrid = $xeTable.$xeGrid;
+        const $xeGantt = $xeTable.$xeGantt;
         const slots = $xeTable.$scopedSlots;
         const { xID } = $xeTable;
         const { fixedColumn, fixedType, tableColumn } = props;
@@ -745,7 +750,7 @@ export default {
         }
         let emptyContent;
         const emptySlot = slots ? slots.empty : null;
-        const emptyParams = { $table: $xeTable, $grid: $xeGrid };
+        const emptyParams = { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt };
         if (emptySlot) {
             emptyContent = emptySlot.call($xeTable, emptyParams);
         }

package/es/table/src/column.js

@@ -154,7 +154,8 @@ export default {
     provide() {
         return {
             $xeColumn: this,
-            $xeGrid: null
+            $xeGrid: null,
+            $xeGantt: null
         };
     },
     inject: {

package/es/table/src/columnInfo.js

@@ -9,6 +9,8 @@ export class ColumnInfo {
     constructor($xeTable, _vm, { renderHeader, renderCell, renderFooter, renderData } = {}) {
         const tableProps = $xeTable;
         const $xeGrid = $xeTable.$xeGrid;
+        const $xeGantt = $xeTable.$xeGantt;
+        const $xeGGWrapper = $xeGrid || $xeGantt;
         const { field, editRender } = _vm;
         const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null;
         const formatter = _vm.formatter;
@@ -158,8 +160,10 @@ export class ColumnInfo {
             // 单元格插槽，只对 grid 有效
             slots: _vm.slots
         });
-        if (proxyOpts && proxyOpts.beforeColumn) {
-            proxyOpts.beforeColumn({ $grid: $xeGrid, column: this });
+        if ($xeGGWrapper) {
+            if (proxyOpts && proxyOpts.beforeColumn) {
+                proxyOpts.beforeColumn({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, column: this });
+            }
         }
     }
     getTitle() {

package/es/table/src/footer.js

@@ -12,6 +12,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const { fixedType } = props;
     const { resizable: allResizable, border, footerCellClassName, footerCellStyle, footerAlign: allFooterAlign, footerSpanMethod, align: allAlign, columnKey, showFooterOverflow: allColumnFooterOverflow } = tableProps;
     const { scrollXLoad, scrollYLoad, overflowX, currentColumn, mergeFootFlag } = tableReactData;
@@ -49,6 +50,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
         const cellParams = {
             $table: $xeTable,
             $grid: $xeGrid,
+            $gantt: $xeGantt,
             row,
             rowIndex: _rowIndex,
             _rowIndex,

package/es/table/src/group.js

@@ -8,7 +8,8 @@ export default {
     provide() {
         return {
             $xeColumn: this,
-            $xeGrid: null
+            $xeGrid: null,
+            $xeGantt: null
         };
     },
     inject: {

package/es/table/src/header.js

@@ -8,6 +8,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
     const props = _vm;
     const $xeTable = _vm.$parent;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const tableProps = $xeTable;
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
@@ -50,6 +51,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
         const cellParams = {
             $table: $xeTable,
             $grid: $xeGrid,
+            $gantt: $xeGantt,
             $rowIndex,
             column,
             columnIndex,