vxe-table 3.12.0-beta.11 → 3.12.0-beta.13

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.0-beta.11";
+const version = "3.12.0-beta.13";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2808,7 +2808,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.0-beta.11"}`;
+const log_version = `table v${"3.12.0-beta.13"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3514,6 +3514,9 @@ function getChangeEvent(renderOpts) {
   return 'change';
 }
 function getSlotVNs(vns) {
+  if (vns === null || vns === undefined) {
+    return [];
+  }
   if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(vns)) {
     return vns;
   }
@@ -20219,7 +20222,6 @@ function createHtmlPage(opts, content) {
 
 
 
-
 const {
   getI18n: export_mixin_getI18n,
   renderer: export_mixin_renderer
@@ -20228,15 +20230,8 @@ let htmlCellElem;
 // 导入
 let fileForm;
 let fileInput;
-// 打印
-let printFrame;
 const csvBOM = '\ufeff';
 const enterSymbol = '\r\n';
-function createFrame() {
-  const frame = document.createElement('iframe');
-  frame.className = 'vxe-table--print-frame';
-  return frame;
-}
 function hasTreeChildren($xetable, row) {
   const treeOpts = $xetable.treeOpts;
   const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -20868,7 +20863,8 @@ function clearColumnConvert(columns) {
     children: 'children'
   });
 }
-function handleExport($xetable, opts) {
+function handleExport($xeTable, opts) {
+  const $xeGrid = $xeTable.$xeGrid;
   const {
     remote,
     columns,
@@ -20880,19 +20876,19 @@ function handleExport($xetable, opts) {
     if (remote) {
       const params = {
         options: opts,
-        $table: $xetable,
-        $grid: $xetable.$xegrid
+        $table: $xeTable,
+        $grid: $xeGrid
       };
       resolve(exportMethod ? exportMethod(params) : params);
     } else {
-      const datas = getExportData($xetable, opts);
-      resolve($xetable.preventEvent(null, 'event.export', {
+      const datas = getExportData($xeTable, opts);
+      resolve($xeTable.preventEvent(null, 'event.export', {
         options: opts,
         columns,
         colgroups,
         datas
       }, () => {
-        return downloadFile($xetable, opts, getContent($xetable, opts, columns, datas));
+        return downloadFile($xeTable, opts, getContent($xeTable, opts, columns, datas));
       }));
     }
   }).then(params => {
@@ -20902,8 +20898,8 @@ function handleExport($xetable, opts) {
         afterExportMethod({
           status: true,
           options: opts,
-          $table: $xetable,
-          $grid: $xetable.$xegrid
+          $table: $xeTable,
+          $grid: $xeGrid
         });
       }
     }
@@ -20917,8 +20913,8 @@ function handleExport($xetable, opts) {
         afterExportMethod({
           status: false,
           options: opts,
-          $table: $xetable,
-          $grid: $xetable.$xegrid
+          $table: $xeTable,
+          $grid: $xeGrid
         });
       }
     }
@@ -21341,61 +21337,9 @@ function readLocalFile(options = {}) {
     fileInput.click();
   });
 }
-function removePrintFrame() {
-  if (printFrame) {
-    if (printFrame.parentNode) {
-      try {
-        printFrame.contentDocument.write('');
-      } catch (e) {}
-      printFrame.parentNode.removeChild(printFrame);
-    }
-    printFrame = null;
-  }
-}
-function appendPrintFrame() {
-  if (!printFrame.parentNode) {
-    document.body.appendChild(printFrame);
-  }
-}
-function afterPrintEvent() {
-  requestAnimationFrame(removePrintFrame);
-}
-function handlePrint($xetable, opts, content) {
+function handleExportAndPrint($xeTable, options, isPrint) {
+  const $xeGrid = $xeTable.$xeGrid;
   const {
-    beforePrintMethod
-  } = opts;
-  if (beforePrintMethod) {
-    content = beforePrintMethod({
-      content,
-      options: opts,
-      $table: $xetable
-    }) || '';
-  }
-  content = createHtmlPage(opts, content);
-  const blob = getExportBlobByContent(content, opts);
-  if (browse.msie) {
-    removePrintFrame();
-    printFrame = createFrame();
-    appendPrintFrame();
-    printFrame.contentDocument.write(content);
-    printFrame.contentDocument.execCommand('print');
-  } else {
-    if (!printFrame) {
-      printFrame = createFrame();
-      printFrame.onload = evnt => {
-        if (evnt.target.src) {
-          evnt.target.contentWindow.onafterprint = afterPrintEvent;
-          evnt.target.contentWindow.print();
-        }
-      };
-    }
-    appendPrintFrame();
-    printFrame.src = URL.createObjectURL(blob);
-  }
-}
-function handleExportAndPrint($xetable, options, isPrint) {
-  const {
-    $xegrid,
     initStore,
     customOpts,
     collectColumn,
@@ -21405,9 +21349,9 @@ function handleExportAndPrint($xetable, options, isPrint) {
     isGroup,
     exportParams,
     exportOpts
-  } = $xetable;
-  const proxyOpts = $xegrid ? $xegrid.proxyOpts : {};
-  const selectRecords = $xetable.getCheckboxRecords();
+  } = $xeTable;
+  const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : {};
+  const selectRecords = $xeTable.getCheckboxRecords();
   const hasFooter = !!footerTableData.length;
   const hasTree = treeConfig;
   const hasMerge = !hasTree && mergeList.length;
@@ -21475,7 +21419,7 @@ function handleExportAndPrint($xetable, options, isPrint) {
     }
   });
   // 更新条件
-  Object.assign($xetable.exportStore, {
+  Object.assign($xeTable.exportStore, {
     columns: exportColumns,
     typeList,
     modeList,
@@ -21490,14 +21434,42 @@ function handleExportAndPrint($xetable, options, isPrint) {
   Object.assign(exportParams, {
     mode: selectRecords.length ? 'selected' : 'current'
   }, defOpts);
-  if (!modeList.some(item => item.value === exportParams.mode)) {
+  const {
+    filename,
+    sheetName,
+    mode,
+    type
+  } = exportParams;
+  if (filename) {
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(filename)) {
+      exportParams.filename = filename({
+        options: defOpts,
+        $table: $xeTable,
+        $grid: $xeGrid
+      });
+    } else {
+      exportParams.filename = `${filename}`;
+    }
+  }
+  if (sheetName) {
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(sheetName)) {
+      exportParams.sheetName = sheetName({
+        options: defOpts,
+        $table: $xeTable,
+        $grid: $xeGrid
+      });
+    } else {
+      exportParams.sheetName = `${sheetName}`;
+    }
+  }
+  if (!modeList.some(item => item.value === mode)) {
     exportParams.mode = modeList[0].value;
   }
-  if (!typeList.some(item => item.value === exportParams.type)) {
+  if (!typeList.some(item => item.value === type)) {
     exportParams.type = typeList[0].value;
   }
   initStore.export = true;
-  return $xetable.$nextTick();
+  return $xeTable.$nextTick();
 }
 const getConvertColumns = columns => {
   const result = [];
@@ -21555,12 +21527,13 @@ const convertToRows = originColumns => {
     /**
      * 导出文件，支持 csv/html/xml/txt
      * 如果是树表格，则默认是导出所有节点
-     * 如果是启用了虚拟滚动，则只能导出数据源，可以配合 dataFilterMethod 函数自行转换数据
+     * 如果是启用了虚拟滚动，则只能导出数据源，可以配合 dataFilterMethod 函数转换数据
      * @param {Object} options 参数
      */
     _exportData(options) {
+      const $xeTable = this;
+      const $xeGrid = $xeTable.$xeGrid;
       const {
-        $xegrid,
         isGroup,
         tableGroupColumn,
         tableFullColumn,
@@ -21594,20 +21567,29 @@ const convertToRows = originColumns => {
         print: false
       }, options);
       const {
+        filename,
+        sheetName,
         type,
         mode,
         columns,
         original,
+        columnFilterMethod,
         beforeExportMethod,
-        excludeFields,
-        includeFields
+        includeFields,
+        excludeFields
       } = opts;
       let groups = [];
       const customCols = columns && columns.length ? columns : null;
+      const handleOptions = Object.assign({}, opts, {
+        filename: '',
+        sheetName: '',
+        colgroups: [],
+        columns: [],
+        data: []
+      });
       // 如果设置源数据，则默认导出设置了字段的列
-      let columnFilterMethod = opts.columnFilterMethod;
       if (!customCols && !columnFilterMethod) {
-        columnFilterMethod = ({
+        handleOptions.columnFilterMethod = ({
           column
         }) => {
           if (excludeFields) {
@@ -21625,24 +21607,24 @@ const convertToRows = originColumns => {
         };
       }
       if (customCols) {
-        opts._isCustomColumn = true;
+        handleOptions._isCustomColumn = true;
         groups = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().mapTree(customCols, item => {
           let targetColumn;
           if (item) {
             if (isColumnInfo(item)) {
               targetColumn = item;
             } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(item)) {
-              targetColumn = this.getColumnByField(item);
+              targetColumn = $xeTable.getColumnByField(item);
             } else {
               const colid = item.id || item.colId;
               const type = item.type;
               const field = item.field;
               if (colid) {
-                targetColumn = this.getColumnById(colid);
+                targetColumn = $xeTable.getColumnById(colid);
               } else if (field && type) {
                 targetColumn = tableFullColumn.find(column => column.field === field && column.type === type);
               } else if (field) {
-                targetColumn = this.getColumnByField(field);
+                targetColumn = $xeTable.getColumnByField(field);
               } else if (type) {
                 targetColumn = tableFullColumn.find(column => column.type === type);
               }
@@ -21653,7 +21635,7 @@ const convertToRows = originColumns => {
           children: 'childNodes',
           mapChildren: '_children'
         }), (column, index) => isColumnInfo(column) && (!columnFilterMethod || columnFilterMethod({
-          column,
+          column: column,
           $columnIndex: index
         })), {
           children: '_children',
@@ -21681,16 +21663,38 @@ const convertToRows = originColumns => {
         children: 'childNodes'
       });
       // 构建分组层级
-      opts.columns = cols;
-      opts.colgroups = convertToRows(groups);
-      if (!opts.filename) {
-        opts.filename = export_mixin_getI18n(opts.original ? 'vxe.table.expOriginFilename' : 'vxe.table.expFilename', [external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(Date.now(), 'yyyyMMddHHmmss')]);
+      handleOptions.columns = cols;
+      handleOptions.colgroups = convertToRows(groups);
+      if (filename) {
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(filename)) {
+          handleOptions.filename = filename({
+            options: opts,
+            $table: $xeTable,
+            $grid: $xeGrid
+          });
+        } else {
+          handleOptions.filename = `${filename}`;
+        }
       }
-      if (!opts.sheetName) {
-        opts.sheetName = document.title;
+      if (!handleOptions.filename) {
+        handleOptions.filename = export_mixin_getI18n(handleOptions.original ? 'vxe.table.expOriginFilename' : 'vxe.table.expFilename', [external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(Date.now(), 'yyyyMMddHHmmss')]);
+      }
+      if (sheetName) {
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(sheetName)) {
+          handleOptions.sheetName = sheetName({
+            options: opts,
+            $table: $xeTable,
+            $grid: $xeGrid
+          });
+        } else {
+          handleOptions.sheetName = `${sheetName}`;
+        }
+      }
+      if (!handleOptions.sheetName) {
+        handleOptions.sheetName = document.title || '';
       }
       // 检查类型，如果为自定义导出，则不需要校验类型
-      if (!opts.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), type)) {
+      if (!handleOptions.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), type)) {
         errLog('vxe.error.notType', [type]);
         if (true) {
           if (['xlsx', 'pdf'].includes(type)) {
@@ -21702,21 +21706,21 @@ const convertToRows = originColumns => {
         };
         return Promise.reject(params);
       }
-      if (!opts.print) {
+      if (!handleOptions.print) {
         if (beforeExportMethod) {
           beforeExportMethod({
-            options: opts,
-            $table: this,
-            $grid: $xegrid
+            options: handleOptions,
+            $table: $xeTable,
+            $grid: $xeGrid
           });
         }
       }
       if (!opts.data) {
-        opts.data = [];
+        handleOptions.data = [];
         if (mode === 'selected') {
-          const selectRecords = this.getCheckboxRecords();
+          const selectRecords = $xeTable.getCheckboxRecords();
           if (['html', 'pdf'].indexOf(type) > -1 && treeConfig) {
-            opts.data = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(this.getTableData().fullData, item => selectRecords.indexOf(item) > -1, Object.assign({}, treeOpts, {
+            opts.data = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree($xeTable.getTableData().fullData, item => $xeTable.findRowIndexOf(selectRecords, item) > -1, Object.assign({}, treeOpts, {
               data: '_row'
             }));
           } else {
@@ -21724,17 +21728,22 @@ const convertToRows = originColumns => {
           }
         } else if (mode === 'all') {
           if (true) {
-            if (!$xegrid) {
+            if (!$xeGrid) {
               warnLog('vxe.error.errProp', ['all', 'mode=current,selected']);
             }
           }
-          if ($xegrid && !opts.remote) {
+          if ($xeGrid && !handleOptions.remote) {
+            const gridReactData = $xeGrid;
+            const proxyOpts = $xeGrid.computeProxyOpts;
+            const {
+              sortData
+            } = gridReactData;
             const {
               beforeQueryAll,
               afterQueryAll,
-              ajax = {},
-              props = {}
-            } = $xegrid.proxyOpts;
+              ajax = {}
+            } = proxyOpts;
+            const resConfigs = proxyOpts.response || proxyOpts.props || {};
             const ajaxMethods = ajax.queryAll;
             const queryAllSuccessMethods = ajax.queryAllSuccess;
             const queryAllErrorMethods = ajax.queryAllError;
@@ -21745,16 +21754,20 @@ const convertToRows = originColumns => {
             }
             if (ajaxMethods) {
               const params = {
-                $table: this,
-                $grid: $xegrid,
-                sort: $xegrid.sortData,
-                filters: $xegrid.filterData,
-                form: $xegrid.formData,
-                target: ajaxMethods,
-                options: opts
+                $table: $xeTable,
+                $grid: $xeGrid,
+                sort: sortData.length ? sortData[0] : {},
+                sorts: sortData,
+                filters: gridReactData.filterData,
+                form: gridReactData.formData,
+                options: handleOptions
               };
               return Promise.resolve((beforeQueryAll || ajaxMethods)(params)).then(rest => {
-                opts.data = (props.list ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, props.list) : rest) || [];
+                const listProp = resConfigs.list;
+                handleOptions.data = (listProp ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(listProp) ? listProp({
+                  data: rest,
+                  $grid: $xeGrid
+                }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, listProp) : rest) || [];
                 if (afterQueryAll) {
                   afterQueryAll(params);
                 }
@@ -21764,7 +21777,7 @@ const convertToRows = originColumns => {
                     response: rest
                   });
                 }
-                return handleExport(this, opts);
+                return handleExport($xeTable, handleOptions);
               }).catch(rest => {
                 if (queryAllErrorMethods) {
                   queryAllErrorMethods({
@@ -21776,10 +21789,10 @@ const convertToRows = originColumns => {
             }
           }
         } else if (mode === 'current') {
-          opts.data = afterFullData;
+          handleOptions.data = afterFullData;
         }
       }
-      return handleExport(this, opts);
+      return handleExport($xeTable, opts);
     },
     _importByFile(file, options) {
       const opts = Object.assign({}, options);
@@ -21836,6 +21849,8 @@ const convertToRows = originColumns => {
       return readLocalFile(options);
     },
     _print(options) {
+      const $xeTable = this;
+      const $xeGrid = $xeTable.$xeGrid;
       const opts = Object.assign({
         original: false
         // beforePrintMethod
@@ -21845,25 +21860,76 @@ const convertToRows = originColumns => {
         remote: false,
         print: true
       });
-      if (!opts.sheetName) {
-        opts.sheetName = document.title;
-      }
-      return new Promise(resolve => {
-        if (opts.content) {
-          resolve(handlePrint(this, opts, opts.content));
+      const {
+        sheetName
+      } = opts;
+      let printTitle = '';
+      if (sheetName) {
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(sheetName)) {
+          printTitle = sheetName({
+            options: opts,
+            $table: $xeTable,
+            $grid: $xeGrid
+          });
         } else {
-          resolve(this.exportData(opts).then(({
-            content
-          }) => {
-            return handlePrint(this, opts, content);
-          }));
+          printTitle = `${sheetName}`;
+        }
+      }
+      if (!printTitle) {
+        printTitle = document.title || '';
+      }
+      const beforePrintMethod = opts.beforePrintMethod;
+      const tableHtml = opts.html || opts.content;
+      return new Promise((resolve, reject) => {
+        if (core_.VxeUI.print) {
+          if (tableHtml) {
+            resolve(core_.VxeUI.print({
+              title: printTitle,
+              html: tableHtml,
+              customStyle: opts.style,
+              beforeMethod: beforePrintMethod ? ({
+                html
+              }) => {
+                return beforePrintMethod({
+                  html,
+                  content: html,
+                  options: opts,
+                  $table: $xeTable
+                });
+              } : undefined
+            }));
+          } else {
+            resolve($xeTable.exportData(opts).then(({
+              content
+            }) => {
+              return core_.VxeUI.print({
+                title: printTitle,
+                html: content,
+                customStyle: opts.style,
+                beforeMethod: beforePrintMethod ? ({
+                  html
+                }) => {
+                  return beforePrintMethod({
+                    html,
+                    content: html,
+                    options: opts,
+                    $table: $xeTable
+                  });
+                } : undefined
+              });
+            }));
+          }
+        } else {
+          const e = {
+            status: false
+          };
+          reject(e);
         }
       });
     },
     _getPrintHtml(options) {
-      const {
-        printOpts
-      } = this;
+      const $xeTable = this;
+      const printOpts = $xeTable.computePrintOpts;
       const opts = Object.assign({
         original: false
         // beforePrintMethod
@@ -21873,7 +21939,7 @@ const convertToRows = originColumns => {
         remote: false,
         print: true
       });
-      return this.exportData(opts).then(({
+      return $xeTable.exportData(opts).then(({
         content
       }) => {
         return {
@@ -25264,11 +25330,12 @@ const {
     /**
      * 渲染按钮
      */
-    renderBtns(h) {
+    renderLeftBtns(h) {
       // 使用已安装的组件，如果未安装则不渲染
       const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
       const $xeToolbar = this;
       const props = $xeToolbar;
+      const slots = $xeToolbar.$scopedSlots;
       const internalData = $xeToolbar.internalData;
       const $xeGrid = $xeToolbar.$xeGrid;
       const {
@@ -25278,7 +25345,16 @@ const {
         connectTable
       } = internalData;
       const $table = connectTable;
+      const buttonPrefixSlot = slots.buttonPrefix || slots['button-prefix'];
+      const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix'];
       const btnVNs = [];
+      if (buttonPrefixSlot) {
+        btnVNs.push(...getSlotVNs(buttonPrefixSlot.call($xeToolbar, {
+          buttons: buttons || [],
+          $grid: $xeGrid,
+          $table: $table
+        })));
+      }
       if (buttons) {
         buttons.forEach(item => {
           const {
@@ -25333,6 +25409,13 @@ const {
           }
         });
       }
+      if (buttonSuffixSlot) {
+        btnVNs.push(...getSlotVNs(buttonSuffixSlot.call($xeToolbar, {
+          buttons: buttons || [],
+          $grid: $xeGrid,
+          $table: $table
+        })));
+      }
       return btnVNs;
     },
     /**
@@ -25343,6 +25426,7 @@ const {
       const VxeUIButtonComponent = core_.VxeUI.getComponent('VxeButton');
       const $xeToolbar = this;
       const props = $xeToolbar;
+      const slots = $xeToolbar.$scopedSlots;
       const internalData = $xeToolbar.internalData;
       const $xeGrid = $xeToolbar.$xeGrid;
       const {
@@ -25352,7 +25436,16 @@ const {
         connectTable
       } = internalData;
       const $table = connectTable;
+      const toolPrefixSlot = slots.toolPrefix || slots['tool-prefix'];
+      const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix'];
       const btnVNs = [];
+      if (toolPrefixSlot) {
+        btnVNs.push(...getSlotVNs(toolPrefixSlot.call($xeToolbar, {
+          tools: tools || [],
+          $grid: $xeGrid,
+          $table: $table
+        })));
+      }
       if (tools) {
         tools.forEach((item, tIndex) => {
           const {
@@ -25410,6 +25503,13 @@ const {
           }
         });
       }
+      if (toolSuffixSlot) {
+        btnVNs.push(...getSlotVNs(toolSuffixSlot.call($xeToolbar, {
+          tools: tools || [],
+          $grid: $xeGrid,
+          $table: $table
+        })));
+      }
       return btnVNs;
     },
     renderToolImport(h) {
@@ -25562,7 +25662,7 @@ const {
       }, buttonsSlot ? buttonsSlot({
         $grid: $xeGrid,
         $table: $table
-      }) : $xeToolbar.renderBtns(h)), h('div', {
+      }) : $xeToolbar.renderLeftBtns(h)), h('div', {
         class: 'vxe-tools--wrapper'
       }, toolsSlot ? toolsSlot({
         $grid: $xeGrid,