vxe-table 3.7.4 → 3.7.6

package/lib/index.umd.js

@@ -10591,7 +10591,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.7.3", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.7.6", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12023,7 +12023,7 @@ var setup = config;
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.7.3",
+  version: "3.7.6",
   reg: reg,
   use: use,
   setup: setup,
@@ -15533,6 +15533,7 @@ var Methods = {
    */
   syncData: function syncData() {
     var _this = this;
+    warnLog('vxe.error.delFunc', ['syncData', 'getData']);
     return this.$nextTick().then(function () {
       _this.tableData = [];
       return _this.$nextTick().then(function () {
@@ -17673,14 +17674,23 @@ var Methods = {
         } else if (layout === 'body') {
           var emptyBlockElem = elemStore["".concat(name, "-").concat(layout, "-emptyBlock")];
           if (methods_isNodeElement(wrapperElem)) {
-            var bodyMinHeight = fixedType ? customMinHeight - headerHeight - footerHeight - (showFooter ? 0 : scrollbarHeight) : customMinHeight - headerHeight - footerHeight;
             var bodyMaxHeight = 0;
+            var bodyMinHeight = customMinHeight - headerHeight - footerHeight;
             if (customMaxHeight) {
-              bodyMaxHeight = Math.max(bodyMinHeight, fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight - footerHeight);
+              bodyMaxHeight = customMaxHeight - headerHeight - footerHeight;
+              // 如果是固定列
+              if (fixedType) {
+                bodyMaxHeight -= showFooter ? 0 : scrollbarHeight;
+              }
+              bodyMaxHeight = Math.max(bodyMinHeight, bodyMaxHeight);
               wrapperElem.style.maxHeight = "".concat(bodyMaxHeight, "px");
             }
-            if (customHeight > 0) {
-              var bodyHeight = fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight;
+            if (customHeight) {
+              var bodyHeight = customHeight - headerHeight - footerHeight;
+              // 如果是固定列
+              if (fixedType) {
+                bodyHeight -= showFooter ? 0 : scrollbarHeight;
+              }
               if (bodyMaxHeight) {
                 bodyHeight = Math.min(bodyMaxHeight, bodyHeight);
               }
@@ -21294,7 +21304,6 @@ var Loading = Object.assign(loading, {
 
 
 
-
 
 
 /**
@@ -22081,12 +22090,10 @@ function handleUupdateResize(_vm) {
         if (!inited) {
           _this.handleInitDefaults();
         }
-        var checkboxColumn = _this.tableFullColumn.find(function (column) {
-          return column.type === 'checkbox';
-        });
-        if (checkboxColumn && _this.tableFullData.length > 300 && !_this.checkboxOpts.checkField) {
-          warnLog('vxe.error.checkProp', ['checkbox-config.checkField']);
-        }
+        // const checkboxColumn = this.tableFullColumn.find(column => column.type === 'checkbox')
+        // if (checkboxColumn && this.tableFullData.length > 300 && !this.checkboxOpts.checkField) {
+        //   warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
+        // }
         if ((_this.scrollXLoad || _this.scrollYLoad) && _this.expandColumn) {
           warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
         }
@@ -30148,7 +30155,7 @@ var es_string_split = __webpack_require__(3123);
 var formatText = utils.formatText;
 
 // 默认导出或打印的 HTML 样式
-var defaultHtmlStyle = 'body{margin:0;color:#333333;font-size:14px;font-family:"Microsoft YaHei",微软雅黑,"MicrosoftJhengHei",华文细黑,STHeiti,MingLiu}body *{-webkit-box-sizing:border-box;box-sizing:border-box}.vxe-table{border-collapse:collapse;text-align:left;border-spacing:0}.vxe-table:not(.is--print){table-layout:fixed}.vxe-table,.vxe-table th,.vxe-table td,.vxe-table td{border-color:#D0D0D0;border-style:solid;border-width:0}.vxe-table.is--print{width:100%}.border--default,.border--full,.border--outer{border-top-width:1px}.border--default,.border--full,.border--outer{border-left-width:1px}.border--outer,.border--default th,.border--default td,.border--full th,.border--full td,.border--outer th,.border--inner th,.border--inner td{border-bottom-width:1px}.border--default,.border--outer,.border--full th,.border--full td{border-right-width:1px}.border--default th,.border--full th,.border--outer th{background-color:#f8f8f9}.vxe-table td>div,.vxe-table th>div{padding:.5em .4em}.col--center{text-align:center}.col--right{text-align:right}.vxe-table:not(.is--print) .col--ellipsis>div{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all}.vxe-table--tree-node{text-align:left}.vxe-table--tree-node-wrapper{position:relative}.vxe-table--tree-icon-wrapper{position:absolute;top:50%;width:1em;height:1em;text-align:center;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.vxe-table--tree-unfold-icon,.vxe-table--tree-fold-icon{position:absolute;width:0;height:0;border-style:solid;border-width:.5em;border-right-color:transparent;border-bottom-color:transparent}.vxe-table--tree-unfold-icon{left:.3em;top:0;border-left-color:#939599;border-top-color:transparent}.vxe-table--tree-fold-icon{left:0;top:.3em;border-left-color:transparent;border-top-color:#939599}.vxe-table--tree-cell{display:block;padding-left:1.5em}.vxe-table input[type="checkbox"]{margin:0}.vxe-table input[type="checkbox"],.vxe-table input[type="radio"],.vxe-table input[type="checkbox"]+span,.vxe-table input[type="radio"]+span{vertical-align:middle;padding-left:0.4em}';
+var defaultHtmlStyle = 'body{margin:0;padding: 0 1px;color:#333333;font-size:14px;font-family:"Microsoft YaHei",微软雅黑,"MicrosoftJhengHei",华文细黑,STHeiti,MingLiu}body *{-webkit-box-sizing:border-box;box-sizing:border-box}.vxe-table{border-collapse:collapse;text-align:left;border-spacing:0}.vxe-table:not(.is--print){table-layout:fixed}.vxe-table,.vxe-table th,.vxe-table td,.vxe-table td{border-color:#D0D0D0;border-style:solid;border-width:0}.vxe-table.is--print{width:100%}.border--default,.border--full,.border--outer{border-top-width:1px}.border--default,.border--full,.border--outer{border-left-width:1px}.border--outer,.border--default th,.border--default td,.border--full th,.border--full td,.border--outer th,.border--inner th,.border--inner td{border-bottom-width:1px}.border--default,.border--outer,.border--full th,.border--full td{border-right-width:1px}.border--default th,.border--full th,.border--outer th{background-color:#f8f8f9}.vxe-table td>div,.vxe-table th>div{padding:.5em .4em}.col--center{text-align:center}.col--right{text-align:right}.vxe-table:not(.is--print) .col--ellipsis>div{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all}.vxe-table--tree-node{text-align:left}.vxe-table--tree-node-wrapper{position:relative}.vxe-table--tree-icon-wrapper{position:absolute;top:50%;width:1em;height:1em;text-align:center;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.vxe-table--tree-unfold-icon,.vxe-table--tree-fold-icon{position:absolute;width:0;height:0;border-style:solid;border-width:.5em;border-right-color:transparent;border-bottom-color:transparent}.vxe-table--tree-unfold-icon{left:.3em;top:0;border-left-color:#939599;border-top-color:transparent}.vxe-table--tree-fold-icon{left:0;top:.3em;border-left-color:transparent;border-top-color:#939599}.vxe-table--tree-cell{display:block;padding-left:1.5em}.vxe-table input[type="checkbox"]{margin:0}.vxe-table input[type="checkbox"],.vxe-table input[type="radio"],.vxe-table input[type="checkbox"]+span,.vxe-table input[type="radio"]+span{vertical-align:middle;padding-left:0.4em}';
 var htmlCellElem;
 
 // 导入
@@ -33952,6 +33959,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
                 code: code,
                 button: button,
                 body: body,
+                form: formData,
                 options: _ajaxMethods
               }].concat(args);
               if (selectRecords.length) {
@@ -34029,6 +34037,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
                 code: code,
                 button: button,
                 body: _body,
+                form: formData,
                 options: _ajaxMethods2
               }].concat(args);
               // 排除掉新增且标记为删除的数据
@@ -34109,15 +34118,17 @@ Object.keys(packages_table.methods).forEach(function (name) {
         default:
           {
             var gCommandOpts = v_x_e_table.commands.get(code);
-            if (gCommandOpts.commandMethod) {
-              gCommandOpts.commandMethod.apply(gCommandOpts, [{
-                code: code,
-                button: button,
-                $grid: this,
-                $table: $xetable
-              }].concat(args));
-            } else {
-              if (false) {}
+            if (gCommandOpts) {
+              if (gCommandOpts.commandMethod) {
+                gCommandOpts.commandMethod.apply(gCommandOpts, [{
+                  code: code,
+                  button: button,
+                  $grid: this,
+                  $table: $xetable
+                }].concat(args));
+              } else {
+                if (false) {}
+              }
             }
           }
       }