vxe-table 3.17.7 → 3.17.8

package/es/grid/src/grid.js

@@ -3,14 +3,14 @@ import XEUtils from 'xe-utils';
 import { getLastZIndex, nextZIndex, isEnableConf } from '../../ui/src/utils';
 import { getOffsetHeight, getPaddingTopBottomSize, getDomNode, toCssUnit } from '../../ui/src/dom';
 import { VxeUI } from '../../ui';
-import VxeTableComponent from '../../table/src/table';
-import VxeToolbarComponent from '../../toolbar/src/toolbar';
-import tableComponentProps from '../../table/src/props';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
+import { tableProps } from '../../table/src/props';
+import VxeTableComponent from '../../table/src/table';
+import VxeToolbarComponent from '../../toolbar/src/toolbar';
 const { getConfig, getI18n, commands, globalEvents, globalMixins, createEvent, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI;
 const tableMethods = {};
-const propKeys = Object.keys(tableComponentProps);
+const propKeys = Object.keys(tableProps);
 const defaultLayouts = [['Form'], ['Toolbar', 'Top', 'Table', 'Bottom', 'Pager']];
 function getTableOns(_vm) {
     const { $listeners, proxyConfig, proxyOpts } = _vm;
@@ -40,9 +40,7 @@ XEUtils.each(VxeTableComponent.methods, (fn, name) => {
     };
 });
 function createInternalData() {
-    return {
-        connectTable: null
-    };
+    return {};
 }
 export default {
     name: 'VxeGrid',
@@ -51,9 +49,7 @@ export default {
     ],
     props: Object.assign(Object.assign({ 
         // 以下仅用于类型
-        round: { type: Boolean, default: () => getConfig().table.round }, height: [Number, String], minHeight: { type: [Number, String], default: () => getConfig().table.minHeight }, maxHeight: [Number, String], seqConfig: Object, sortConfig: Object, filterConfig: Object, editConfig: [Boolean, Object], loading: Boolean, validConfig: Object, editRules: Object, animat: { type: Boolean, default: () => getConfig().table.animat } }, tableComponentProps), { 
-        // 以上仅用于类型
-        layouts: Array, columns: Array, pagerConfig: Object, proxyConfig: Object, toolbarConfig: Object, formConfig: Object, zoomConfig: Object, size: {
+        round: { type: Boolean, default: () => getConfig().table.round }, height: [Number, String], minHeight: { type: [Number, String], default: () => getConfig().table.minHeight }, maxHeight: [Number, String], seqConfig: Object, sortConfig: Object, filterConfig: Object, editConfig: [Boolean, Object], loading: Boolean, validConfig: Object, editRules: Object, animat: { type: Boolean, default: () => getConfig().table.animat } }, tableProps), { layouts: Array, columns: Array, pagerConfig: Object, proxyConfig: Object, toolbarConfig: Object, formConfig: Object, zoomConfig: Object, size: {
             type: String,
             default: () => getConfig().grid.size || getConfig().size
         } }),
@@ -312,7 +308,7 @@ export default {
     },
     methods: Object.assign(Object.assign({}, tableMethods), { dispatchEvent(type, params, evnt) {
             const $xeGrid = this;
-            $xeGrid.$emit(type, createEvent(evnt, { $grid: $xeGrid }, params));
+            $xeGrid.$emit(type, createEvent(evnt, { $grid: $xeGrid, $gantt: null }, params));
         },
         initPages(propKey) {
             const $xeGrid = this;
@@ -394,7 +390,7 @@ export default {
                 const $xeTable = $xeGrid.$refs.refTable;
                 const $xeToolbar = $xeGrid.$refs.refToolbar;
                 if ($xeTable && $xeToolbar) {
-                    $xeTable.connect($xeToolbar);
+                    $xeTable.connectToolbar($xeToolbar);
                 }
             });
         },
@@ -457,9 +453,10 @@ export default {
             const proxyOpts = $xeGrid.computeProxyOpts;
             const resConfigs = proxyOpts.response || proxyOpts.props || {};
             const messageProp = resConfigs.message;
+            const $xeTable = $xeGrid.$refs.refTable;
             let msg;
             if (rest && messageProp) {
-                msg = XEUtils.isFunction(messageProp) ? messageProp({ data: rest, $grid: $xeGrid }) : XEUtils.get(rest, messageProp);
+                msg = XEUtils.isFunction(messageProp) ? messageProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: null }) : XEUtils.get(rest, messageProp);
             }
             return msg || getI18n(defaultMsg);
         },
@@ -646,11 +643,13 @@ export default {
                             }
                         }
                         const commitParams = {
+                            $table: $xeTable,
+                            $grid: $xeGrid,
+                            $gantt: null,
                             code,
                             button,
                             isInited,
                             isReload,
-                            $grid: $xeGrid,
                             page: pageParams,
                             sort: sortList.length ? sortList[0] : {},
                             sorts: sortList,
@@ -669,10 +668,10 @@ export default {
                             if (rest) {
                                 if (pagerConfig && isEnableConf(pagerOpts)) {
                                     const totalProp = resConfigs.total;
-                                    const total = (XEUtils.isFunction(totalProp) ? totalProp({ data: rest, $grid: $xeGrid }) : XEUtils.get(rest, totalProp || 'page.total')) || 0;
+                                    const total = (XEUtils.isFunction(totalProp) ? totalProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: null }) : XEUtils.get(rest, totalProp || 'page.total')) || 0;
                                     tablePage.total = XEUtils.toNumber(total);
                                     const resultProp = resConfigs.result;
-                                    tableData = (XEUtils.isFunction(resultProp) ? resultProp({ data: rest, $grid: $xeGrid }) : XEUtils.get(rest, resultProp || 'result')) || [];
+                                    tableData = (XEUtils.isFunction(resultProp) ? resultProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: null }) : XEUtils.get(rest, resultProp || 'result')) || [];
                                     // 检验当前页码，不能超出当前最大页数
                                     const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
                                     if (tablePage.currentPage > pageCount) {
@@ -681,7 +680,7 @@ export default {
                                 }
                                 else {
                                     const listProp = resConfigs.list;
-                                    tableData = (listProp ? (XEUtils.isFunction(listProp) ? listProp({ data: rest, $grid: $xeGrid }) : XEUtils.get(rest, listProp)) : rest) || [];
+                                    tableData = (listProp ? (XEUtils.isFunction(listProp) ? listProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: null }) : XEUtils.get(rest, listProp)) : rest) || [];
                                 }
                             }
                             if ($xeTable) {
@@ -722,7 +721,16 @@ export default {
                         const selectRecords = $xeTable.getCheckboxRecords();
                         const removeRecords = selectRecords.filter((row) => !$xeTable.isInsertByRow(row));
                         const body = { removeRecords };
-                        const commitParams = { $grid: $xeGrid, code, button, body, form: formData, options: ajaxMethods };
+                        const commitParams = {
+                            $table: $xeTable,
+                            $grid: $xeGrid,
+                            $gantt: null,
+                            code,
+                            button,
+                            body,
+                            form: formData,
+                            options: ajaxMethods
+                        };
                         const applyArgs = [commitParams].concat(args);
                         if (selectRecords.length) {
                             return $xeGrid.handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', () => {
@@ -790,7 +798,16 @@ export default {
                     if (ajaxMethods) {
                         const body = $xeGrid.getRecordset();
                         const { insertRecords, removeRecords, updateRecords, pendingRecords } = body;
-                        const commitParams = { $grid: $xeGrid, code, button, body, form: formData, options: ajaxMethods };
+                        const commitParams = {
+                            $table: $xeTable,
+                            $grid: $xeGrid,
+                            $gantt: null,
+                            code,
+                            button,
+                            body,
+                            form: formData,
+                            options: ajaxMethods
+                        };
                         const applyArgs = [commitParams].concat(args);
                         // 排除掉新增且标记为删除的数据
                         if (insertRecords.length) {
@@ -868,8 +885,9 @@ export default {
                 default: {
                     const gCommandOpts = commands.get(code);
                     if (gCommandOpts) {
-                        if (gCommandOpts.commandMethod) {
-                            gCommandOpts.commandMethod({ code, button, $grid: $xeGrid, $table: $xeTable }, ...args);
+                        const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
+                        if (tCommandMethod) {
+                            tCommandMethod({ code, button, $grid: $xeGrid, $table: $xeTable, $gantt: null }, ...args);
                         }
                         else {
                             errLog('vxe.error.notCommands', [code]);
@@ -1313,7 +1331,7 @@ export default {
                     const beforeItem = proxyOpts.beforeItem;
                     if (proxyOpts && beforeItem) {
                         formOpts.items.forEach((item) => {
-                            beforeItem.call($xeGrid, { $grid: $xeGrid, item });
+                            beforeItem.call($xeGrid, { $grid: $xeGrid, $gantt: null, item });
                         });
                     }
                 }
@@ -1358,7 +1376,7 @@ export default {
                     key: 'form',
                     ref: 'refFormWrapper',
                     class: 'vxe-grid--form-wrapper'
-                }, formSlot ? formSlot.call($xeGrid, { $grid: $xeGrid }) : $xeGrid.renderDefaultForm(h));
+                }, formSlot ? formSlot.call($xeGrid, { $grid: $xeGrid, $gantt: null }) : $xeGrid.renderDefaultForm(h));
             }
             return renderEmptyElement($xeGrid);
         },
@@ -1376,7 +1394,7 @@ export default {
                     ref: 'refToolbarWrapper',
                     class: 'vxe-grid--toolbar-wrapper'
                 }, toolbarSlot
-                    ? toolbarSlot.call($xeGrid, { $grid: $xeGrid })
+                    ? toolbarSlot.call($xeGrid, { $grid: $xeGrid, $gantt: null })
                     : [
                         h(VxeToolbarComponent, {
                             props: Object.assign({}, toolbarOpts, { slots: undefined }),
@@ -1396,7 +1414,7 @@ export default {
                     key: 'top',
                     ref: 'refTopWrapper',
                     class: 'vxe-grid--top-wrapper'
-                }, topSlot.call($xeGrid, { $grid: $xeGrid }))
+                }, topSlot.call($xeGrid, { $grid: $xeGrid, $gantt: null }))
                 : renderEmptyElement($xeGrid);
         },
         renderTableLeft(h) {
@@ -1406,7 +1424,7 @@ export default {
             if (leftSlot) {
                 return h('div', {
                     class: 'vxe-grid--left-wrapper'
-                }, leftSlot({ $grid: $xeGrid }));
+                }, leftSlot({ $grid: $xeGrid, $gantt: null }));
             }
             return renderEmptyElement($xeGrid);
         },
@@ -1417,7 +1435,7 @@ export default {
             if (rightSlot) {
                 return h('div', {
                     class: 'vxe-grid--right-wrapper'
-                }, rightSlot({ $grid: $xeGrid }));
+                }, rightSlot({ $grid: $xeGrid, $gantt: null }));
             }
             return renderEmptyElement($xeGrid);
         },
@@ -1446,7 +1464,7 @@ export default {
                     key: 'bottom',
                     ref: 'refBottomWrapper',
                     class: 'vxe-grid--bottom-wrapper'
-                }, bottomSlot.call($xeGrid, { $grid: $xeGrid }))
+                }, bottomSlot.call($xeGrid, { $grid: $xeGrid, $gantt: null }))
                 : renderEmptyElement($xeGrid);
         },
         renderPager(h) {
@@ -1465,7 +1483,7 @@ export default {
                     key: 'pager',
                     class: 'vxe-grid--pager-wrapper'
                 }, pagerSlot
-                    ? pagerSlot.call($xeGrid, { $grid: $xeGrid })
+                    ? pagerSlot.call($xeGrid, { $grid: $xeGrid, $gantt: null })
                     : [
                         VxeUIPagerComponent
                             ? h(VxeUIPagerComponent, {