vxe-table 3.15.39 → 3.15.41

package/es/grid/src/grid.js

@@ -41,8 +41,11 @@ function renderDefaultForm(h, $xeGrid) {
     const VxeUIFormComponent = VxeUI.getComponent('VxeForm');
     const props = $xeGrid;
     const slots = $xeGrid.$scopedSlots;
+    const reactData = $xeGrid;
     const { proxyConfig, formConfig } = props;
-    const { proxyOpts, formData, formOpts } = $xeGrid;
+    const { formData } = reactData;
+    const proxyOpts = $xeGrid.computeProxyOpts;
+    const formOpts = $xeGrid.computeFormOpts;
     if (isEnableConf(formConfig) && formOpts.items && formOpts.items.length) {
         const formSlots = {};
         if (!formOpts.inited) {
@@ -121,29 +124,44 @@ const getConfigSlot = ($xeGrid, slotConfigs) => {
     });
     return slotConf;
 };
-function getToolbarSlots(_vm) {
-    const { $scopedSlots, toolbarOpts } = _vm;
+function getToolbarSlots($xeGrid) {
+    const slots = $xeGrid.$scopedSlots;
+    const toolbarOpts = $xeGrid.computeToolbarOpts;
     const toolbarOptSlots = toolbarOpts.slots;
-    let buttonsSlot;
-    let toolsSlot;
-    const slots = {};
-    if ($scopedSlots.buttons && (!toolbarOptSlots || toolbarOptSlots.buttons !== 'buttons')) {
+    const toolbarSlots = {};
+    if (slots.buttons && (!toolbarOptSlots || toolbarOptSlots.buttons !== 'buttons')) {
         warnLog('vxe.error.reqProp', ['toolbar-config.slots.buttons']);
     }
-    if ($scopedSlots.tools && (!toolbarOptSlots || toolbarOptSlots.tools !== 'tools')) {
+    if (slots.tools && (!toolbarOptSlots || toolbarOptSlots.tools !== 'tools')) {
         warnLog('vxe.error.reqProp', ['toolbar-config.slots.tools']);
     }
     if (toolbarOptSlots) {
-        buttonsSlot = getFuncSlot(_vm, toolbarOptSlots, 'buttons');
-        toolsSlot = getFuncSlot(_vm, toolbarOptSlots, 'tools');
+        const buttonsSlot = getFuncSlot($xeGrid, toolbarOptSlots, 'buttons');
+        const buttonPrefixSlot = getFuncSlot($xeGrid, toolbarOptSlots, 'buttonPrefix');
+        const buttonSuffixSlot = getFuncSlot($xeGrid, toolbarOptSlots, 'buttonSuffix');
+        const toolsSlot = getFuncSlot($xeGrid, toolbarOptSlots, 'tools');
+        const toolPrefixSlot = getFuncSlot($xeGrid, toolbarOptSlots, 'toolPrefix');
+        const toolSuffixSlot = getFuncSlot($xeGrid, toolbarOptSlots, 'toolSuffix');
         if (buttonsSlot) {
-            slots.buttons = buttonsSlot;
+            toolbarSlots.buttons = buttonsSlot;
+        }
+        if (buttonPrefixSlot) {
+            toolbarSlots.buttonPrefix = buttonPrefixSlot;
+        }
+        if (buttonSuffixSlot) {
+            toolbarSlots.buttonSuffix = buttonSuffixSlot;
         }
         if (toolsSlot) {
-            slots.tools = toolsSlot;
+            toolbarSlots.tools = toolsSlot;
+        }
+        if (toolPrefixSlot) {
+            toolbarSlots.toolPrefix = toolPrefixSlot;
+        }
+        if (toolSuffixSlot) {
+            toolbarSlots.toolSuffix = toolSuffixSlot;
         }
     }
-    return slots;
+    return toolbarSlots;
 }
 function getTableOns(_vm) {
     const { $listeners, proxyConfig, proxyOpts } = _vm;
@@ -182,90 +200,96 @@ function pageChangeEvent($xeGrid, params) {
 /**
  * 渲染表单
  */
-function renderForm(h, _vm) {
-    const { _e, $scopedSlots, formConfig } = _vm;
-    const formSlot = $scopedSlots.form;
+function renderForm(h, $xeGrid) {
+    const slots = $xeGrid.$scopedSlots;
+    const props = $xeGrid;
+    const { formConfig } = props;
+    const formSlot = slots.form;
     const hasForm = !!(formSlot || isEnableConf(formConfig));
     if (hasForm) {
         return h('div', {
             key: 'form',
             ref: 'refFormWrapper',
             class: 'vxe-grid--form-wrapper'
-        }, formSlot ? formSlot.call(_vm, { $grid: _vm }, h) : renderDefaultForm(h, _vm));
+        }, formSlot ? formSlot.call($xeGrid, { $grid: $xeGrid }) : renderDefaultForm(h, $xeGrid));
     }
-    return _e();
+    return renderEmptyElement($xeGrid);
 }
 /**
  * 渲染工具栏
  */
-function renderToolbar(h, _vm) {
-    const { _e, $scopedSlots, toolbarConfig, toolbar } = _vm;
-    const toolbarSlot = $scopedSlots.toolbar;
+function renderToolbar(h, $xeGrid) {
+    const slots = $xeGrid.$scopedSlots;
+    const props = $xeGrid;
+    const { toolbarConfig } = props;
+    const toolbarSlot = slots.toolbar;
     const hasToolbar = !!(toolbarSlot || isEnableConf(toolbarConfig) || toolbar);
+    const toolbarOpts = $xeGrid.computeToolbarOpts;
     if (hasToolbar) {
         return h('div', {
             key: 'toolbar',
             ref: 'refToolbarWrapper',
             class: 'vxe-grid--toolbar-wrapper'
         }, toolbarSlot
-            ? toolbarSlot.call(_vm, { $grid: _vm }, h)
+            ? toolbarSlot.call($xeGrid, { $grid: $xeGrid })
             : [
                 h(VxeToolbarComponent, {
-                    props: Object.assign({}, _vm.toolbarOpts, { slots: undefined }),
+                    props: Object.assign({}, toolbarOpts, { slots: undefined }),
                     ref: 'xToolbar',
-                    scopedSlots: getToolbarSlots(_vm)
+                    scopedSlots: getToolbarSlots($xeGrid)
                 })
             ]);
     }
-    return _e();
+    return renderEmptyElement($xeGrid);
 }
 /**
  * 渲染表格顶部区域
  */
-function renderTop(h, _vm) {
-    const { _e, $scopedSlots } = _vm;
-    const topSlot = $scopedSlots.top;
+function renderTop(h, $xeGrid) {
+    const slots = $xeGrid.$scopedSlots;
+    const topSlot = slots.top;
     return topSlot
         ? h('div', {
             key: 'top',
             ref: 'refTopWrapper',
             class: 'vxe-grid--top-wrapper'
-        }, topSlot.call(_vm, { $grid: _vm }, h))
-        : _e();
+        }, topSlot.call($xeGrid, { $grid: $xeGrid }))
+        : renderEmptyElement($xeGrid);
 }
-function renderTableLeft(h, _vm) {
-    const { _e, $scopedSlots } = _vm;
-    const leftSlot = $scopedSlots.left;
+function renderTableLeft(h, $xeGrid) {
+    const slots = $xeGrid.$scopedSlots;
+    const leftSlot = slots.left;
     if (leftSlot) {
         return h('div', {
             class: 'vxe-grid--left-wrapper'
-        }, leftSlot({ $grid: _vm }));
+        }, leftSlot({ $grid: $xeGrid }));
     }
-    return _e();
+    return renderEmptyElement($xeGrid);
 }
-function renderTableRight(h, _vm) {
-    const { _e, $scopedSlots } = _vm;
-    const rightSlot = $scopedSlots.right;
+function renderTableRight(h, $xeGrid) {
+    const slots = $xeGrid.$scopedSlots;
+    const rightSlot = slots.right;
     if (rightSlot) {
         return h('div', {
             class: 'vxe-grid--right-wrapper'
-        }, rightSlot({ $grid: _vm }));
+        }, rightSlot({ $grid: $xeGrid }));
     }
-    return _e();
+    return renderEmptyElement($xeGrid);
 }
 /**
  * 渲染表格
  */
-function renderTable(h, _vm) {
-    const { $scopedSlots, tableProps } = _vm;
+function renderTable(h, $xeGrid) {
+    const slots = $xeGrid.$scopedSlots;
+    const tableProps = $xeGrid.computeTableProps;
     return h('div', {
         class: 'vxe-grid--table-wrapper'
     }, [
         h('vxe-table', {
             key: 'table',
             props: tableProps,
-            on: getTableOns(_vm),
-            scopedSlots: $scopedSlots,
+            on: getTableOns($xeGrid),
+            scopedSlots: slots,
             ref: 'xTable'
         })
     ]);
@@ -273,16 +297,16 @@ function renderTable(h, _vm) {
 /**
  * 渲染表格底部区域
  */
-function renderBottom(h, _vm) {
-    const { _e, $scopedSlots } = _vm;
-    const bottomSlot = $scopedSlots.bottom;
+function renderBottom(h, $xeGrid) {
+    const slots = $xeGrid.$scopedSlots;
+    const bottomSlot = slots.bottom;
     return bottomSlot
         ? h('div', {
             key: 'bottom',
             ref: 'refBottomWrapper',
             class: 'vxe-grid--bottom-wrapper'
-        }, bottomSlot.call(_vm, { $grid: _vm }, h))
-        : _e();
+        }, bottomSlot.call($xeGrid, { $grid: $xeGrid }))
+        : renderEmptyElement($xeGrid);
 }
 /**
  * 渲染分页