vxe-table 4.23.0 → 4.23.2

package/lib/table/module/validator/hook.js

@@ -168,6 +168,44 @@ hooks.add('tableValidatorModule', {
     } = $xeTable.getComputeMaps();
     let validatorMethods = {};
     let validatorPrivateMethods = {};
+    const handleClearValid = (rows, fieldOrColumn) => {
+      const {
+        validErrorMaps
+      } = reactData;
+      const validOpts = computeValidOpts.value;
+      const rowList = _xeUtils.default.isArray(rows) ? rows : rows ? [rows] : [];
+      const colList = (_xeUtils.default.isArray(fieldOrColumn) ? fieldOrColumn : fieldOrColumn ? [fieldOrColumn] : []).map(column => (0, _util.handleFieldOrColumn)($xeTable, column));
+      let validErrMaps = {};
+      // 如果是多个提示模式
+      if (validOpts.msgMode === 'full') {
+        validErrMaps = Object.assign({}, validErrorMaps);
+        if (rowList.length && colList.length) {
+          rowList.forEach(row => {
+            colList.forEach(column => {
+              const validKey = `${(0, _util.getRowid)($xeTable, row)}:${column.id}`;
+              if (validErrMaps[validKey]) {
+                delete validErrMaps[validKey];
+              }
+            });
+          });
+        } else if (rowList.length) {
+          const rowIdList = rowList.map(row => `${(0, _util.getRowid)($xeTable, row)}`);
+          _xeUtils.default.each(validErrorMaps, (item, key) => {
+            if (rowIdList.indexOf(key.split(':')[0]) > -1) {
+              delete validErrMaps[key];
+            }
+          });
+        } else if (colList.length) {
+          const colidList = colList.map(column => `${column.id}`);
+          _xeUtils.default.each(validErrorMaps, (item, key) => {
+            if (colidList.indexOf(key.split(':')[1]) > -1) {
+              delete validErrMaps[key];
+            }
+          });
+        }
+      }
+      return validErrMaps;
+    };
     /**
      * 聚焦到校验通过的单元格并弹出校验错误提示
      */
@@ -316,7 +354,7 @@ hooks.add('tableValidatorModule', {
         }
         return Promise.all(rowValidErrs).then(() => {
           const ruleProps = Object.keys(validRest);
-          reactData.validErrorMaps = handleErrMsgMode(validErrMaps);
+          reactData.validErrorMaps = Object.assign(handleClearValid(rows, columns), handleErrMsgMode(validErrMaps));
           return (0, _vue.nextTick)().then(() => {
             if (ruleProps.length) {
               return Promise.reject(validRest[ruleProps[0]][0]);
@@ -407,48 +445,11 @@ hooks.add('tableValidatorModule', {
         return (0, _vue.nextTick)();
       },
       clearValidate(rows, fieldOrColumn) {
-        const {
-          validErrorMaps
-        } = reactData;
         const validTip = refValidTooltip.value;
-        const validOpts = computeValidOpts.value;
-        const rowList = _xeUtils.default.isArray(rows) ? rows : rows ? [rows] : [];
-        const colList = (_xeUtils.default.isArray(fieldOrColumn) ? fieldOrColumn : fieldOrColumn ? [fieldOrColumn] : []).map(column => (0, _util.handleFieldOrColumn)($xeTable, column));
-        let validErrMaps = {};
         if (validTip && validTip.reactData.visible) {
           validTip.close();
         }
-        // 如果是单个提示模式
-        if (validOpts.msgMode === 'single') {
-          reactData.validErrorMaps = {};
-          return (0, _vue.nextTick)();
-        }
-        if (rowList.length && colList.length) {
-          validErrMaps = Object.assign({}, validErrorMaps);
-          rowList.forEach(row => {
-            colList.forEach(column => {
-              const validKey = `${(0, _util.getRowid)($xeTable, row)}:${column.id}`;
-              if (validErrMaps[validKey]) {
-                delete validErrMaps[validKey];
-              }
-            });
-          });
-        } else if (rowList.length) {
-          const rowIdList = rowList.map(row => `${(0, _util.getRowid)($xeTable, row)}`);
-          _xeUtils.default.each(validErrorMaps, (item, key) => {
-            if (rowIdList.indexOf(key.split(':')[0]) > -1) {
-              validErrMaps[key] = item;
-            }
-          });
-        } else if (colList.length) {
-          const colidList = colList.map(column => `${column.id}`);
-          _xeUtils.default.each(validErrorMaps, (item, key) => {
-            if (colidList.indexOf(key.split(':')[1]) > -1) {
-              validErrMaps[key] = item;
-            }
-          });
-        }
-        reactData.validErrorMaps = validErrMaps;
+        reactData.validErrorMaps = handleClearValid(rows, fieldOrColumn);
         return (0, _vue.nextTick)();
       }
     };

package/lib/table/module/validator/hook.min.js

@@ -1 +1 @@
-var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_util=require("../../src/util"),_log=require("../../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{warnLog,errLog}=(0,_log.createComponentLog)("table"),{getConfig,validators,hooks}=_ui.VxeUI;class Rule{constructor(e){Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.max,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}get content(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)}get message(){return this.content}}function validREValue(e,l){return!(e&&!(_xeUtils.default.isRegExp(e)?e:new RegExp(e)).test(l))}function validMaxValue(e,l){return!(!_xeUtils.default.eqNull(e)&&l>_xeUtils.default.toNumber(e))}function validMinValue(e,l){return!(!_xeUtils.default.eqNull(e)&&l<_xeUtils.default.toNumber(e))}function validRuleValue(e,l,t){var{type:e,min:r,max:i,pattern:a}=e,u="array"===e,n="number"===e,e="string"===e,s=""+l;if(!validREValue(a,s))return!1;if(u){if(!_xeUtils.default.isArray(l))return!1;if(t&&!l.length)return!1;if(!validMinValue(r,l.length))return!1;if(!validMaxValue(i,l.length))return!1}else if(n){a=Number(l);if(isNaN(a))return!1;if(!validMinValue(r,a))return!1;if(!validMaxValue(i,a))return!1}else{if(e&&!_xeUtils.default.isString(l))return!1;if(t&&!s)return!1;if(!validMinValue(r,s.length))return!1;if(!validMaxValue(i,s.length))return!1}return!0}function checkRuleStatus(e,l,t){var{required:r,field:i}=e,l=i?_xeUtils.default.get(l,i):t,i=_xeUtils.default.isArray(l)?!l.length:(0,_utils.eqEmptyValue)(l);if(r){if(i)return!1;if(!validRuleValue(e,l,r))return!1}else if(!i&&!validRuleValue(e,l,r))return!1;return!0}let tableValidatorMethodKeys=["fullValidate","validate","fullValidateField","validateField","clearValidate"];hooks.add("tableValidatorModule",{setupTable(p){let{props:x,reactData:_,internalData:R}=p,g=p.getRefMaps().refValidTooltip,{computeValidOpts:w,computeTreeOpts:V,computeEditOpts:r,computeAggregateOpts:M}=p.getComputeMaps(),n,U={},t=(e,t,u,a)=>{let n={},{editRules:s,treeConfig:r}=x;var i=_.isRowGroupStatus;let{afterFullData:l,pendingRowMaps:o,removeRowMaps:d}=R;var c=V.value,g=M.value;let f=w.value,v,h=(!0===e?v=l:e&&(_xeUtils.default.isFunction(e)?u=e:v=_xeUtils.default.isArray(e)?e:[e]),v=v||(p.getInsertRecords?p.getInsertRecords().concat(p.getUpdateRecords()):[]),[]),m=(R._lastCallTime=Date.now(),R.validRuleErr=!1,p.clearValidate(),{});if(s){let l=t&&t.length?t:p.getColumns();e=i=>{var e=(0,_util.getRowid)(p,i);if(!d[e]&&!o[e]&&!p.isAggregateRecord(i)&&(a||!R.validRuleErr)){let e=[];l.forEach(t=>{let r=_xeUtils.default.isString(t)?t:t.field;!a&&R.validRuleErr||!_xeUtils.default.has(s,r)||e.push(U.validCellRules("all",i,t).catch(({rule:e,rules:l})=>{l={rule:e,rules:l,rowIndex:p.getRowIndex(i),row:i,columnIndex:p.getColumnIndex(t),column:t,field:r,$table:p};if(n[r]||(n[r]=[]),m[(0,_util.getRowid)(p,i)+":"+t.id]={column:t,row:i,rule:e,content:e.content},n[r].push(l),!a)return R.validRuleErr=!0,Promise.reject(l)}))}),h.push(Promise.all(e))}};return i?_xeUtils.default.eachTree(v,e,{children:g.mapChildrenField}):r?(t=c.children||c.childrenField,_xeUtils.default.eachTree(v,e,{children:t})):v.forEach(e),Promise.all(h).then(()=>{let e=Object.keys(n);var l,t,r;return _.validErrorMaps=(l=m,"single"===w.value.msgMode?(t={},(r=Object.keys(l)).length&&(t[r=r[0]]=l[r]),t):l),(0,_vue.nextTick)().then(()=>{if(e.length)return Promise.reject(n[e[0]][0]);u&&u()})}).catch(a=>new Promise((e,l)=>{let t=()=>{(0,_vue.nextTick)(()=>{u?(u(n),e()):("obsolete"===getConfig().validToReject?l:e)(n)})};var r,i=()=>{var l;a.cell=p.getCellElement(a.row,a.column),(0,_dom.scrollToView)(a.cell),l=a,new Promise(e=>{!1===w.value.autoPos?(p.dispatchEvent("valid-error",l,null),e()):p.handleEdit(l,{type:"valid-error",trigger:"call"}).then(()=>{e(p.showValidTooltip(l))})}).then(t)};!1===f.autoPos?t():(r=a.row,p.scrollToRow(r,a.column).then(i))}))}return _.validErrorMaps={},(0,_vue.nextTick)().then(()=>{u&&u()})};return n={fullValidate(e,l){return _xeUtils.default.isFunction(l)&&warnLog("vxe.error.notValidators",["fullValidate(rows, callback)","fullValidate(rows)"]),t(e,null,l,!0)},validate(e,l){return t(e,null,l)},fullValidateField(e,l){l=(_xeUtils.default.isArray(l)?l:l?[l]:[]).map(e=>(0,_util.handleFieldOrColumn)(p,e));return l.length?t(e,l,null,!0):(0,_vue.nextTick)()},validateField(e,l){l=(_xeUtils.default.isArray(l)?l:l?[l]:[]).map(e=>(0,_util.handleFieldOrColumn)(p,e));return l.length?t(e,l,null):(0,_vue.nextTick)()},clearValidate(e,l){var r=_.validErrorMaps,t=g.value,i=w.value,e=_xeUtils.default.isArray(e)?e:e?[e]:[];let a=(_xeUtils.default.isArray(l)?l:l?[l]:[]).map(e=>(0,_util.handleFieldOrColumn)(p,e)),u={};if(t&&t.reactData.visible&&t.close(),"single"===i.msgMode)_.validErrorMaps={};else{if(e.length&&a.length)u=Object.assign({},r),e.forEach(l=>{a.forEach(e=>{e=(0,_util.getRowid)(p,l)+":"+e.id;u[e]&&delete u[e]})});else if(e.length){let t=e.map(e=>""+(0,_util.getRowid)(p,e));_xeUtils.default.each(r,(e,l)=>{-1<t.indexOf(l.split(":")[0])&&(u[l]=e)})}else if(a.length){let t=a.map(e=>""+e.id);_xeUtils.default.each(r,(e,l)=>{-1<t.indexOf(l.split(":")[1])&&(u[l]=e)})}_.validErrorMaps=u}return(0,_vue.nextTick)()}},U={validCellRules(e,s,o,l){let d=p.xeGrid,c=p.xeGantt;var t=x.editRules,r=o.field;let g=[],f=[];if(r&&t){let n=o.rules||_xeUtils.default.get(t,r);if(n){let u=_xeUtils.default.isUndefined(l)?_xeUtils.default.get(s,r):l;n.forEach(l=>{let{trigger:t,validator:r}=l;if("all"===e||!t||e===t)if(r){var i,a={cellValue:u,rule:l,rules:n,row:s,rowIndex:p.getRowIndex(s),column:o,columnIndex:p.getColumnIndex(o),field:o.field,$table:p,$grid:d,$gantt:c};let e;_xeUtils.default.isString(r)?(i=validators.get(r))&&(i=i.tableCellValidatorMethod||i.cellValidatorMethod)?e=i(a):errLog("vxe.error.notValidators",[r]):e=r(a),e&&(_xeUtils.default.isError(e)?(R.validRuleErr=!0,g.push(new Rule({type:"custom",trigger:t,content:e.message,rule:new Rule(l)}))):e.catch&&f.push(e.catch(e=>{R.validRuleErr=!0,g.push(new Rule({type:"custom",trigger:t,content:e&&e.message?e.message:l.content||l.message,rule:new Rule(l)}))})))}else checkRuleStatus(l,s,u)||(R.validRuleErr=!0,g.push(new Rule(l)))})}}return Promise.all(f).then(()=>{var e;if(g.length)return e={rules:g,rule:g[0]},Promise.reject(e)})},hasCellRules(l,e,t){var r=x.editRules,i=t.field;return!(!i||!r)&&(t=t.rules||_xeUtils.default.get(r,i))&&!!_xeUtils.default.find(t,e=>"all"===l||!e.trigger||l===e.trigger)},triggerValidate(i){var{editConfig:e,editRules:l}=x,a=_.editStore,a=a.actived;let u=r.value;var t=w.value;if(l&&"single"===t.msgMode&&(_.validErrorMaps={}),e&&l&&a.row){let{row:l,column:t,cell:r}=a.args;if(p.hasCellRules(i,l,t))return p.validCellRules(i,l,t).then(()=>{"row"===u.mode&&n.clearValidate(l,t)}).catch(({rule:e})=>e.trigger&&i!==e.trigger?Promise.resolve():(e={rule:e,row:l,column:t,cell:r},p.showValidTooltip(e),Promise.reject(e)))}return Promise.resolve()},showValidTooltip(e){var l=x.height,{tableData:t,validStore:r,validErrorMaps:i}=_,{rule:a,row:u,column:n,cell:s}=e,o=w.value,d=g.value,c=a.content;return r.visible=!0,"single"===o.msgMode?_.validErrorMaps={[(0,_util.getRowid)(p,u)+":"+n.id]:{column:n,row:u,rule:a,content:c}}:_.validErrorMaps=Object.assign({},i,{[(0,_util.getRowid)(p,u)+":"+n.id]:{column:n,row:u,rule:a,content:c}}),p.dispatchEvent("valid-error",e,null),d&&("tooltip"===o.message||"default"===o.message&&!l&&t.length<2)?d.open(s,c):(0,_vue.nextTick)()}},Object.assign(Object.assign({},n),U)},setupGrid(e){return e.extendTableMethods(tableValidatorMethodKeys)},setupGantt(e){return e.extendTableMethods(tableValidatorMethodKeys)}});
+var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_util=require("../../src/util"),_log=require("../../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{warnLog,errLog}=(0,_log.createComponentLog)("table"),{getConfig,validators,hooks}=_ui.VxeUI;class Rule{constructor(e){Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.max,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}get content(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)}get message(){return this.content}}function validREValue(e,l){return!(e&&!(_xeUtils.default.isRegExp(e)?e:new RegExp(e)).test(l))}function validMaxValue(e,l){return!(!_xeUtils.default.eqNull(e)&&l>_xeUtils.default.toNumber(e))}function validMinValue(e,l){return!(!_xeUtils.default.eqNull(e)&&l<_xeUtils.default.toNumber(e))}function validRuleValue(e,l,t){var{type:e,min:r,max:i,pattern:a}=e,u="array"===e,n="number"===e,e="string"===e,s=""+l;if(!validREValue(a,s))return!1;if(u){if(!_xeUtils.default.isArray(l))return!1;if(t&&!l.length)return!1;if(!validMinValue(r,l.length))return!1;if(!validMaxValue(i,l.length))return!1}else if(n){a=Number(l);if(isNaN(a))return!1;if(!validMinValue(r,a))return!1;if(!validMaxValue(i,a))return!1}else{if(e&&!_xeUtils.default.isString(l))return!1;if(t&&!s)return!1;if(!validMinValue(r,s.length))return!1;if(!validMaxValue(i,s.length))return!1}return!0}function checkRuleStatus(e,l,t){var{required:r,field:i}=e,l=i?_xeUtils.default.get(l,i):t,i=_xeUtils.default.isArray(l)?!l.length:(0,_utils.eqEmptyValue)(l);if(r){if(i)return!1;if(!validRuleValue(e,l,r))return!1}else if(!i&&!validRuleValue(e,l,r))return!1;return!0}let tableValidatorMethodKeys=["fullValidate","validate","fullValidateField","validateField","clearValidate"];hooks.add("tableValidatorModule",{setupTable(p){let{props:x,reactData:_,internalData:R}=p,g=p.getRefMaps().refValidTooltip,{computeValidOpts:w,computeTreeOpts:V,computeEditOpts:r,computeAggregateOpts:M}=p.getComputeMaps(),n,U={},E=(e,l)=>{var r=_.validErrorMaps,t=w.value,e=_xeUtils.default.isArray(e)?e:e?[e]:[];let i=(_xeUtils.default.isArray(l)?l:l?[l]:[]).map(e=>(0,_util.handleFieldOrColumn)(p,e)),a={};if("full"===t.msgMode)if(a=Object.assign({},r),e.length&&i.length)e.forEach(l=>{i.forEach(e=>{e=(0,_util.getRowid)(p,l)+":"+e.id;a[e]&&delete a[e]})});else if(e.length){let t=e.map(e=>""+(0,_util.getRowid)(p,e));_xeUtils.default.each(r,(e,l)=>{-1<t.indexOf(l.split(":")[0])&&delete a[l]})}else if(i.length){let t=i.map(e=>""+e.id);_xeUtils.default.each(r,(e,l)=>{-1<t.indexOf(l.split(":")[1])&&delete a[l]})}return a},t=(i,e,u,n)=>{let s={},{editRules:l,treeConfig:t}=x;var r=_.isRowGroupStatus;let{afterFullData:a,pendingRowMaps:o,removeRowMaps:d}=R;var c=V.value,g=M.value;let f=w.value,v,h=(!0===i?v=a:i&&(_xeUtils.default.isFunction(i)?u=i:v=_xeUtils.default.isArray(i)?i:[i]),v=v||(p.getInsertRecords?p.getInsertRecords().concat(p.getUpdateRecords()):[]),[]),m=(R._lastCallTime=Date.now(),R.validRuleErr=!1,p.clearValidate(),{});if(l){let a=e&&e.length?e:p.getColumns();e=i=>{var e=(0,_util.getRowid)(p,i);if(!d[e]&&!o[e]&&!p.isAggregateRecord(i)&&(n||!R.validRuleErr)){let e=[];a.forEach(t=>{let r=_xeUtils.default.isString(t)?t:t.field;!n&&R.validRuleErr||!_xeUtils.default.has(l,r)||e.push(U.validCellRules("all",i,t).catch(({rule:e,rules:l})=>{l={rule:e,rules:l,rowIndex:p.getRowIndex(i),row:i,columnIndex:p.getColumnIndex(t),column:t,field:r,$table:p};if(s[r]||(s[r]=[]),m[(0,_util.getRowid)(p,i)+":"+t.id]={column:t,row:i,rule:e,content:e.content},s[r].push(l),!n)return R.validRuleErr=!0,Promise.reject(l)}))}),h.push(Promise.all(e))}};return r?_xeUtils.default.eachTree(v,e,{children:g.mapChildrenField}):t?(r=c.children||c.childrenField,_xeUtils.default.eachTree(v,e,{children:r})):v.forEach(e),Promise.all(h).then(()=>{let e=Object.keys(s);var l,t,r;return _.validErrorMaps=Object.assign(E(i,a),(l=m,"single"===w.value.msgMode?(t={},(r=Object.keys(l)).length&&(t[r=r[0]]=l[r]),t):l)),(0,_vue.nextTick)().then(()=>{if(e.length)return Promise.reject(s[e[0]][0]);u&&u()})}).catch(a=>new Promise((e,l)=>{let t=()=>{(0,_vue.nextTick)(()=>{u?(u(s),e()):("obsolete"===getConfig().validToReject?l:e)(s)})};var r,i=()=>{var l;a.cell=p.getCellElement(a.row,a.column),(0,_dom.scrollToView)(a.cell),l=a,new Promise(e=>{!1===w.value.autoPos?(p.dispatchEvent("valid-error",l,null),e()):p.handleEdit(l,{type:"valid-error",trigger:"call"}).then(()=>{e(p.showValidTooltip(l))})}).then(t)};!1===f.autoPos?t():(r=a.row,p.scrollToRow(r,a.column).then(i))}))}return _.validErrorMaps={},(0,_vue.nextTick)().then(()=>{u&&u()})};return n={fullValidate(e,l){return _xeUtils.default.isFunction(l)&&warnLog("vxe.error.notValidators",["fullValidate(rows, callback)","fullValidate(rows)"]),t(e,null,l,!0)},validate(e,l){return t(e,null,l)},fullValidateField(e,l){l=(_xeUtils.default.isArray(l)?l:l?[l]:[]).map(e=>(0,_util.handleFieldOrColumn)(p,e));return l.length?t(e,l,null,!0):(0,_vue.nextTick)()},validateField(e,l){l=(_xeUtils.default.isArray(l)?l:l?[l]:[]).map(e=>(0,_util.handleFieldOrColumn)(p,e));return l.length?t(e,l,null):(0,_vue.nextTick)()},clearValidate(e,l){var t=g.value;return t&&t.reactData.visible&&t.close(),_.validErrorMaps=E(e,l),(0,_vue.nextTick)()}},U={validCellRules(e,s,o,l){let d=p.xeGrid,c=p.xeGantt;var t=x.editRules,r=o.field;let g=[],f=[];if(r&&t){let n=o.rules||_xeUtils.default.get(t,r);if(n){let u=_xeUtils.default.isUndefined(l)?_xeUtils.default.get(s,r):l;n.forEach(l=>{let{trigger:t,validator:r}=l;if("all"===e||!t||e===t)if(r){var i,a={cellValue:u,rule:l,rules:n,row:s,rowIndex:p.getRowIndex(s),column:o,columnIndex:p.getColumnIndex(o),field:o.field,$table:p,$grid:d,$gantt:c};let e;_xeUtils.default.isString(r)?(i=validators.get(r))&&(i=i.tableCellValidatorMethod||i.cellValidatorMethod)?e=i(a):errLog("vxe.error.notValidators",[r]):e=r(a),e&&(_xeUtils.default.isError(e)?(R.validRuleErr=!0,g.push(new Rule({type:"custom",trigger:t,content:e.message,rule:new Rule(l)}))):e.catch&&f.push(e.catch(e=>{R.validRuleErr=!0,g.push(new Rule({type:"custom",trigger:t,content:e&&e.message?e.message:l.content||l.message,rule:new Rule(l)}))})))}else checkRuleStatus(l,s,u)||(R.validRuleErr=!0,g.push(new Rule(l)))})}}return Promise.all(f).then(()=>{var e;if(g.length)return e={rules:g,rule:g[0]},Promise.reject(e)})},hasCellRules(l,e,t){var r=x.editRules,i=t.field;return!(!i||!r)&&(t=t.rules||_xeUtils.default.get(r,i))&&!!_xeUtils.default.find(t,e=>"all"===l||!e.trigger||l===e.trigger)},triggerValidate(i){var{editConfig:e,editRules:l}=x,a=_.editStore,a=a.actived;let u=r.value;var t=w.value;if(l&&"single"===t.msgMode&&(_.validErrorMaps={}),e&&l&&a.row){let{row:l,column:t,cell:r}=a.args;if(p.hasCellRules(i,l,t))return p.validCellRules(i,l,t).then(()=>{"row"===u.mode&&n.clearValidate(l,t)}).catch(({rule:e})=>e.trigger&&i!==e.trigger?Promise.resolve():(e={rule:e,row:l,column:t,cell:r},p.showValidTooltip(e),Promise.reject(e)))}return Promise.resolve()},showValidTooltip(e){var l=x.height,{tableData:t,validStore:r,validErrorMaps:i}=_,{rule:a,row:u,column:n,cell:s}=e,o=w.value,d=g.value,c=a.content;return r.visible=!0,"single"===o.msgMode?_.validErrorMaps={[(0,_util.getRowid)(p,u)+":"+n.id]:{column:n,row:u,rule:a,content:c}}:_.validErrorMaps=Object.assign({},i,{[(0,_util.getRowid)(p,u)+":"+n.id]:{column:n,row:u,rule:a,content:c}}),p.dispatchEvent("valid-error",e,null),d&&("tooltip"===o.message||"default"===o.message&&!l&&t.length<2)?d.open(s,c):(0,_vue.nextTick)()}},Object.assign(Object.assign({},n),U)},setupGrid(e){return e.extendTableMethods(tableValidatorMethodKeys)},setupGantt(e){return e.extendTableMethods(tableValidatorMethodKeys)}});

package/lib/table/src/table.js

@@ -8,7 +8,7 @@ if(_xeUtils.default.isBoolean(opts.showMessage)){opts.showErrorMessage=opts.show
 return Object.assign({},globalScrollX,scrollX);}if(globalVirtualXConfig){return Object.assign({},globalVirtualXConfig,virtualXConfig);}// 已废弃，保留兼容
 return Object.assign({},globalScrollX,scrollX);});const computeVirtualYOpts=(0,_vue.computed)(()=>{const{virtualYConfig,scrollY}=props;const globalVirtualYConfig=getConfig().table.virtualYConfig;const globalScrollY=getConfig().table.scrollY;if(virtualYConfig){return Object.assign({},globalVirtualYConfig,virtualYConfig);}if(scrollY){// 已废弃，保留兼容
 return Object.assign({},globalScrollY,scrollY);}if(globalVirtualYConfig){return Object.assign({},globalVirtualYConfig,virtualYConfig);}// 已废弃，保留兼容
-return Object.assign({},globalScrollY,scrollY);});const computeScrollbarOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.scrollbarConfig,props.scrollbarConfig);});const computeScrollbarXOpts=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;return scrollbarOpts.x?Object.assign({},scrollbarOpts.x,scrollbarOpts.xConfig):scrollbarOpts.xConfig||{};});const computeScrollbarYOpts=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;return scrollbarOpts.y?Object.assign({},scrollbarOpts.y,scrollbarOpts.yConfig):scrollbarOpts.yConfig||{};});const computeScrollXHeight=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;const scrollbarXOpts=computeScrollbarXOpts.value;return _xeUtils.default.toNumber((0,_utils.getDefaultConfig)((0,_utils.getDefaultConfig)(scrollbarXOpts.height,scrollbarOpts.height),scrollDefaultConf.height));});const computeScrollYWidth=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;const scrollbarYOpts=computeScrollbarYOpts.value;return _xeUtils.default.toNumber((0,_utils.getDefaultConfig)((0,_utils.getDefaultConfig)(scrollbarYOpts.width,scrollbarOpts.width),scrollDefaultConf.width));});const computeScrollXVisible=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;const scrollbarXOpts=computeScrollbarXOpts.value;return(0,_utils.getDefaultConfig)(scrollbarXOpts.visible,scrollbarOpts.visible);});const computeScrollYVisible=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;const scrollbarYOpts=computeScrollbarYOpts.value;return(0,_utils.getDefaultConfig)(scrollbarYOpts.visible,scrollbarOpts.visible);});const computeScrollXAutoHide=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;const scrollbarXOpts=computeScrollbarXOpts.value;return(0,_utils.getDefaultConfig)((0,_utils.getDefaultConfig)(scrollbarXOpts.autoHide,scrollbarOpts.autoHide),scrollDefaultConf.autoHide);});const computeScrollYAutoHide=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;const scrollbarYOpts=computeScrollbarYOpts.value;return(0,_utils.getDefaultConfig)((0,_utils.getDefaultConfig)(scrollbarYOpts.autoHide,scrollbarOpts.autoHide),scrollDefaultConf.autoHide);});const computeScrollbarXToTop=(0,_vue.computed)(()=>{const scrollbarXOpts=computeScrollbarXOpts.value;return scrollbarXOpts.position==='top';});const computeScrollbarYToLeft=(0,_vue.computed)(()=>{const scrollbarYOpts=computeScrollbarYOpts.value;return scrollbarYOpts.position==='left';});const computeScrollbarWrapperClss=(0,_vue.computed)(()=>{const{yThumbHeight,xThumbWidth}=reactData;const scrollbarXToTop=computeScrollbarXToTop.value;const scrollbarYToLeft=computeScrollbarYToLeft.value;const scrollXVisible=computeScrollXVisible.value;const scrollYVisible=computeScrollYVisible.value;return domUtils.buildClass(['vxe-scrollbar is--virtual',`ov-x--${scrollXVisible===false?'hidden':'visible'}`,`ov-y--${scrollYVisible===false?'hidden':'visible'}`,`sx-pos--${scrollbarXToTop?'top':'bottom'}`,`sy-pos--${scrollbarYToLeft?'left':'right'}`],{'overflow-y':yThumbHeight,'overflow-x':xThumbWidth});});const computeScrollYThreshold=(0,_vue.computed)(()=>{const virtualYOpts=computeVirtualYOpts.value;const{threshold}=virtualYOpts;if(threshold){return _xeUtils.default.toNumber(threshold);}return 0;});const computeRowHeightMaps=(0,_vue.computed)(()=>{return reactData.rowHeightStore;});const computeDefaultRowHeight=(0,_vue.computed)(()=>{const vSize=computeSize.value;const rowHeightMaps=computeRowHeightMaps.value;return rowHeightMaps[vSize||'default']||18;});const computeColumnOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.columnConfig,props.columnConfig);});const computeCurrentColumnOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.currentColumnConfig,props.currentColumnConfig);});const computeCellOpts=(0,_vue.computed)(()=>{const cellOpts=Object.assign({},getConfig().table.cellConfig,props.cellConfig);if(cellOpts.height){cellOpts.height=_xeUtils.default.toNumber(cellOpts.height);}return cellOpts;});const computeCellHeitht=(0,_vue.computed)(()=>{const cellOpts=computeCellOpts.value;return cellOpts.height;});const computeHeaderCellOpts=(0,_vue.computed)(()=>{const headerCellOpts=Object.assign({},getConfig().table.headerCellConfig,props.headerCellConfig);const defaultRowHeight=computeDefaultRowHeight.value;const cellOpts=computeCellOpts.value;let headCellHeight=_xeUtils.default.toNumber((0,_util.getCalcHeight)(headerCellOpts.height||cellOpts.height));if($xeGantt){const{computeTaskViewScales}=$xeGantt.getComputeMaps();const taskViewScales=computeTaskViewScales.value;if(taskViewScales&&taskViewScales.length>2){const ganttMinHeadCellHeight=defaultRowHeight/2*taskViewScales.length;headCellHeight=Math.max(ganttMinHeadCellHeight,headCellHeight);}}headerCellOpts.height=headCellHeight;return headerCellOpts;});const computeFooterCellOpts=(0,_vue.computed)(()=>{const footerCellOpts=Object.assign({},getConfig().table.footerCellConfig,props.footerCellConfig);const cellOpts=computeCellOpts.value;footerCellOpts.height=_xeUtils.default.toNumber((0,_util.getCalcHeight)(footerCellOpts.height||cellOpts.height));return footerCellOpts;});const computeRowOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.rowConfig,props.rowConfig);});const computeAggregateOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.aggregateConfig||getConfig().table.rowGroupConfig,props.aggregateConfig||props.rowGroupConfig);});const computeRowGroupOpts=(0,_vue.computed)(()=>{return computeAggregateOpts.value;});const computeAggregateMode=(0,_vue.computed)(()=>{const aggregateOpts=computeAggregateOpts.value;return aggregateOpts.mode;});const computeAggregateAccuracyOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.aggregateAccuracyConfig,props.aggregateAccuracyConfig);});const computeCurrentRowOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.currentRowConfig,props.currentRowConfig);});const computeRowDragOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.rowDragConfig,props.rowDragConfig);});const computeColumnDragOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.columnDragConfig,props.columnDragConfig);});const computeResizeOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.resizeConfig,props.resizeConfig);});const computeResizableOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.resizableConfig,props.resizableConfig);});const computeSeqOpts=(0,_vue.computed)(()=>{return Object.assign({startIndex:0},getConfig().table.seqConfig,props.seqConfig);});const computeRadioOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.radioConfig,props.radioConfig);});const computeCheckboxOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.checkboxConfig,props.checkboxConfig);});const computeTooltipOpts=(0,_vue.computed)(()=>{const isVScrollbar=computeIsVScrollbar.value;return Object.assign({useScrollbar:isVScrollbar},getConfig().tooltip,getConfig().table.tooltipConfig,props.tooltipConfig);});const computeHeaderTooltipOpts=(0,_vue.computed)(()=>{const tooltipOpts=computeTooltipOpts.value;return Object.assign({},getConfig().tooltip,{enterable:tooltipOpts.enterable,defaultPlacement:tooltipOpts.defaultPlacement},getConfig().table.headerTooltipConfig,props.headerTooltipConfig);});const computeFooterTooltipOpts=(0,_vue.computed)(()=>{const tooltipOpts=computeTooltipOpts.value;return Object.assign({},getConfig().tooltip,{enterable:tooltipOpts.enterable,defaultPlacement:tooltipOpts.defaultPlacement},getConfig().table.footerTooltipConfig,props.footerTooltipConfig);});const computeTableTipConfig=(0,_vue.computed)(()=>{const{tooltipStore}=reactData;const tooltipOpts=computeTooltipOpts.value;return Object.assign({},tooltipOpts,tooltipStore.currOpts);});const computeValidTipConfig=(0,_vue.computed)(()=>{const tooltipOpts=computeTooltipOpts.value;return Object.assign({},tooltipOpts);});const computeEditOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.editConfig,props.editConfig);});const computeEditDirtyOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.editDirtyConfig,props.editDirtyConfig);});const computeSortOpts=(0,_vue.computed)(()=>{return Object.assign({orders:['asc','desc',null]},getConfig().table.sortConfig,props.sortConfig);});const computeFilterOpts=(0,_vue.computed)(()=>{const isVScrollbar=computeIsVScrollbar.value;return Object.assign({useScrollbar:isVScrollbar},getConfig().table.filterConfig,props.filterConfig);});const computeFloatingFilterOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.floatingFilterConfig,props.floatingFilterConfig);});const computeMouseOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.mouseConfig,props.mouseConfig);});const computeAreaOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.areaConfig,props.areaConfig);});const computeKeyboardOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.keyboardConfig,props.keyboardConfig);});const computeClipOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.clipConfig,props.clipConfig);});const computeUndoRedoHistoryOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.undoRedoHistoryConfig,props.undoRedoHistoryConfig);});const computeFNROpts=(0,_vue.computed)(()=>{const fnrOpts=computeFnrOpts.value;return fnrOpts;});const computeFnrOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.fnrConfig,props.fnrConfig);});const computeMenuOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.menuConfig,props.menuConfig);});const computeLeftFixedWidth=(0,_vue.computed)(()=>{const{columnStore}=reactData;const{leftList}=columnStore;let leftWidth=0;for(let i=0;i<leftList.length;i++){const column=leftList[i];leftWidth+=column.renderWidth;}return leftWidth;});const computeRightFixedWidth=(0,_vue.computed)(()=>{const{columnStore}=reactData;const{rightList}=columnStore;let leftWidth=0;for(let i=0;i<rightList.length;i++){const column=rightList[i];leftWidth+=column.renderWidth;}return leftWidth;});// 合并列是否超越冻结列
+return Object.assign({},globalScrollY,scrollY);});const computeScrollbarOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.scrollbarConfig,props.scrollbarConfig);});const computeScrollbarXOpts=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;return scrollbarOpts.x?Object.assign({},scrollbarOpts.x,scrollbarOpts.xConfig):scrollbarOpts.xConfig||{};});const computeScrollbarYOpts=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;return scrollbarOpts.y?Object.assign({},scrollbarOpts.y,scrollbarOpts.yConfig):scrollbarOpts.yConfig||{};});const computeScrollXHeight=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;const scrollbarXOpts=computeScrollbarXOpts.value;return _xeUtils.default.toNumber((0,_utils.getDefaultConfig)((0,_utils.getDefaultConfig)(scrollbarXOpts.height,scrollbarOpts.height),scrollDefaultConf.height));});const computeScrollYWidth=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;const scrollbarYOpts=computeScrollbarYOpts.value;return _xeUtils.default.toNumber((0,_utils.getDefaultConfig)((0,_utils.getDefaultConfig)(scrollbarYOpts.width,scrollbarOpts.width),scrollDefaultConf.width));});const computeScrollXVisible=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;const scrollbarXOpts=computeScrollbarXOpts.value;return(0,_utils.getDefaultConfig)(scrollbarXOpts.visible,scrollbarOpts.visible);});const computeScrollYVisible=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;const scrollbarYOpts=computeScrollbarYOpts.value;return(0,_utils.getDefaultConfig)(scrollbarYOpts.visible,scrollbarOpts.visible);});const computeScrollXAutoHide=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;const scrollbarXOpts=computeScrollbarXOpts.value;return(0,_utils.getDefaultConfig)((0,_utils.getDefaultConfig)(scrollbarXOpts.autoHide,scrollbarOpts.autoHide),scrollDefaultConf.autoHide);});const computeScrollYAutoHide=(0,_vue.computed)(()=>{const scrollbarOpts=computeScrollbarOpts.value;const scrollbarYOpts=computeScrollbarYOpts.value;return(0,_utils.getDefaultConfig)((0,_utils.getDefaultConfig)(scrollbarYOpts.autoHide,scrollbarOpts.autoHide),scrollDefaultConf.autoHide);});const computeScrollbarXToTop=(0,_vue.computed)(()=>{const scrollbarXOpts=computeScrollbarXOpts.value;return scrollbarXOpts.position==='top';});const computeScrollbarYToLeft=(0,_vue.computed)(()=>{const scrollbarYOpts=computeScrollbarYOpts.value;return scrollbarYOpts.position==='left';});const computeScrollbarWrapperClss=(0,_vue.computed)(()=>{const{yThumbHeight,xThumbWidth}=reactData;const scrollbarOpts=computeScrollbarOpts.value;const scrollbarXToTop=computeScrollbarXToTop.value;const scrollbarYToLeft=computeScrollbarYToLeft.value;const scrollXVisible=computeScrollXVisible.value;const scrollYVisible=computeScrollYVisible.value;return domUtils.buildClass(['vxe-scrollbar is--virtual',scrollbarOpts.fluentOverlay?'is--fluent-overlay':'is--default-mode',`ov-x--${scrollXVisible===false?'hidden':'visible'}`,`ov-y--${scrollYVisible===false?'hidden':'visible'}`,`sx-pos--${scrollbarXToTop?'top':'bottom'}`,`sy-pos--${scrollbarYToLeft?'left':'right'}`],{'overflow-y':yThumbHeight,'overflow-x':xThumbWidth});});const computeScrollYThreshold=(0,_vue.computed)(()=>{const virtualYOpts=computeVirtualYOpts.value;const{threshold}=virtualYOpts;if(threshold){return _xeUtils.default.toNumber(threshold);}return 0;});const computeRowHeightMaps=(0,_vue.computed)(()=>{return reactData.rowHeightStore;});const computeDefaultRowHeight=(0,_vue.computed)(()=>{const vSize=computeSize.value;const rowHeightMaps=computeRowHeightMaps.value;return rowHeightMaps[vSize||'default']||18;});const computeColumnOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.columnConfig,props.columnConfig);});const computeCurrentColumnOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.currentColumnConfig,props.currentColumnConfig);});const computeCellOpts=(0,_vue.computed)(()=>{const cellOpts=Object.assign({},getConfig().table.cellConfig,props.cellConfig);if(cellOpts.height){cellOpts.height=_xeUtils.default.toNumber(cellOpts.height);}return cellOpts;});const computeCellHeitht=(0,_vue.computed)(()=>{const cellOpts=computeCellOpts.value;return cellOpts.height;});const computeHeaderCellOpts=(0,_vue.computed)(()=>{const headerCellOpts=Object.assign({},getConfig().table.headerCellConfig,props.headerCellConfig);const defaultRowHeight=computeDefaultRowHeight.value;const cellOpts=computeCellOpts.value;let headCellHeight=_xeUtils.default.toNumber((0,_util.getCalcHeight)(headerCellOpts.height||cellOpts.height));if($xeGantt){const{computeTaskViewScales}=$xeGantt.getComputeMaps();const taskViewScales=computeTaskViewScales.value;if(taskViewScales&&taskViewScales.length>2){const ganttMinHeadCellHeight=defaultRowHeight/2*taskViewScales.length;headCellHeight=Math.max(ganttMinHeadCellHeight,headCellHeight);}}headerCellOpts.height=headCellHeight;return headerCellOpts;});const computeFooterCellOpts=(0,_vue.computed)(()=>{const footerCellOpts=Object.assign({},getConfig().table.footerCellConfig,props.footerCellConfig);const cellOpts=computeCellOpts.value;footerCellOpts.height=_xeUtils.default.toNumber((0,_util.getCalcHeight)(footerCellOpts.height||cellOpts.height));return footerCellOpts;});const computeRowOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.rowConfig,props.rowConfig);});const computeAggregateOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.aggregateConfig||getConfig().table.rowGroupConfig,props.aggregateConfig||props.rowGroupConfig);});const computeRowGroupOpts=(0,_vue.computed)(()=>{return computeAggregateOpts.value;});const computeAggregateMode=(0,_vue.computed)(()=>{const aggregateOpts=computeAggregateOpts.value;return aggregateOpts.mode;});const computeAggregateAccuracyOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.aggregateAccuracyConfig,props.aggregateAccuracyConfig);});const computeCurrentRowOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.currentRowConfig,props.currentRowConfig);});const computeRowDragOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.rowDragConfig,props.rowDragConfig);});const computeColumnDragOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.columnDragConfig,props.columnDragConfig);});const computeResizeOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.resizeConfig,props.resizeConfig);});const computeResizableOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.resizableConfig,props.resizableConfig);});const computeSeqOpts=(0,_vue.computed)(()=>{return Object.assign({startIndex:0},getConfig().table.seqConfig,props.seqConfig);});const computeRadioOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.radioConfig,props.radioConfig);});const computeCheckboxOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.checkboxConfig,props.checkboxConfig);});const computeTooltipOpts=(0,_vue.computed)(()=>{const isVScrollbar=computeIsVScrollbar.value;return Object.assign({useScrollbar:isVScrollbar},getConfig().tooltip,getConfig().table.tooltipConfig,props.tooltipConfig);});const computeHeaderTooltipOpts=(0,_vue.computed)(()=>{const tooltipOpts=computeTooltipOpts.value;return Object.assign({},getConfig().tooltip,{enterable:tooltipOpts.enterable,defaultPlacement:tooltipOpts.defaultPlacement},getConfig().table.headerTooltipConfig,props.headerTooltipConfig);});const computeFooterTooltipOpts=(0,_vue.computed)(()=>{const tooltipOpts=computeTooltipOpts.value;return Object.assign({},getConfig().tooltip,{enterable:tooltipOpts.enterable,defaultPlacement:tooltipOpts.defaultPlacement},getConfig().table.footerTooltipConfig,props.footerTooltipConfig);});const computeTableTipConfig=(0,_vue.computed)(()=>{const{tooltipStore}=reactData;const tooltipOpts=computeTooltipOpts.value;return Object.assign({},tooltipOpts,tooltipStore.currOpts);});const computeValidTipConfig=(0,_vue.computed)(()=>{const tooltipOpts=computeTooltipOpts.value;return Object.assign({},tooltipOpts);});const computeEditOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.editConfig,props.editConfig);});const computeEditDirtyOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.editDirtyConfig,props.editDirtyConfig);});const computeSortOpts=(0,_vue.computed)(()=>{return Object.assign({orders:['asc','desc',null]},getConfig().table.sortConfig,props.sortConfig);});const computeFilterOpts=(0,_vue.computed)(()=>{const isVScrollbar=computeIsVScrollbar.value;return Object.assign({useScrollbar:isVScrollbar},getConfig().table.filterConfig,props.filterConfig);});const computeFloatingFilterOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.floatingFilterConfig,props.floatingFilterConfig);});const computeMouseOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.mouseConfig,props.mouseConfig);});const computeAreaOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.areaConfig,props.areaConfig);});const computeKeyboardOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.keyboardConfig,props.keyboardConfig);});const computeClipOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.clipConfig,props.clipConfig);});const computeUndoRedoHistoryOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.undoRedoHistoryConfig,props.undoRedoHistoryConfig);});const computeFNROpts=(0,_vue.computed)(()=>{const fnrOpts=computeFnrOpts.value;return fnrOpts;});const computeFnrOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.fnrConfig,props.fnrConfig);});const computeMenuOpts=(0,_vue.computed)(()=>{return Object.assign({},getConfig().table.menuConfig,props.menuConfig);});const computeLeftFixedWidth=(0,_vue.computed)(()=>{const{columnStore}=reactData;const{leftList}=columnStore;let leftWidth=0;for(let i=0;i<leftList.length;i++){const column=leftList[i];leftWidth+=column.renderWidth;}return leftWidth;});const computeRightFixedWidth=(0,_vue.computed)(()=>{const{columnStore}=reactData;const{rightList}=columnStore;let leftWidth=0;for(let i=0;i<rightList.length;i++){const column=rightList[i];leftWidth+=column.renderWidth;}return leftWidth;});// 合并列是否超越冻结列
 const computeBodyMergeCoverFixed=(0,_vue.computed)(()=>{const{columnStore,mergeBodyFlag}=reactData;const{mergeBodyList,visibleColumn}=internalData;const{leftList,rightList}=columnStore;const rscIndex=visibleColumn.length-rightList.length;if(mergeBodyFlag&&(leftList.length||rightList.length)){const lecIndex=leftList.length;for(let i=0;i<mergeBodyList.length;i++){const{col,colspan}=mergeBodyList[i];if(col<lecIndex&&col+colspan>lecIndex){return true;}else if(col<rscIndex&&col+colspan>rscIndex){return true;}}}return false;});const computeIsHeaderRenderOptimize=(0,_vue.computed)(()=>{const{spanMethod,footerSpanMethod,showHeaderOverflow:allColumnHeaderOverflow}=props;const{isGroup,scrollXLoad}=reactData;let isOptimizeMode=false;if(isGroup){// 分组表头
 }else{// 如果是使用优化模式
 if(scrollXLoad&&allColumnHeaderOverflow){if(spanMethod||footerSpanMethod){// 如果不支持优化模式
@@ -897,7 +897,7 @@ if(bodyScrollElem&&bodyTableElem&&bodyScrollElem.scrollTop+clientHeight>=maxYHei
              */triggerHoverEvent(evnt,{row}){$xeTable.setHoverRow(row);},setHoverRow(row){const $xeGanttView=internalData.xeGanttView;$xeTable.clearHoverRow();const rowid=(0,_util.getRowid)($xeTable,row);const el=refElem.value;if(el){_xeUtils.default.arrayEach(el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`),elem=>(0,_dom.addClass)(elem,'row--hover'));}internalData.hoverRow=row;if($xeGanttView&&$xeGanttView.handleUpdateHoverRow){$xeGanttView.handleUpdateHoverRow(row);}},clearHoverRow(){const $xeGanttView=internalData.xeGanttView;const el=refElem.value;if(el){_xeUtils.default.arrayEach(el.querySelectorAll('.vxe-body--row.row--hover'),elem=>(0,_dom.removeClass)(elem,'row--hover'));}internalData.hoverRow=null;if($xeGanttView&&$xeGanttView.handleUpdateHoverRow){$xeGanttView.handleUpdateHoverRow();}},/**
              * 已废弃，被 getCellElement 替换
              * @deprecated
-             */getCell(row,column){return $xeTable.getCellElement(row,column);},findRowIndexOf(list,row){return row?_xeUtils.default.findIndexOf(list,item=>$xeTable.eqRow(item,row)):-1;},eqRow(row1,row2){if(row1&&row2){if(row1===row2){return true;}return(0,_util.getRowid)($xeTable,row1)===(0,_util.getRowid)($xeTable,row2);}return false;},handleConnectGanttView($ganttView){if($ganttView&&$ganttView.connectUpdate){$ganttView.connectUpdate({$table:$xeTable});internalData.xeGanttView=$ganttView;}return(0,_vue.nextTick)();}};const bindScrollbarResize=()=>{const{elemStore}=internalData;const isVScrollbar=computeIsVScrollbar.value;if(isVScrollbar){const el=refElem.value;const viewInnerEl=(0,_util.getRefElem)(elemStore['main-body-table']);const scrollObserver=globalResize.create(()=>{reScrollFlag.value++;});if(el){scrollObserver.observe(el);}if(viewInnerEl){scrollObserver.observe(viewInnerEl);}internalData.scrollObserver=scrollObserver;}};// 检测对应模块是否安装
+             */getCell(row,column){return $xeTable.getCellElement(row,column);},findRowIndexOf(list,row){return row?_xeUtils.default.findIndexOf(list,item=>$xeTable.eqRow(item,row)):-1;},eqRow(row1,row2){if(row1&&row2){if(row1===row2){return true;}return(0,_util.getRowid)($xeTable,row1)===(0,_util.getRowid)($xeTable,row2);}return false;},handleConnectGanttView($ganttView){if($ganttView&&$ganttView.connectUpdate){$ganttView.connectUpdate({$table:$xeTable});internalData.xeGanttView=$ganttView;}return(0,_vue.nextTick)();}};const bindScrollbarResize=()=>{const{elemStore}=internalData;const isVScrollbar=computeIsVScrollbar.value;if(isVScrollbar){const el=refElem.value;const viewInnerEl=(0,_util.getRefElem)(elemStore['main-body-table']);const viewXSpaceEl=(0,_util.getRefElem)(elemStore['main-body-xSpace']);const viewYSpaceEl=(0,_util.getRefElem)(elemStore['main-body-ySpace']);const scrollObserver=globalResize.create(()=>{reScrollFlag.value++;});if(el){scrollObserver.observe(el);}if(viewInnerEl){scrollObserver.observe(viewInnerEl);}if(viewXSpaceEl){scrollObserver.observe(viewXSpaceEl);}if(viewYSpaceEl){scrollObserver.observe(viewYSpaceEl);}internalData.scrollObserver=scrollObserver;}};// 检测对应模块是否安装
 // 'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
 //   ($xeTable as any)[name] = function () {
 //     errLog('vxe.error.reqModule', ['Export'])