vxe-table 3.20.0-beta.25 → 3.20.0-beta.26

package/es/table/src/methods.js

@@ -6780,13 +6780,15 @@ const tableMethods = {
         if (ctxMenuStore.visible && tableMenu && !getEventTargetNode(evnt, tableMenu.$el).flag) {
             $xeTable.closeMenu();
         }
-        const isActivated = getEventTargetNode(evnt, ($xeGGWrapper || $xeTable).$el).flag;
-        // 如果存在校验，点击了表格之外则清除
-        if (!isActivated && editRules && validOpts.autoClear) {
-            reactData.validErrorMaps = {};
+        if (!(actived.row && getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag)) {
+            const isActivated = getEventTargetNode(evnt, ($xeGGWrapper || $xeTable).$el).flag;
+            // 如果存在校验，点击了表格之外则清除
+            if (!isActivated && editRules && validOpts.autoClear) {
+                reactData.validErrorMaps = {};
+            }
+            // 最后激活的表格
+            internalData.isActivated = isActivated;
         }
-        // 最后激活的表格
-        internalData.isActivated = isActivated;
     },
     /**
      * 窗口失焦事件处理
@@ -12050,9 +12052,11 @@ const tableMethods = {
     updateStatus(slotParams, cellValue) {
         const $xeTable = this;
         const props = $xeTable;
+        const internalData = $xeTable;
         return this.$nextTick().then(() => {
             const { editRules } = props;
-            if (slotParams && editRules) {
+            const { isActivated } = internalData;
+            if (isActivated && slotParams && editRules) {
                 return $xeTable.handleCellRuleUpdateStatus('change', slotParams, cellValue);
             }
         });

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.20.0-beta.25";
+export const version = "3.20.0-beta.26";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.20.0-beta.25"}`;
+const version = `table v${"3.20.0-beta.26"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.20.0-beta.25";
+const version = "3.20.0-beta.26";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2739,7 +2739,7 @@ function scrollTopTo(diffNum, cb) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.20.0-beta.25"}`;
+const log_version = `table v${"3.20.0-beta.26"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6704,9 +6704,9 @@ if(!isClear){isClear=getEventTargetNode(evnt,el,'vxe-footer--row').flag;}// 如
 if(!isClear&&props.height&&!reactData.overflowY){const bodyWrapperElem=evnt.target;if(hasClass(bodyWrapperElem,'vxe-table--body-wrapper')){isClear=evnt.offsetY<bodyWrapperElem.clientHeight;}}if(isClear||// 如果点击了当前表格之外
 !getEventTargetNode(evnt,el).flag){setTimeout(()=>{$xeTable.handleClearEdit(evnt).then(()=>{// 如果存在校验，点击了表格之外则清除
 if(!internalData.isActivated&&editRules&&validOpts.autoClear){reactData.validErrorMaps={};}});});}});}}}}}else if(mouseConfig){if(!getEventTargetNode(evnt,el).flag&&!($xeGGWrapper&&getEventTargetNode(evnt,$xeGGWrapper.$el).flag)&&!(tableMenu&&getEventTargetNode(evnt,tableMenu.$el).flag)&&!(this.$toolbar&&getEventTargetNode(evnt,this.$toolbar.$el).flag)){if($xeTable.clearSelected){$xeTable.clearSelected();}if(areaOpts.autoClear){if($xeTable.getCellAreas){const cellAreas=$xeTable.getCellAreas();if(cellAreas&&cellAreas.length&&!getEventTargetNode(evnt,document.body,'vxe-table--ignore-areas-clear').flag){$xeTable.preventEvent(evnt,'event.clearAreas',{},()=>{$xeTable.clearCellAreas();$xeTable.clearCopyCellArea();$xeTable.dispatchEvent('clear-cell-area-selection',{cellAreas},evnt);});}}}}}// 如果配置了快捷菜单且，点击了其他地方则关闭
-if(ctxMenuStore.visible&&tableMenu&&!getEventTargetNode(evnt,tableMenu.$el).flag){$xeTable.closeMenu();}const isActivated=getEventTargetNode(evnt,($xeGGWrapper||$xeTable).$el).flag;// 如果存在校验，点击了表格之外则清除
+if(ctxMenuStore.visible&&tableMenu&&!getEventTargetNode(evnt,tableMenu.$el).flag){$xeTable.closeMenu();}if(!(actived.row&&getEventTargetNode(evnt,document.body,'vxe-table--ignore-clear').flag)){const isActivated=getEventTargetNode(evnt,($xeGGWrapper||$xeTable).$el).flag;// 如果存在校验，点击了表格之外则清除
 if(!isActivated&&editRules&&validOpts.autoClear){reactData.validErrorMaps={};}// 最后激活的表格
-internalData.isActivated=isActivated;},/**
+internalData.isActivated=isActivated;}},/**
      * 窗口失焦事件处理
      */handleGlobalBlurEvent(){const $xeTable=this;$xeTable.closeFilter();$xeTable.closeMenu();},/**
      * 全局滚动事件
@@ -7039,7 +7039,7 @@ if(bodyScrollElem&&bodyTableElem&&bodyScrollElem.scrollTop+clientHeight>=maxYHei
      * 更新列状态 updateStatus({ row, column }, cellValue)
      * 如果组件值 v-model 发生 change 时，调用改函数用于更新某一列编辑状态
      * 如果单元格配置了校验规则，则会进行校验
-     */updateStatus(slotParams,cellValue){const $xeTable=this;const props=$xeTable;return this.$nextTick().then(()=>{const{editRules}=props;if(slotParams&&editRules){return $xeTable.handleCellRuleUpdateStatus('change',slotParams,cellValue);}});},/**
+     */updateStatus(slotParams,cellValue){const $xeTable=this;const props=$xeTable;const internalData=$xeTable;return this.$nextTick().then(()=>{const{editRules}=props;const{isActivated}=internalData;if(isActivated&&slotParams&&editRules){return $xeTable.handleCellRuleUpdateStatus('change',slotParams,cellValue);}});},/**
      * 设置合并单元格 [{ row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }]
      */setMergeCells(merges){const $xeTable=this;const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;if(props.spanMethod){errLog('vxe.error.errConflicts',['merge-cells','span-method']);}handleBodyMerge($xeTable,merges);$xeTable.handleUpdateBodyMerge();return $xeTable.$nextTick().then(()=>{const{expandColumn}=reactData;const{mergeBodyList}=internalData;if(expandColumn&&mergeBodyList.length){warnLog('vxe.error.errConflicts',['type=expand','merge-cells | span-method']);}$xeTable.updateCellAreas();return updateStyle($xeTable);});},/**
      * 移除单元格合并 [{row:Row|number, col:ColumnInfo|number}]