vxe-table 4.1.18 → 4.1.20

package/README.md

@@ -108,7 +108,7 @@ createApp(App).use(VXETable).mount('#app')
 
 ### CDN
 
-不建议将公共的 CDN 地址用于生产，因为该连接随时都可能会失效，导致项目挂掉;  
+不建议将第三方的 CDN 地址用于生产，因为该连接随时都可能会失效，导致项目挂掉;  
 使用 CDN 方式记得锁定版本号，避免受到非兼容性更新的影响
 
 ```HTML
@@ -157,7 +157,7 @@ export default defineComponent({
 ## 文档
 
 💡 [使用指南](https://github.com/xuliangzhan/vxe-table-demo)  
-👉 [查看演示](https://xuliangzhan_admin.gitee.io/vxe-table/#/table/base/basic) [👀备用地址](https://x-extends.github.io/vxe-table/#/table/base/basic)  
+👉 [查看演示](https://xuliangzhan_admin.gitee.io/vxe-table/) [👀备用地址](https://x-extends.github.io/vxe-table/#/table/base/basic)  
 👉 [查看文档](https://xuliangzhan_admin.gitee.io/vxe-table/#/table/api) [👀备用地址](https://x-extends.github.io/vxe-table/#/table/api)
 
 ## 运行项目

package/README.zh-TW.md

@@ -106,7 +106,7 @@ createApp(App).use(VXETable).mount('#app')
 
 ### CDN
 
-不建議將公共的CDN地址用於生產，因為該連接隨時都可能會失效，導致項目掛掉；  
+不建議將第三方的CDN地址用於生產，因為該連接隨時都可能會失效，導致項目掛掉；  
 使用CDN管道記得鎖定版本號，避免受到非相容性更新的影響
 
 ```HTML
@@ -155,8 +155,8 @@ export default defineComponent({
 ## 檔案
 
 💡 [使用指南](https://github.com/xuliangzhan/vxe-table-demo)  
-👉 [查看演示](https://xuliangzhan_admin.gitee.io/vxe-table/#/table/base/basic) [👀備用地址](https://x-extends.github.io/vxe-table/#/table/base/basic)  
-👉 [查看檔案](https://xuliangzhan_admin.gitee.io/vxe-table/#/table/api) [👀備用地址](https://x-extends.github.io/vxe-table/#/table/api)
+👉 [查看檔案](https://xuliangzhan_admin.gitee.io/vxe-table/) [👀備用地址1](https://x-extends.github.io/vxe-table/#/table/base/basic)  
+👉 [查看檔案](https://xuliangzhan_admin.gitee.io/vxe-table/#/table/api) [👀備用地址1](https://x-extends.github.io/vxe-table/#/table/api)
 
 ## 運行項目
 

package/es/edit/src/hook.js

@@ -579,12 +579,13 @@ var editHook = {
                 var actived = editStore.actived;
                 var row = params.row, column = params.column;
                 var editRender = column.editRender;
-                var cell = params.cell = (params.cell || $xetable.getCell(row, column));
+                var cell = (params.cell || $xetable.getCell(row, column));
+                params.cell = cell;
                 if (isEnableConf(editConfig) && isEnableConf(editRender) && cell) {
                     if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
                         // 判断是否禁用编辑
                         var type = 'edit-disabled';
-                        if (!activeMethod || activeMethod(params)) {
+                        if (!activeMethod || activeMethod(__assign(__assign({}, params), { $table: $xetable }))) {
                             if (mouseConfig) {
                                 editMethods.clearSelected();
                                 if ($xetable.clearCellAreas) {

package/es/export/style.css

@@ -100,6 +100,8 @@
     background-color: #f3f3f3; }
   .is--disabled.vxe-export--panel-column-option .vxe-checkbox--icon:after {
     border-color: #c0c4cc; }
+  .is--disabled.vxe-export--panel-column-option .vxe-checkbox--indeterminate-icon:after {
+    background-color: #c0c4cc; }
 
 .vxe-export--panel-column > ul {
   list-style-type: none;

package/es/filter/style.css

@@ -101,6 +101,8 @@
     background-color: #f3f3f3; }
   .is--disabled.vxe-table--filter-option .vxe-checkbox--icon:after {
     border-color: #c0c4cc; }
+  .is--disabled.vxe-table--filter-option .vxe-checkbox--indeterminate-icon:after {
+    background-color: #c0c4cc; }
 
 /*筛选*/
 .vxe-cell--filter {

package/es/footer/src/footer.js

@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { createCommentVNode, defineComponent, h, ref, inject, nextTick, onMounted } from 'vue';
+import { createCommentVNode, defineComponent, h, ref, inject, nextTick, onMounted, onUnmounted } from 'vue';
 import XEUtils from 'xe-utils';
 import { getPropClass } from '../../table/src/util';
 import { updateCellTitle } from '../../tools/dom';
@@ -90,6 +90,16 @@ export default defineComponent({
                 elemStore[prefix + "xSpace"] = refFooterXSpace.value;
             });
         });
+        onUnmounted(function () {
+            var fixedType = props.fixedType;
+            var elemStore = tableInternalData.elemStore;
+            var prefix = (fixedType || 'main') + "-footer-";
+            elemStore[prefix + "wrapper"] = null;
+            elemStore[prefix + "table"] = null;
+            elemStore[prefix + "colgroup"] = null;
+            elemStore[prefix + "list"] = null;
+            elemStore[prefix + "xSpace"] = null;
+        });
         var renderVN = function () {
             var fixedType = props.fixedType, fixedColumn = props.fixedColumn, tableColumn = props.tableColumn, footerTableData = props.footerTableData;
             var footerRowClassName = tableProps.footerRowClassName, footerCellClassName = tableProps.footerCellClassName, footerRowStyle = tableProps.footerRowStyle, footerCellStyle = tableProps.footerCellStyle, allFooterAlign = tableProps.footerAlign, footerSpanMethod = tableProps.footerSpanMethod, allAlign = tableProps.align, columnKey = tableProps.columnKey, allColumnFooterOverflow = tableProps.showFooterOverflow;

package/es/form/src/form.js

@@ -239,7 +239,7 @@ export default defineComponent({
                     if (isEnableConf(itemRender)) {
                         var compConf = VXETable.renderer.get(itemRender.name);
                         if (compConf && compConf.itemResetMethod) {
-                            compConf.itemResetMethod({ data: data, property: field, item: item, $form: $xeform });
+                            compConf.itemResetMethod({ data: data, field: field, property: field, item: item, $form: $xeform });
                         }
                         else if (field) {
                             XEUtils.set(data, field, resetValue === null ? getResetValue(XEUtils.get(data, field), undefined) : resetValue);
@@ -313,6 +313,7 @@ export default defineComponent({
                                     rule: rule,
                                     rules: rules_1,
                                     data: data,
+                                    field: property,
                                     property: property,
                                     $form: $xeform
                                 });
@@ -353,7 +354,6 @@ export default defineComponent({
             var validRest = {};
             var validFields = [];
             var itemValids = [];
-            clearValidate();
             clearTimeout(showErrTime);
             if (data && formRules) {
                 itemList.forEach(function (item) {
@@ -363,7 +363,7 @@ export default defineComponent({
                             item.errRule = null;
                         }).catch(function (_a) {
                             var rule = _a.rule, rules = _a.rules;
-                            var rest = { rule: rule, rules: rules, data: data, property: field, $form: $xeform };
+                            var rest = { rule: rule, rules: rules, data: data, field: field, property: field, $form: $xeform };
                             if (!validRest[field]) {
                                 validRest[field] = [];
                             }
@@ -408,6 +408,7 @@ export default defineComponent({
             return Promise.resolve();
         };
         var validate = function (callback) {
+            clearValidate();
             return beginValidate(getItems(), '', callback);
         };
         var validateField = function (field, callback) {
@@ -416,6 +417,7 @@ export default defineComponent({
         var submitEvent = function (evnt) {
             evnt.preventDefault();
             if (!props.preventSubmit) {
+                clearValidate();
                 beginValidate(getItems()).then(function () {
                     formMethods.dispatchEvent('submit', { data: props.data }, evnt);
                 }).catch(function (errMap) {
@@ -514,7 +516,7 @@ export default defineComponent({
                 var showTooltip = itemOverflow === true || itemOverflow === 'tooltip';
                 var hasEllipsis = showTitle || showTooltip || showEllipsis;
                 var itemVisibleMethod = visibleMethod;
-                var params = { data: data, property: field, item: item, $form: $xeform };
+                var params = { data: data, field: field, property: field, item: item, $form: $xeform };
                 if (visible === false) {
                     return createCommentVNode();
                 }

package/es/grid/src/grid.js

@@ -166,7 +166,7 @@ export default defineComponent({
             var pendingRecords = reactData.pendingRecords;
             var $xetable = refTable.value;
             var activeMethod = editConfig ? editConfig.activeMethod : null;
-            return $xetable.findRowIndexOf(pendingRecords, params.row) === -1 && (!activeMethod || activeMethod(params));
+            return $xetable.findRowIndexOf(pendingRecords, params.row) === -1 && (!activeMethod || activeMethod(__assign(__assign({}, params), { $grid: $xegrid })));
         };
         var computeTableProps = computed(function () {
             var seqConfig = props.seqConfig, pagerConfig = props.pagerConfig, loading = props.loading, editConfig = props.editConfig, proxyConfig = props.proxyConfig;
@@ -550,10 +550,10 @@ export default defineComponent({
                         leftSlot = getFuncSlot(pagerOptSlots, 'left');
                         rightSlot = getFuncSlot(pagerOptSlots, 'right');
                         if (leftSlot) {
-                            pagerSlots.buttons = leftSlot;
+                            pagerSlots.left = leftSlot;
                         }
                         if (rightSlot) {
-                            pagerSlots.tools = rightSlot;
+                            pagerSlots.right = rightSlot;
                         }
                     }
                     slotVNs.push(h(resolveComponent('vxe-pager'), __assign(__assign(__assign({ ref: refPager }, pagerOpts), (props.proxyConfig ? reactData.tablePage : {})), { onPageChange: pageChangeEvent }), pagerSlots));

package/es/header/src/header.js

@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { createCommentVNode, defineComponent, h, ref, inject, nextTick, watch, onMounted } from 'vue';
+import { createCommentVNode, defineComponent, h, ref, inject, nextTick, watch, onMounted, onUnmounted } from 'vue';
 import XEUtils from 'xe-utils';
 import { convertToRows } from './util';
 import { getColMinWidth } from '../../table/src/util';
@@ -145,6 +145,18 @@ export default defineComponent({
                 uploadColumn();
             });
         });
+        onUnmounted(function () {
+            var fixedType = props.fixedType;
+            var internalData = $xetable.internalData;
+            var elemStore = internalData.elemStore;
+            var prefix = (fixedType || 'main') + "-header-";
+            elemStore[prefix + "wrapper"] = null;
+            elemStore[prefix + "table"] = null;
+            elemStore[prefix + "colgroup"] = null;
+            elemStore[prefix + "list"] = null;
+            elemStore[prefix + "xSpace"] = null;
+            elemStore[prefix + "repair"] = null;
+        });
         var renderVN = function () {
             var fixedType = props.fixedType, fixedColumn = props.fixedColumn, tableColumn = props.tableColumn;
             var resizable = tableProps.resizable, border = tableProps.border, columnKey = tableProps.columnKey, headerRowClassName = tableProps.headerRowClassName, headerCellClassName = tableProps.headerCellClassName, headerRowStyle = tableProps.headerRowStyle, headerCellStyle = tableProps.headerCellStyle, allColumnHeaderOverflow = tableProps.showHeaderOverflow, allHeaderAlign = tableProps.headerAlign, allAlign = tableProps.align, mouseConfig = tableProps.mouseConfig;

package/es/input/src/input.js

@@ -516,6 +516,9 @@ export default defineComponent({
             var type = props.type, immediate = props.immediate;
             return immediate || !(type === 'text' || type === 'number' || type === 'integer' || type === 'float');
         });
+        var handleNumber = function (val) {
+            return XEUtils.isString(val) ? val.replace(/,/g, '') : val;
+        };
         function toFloatValueFixed(inputValue, digitsValue) {
             if (/^-/.test('' + inputValue)) {
                 return XEUtils.toFixed(XEUtils.ceil(inputValue, digitsValue), digitsValue);
@@ -720,7 +723,7 @@ export default defineComponent({
             if (!inpReadonly) {
                 if (isNumType) {
                     if (inputValue) {
-                        var inpNumVal = type === 'integer' ? XEUtils.toInteger(inputValue) : XEUtils.toNumber(inputValue);
+                        var inpNumVal = type === 'integer' ? XEUtils.toInteger(handleNumber(inputValue)) : XEUtils.toNumber(handleNumber(inputValue));
                         if (!vaildMinNum(inpNumVal)) {
                             inpNumVal = min;
                         }
@@ -810,7 +813,7 @@ export default defineComponent({
             var min = props.min, max = props.max, type = props.type;
             var inputValue = reactData.inputValue;
             var stepValue = computeStepValue.value;
-            var numValue = type === 'integer' ? XEUtils.toInteger(inputValue) : XEUtils.toNumber(inputValue);
+            var numValue = type === 'integer' ? XEUtils.toInteger(handleNumber(inputValue)) : XEUtils.toNumber(handleNumber(inputValue));
             var newValue = isPlus ? XEUtils.add(numValue, stepValue) : XEUtils.subtract(numValue, stepValue);
             var restNum;
             if (!vaildMinNum(newValue)) {