vxe-table 3.8.6-beta.1 → 3.8.6-beta.3

package/lib/index.umd.js

@@ -10742,6 +10742,7 @@ __webpack_require__.d(__webpack_exports__, {
   readFile: function() { return /* reexport */ readLocalFile; },
   renderer: function() { return /* reexport */ renderer; },
   saveFile: function() { return /* reexport */ saveLocalFile; },
+  setConfig: function() { return /* reexport */ setConfig; },
   setup: function() { return /* reexport */ setup; },
   t: function() { return /* reexport */ t; },
   use: function() { return /* reexport */ use; },
@@ -10835,6 +10836,7 @@ __webpack_require__.d(all_namespaceObject, {
   readFile: function() { return readLocalFile; },
   renderer: function() { return renderer; },
   saveFile: function() { return saveLocalFile; },
+  setConfig: function() { return setConfig; },
   setup: function() { return setup; },
   t: function() { return t; },
   use: function() { return use; },
@@ -11073,6 +11075,7 @@ var iconPrefix = 'vxe-icon-';
       isEsc: true
     },
     areaConfig: {
+      autoClear: true,
       selectCellByHeader: true
     },
     clipConfig: {
@@ -11346,7 +11349,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.6-beta.1", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.6-beta.3", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12974,15 +12977,18 @@ function setTheme(options) {
 /**
  * 全局参数设置
  */
-function config(options) {
+function setConfig(options) {
   if (options) {
-    setTheme(options);
+    if (options.theme) {
+      setTheme(options);
+    }
     if (options.zIndex) {
       index_esm.setCurrent(options.zIndex);
     }
   }
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, options);
 }
+var config = setConfig;
 ;// CONCATENATED MODULE: ./packages/v-x-e-table/index.js
 
 
@@ -13079,14 +13085,14 @@ function _t(key, args) {
   return key ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(conf.translate ? conf.translate(key, args) : key) : '';
 }
 var v = 'v3';
-var setup = config;
+var setup = setConfig;
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.6-beta.1",
+  version: "3.8.6-beta.3",
   reg: reg,
   use: use,
-  setup: setup,
+  setConfig: setConfig,
   globalStore: globalStore,
   interceptor: interceptor,
   renderer: renderer,
@@ -13097,7 +13103,8 @@ var VXETable = {
   t: t,
   _t: _t,
   // 已废弃
-  config: config,
+  config: setConfig,
+  setup: setup,
   globalConfs: globalConfs
 };
 setTheme(globalStore);
@@ -13867,6 +13874,7 @@ function getSlotVNs(vns) {
 
 
 
+
 var renderType = 'body';
 
 // 滚动、拖动过程中不需要触发
@@ -13876,7 +13884,8 @@ function isVMScrollProcess($xetable) {
 function renderLine(h, _vm, $xetable, params) {
   var row = params.row,
     column = params.column;
-  var treeOpts = $xetable.treeOpts,
+  var afterFullData = $xetable.afterFullData,
+    treeOpts = $xetable.treeOpts,
     treeConfig = $xetable.treeConfig,
     fullAllDataRowIdData = $xetable.fullAllDataRowIdData;
   var slots = column.slots,
@@ -13894,13 +13903,14 @@ function renderLine(h, _vm, $xetable, params) {
   if (slots && slots.line) {
     return $xetable.callSlot(slots.line, params, h);
   }
+  var isFirstRow = $xetable.eqRow(afterFullData[0], row);
   if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
     return [h('div', {
       class: 'vxe-tree--line-wrapper'
     }, [h('div', {
       class: 'vxe-tree--line',
       style: {
-        height: "".concat(calcTreeLine(params, items, rIndex), "px"),
+        height: "".concat(isFirstRow ? 1 : calcTreeLine(params, items, rIndex), "px"),
         left: "".concat(rLevel * treeOpts.indent + (rLevel ? 2 - getOffsetSize($xetable) : 0) + 16, "px")
       }
     })])];
@@ -19348,6 +19358,7 @@ var Methods = {
       editRules = this.editRules,
       editOpts = this.editOpts,
       validOpts = this.validOpts,
+      areaOpts = this.areaOpts,
       filterStore = this.filterStore,
       customStore = this.customStore,
       getRowNode = this.getRowNode;
@@ -19436,11 +19447,13 @@ var Methods = {
         if (this.clearSelected) {
           this.clearSelected();
         }
-        if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
-          this.preventEvent(evnt, 'event.clearAreas', {}, function () {
-            _this27.clearCellAreas();
-            _this27.clearCopyCellArea();
-          });
+        if (areaOpts.autoClear) {
+          if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
+            this.preventEvent(evnt, 'event.clearAreas', {}, function () {
+              _this27.clearCellAreas();
+              _this27.clearCopyCellArea();
+            });
+          }
         }
       }
     }
@@ -23880,15 +23893,15 @@ function handleUupdateResize(_vm) {
     var _this12 = this;
     if (false) { var $listeners; }
     if (this.autoResize) {
-      var handleWarpperResize = this.resizeOpts.refreshDelay ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().throttle(function () {
+      var handleWrapperResize = this.resizeOpts.refreshDelay ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().throttle(function () {
         return _this12.recalculate(true);
       }, this.resizeOpts.refreshDelay, {
         leading: true,
         trailing: true
       }) : null;
-      var resizeObserver = createResizeEvent(handleWarpperResize ? function () {
+      var resizeObserver = createResizeEvent(handleWrapperResize ? function () {
         if (_this12.autoResize) {
-          requestAnimationFrame(handleWarpperResize);
+          requestAnimationFrame(handleWrapperResize);
         }
       } : function () {
         if (_this12.autoResize) {
@@ -34577,11 +34590,11 @@ function updateDropHint(_vm, evnt) {
     return;
   }
   if (dragHintEl) {
-    var warpperEl = bodyEl.parentNode;
-    var warpperRect = warpperEl.getBoundingClientRect();
+    var wrapperEl = bodyEl.parentNode;
+    var wrapperRect = wrapperEl.getBoundingClientRect();
     dragHintEl.style.display = 'block';
-    dragHintEl.style.top = "".concat(Math.min(warpperEl.clientHeight - warpperEl.scrollTop - dragHintEl.clientHeight, evnt.clientY - warpperRect.y), "px");
-    dragHintEl.style.left = "".concat(Math.min(warpperEl.clientWidth - warpperEl.scrollLeft - dragHintEl.clientWidth - 16, evnt.clientX - warpperRect.x), "px");
+    dragHintEl.style.top = "".concat(Math.min(wrapperEl.clientHeight - wrapperEl.scrollTop - dragHintEl.clientHeight, evnt.clientY - wrapperRect.y), "px");
+    dragHintEl.style.left = "".concat(Math.min(wrapperEl.clientWidth - wrapperEl.scrollLeft - dragHintEl.clientWidth - 16, evnt.clientX - wrapperRect.x), "px");
   }
 }
 function renderSimplePanel(h, _vm) {
@@ -36008,7 +36021,8 @@ Object.keys(packages_table.methods).forEach(function (name) {
         editRules = this.editRules,
         formData = this.formData,
         isMsg = this.isMsg,
-        validConfig = this.validConfig;
+        validConfig = this.validConfig,
+        pagerOpts = this.pagerOpts;
       var beforeQuery = proxyOpts.beforeQuery,
         afterQuery = proxyOpts.afterQuery,
         beforeDelete = proxyOpts.beforeDelete,
@@ -36016,9 +36030,8 @@ Object.keys(packages_table.methods).forEach(function (name) {
         beforeSave = proxyOpts.beforeSave,
         afterSave = proxyOpts.afterSave,
         _proxyOpts$ajax = proxyOpts.ajax,
-        ajax = _proxyOpts$ajax === void 0 ? {} : _proxyOpts$ajax,
-        _proxyOpts$props = proxyOpts.props,
-        proxyProps = _proxyOpts$props === void 0 ? {} : _proxyOpts$props;
+        ajax = _proxyOpts$ajax === void 0 ? {} : _proxyOpts$ajax;
+      var resConfigs = proxyOpts.response || proxyOpts.props || {};
       var $xetable = $refs.xTable;
       var button;
       var code;
@@ -36141,17 +36154,29 @@ Object.keys(packages_table.methods).forEach(function (name) {
               return Promise.resolve((beforeQuery || ajaxMethods).apply(void 0, _toConsumableArray(applyArgs))).then(function (rest) {
                 _this5.tableLoading = false;
                 if (rest) {
-                  if (isEnableConf(pagerConfig)) {
-                    var total = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, proxyProps.total || 'page.total') || 0;
+                  if (pagerConfig && isEnableConf(pagerOpts)) {
+                    var totalProp = resConfigs.total;
+                    var total = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(totalProp) ? totalProp({
+                      data: rest,
+                      $grid: _this5
+                    }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, totalProp || 'page.total')) || 0;
                     tablePage.total = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(total);
-                    _this5.tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, proxyProps.result || 'result') || [];
+                    var resultProp = resConfigs.result;
+                    _this5.tableData = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(resultProp) ? resultProp({
+                      data: rest,
+                      $grid: _this5
+                    }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, resultProp || 'result')) || [];
                     // 检验当前页码，不能超出当前最大页数
                     var pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
                     if (tablePage.currentPage > pageCount) {
                       tablePage.currentPage = pageCount;
                     }
                   } else {
-                    _this5.tableData = (proxyProps.list ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, proxyProps.list) : rest) || [];
+                    var listProp = resConfigs.list;
+                    _this5.tableData = (listProp ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(listProp) ? listProp({
+                      data: rest,
+                      $grid: _this5
+                    }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, listProp) : rest) || [];
                   }
                 } else {
                   _this5.tableData = [];
@@ -36361,11 +36386,11 @@ Object.keys(packages_table.methods).forEach(function (name) {
       return this.$nextTick();
     },
     getRespMsg: function getRespMsg(rest, defaultMsg) {
-      var _this$proxyOpts$props = this.proxyOpts.props,
-        proxyProps = _this$proxyOpts$props === void 0 ? {} : _this$proxyOpts$props;
+      var proxyOpts = this.proxyOpts;
+      var resConfigs = proxyOpts.response || proxyOpts.props || {};
       var msg;
-      if (rest && proxyProps.message) {
-        msg = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, proxyProps.message);
+      if (rest && resConfigs.message) {
+        msg = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, resConfigs.message);
       }
       return msg || conf.i18n(defaultMsg);
     },
@@ -42243,7 +42268,9 @@ Icon, Column, Colgroup, Table, Grid, Toolbar, Pager, Checkbox, CheckboxGroup, Ra
 function install(Vue, options) {
   if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isPlainObject(options)) {
     VXETable.config(options);
-    setTheme(options);
+    if (options.theme) {
+      setTheme(options);
+    }
   }
   components.map(function (component) {
     return component.install(Vue);