vxe-table 3.7.0-beta.0 → 3.7.0-beta.3

package/lib/index.umd.js

@@ -11042,7 +11042,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.7.0-beta.0", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.7.0-beta.2", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12229,7 +12229,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.7.0-beta.0",
+  version: "3.7.0-beta.2",
   reg: reg,
   use: use,
   setup: setup,
@@ -16069,9 +16069,11 @@ var Methods = {
       tableFullData = this.tableFullData,
       fullDataRowMap = this.fullDataRowMap,
       fullAllDataRowMap = this.fullAllDataRowMap,
-      tableFullTreeData = this.tableFullTreeData;
+      tableFullTreeData = this.tableFullTreeData,
+      tableSourceData = this.tableSourceData;
     var fullDataRowIdData = this.fullDataRowIdData,
-      fullAllDataRowIdData = this.fullAllDataRowIdData;
+      fullAllDataRowIdData = this.fullAllDataRowIdData,
+      sourceDataRowIdData = this.sourceDataRowIdData;
     var rowkey = getRowkey(this);
     var isLazy = treeConfig && treeOpts.lazy;
     var handleCache = function handleCache(row, index, items, path, parent, nodes) {
@@ -16108,12 +16110,30 @@ var Methods = {
       fullDataRowMap.clear();
     }
     fullAllDataRowIdData = this.fullAllDataRowIdData = {};
+    sourceDataRowIdData = this.sourceDataRowIdData = {};
     fullAllDataRowMap.clear();
     if (treeConfig) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleCache, treeOpts);
     } else {
       tableFullData.forEach(handleCache);
     }
+    var handleSourceRow = function handleSourceRow(row) {
+      var rowid = getRowid(_this10, row);
+      if (eqEmptyValue(rowid)) {
+        rowid = getRowUniqueId();
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
+      }
+      sourceDataRowIdData[rowid] = {
+        row: row,
+        rowid: rowid
+      };
+    };
+    // 源数据缓存
+    if (treeConfig && !treeOpts.transform) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableSourceData, handleSourceRow, treeOpts);
+    } else {
+      tableSourceData.forEach(handleSourceRow);
+    }
   },
   loadTreeChildren: function loadTreeChildren(row, childRecords) {
     var _this11 = this;
@@ -17115,7 +17135,7 @@ var Methods = {
    */
   showColumn: function showColumn(fieldOrColumn) {
     var column = handleFieldOrColumn(this, fieldOrColumn);
-    if (column & !column.visible) {
+    if (column && column.visible) {
       column.visible = true;
       return this.handleCustom();
     }
@@ -30120,7 +30140,8 @@ function getLabelData($xetable, opts, columns, datas) {
   var treeConfig = $xetable.treeConfig,
     treeOpts = $xetable.treeOpts,
     radioOpts = $xetable.radioOpts,
-    checkboxOpts = $xetable.checkboxOpts;
+    checkboxOpts = $xetable.checkboxOpts,
+    columnOpts = $xetable.columnOpts;
   if (!htmlCellElem) {
     htmlCellElem = document.createElement('div');
   }
@@ -30142,15 +30163,18 @@ function getLabelData($xetable, opts, columns, datas) {
         columns.forEach(function (column, $columnIndex) {
           var cellValue = '';
           var renderOpts = column.editRender || column.cellRender;
-          var exportLabelMethod = column.exportMethod;
-          if (!exportLabelMethod && renderOpts && renderOpts.name) {
+          var bodyExportMethod = column.exportMethod;
+          if (!bodyExportMethod && renderOpts && renderOpts.name) {
             var compConf = v_x_e_table.renderer.get(renderOpts.name);
             if (compConf) {
-              exportLabelMethod = compConf.exportMethod || compConf.cellExportMethod;
+              bodyExportMethod = compConf.exportMethod || compConf.cellExportMethod;
             }
           }
-          if (exportLabelMethod) {
-            cellValue = exportLabelMethod({
+          if (!bodyExportMethod) {
+            bodyExportMethod = columnOpts.exportMethod;
+          }
+          if (bodyExportMethod) {
+            cellValue = bodyExportMethod({
               $table: $xetable,
               row: row,
               column: column,
@@ -30282,23 +30306,29 @@ function getBooleanValue(cellValue) {
   return cellValue === 'TRUE' || cellValue === 'true' || cellValue === true;
 }
 function getHeaderTitle($xetable, opts, column) {
-  var headerExportMethod = column.headerExportMethod;
-  return headerExportMethod ? headerExportMethod({
+  var columnOpts = $xetable.columnOpts;
+  var headExportMethod = column.headerExportMethod || columnOpts.headerExportMethod;
+  return headExportMethod ? headExportMethod({
     column: column,
+    options: opts,
     $table: $xetable
   }) : (opts.original ? column.property : column.getTitle()) || '';
 }
 function getFooterCellValue($xetable, opts, items, column) {
+  var columnOpts = $xetable.columnOpts;
   var renderOpts = column.editRender || column.cellRender;
-  var exportLabelMethod = column.footerExportMethod;
-  if (!exportLabelMethod && renderOpts && renderOpts.name) {
+  var footLabelMethod = column.footerExportMethod;
+  if (!footLabelMethod && renderOpts && renderOpts.name) {
     var compConf = v_x_e_table.renderer.get(renderOpts.name);
     if (compConf) {
-      exportLabelMethod = compConf.footerExportMethod || compConf.footerCellExportMethod;
+      footLabelMethod = compConf.footerExportMethod || compConf.footerCellExportMethod;
     }
   }
+  if (!footLabelMethod) {
+    footLabelMethod = columnOpts.footerExportMethod;
+  }
   var _columnIndex = $xetable.getVTColumnIndex(column);
-  var cellValue = exportLabelMethod ? exportLabelMethod({
+  var cellValue = footLabelMethod ? footLabelMethod({
     $table: $xetable,
     items: items,
     itemIndex: _columnIndex,