vxe-table 3.7.9 → 3.7.10-beta.0

package/lib/index.umd.js

@@ -10355,7 +10355,8 @@ var iconPrefix = 'vxe-icon-';
     TABLE_FILTER_NONE: iconPrefix + 'funnel',
     TABLE_FILTER_MATCH: iconPrefix + 'funnel',
     TABLE_EDIT: iconPrefix + 'edit',
-    TABLE_HELP: iconPrefix + 'question-circle-fill',
+    TABLE_TITLE_PREFIX: iconPrefix + 'question-circle-fill',
+    TABLE_TITLE_SUFFIX: iconPrefix + 'question-circle-fill',
     TABLE_TREE_LOADED: iconPrefix + 'spinner roll',
     TABLE_TREE_OPEN: iconPrefix + 'caret-right rotate90',
     TABLE_TREE_CLOSE: iconPrefix + 'caret-right',
@@ -10595,7 +10596,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.7.9", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.7.10-beta.0", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12027,7 +12028,7 @@ var setup = config;
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.7.9",
+  version: "3.7.10-beta.0",
   reg: reg,
   use: use,
   setup: setup,
@@ -12204,6 +12205,7 @@ var ColumnInfo = /*#__PURE__*/function () {
       footerExportMethod: _vm.footerExportMethod,
       titleHelp: _vm.titleHelp,
       titlePrefix: _vm.titlePrefix,
+      titleSuffix: _vm.titleSuffix,
       // 自定义参数
       params: _vm.params,
       // 渲染属性
@@ -12619,10 +12621,11 @@ function getColReMinWidth(params) {
     var checkboxIconWidth = getPaddingLeftRightSize(queryCellElement(cell, '--title>.vxe-cell--checkbox'));
     var requiredIconWidth = getElemenMarginWidth(queryCellElement(cell, '>.vxe-cell--required-icon'));
     var editIconWidth = getElemenMarginWidth(queryCellElement(cell, '>.vxe-cell--edit-icon'));
-    var helpIconWidth = getElemenMarginWidth(queryCellElement(cell, '>.vxe-cell-help-icon'));
+    var prefixIconWidth = getElemenMarginWidth(queryCellElement(cell, '>.vxe-cell-title-prefix-icon'));
+    var suffixIconWidth = getElemenMarginWidth(queryCellElement(cell, '>.vxe-cell-title-suffix-icon'));
     var sortIconWidth = getElemenMarginWidth(queryCellElement(cell, '>.vxe-cell--sort'));
     var filterIconWidth = getElemenMarginWidth(queryCellElement(cell, '>.vxe-cell--filter'));
-    mWidth += checkboxIconWidth + requiredIconWidth + editIconWidth + helpIconWidth + filterIconWidth + sortIconWidth;
+    mWidth += checkboxIconWidth + requiredIconWidth + editIconWidth + prefixIconWidth + suffixIconWidth + filterIconWidth + sortIconWidth;
   }
   // 如果设置最小宽
   if (colMinWidth) {
@@ -14386,10 +14389,26 @@ function renderTitlePrefixIcon(h, params) {
     column = params.column;
   var titlePrefix = column.titlePrefix || column.titleHelp;
   return titlePrefix ? [h('i', {
-    class: ['vxe-cell-help-icon', titlePrefix.icon || conf.icon.TABLE_HELP],
+    class: ['vxe-cell-title-prefix-icon', titlePrefix.icon || conf.icon.TABLE_TITLE_PREFIX],
     on: {
       mouseenter: function mouseenter(evnt) {
-        $table.triggerHeaderHelpEvent(evnt, params);
+        $table.triggerHeaderTitleEvent(evnt, titlePrefix, params);
+      },
+      mouseleave: function mouseleave(evnt) {
+        $table.handleTargetLeaveEvent(evnt);
+      }
+    }
+  })] : [];
+}
+function renderTitleSuffixIcon(h, params) {
+  var $table = params.$table,
+    column = params.column;
+  var titleSuffix = column.titleSuffix;
+  return titleSuffix ? [h('i', {
+    class: ['vxe-cell-title-suffix-icon', titleSuffix.icon || conf.icon.TABLE_TITLE_SUFFIX],
+    on: {
+      mouseenter: function mouseenter(evnt) {
+        $table.triggerHeaderTitleEvent(evnt, titleSuffix, params);
       },
       mouseleave: function mouseleave(evnt) {
         $table.handleTargetLeaveEvent(evnt);
@@ -14547,7 +14566,7 @@ var Cell = {
     return renderTitleContent(h, params, utils.formatText(column.getTitle(), 1));
   },
   renderDefaultHeader: function renderDefaultHeader(h, params) {
-    return renderTitlePrefixIcon(h, params).concat(Cell.renderHeaderTitle(h, params));
+    return renderTitlePrefixIcon(h, params).concat(Cell.renderHeaderTitle(h, params)).concat(renderTitleSuffixIcon(h, params));
   },
   renderDefaultCell: function renderDefaultCell(h, params) {
     var $table = params.$table,
@@ -18406,16 +18425,15 @@ var Methods = {
       this.closeTooltip();
     }
   },
-  triggerHeaderHelpEvent: function triggerHeaderHelpEvent(evnt, params) {
-    var column = params.column;
-    var titlePrefix = column.titlePrefix || column.titleHelp;
-    if (titlePrefix.content || titlePrefix.message) {
+  triggerHeaderTitleEvent: function triggerHeaderTitleEvent(evnt, iconParams, params) {
+    var tipContent = iconParams.content || iconParams.message;
+    if (tipContent) {
       var $refs = this.$refs,
         tooltipStore = this.tooltipStore;
-      var content = getFuncText(titlePrefix.content || titlePrefix.message);
+      var content = getFuncText(tipContent);
       this.handleTargetEnterEvent(true);
       tooltipStore.visible = true;
-      tooltipStore.currOpts = _objectSpread2(_objectSpread2({}, titlePrefix), {}, {
+      tooltipStore.currOpts = _objectSpread2(_objectSpread2({}, params), {}, {
         content: null
       });
       this.$nextTick(function () {
@@ -22596,7 +22614,7 @@ function handleUupdateResize(_vm) {
         icon: loadingOpts.icon,
         text: loadingOpts.text
       }
-    }, this.callSlot($scopedSlots.loading, {})),
+    }, this.callSlot($scopedSlots.loading, {}, h)),
     /**
      * 筛选
      */
@@ -33421,8 +33439,10 @@ var column_props = {
   footerExportMethod: Function,
   // 已废弃，被 titlePrefix 替换
   titleHelp: Object,
-  // 标题帮助图标配置项
+  // 标题前缀图标配置项
   titlePrefix: Object,
+  // 标题后缀图标配置项
+  titleSuffix: Object,
   // 单元格值类型
   cellType: String,
   // 单元格渲染配置项
@@ -38182,6 +38202,7 @@ function getResetValue(value, resetValue) {
       customLayout = this.customLayout;
     var hasUseTooltip = v_x_e_table._tooltip;
     var defaultSlot = this.$scopedSlots.default;
+    var loadingSlot = this.$scopedSlots.loading;
     return h('form', {
       class: ['vxe-form', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
         items: formItems,
@@ -38194,7 +38215,7 @@ function getResetValue(value, resetValue) {
       }
     }, [h('div', {
       class: 'vxe-form--wrapper vxe-row'
-    }, customLayout ? defaultSlot ? defaultSlot.call(this, h, {}) : [] : formItems.map(function (item, index) {
+    }, customLayout ? defaultSlot ? this.callSlot(defaultSlot, {}, h) : [] : formItems.map(function (item, index) {
       return h(form_config_item, {
         key: index,
         props: {
@@ -38204,7 +38225,7 @@ function getResetValue(value, resetValue) {
     })), h('div', {
       class: 'vxe-form-slots',
       ref: 'hideItem'
-    }, customLayout ? [] : defaultSlot ? defaultSlot.call(this, h, {}) : []),
+    }, customLayout ? [] : defaultSlot ? this.callSlot(defaultSlot, {}, h) : []),
     /**
      * 加载中
      */
@@ -38213,7 +38234,7 @@ function getResetValue(value, resetValue) {
       props: {
         value: loading
       }
-    }),
+    }, loadingSlot ? this.callSlot(loadingSlot, {}, h) : []),
     /**
      * 工具提示
      */
@@ -40037,7 +40058,6 @@ var Pulldown = Object.assign(pulldown, {
       confirmFilter: '筛选',
       resetFilter: '重置',
       allFilter: '全部',
-      sortSingle: '点击排序',
       sortAsc: '升序：最低到最高',
       sortDesc: '降序：最高到最低',
       filter: '对所选的列启用筛选',