vxe-table 3.7.10-beta.0 → 3.7.10-beta.2

package/lib/index.umd.js

@@ -10596,7 +10596,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.7.10-beta.0", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.7.10-beta.2", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12028,7 +12028,7 @@ var setup = config;
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.7.10-beta.0",
+  version: "3.7.10-beta.2",
   reg: reg,
   use: use,
   setup: setup,
@@ -14465,6 +14465,7 @@ function getFooterContent(h, params) {
   var $table = params.$table,
     column = params.column,
     _columnIndex = params._columnIndex,
+    row = params.row,
     items = params.items;
   var slots = column.slots,
     editRender = column.editRender,
@@ -14479,7 +14480,11 @@ function getFooterContent(h, params) {
       return getSlotVNs(compConf.renderFooter.call($table, h, renderOpts, params));
     }
   }
-  return [utils.formatText(items[_columnIndex], 1)];
+  // 兼容老模式
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(items)) {
+    return [utils.formatText(items[_columnIndex], 1)];
+  }
+  return [utils.formatText(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field), 1)];
 }
 function getDefaultCellLabel(params) {
   var $table = params.$table,
@@ -20286,9 +20291,7 @@ var Methods = {
     return !!rowExpandedMaps[rowid];
   },
   isExpandByRow: function isExpandByRow(row) {
-    // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-    //   warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow'])
-    // }
+    if (false) {}
     // 即将废弃
     return this.isRowExpandByRow(row);
   },
@@ -21101,15 +21104,20 @@ var Methods = {
   updateFooter: function updateFooter() {
     var showFooter = this.showFooter,
       visibleColumn = this.visibleColumn,
+      footerData = this.footerData,
       footerMethod = this.footerMethod;
-    if (showFooter && footerMethod) {
-      this.footerTableData = visibleColumn.length ? footerMethod({
+    var footData = [];
+    if (showFooter && footerData && footerData.length) {
+      footData = footerData.slice(0);
+    } else if (showFooter && footerMethod) {
+      footData = visibleColumn.length ? footerMethod({
         columns: visibleColumn,
         data: this.afterFullData,
         $table: this,
         $grid: this.$xegrid
       }) : [];
     }
+    this.footerTableData = footData;
     return this.$nextTick();
   },
   /**
@@ -21655,6 +21663,8 @@ function handleUupdateResize(_vm) {
     highlightCell: Boolean,
     // 是否显示表尾合计
     showFooter: Boolean,
+    // 表尾数据
+    footerData: Array,
     // 表尾合计的计算方法
     footerMethod: Function,
     // 给行附加 className
@@ -32848,7 +32858,7 @@ function validErrorRuleValue(rule, val) {
         return handleFieldOrColumn(_this4, column);
       });
       var validErrMaps = {};
-      if (validTip && validTip.reactData.visible) {
+      if (validTip && validTip.visible) {
         validTip.close();
       }
       // 如果是单个提示模式
@@ -33180,6 +33190,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         var params = {
           $table: $xetable,
           $grid: $xetable.xegrid,
+          row: list,
           _rowIndex: _rowIndex,
           $rowIndex: $rowIndex,
           column: column,
@@ -36721,11 +36732,14 @@ var Textarea = Object.assign(src_textarea, {
 
 
 
+// import { warnLog } from '../../tools/log'
+
 /* harmony default export */ var button_src_button = ({
   name: 'VxeButton',
   mixins: [size],
   props: {
     type: String,
+    mode: String,
     size: {
       type: String,
       default: function _default() {
@@ -36762,17 +36776,20 @@ var Textarea = Object.assign(src_textarea, {
     };
   },
   computed: {
-    isText: function isText() {
-      return this.type === 'text';
-    },
     isFormBtn: function isFormBtn() {
       return ['submit', 'reset', 'button'].indexOf(this.type) > -1;
     },
     btnType: function btnType() {
-      return this.isText ? this.type : 'button';
+      return this.type === 'text' || this.mode === 'text' ? 'text' : 'button';
     }
   },
   created: function created() {
+    // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    //   if (props.type === 'text') {
+    //     warnLog('vxe.error.delFunc', ['type=text', 'mode=text'])
+    //   }
+    // }
+
     GlobalEvent.on(this, 'mousewheel', this.handleGlobalMousewheelEvent);
   },
   beforeDestroy: function beforeDestroy() {