vxe-table 3.6.0 → 3.6.4

package/lib/index.umd.js

@@ -8812,7 +8812,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.6.0-beta.11", "] ").concat(src_conf.i18n(message, params));
+  return "[vxe-table v".concat("3.6.4", "] ").concat(src_conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10093,7 +10093,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.6.0-beta.11",
+  version: "3.6.4",
   reg: reg,
   use: use,
   setup: setup,
@@ -10921,6 +10921,15 @@ function colToVisible($xetable, column) {
 
   return Promise.resolve();
 }
+// CONCATENATED MODULE: ./packages/tools/vn.js
+
+function getSlotVNs(vns) {
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(vns)) {
+    return vns;
+  }
+
+  return [vns];
+}
 // CONCATENATED MODULE: ./packages/table/src/body.js
 
 
@@ -10936,6 +10945,7 @@ function colToVisible($xetable, column) {
 
 
 
+
 var renderType = 'body'; // 滚动、拖动过程中不需要触发
 
 function isOperateMouse($xetable) {
@@ -11558,9 +11568,9 @@ function syncBodyScroll(_vm, fixedType, scrollTop, elem1, elem2) {
       var renderEmpty = compConf ? compConf.renderEmpty : null;
 
       if (renderEmpty) {
-        emptyContent = renderEmpty.call(this, h, emptyOpts, {
+        emptyContent = getSlotVNs(renderEmpty.call(this, h, emptyOpts, {
           $table: $xetable
-        });
+        }));
       } else {
         emptyContent = $xetable.emptyText || src_conf.i18n('vxe.table.emptyText');
       }
@@ -12534,15 +12544,6 @@ var es_array_sort = __webpack_require__("4e82");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.finally.js
 var es_promise_finally = __webpack_require__("a79d");
 
-// CONCATENATED MODULE: ./packages/tools/vn.js
-
-function getSlotVNs(vns) {
-  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(vns)) {
-    return vns;
-  }
-
-  return [vns];
-}
 // CONCATENATED MODULE: ./packages/table/src/cell.js
 
 
@@ -19936,6 +19937,7 @@ var Loading = Object.assign(src_loading, {
 
 
 
+
 
 
 /**
@@ -20007,7 +20009,7 @@ function renderEmptyContenet(h, _vm) {
     var renderEmpty = compConf ? compConf.renderEmpty : null;
 
     if (renderEmpty) {
-      emptyContent = renderEmpty.call(_vm, h, emptyOpts, params);
+      emptyContent = getSlotVNs(renderEmpty.call(_vm, h, emptyOpts, params));
     } else {
       emptyContent = getFuncText(_vm.emptyText) || src_conf.i18n('vxe.table.emptyText');
     }
@@ -21202,6 +21204,7 @@ var Table = Object.assign(table, {
 
 
 
+
 /* harmony default export */ var panel = ({
   name: 'VxeTableFilter',
   props: {
@@ -21257,10 +21260,10 @@ var Table = Object.assign(table, {
       } else if (compConf && compConf.renderFilter) {
         return [h('div', {
           class: 'vxe-table--filter-template'
-        }, compConf.renderFilter.call($xetable, h, filterRender, Object.assign({
+        }, getSlotVNs(compConf.renderFilter.call($xetable, h, filterRender, Object.assign({
           $panel: this,
           context: this
-        }, args)))];
+        }, args))))];
       }
 
       var isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some(function (item) {
@@ -23025,6 +23028,10 @@ function insertTreeRow(_vm, newRecords, isAppend) {
 
         if (!autofocus && compRender) {
           autofocus = compRender.autofocus;
+        }
+
+        if (!autoselect && compRender) {
+          autoselect = compRender.autoselect;
         } // 如果指定了聚焦 class
 
 
@@ -34098,6 +34105,7 @@ var Grid = Object.assign(grid, {
 
 
 
+
 var renderDropdowns = function renderDropdowns(h, _vm, item, isBtn) {
   var _e = _vm._e;
   var dropdowns = item.dropdowns;
@@ -34162,11 +34170,11 @@ function renderBtns(h, _vm) {
       if (renderToolbarButton) {
         return h('span', {
           class: 'vxe-button--item'
-        }, renderToolbarButton.call(_vm, h, buttonRender, {
+        }, getSlotVNs(renderToolbarButton.call(_vm, h, buttonRender, {
           $grid: $xegrid,
           $table: $xetable,
           button: item
-        }));
+        })));
       }
     }
 
@@ -34233,11 +34241,11 @@ function renderRightTools(h, _vm) {
       if (renderToolbarTool) {
         return h('span', {
           class: 'vxe-tool--item'
-        }, renderToolbarTool.call(_vm, h, toolRender, {
+        }, getSlotVNs(renderToolbarTool.call(_vm, h, toolRender, {
           $grid: $xegrid,
           $table: $xetable,
           tool: item
-        }));
+        })));
       }
     }
 
@@ -34461,8 +34469,10 @@ function renderCustoms(h, _vm) {
     this.$nextTick(function () {
       var $xetable = _this.fintTable();
 
-      if (refresh && !_this.$xegrid && !refreshOpts.query) {
-        warnLog('vxe.error.notFunc', ['query']);
+      var queryMethod = refreshOpts.queryMethod || refreshOpts.query;
+
+      if (refresh && !_this.$xegrid && !queryMethod) {
+        warnLog('vxe.error.notFunc', ['queryMethod']);
       }
 
       if ($xetable) {
@@ -34771,11 +34781,13 @@ function renderCustoms(h, _vm) {
           isRefresh = this.isRefresh;
 
       if (!isRefresh) {
-        if (refreshOpts.query) {
+        var queryMethod = refreshOpts.queryMethod || refreshOpts.query;
+
+        if (queryMethod) {
           this.isRefresh = true;
 
           try {
-            Promise.resolve(refreshOpts.query()).catch(function (e) {
+            Promise.resolve(queryMethod({})).catch(function (e) {
               return e;
             }).then(function () {
               _this4.isRefresh = false;
@@ -34785,7 +34797,7 @@ function renderCustoms(h, _vm) {
           }
         } else if ($xegrid) {
           this.isRefresh = true;
-          $xegrid.commitProxy('reload').catch(function (e) {
+          $xegrid.commitProxy(refreshOpts.code || 'reload').catch(function (e) {
             return e;
           }).then(function () {
             _this4.isRefresh = false;
@@ -37095,6 +37107,7 @@ function assemItem(_vm) {
 
 
 
+
 function renderPrefixIcon(h, titlePrefix) {
   return h('span', {
     class: 'vxe-form--item-title-prefix'
@@ -37140,7 +37153,7 @@ function renderTitle(h, _vm, item) {
 
   titVNs.push(h('span', {
     class: 'vxe-form--item-title-label'
-  }, compConf && compConf.renderItemTitle ? compConf.renderItemTitle(itemRender, params) : slots && slots.title ? _vm.callSlot(slots.title, params, h) : getFuncText(item.title)));
+  }, compConf && compConf.renderItemTitle ? getSlotVNs(compConf.renderItemTitle(itemRender, params)) : slots && slots.title ? _vm.callSlot(slots.title, params, h) : getFuncText(item.title)));
   contVNs.push(h('div', {
     class: 'vxe-form--item-title-content'
   }, titVNs));
@@ -38101,8 +38114,14 @@ var form_item_props = {
   size: String,
   span: [String, Number],
   align: String,
-  titleAlign: String,
-  titleWidth: [String, Number],
+  titleAlign: {
+    type: String,
+    default: null
+  },
+  titleWidth: {
+    type: [String, Number],
+    default: null
+  },
   titleColon: {
     type: Boolean,
     default: null
@@ -38143,6 +38162,10 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
       data = _vm.data,
       collapseAll = _vm.collapseAll,
       validOpts = _vm.validOpts,
+      allTitleAlign = _vm.titleAlign,
+      allTitleWidth = _vm.titleWidth,
+      allTitleColon = _vm.titleColon,
+      allTitleAsterisk = _vm.titleAsterisk,
       allTitleOverflow = _vm.titleOverflow;
   var title = item.title,
       folding = item.folding,
@@ -38158,8 +38181,10 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
   var itemClassName = compConf ? compConf.itemClassName : '';
   var span = item.span || _vm.span;
   var align = item.align || _vm.align;
-  var titleAlign = item.titleAlign || _vm.titleAlign;
-  var titleWidth = item.titleWidth || _vm.titleWidth;
+  var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
+  var titleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
+  var titleColon = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleColon) ? allTitleColon : item.titleColon;
+  var titleAsterisk = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
   var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isUndefined(titleOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
   var showEllipsis = itemOverflow === 'ellipsis';
   var showTitle = itemOverflow === 'title';
@@ -38209,6 +38234,8 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
   return h('div', {
     class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
       'is--title': title,
+      'is--colon': titleColon,
+      'is--asterisk': titleAsterisk,
       'is--required': isRequired,
       'is--hidden': folding && collapseAll,
       'is--active': isActivetem(_vm, item),
@@ -39362,6 +39389,7 @@ var Pulldown = Object.assign(pulldown, {
       },
       combination: {
         menus: {
+          clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
           fixedColumn: '锁定列',