vxe-table 3.19.39 → 3.20.0-beta.1

package/lib/table/src/util.js

@@ -13,6 +13,7 @@ exports.createColumn = createColumn;
 exports.createHandleGetRowId = createHandleGetRowId;
 exports.createHandleUpdateRowId = createHandleUpdateRowId;
 exports.createInternalData = createInternalData;
+exports.createReactData = createReactData;
 exports.destroyColumn = destroyColumn;
 exports.encodeRowid = encodeRowid;
 exports.getCalcHeight = getCalcHeight;
@@ -170,6 +171,248 @@ function createInternalData() {
     isActivated: false
   };
 }
+function createReactData() {
+  return {
+    // 低性能的静态列
+    staticColumns: [],
+    // 渲染的列分组
+    tableGroupColumn: [],
+    // 可视区渲染的列
+    tableColumn: [],
+    // 渲染中的数据
+    tableData: [],
+    // 是否启用了横向 X 可视渲染方式加载
+    scrollXLoad: false,
+    // 是否启用了纵向 Y 可视渲染方式加载
+    scrollYLoad: false,
+    // 是否存在纵向滚动条
+    overflowY: true,
+    // 是否存在横向滚动条
+    overflowX: false,
+    // 纵向滚动条的宽度
+    scrollbarWidth: 0,
+    // 横向滚动条的高度
+    scrollbarHeight: 0,
+    // 最后滚动时间戳
+    lastScrollTime: 0,
+    // 行高
+    rowHeight: 0,
+    // 表格父容器的高度
+    parentHeight: 0,
+    // 是否使用分组表头
+    isGroup: false,
+    isAllOverflow: false,
+    // 复选框属性，是否全选
+    isAllSelected: false,
+    // 复选框属性，有选中且非全选状态
+    isIndeterminate: false,
+    // 当前行
+    currentRow: null,
+    // 单选框属性，选中列
+    currentColumn: null,
+    // 单选框属性，选中行
+    selectRadioRow: null,
+    // 表尾合计数据
+    footerTableData: [],
+    // 行分组列信息
+    rowGroupColumn: null,
+    // 展开列信息
+    expandColumn: null,
+    checkboxColumn: null,
+    radioColumn: null,
+    // 树节点列信息
+    treeNodeColumn: null,
+    hasFixedColumn: false,
+    // 刷新列标识，当列筛选被改变时，触发表格刷新数据
+    upDataFlag: 0,
+    // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
+    reColumnFlag: 0,
+    // 初始化标识
+    initStore: {
+      filter: false,
+      import: false,
+      export: false,
+      custom: false
+    },
+    // 自定义列相关的信息
+    customStore: {
+      btnEl: null,
+      isAll: false,
+      isIndeterminate: false,
+      activeBtn: false,
+      activeWrapper: false,
+      visible: false,
+      maxHeight: 0,
+      oldSortMaps: {},
+      oldFixedMaps: {},
+      oldVisibleMaps: {}
+    },
+    customColumnList: [],
+    // 当前选中的筛选列
+    filterStore: {
+      isAllSelected: false,
+      isIndeterminate: false,
+      style: null,
+      column: null,
+      visible: false,
+      maxHeight: null
+    },
+    // 存放列相关的信息
+    columnStore: {
+      leftList: [],
+      centerList: [],
+      rightList: [],
+      resizeList: [],
+      pxList: [],
+      pxMinList: [],
+      autoMinList: [],
+      scaleList: [],
+      scaleMinList: [],
+      autoList: [],
+      remainList: []
+    },
+    // 存放快捷菜单的信息
+    ctxMenuStore: {
+      selected: null,
+      visible: false,
+      showChild: false,
+      selectChild: null,
+      list: [],
+      style: null
+    },
+    // 存放可编辑相关信息
+    editStore: {
+      indexs: {
+        columns: []
+      },
+      titles: {
+        columns: []
+      },
+      // 选中源
+      selected: {
+        row: null,
+        column: null
+      },
+      // 已复制源
+      copyed: {
+        cut: false,
+        rows: [],
+        columns: []
+      },
+      // 激活
+      actived: {
+        row: null,
+        column: null
+      },
+      // 当前被强制聚焦单元格，只会在鼠标点击后算聚焦
+      focused: {
+        row: null,
+        column: null
+      }
+    },
+    // 存放 tooltip 相关信息
+    tooltipStore: {
+      row: null,
+      column: null,
+      content: null,
+      visible: false,
+      type: null,
+      currOpts: {}
+    },
+    // 存放数据校验相关信息
+    validStore: {
+      visible: false
+    },
+    validErrorMaps: {},
+    // 导入相关信息
+    importStore: {
+      inited: false,
+      file: null,
+      type: '',
+      modeList: [],
+      typeList: [],
+      filename: '',
+      visible: false
+    },
+    importParams: {
+      mode: '',
+      types: null,
+      message: true
+    },
+    // 导出相关信息
+    exportStore: {
+      inited: false,
+      name: '',
+      modeList: [],
+      typeList: [],
+      columns: [],
+      isPrint: false,
+      hasFooter: false,
+      hasMerge: false,
+      hasTree: false,
+      hasColgroup: false,
+      visible: false
+    },
+    exportParams: {
+      filename: '',
+      sheetName: '',
+      mode: '',
+      type: '',
+      isColgroup: false,
+      isMerge: false,
+      isAllExpand: false,
+      useStyle: false,
+      original: false,
+      message: true,
+      isHeader: false,
+      isTitle: false,
+      isFooter: false
+    },
+    visiblwRowsFlag: 1,
+    isRowGroupStatus: false,
+    rowGroupList: [],
+    aggHandleFields: [],
+    aggHandleAggColumns: [],
+    rowGroupExpandedFlag: 1,
+    rowExpandedFlag: 1,
+    treeExpandedFlag: 1,
+    updateCheckboxFlag: 1,
+    pendingRowFlag: 1,
+    insertRowFlag: 1,
+    removeRowFlag: 1,
+    mergeHeadFlag: 1,
+    mergeBodyFlag: 1,
+    mergeFootFlag: 1,
+    rowHeightStore: {
+      large: 52,
+      default: 48,
+      medium: 44,
+      small: 40,
+      mini: 36
+    },
+    scrollVMLoading: false,
+    scrollYHeight: 0,
+    scrollYTop: 0,
+    isScrollYBig: false,
+    scrollXLeft: 0,
+    scrollXWidth: 0,
+    isScrollXBig: false,
+    lazScrollLoading: false,
+    rowExpandHeightFlag: 1,
+    calcCellHeightFlag: 1,
+    resizeHeightFlag: 1,
+    resizeWidthFlag: 1,
+    isCustomStatus: false,
+    isCrossDragRow: false,
+    dragRow: null,
+    isCrossDragCol: false,
+    dragCol: null,
+    dragTipText: '',
+    isDragResize: false,
+    isRowLoading: false,
+    isColLoading: false
+  };
+}
 const getAllConvertColumns = (columns, parentColumn) => {
   const result = [];
   columns.forEach(column => {

package/lib/table/src/util.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.assembleColumn=assembleColumn,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.colToVisible=colToVisible,exports.convertHeaderColumnToRows=void 0,exports.convertHeaderToGridRows=convertHeaderToGridRows,exports.createColumn=createColumn,exports.createHandleGetRowId=createHandleGetRowId,exports.createHandleUpdateRowId=createHandleUpdateRowId,exports.createInternalData=createInternalData,exports.destroyColumn=destroyColumn,exports.encodeRowid=encodeRowid,exports.getCalcHeight=getCalcHeight,exports.getCellRestHeight=getCellRestHeight,exports.getCellValue=getCellValue,exports.getColReMinWidth=getColReMinWidth,exports.getColumnList=getColumnList,exports.getFirstChildColumn=getFirstChildColumn,exports.getLastChildColumn=getLastChildColumn,exports.getRefElem=getRefElem,exports.getRootColumn=getRootColumn,exports.getRowUniqueId=getRowUniqueId,exports.getRowid=getRowid,exports.getRowkey=getRowkey,exports.handleFieldOrColumn=handleFieldOrColumn,exports.handleRowidOrRow=handleRowidOrRow,exports.hasDeepKey=hasDeepKey,exports.isColumnInfo=isColumnInfo,exports.restoreScrollLocation=restoreScrollLocation,exports.rowToVisible=rowToVisible,exports.setCellValue=setCellValue,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq,exports.updateDeepRowKey=updateDeepRowKey,exports.updateFastRowKey=updateFastRowKey;var _xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=require("../../ui/src/dom"),_log=require("../../ui/src/log"),_utils=require("../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function createInternalData(){return{tZindex:0,currKeyField:"",isCurrDeepKey:!1,elemStore:{},scrollXStore:{preloadSize:0,offsetSize:0,visibleSize:0,visibleStartIndex:0,visibleEndIndex:0,startIndex:0,endIndex:0},scrollYStore:{preloadSize:0,offsetSize:0,visibleSize:0,visibleStartIndex:0,visibleEndIndex:0,startIndex:0,endIndex:0},tableWidth:0,tableHeight:0,customHeight:0,customMinHeight:0,customMaxHeight:0,hoverRow:null,lastScrollLeft:0,lastScrollTop:0,radioReserveRow:null,checkboxReserveRowMap:{},rowExpandedReserveRowMap:{},treeExpandedReserveRowMap:{},treeIndeterminateRowMaps:{},tableFullData:[],afterFullData:[],afterTreeFullData:[],afterGroupFullData:[],afterFullRowMaps:{},tableFullTreeData:[],tableFullGroupData:[],tableSynchData:[],tableSourceData:[],collectColumn:[],tableFullColumn:[],visibleColumn:[],fullAllDataRowIdData:{},fullDataRowIdData:{},visibleDataRowIdData:{},footerFullDataRowData:{},sourceDataRowIdData:{},fullColumnIdData:{},fullColumnFieldData:{},mergeHeaderList:[],mergeHeaderMaps:{},mergeHeaderCellMaps:{},mergeBodyList:[],mergeBodyMaps:{},mergeBodyCellMaps:{},mergeFooterList:[],mergeFooterMaps:{},mergeFooterCellMaps:{},rowExpandedMaps:{},rowExpandLazyLoadedMaps:{},rowGroupExpandedMaps:{},treeExpandedMaps:{},treeExpandLazyLoadedMaps:{},selectCheckboxMaps:{},pendingRowMaps:{},insertRowMaps:{},removeRowMaps:{},cvCacheMaps:{},tHeaderHeight:0,tBodyHeight:0,tFooterHeight:0,teleportToWrapperElem:null,popupToWrapperElem:null,inited:!1,tooltipTimeout:null,initStatus:!1,isActivated:!1}}let getAllConvertColumns=(e,t)=>{let l=[];return e.forEach(e=>{e.parentId=t?t.id:null,e.visible&&(e.children&&e.children.length&&e.children.some(e=>e.visible)?(l.push(e),l.push(...getAllConvertColumns(e.children,e))):l.push(e))}),l},convertHeaderColumnToRows=e=>{let t=1,r=(l,e)=>{if(e&&(l.level=e.level+1,t<l.level)&&(t=l.level),l.children&&l.children.length&&l.children.some(e=>e.visible)){let t=0;l.children.forEach(e=>{e.visible&&(r(e,l),t+=e.colSpan)}),l.colSpan=t}else l.colSpan=1},l=(e.forEach(e=>{e.level=1,r(e)}),[]);for(let e=0;e<t;e++)l.push([]);return getAllConvertColumns(e).forEach(e=>{e.children&&e.children.length&&e.children.some(e=>e.visible)?e.rowSpan=1:e.rowSpan=t-e.level+1,l[e.level-1].push(e)}),l};function convertHeaderToGridRows(t){var l=t.length,i=t[0].reduce((e,t)=>e+t.colSpan,0),n=[],a=[];for(let e=0;e<l;e++){var r=[],o=[];for(let e=0;e<i;e++)r.push(!1),o.push("");n.push(r),a.push(o)}for(let o=0;o<l;o++){let e=0;for(var u of t[o]){var{colSpan:d,rowSpan:s}=u;let r=-1;for(let l=e;l<=i-d;l++){let t=!0;for(let e=0;e<d;e++)if(n[o][l+e]){t=!1;break}if(t){r=l;break}}if(-1===r){for(let l=0;l<=i-d;l++){let t=!0;for(let e=0;e<d;e++)if(n[o][l+e]){t=!1;break}if(t){r=l;break}}if(-1===r)break}for(let t=o;t<o+s;t++)for(let e=r;e<r+d;e++)n[t][e]=!0,a[t][e]=u;e=r+d}}return a}function restoreScrollLocation(e,t,l){var r=e;return t||l?(r.intoRunScroll=!1,r.inVirtualScroll=!1,r.inWheelScroll=!1,r.inHeaderScroll=!1,r.inBodyScroll=!1,r.inFooterScroll=!1,r.scrollRenderType="",e.scrollTo(t,l)):e.clearScroll()}function toTreePathSeq(e){return e.map((e,t)=>t%2==0?Number(e)+1:".").join("")}function getRowUniqueId(){return _xeUtils.default.uniqueId("row_")}function hasDeepKey(e){return-1<e.indexOf(".")}function getRowkey(e){e=e.currKeyField;return e}function getRowid(e,t){var{isCurrDeepKey:e,currKeyField:l}=e;return t?encodeRowid((e?getDeepRowIdByKey:getFastRowIdByKey)(t,l)):""}function createHandleUpdateRowId(e){let{isCurrDeepKey:t,currKeyField:l}=e,r=t?updateDeepRowKey:updateFastRowKey;return{rowKey:l,handleUpdateRowId(e){return e?r(e,l):""}}}function createHandleGetRowId(e){let{isCurrDeepKey:t,currKeyField:l}=e,r=t?getDeepRowIdByKey:getFastRowIdByKey;return{rowKey:l,handleGetRowId(e){return e?encodeRowid(r(e,l)):""}}}function encodeRowid(e){return _xeUtils.default.eqNull(e)?"":encodeURIComponent(e)}function getDeepRowIdByKey(e,t){return _xeUtils.default.get(e,t)}function updateDeepRowKey(e,t){let l=encodeRowid(getDeepRowIdByKey(e,t));return(0,_utils.eqEmptyValue)(l)&&(l=getRowUniqueId(),_xeUtils.default.set(e,t,l)),l}function getFastRowIdByKey(e,t){return e[t]}function updateFastRowKey(e,t){let l=encodeRowid(getFastRowIdByKey(e,t));return(0,_utils.eqEmptyValue)(l)&&(l=getRowUniqueId(),e[t]=l),l}function getPaddingLeftRightSize(e){return e?(e=getComputedStyle(e),_xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)):0}function getElementMarginAndWidth(e){var t,l;return e?(l=getComputedStyle(e),t=_xeUtils.default.toNumber(l.marginLeft),l=_xeUtils.default.toNumber(l.marginRight),e.offsetWidth+t+l):0}function getCalcHeight(e){return"unset"!==e&&e||0}function handleFieldOrColumn(e,t){return t?_xeUtils.default.isString(t)||_xeUtils.default.isNumber(t)?e.getColumnByField(""+t):t:null}function handleRowidOrRow(e,t){return t?(t=_xeUtils.default.isString(t)||_xeUtils.default.isNumber(t)?t:getRowid(e,t),e.getRowById(t)):null}function getCellRestHeight(e,t,l,r){return e.resizeHeight||t.height||l.height||e.height||r}function assembleColumn(e){var t=e.$xeTable,l=t.staticColumns,{$el:e,$xeColumn:r,columnConfig:o}=e,i=r?r.columnConfig:null;i?("vxe-table-column"===r.$options._componentTag?(0,_log.errLog)("vxe.error.groupTag",[`<vxe-table-colgroup title=${r.title} ...>`,`<vxe-table-column title=${r.title} ...>`]):"vxe-column"===r.$options._componentTag&&(0,_log.warnLog)("vxe.error.groupTag",[`<vxe-colgroup title=${r.title} ...>`,`<vxe-column title=${r.title} ...>`]),i.children||(i.children=[]),o.defaultParentId=i.id,i.children.splice(_xeUtils.default.arrayIndexOf(r.$el.children,e),0,o)):l.splice(_xeUtils.default.arrayIndexOf(t.$refs.hideColumn.children,e),0,o)}function destroyColumn(e){var t=e.$xeTable.staticColumns;let l=e.columnConfig;e=_xeUtils.default.findTree(t,e=>e===l);e&&e.items.splice(e.index,1)}function getRootColumn(e,t){var l=e.fullColumnIdData;if(!t)return null;let r=t.parentId;for(;l[r];){let e=l[r].column;if(!(r=e.parentId))return e}return t}function toFilters(e,i){return e&&(_xeUtils.default.isArray(e)?e.map(({label:e,value:t,data:l,resetValue:r,checked:o})=>({label:e,value:t,data:l,resetValue:r,checked:!!o,_checked:!!o,_colId:i})):[])}function getColReMinWidth(e){var{$table:t,column:l,cell:r}=e,o=t,{showHeaderOverflow:t,resizableOpts:i}=t,i=i.minWidth;if(i){e=_xeUtils.default.isFunction(i)?i(e):i;if("auto"!==e)return Math.max(1,_xeUtils.default.toNumber(e))}var n,a,u,d,i=o.elemStore,{showHeaderOverflow:e,minWidth:o}=l,l=_xeUtils.default.isUndefined(e)||_xeUtils.default.isNull(e)?t:e,t="title"===l||(!0===l||"tooltip"===l)||"ellipsis"===l;let s=_xeUtils.default.floor(1.8*(_xeUtils.default.toNumber(getComputedStyle(r).fontSize)||14))+(getPaddingLeftRightSize(r)+getPaddingLeftRightSize((0,_dom.queryElement)(r,".vxe-cell")));if(t&&(e=getElementMarginAndWidth((0,_dom.queryElement)(r,".vxe-cell--drag-handle")),l=getElementMarginAndWidth((0,_dom.queryElement)(r,".vxe-cell--checkbox")),t=getElementMarginAndWidth((0,_dom.queryElement)(r,".vxe-cell--required-icon")),n=getElementMarginAndWidth((0,_dom.queryElement)(r,".vxe-cell--edit-icon")),a=getElementMarginAndWidth((0,_dom.queryElement)(r,".vxe-cell-title-prefix-icon")),u=getElementMarginAndWidth((0,_dom.queryElement)(r,".vxe-cell-title-suffix-icon")),d=getElementMarginAndWidth((0,_dom.queryElement)(r,".vxe-cell--sort")),r=getElementMarginAndWidth((0,_dom.queryElement)(r,".vxe-cell--filter")),s+=e+l+t+n+a+u+r+d),o){e=getRefElem(i["main-body-scroll"]);if(e){if((0,_dom.isScale)(o))return l=(e.clientWidth-1)/100,Math.max(s,Math.floor(_xeUtils.default.toInteger(o)*l));if((0,_dom.isPx)(o))return Math.max(s,_xeUtils.default.toInteger(o))}}return s}function getFirstChildColumn(e){var t=e.children;return t&&t.length?getFirstChildColumn(_xeUtils.default.first(t)):e}function getLastChildColumn(e){var t=e.children;return t&&t.length?getFirstChildColumn(_xeUtils.default.last(t)):e}function getCellValue(e,t){return _xeUtils.default.get(e,t.field)}function setCellValue(e,t,l){return _xeUtils.default.set(e,t.field,l)}function getRefElem(e){return e?e.$el||e:null}function clearTableDefaultStatus(e){var t=e,l=(e.initStatus=!1,[e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearPendingRow()]);return e.clearFilter&&l.push(e.clearFilter()),e.clearSelected&&(t.keyboardConfig||t.mouseConfig)&&l.push(e.clearSelected()),e.clearCellAreas&&t.mouseConfig&&l.push(e.clearCellAreas(),e.clearCopyCellArea()),Promise.all(l).then(()=>e.clearScroll())}function clearTableAllStatus(e){return e.clearFilter&&e.clearFilter(),clearTableDefaultStatus(e)}function isColumnInfo(e){return e instanceof _columnInfo.ColumnInfo}function getColumnList(e){let t=[];return e.forEach(e=>{t.push(...e.children&&e.children.length?getColumnList(e.children):[e])}),t}function createColumn(e,t,l){return isColumnInfo(t)?t:new _columnInfo.ColumnInfo(e,t,l)}function rowToVisible(l,r){var e=l.showOverflow,{scrollYLoad:t,scrollYTop:o}=l,{elemStore:i,afterFullData:n,fullAllDataRowIdData:a,isResizeCellHeight:u}=l,d=l.computeRowOpts,s=l.computeCellOpts,c=l.computeDefaultRowHeight,f=l.computeLeftFixedWidth,g=l.computeRightFixedWidth,i=getRefElem(i["main-body-scroll"]),p=getRowid(l,r);if(i){var m=i.clientHeight,h=i.scrollTop,i=i.querySelector(`[rowid="${p}"]`);if(i){o=i.offsetTop+(t?o:0),i=i.clientHeight;if(o<h||h+m<o)return l.scrollTo(null,o);if(m+h<=o+i)return l.scrollTo(null,h+i)}else if(t){if(!(u||s.height||d.height)&&e)return l.scrollTo(null,(l.findRowIndexOf(n,r)-1)*c);let t=0;o=a[p],i=o.resizeHeight||s.height||d.height||o.height||c;for(let e=0;e<n.length;e++){var x=n[e],R=getRowid(l,x);if(x===r||R===p)break;x=a[R];t+=x.resizeHeight||s.height||d.height||x.height||c}return t<h?l.scrollTo(null,t-f-1):l.scrollTo(null,t+i-(m-g-1))}}return Promise.resolve()}function colToVisible(l,r,t){var{scrollXLoad:o,scrollXLeft:i}=l,{elemStore:n,visibleColumn:a}=l,u=l.computeLeftFixedWidth,d=l.computeRightFixedWidth,n=getRefElem(n["main-body-scroll"]);if(!r.fixed&&n){var s=n.clientWidth,c=n.scrollLeft;let e=null;if(t&&(t=getRowid(l,t),e=n.querySelector(`[rowid="${t}"] .`+r.id)),e=e||n.querySelector("."+r.id)){t=e.offsetLeft+(o?i:0),n=e.clientWidth;if(t<c+u)return l.scrollTo(t-u-1);if(s-d<t+n-c)return l.scrollTo(t+n-(s-d-1))}else if(o){let t=0;i=r.renderWidth;for(let e=0;e<a.length;e++){var f=a[e];if(f===r||f.id===r.id)break;t+=f.renderWidth}return t<c?l.scrollTo(t-u-1):l.scrollTo(t+i-(s-d-1))}}return Promise.resolve()}exports.convertHeaderColumnToRows=convertHeaderColumnToRows;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.assembleColumn=assembleColumn,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.colToVisible=colToVisible,exports.convertHeaderColumnToRows=void 0,exports.convertHeaderToGridRows=convertHeaderToGridRows,exports.createColumn=createColumn,exports.createHandleGetRowId=createHandleGetRowId,exports.createHandleUpdateRowId=createHandleUpdateRowId,exports.createInternalData=createInternalData,exports.createReactData=createReactData,exports.destroyColumn=destroyColumn,exports.encodeRowid=encodeRowid,exports.getCalcHeight=getCalcHeight,exports.getCellRestHeight=getCellRestHeight,exports.getCellValue=getCellValue,exports.getColReMinWidth=getColReMinWidth,exports.getColumnList=getColumnList,exports.getFirstChildColumn=getFirstChildColumn,exports.getLastChildColumn=getLastChildColumn,exports.getRefElem=getRefElem,exports.getRootColumn=getRootColumn,exports.getRowUniqueId=getRowUniqueId,exports.getRowid=getRowid,exports.getRowkey=getRowkey,exports.handleFieldOrColumn=handleFieldOrColumn,exports.handleRowidOrRow=handleRowidOrRow,exports.hasDeepKey=hasDeepKey,exports.isColumnInfo=isColumnInfo,exports.restoreScrollLocation=restoreScrollLocation,exports.rowToVisible=rowToVisible,exports.setCellValue=setCellValue,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq,exports.updateDeepRowKey=updateDeepRowKey,exports.updateFastRowKey=updateFastRowKey;var _xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=require("../../ui/src/dom"),_log=require("../../ui/src/log"),_utils=require("../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function createInternalData(){return{tZindex:0,currKeyField:"",isCurrDeepKey:!1,elemStore:{},scrollXStore:{preloadSize:0,offsetSize:0,visibleSize:0,visibleStartIndex:0,visibleEndIndex:0,startIndex:0,endIndex:0},scrollYStore:{preloadSize:0,offsetSize:0,visibleSize:0,visibleStartIndex:0,visibleEndIndex:0,startIndex:0,endIndex:0},tableWidth:0,tableHeight:0,customHeight:0,customMinHeight:0,customMaxHeight:0,hoverRow:null,lastScrollLeft:0,lastScrollTop:0,radioReserveRow:null,checkboxReserveRowMap:{},rowExpandedReserveRowMap:{},treeExpandedReserveRowMap:{},treeIndeterminateRowMaps:{},tableFullData:[],afterFullData:[],afterTreeFullData:[],afterGroupFullData:[],afterFullRowMaps:{},tableFullTreeData:[],tableFullGroupData:[],tableSynchData:[],tableSourceData:[],collectColumn:[],tableFullColumn:[],visibleColumn:[],fullAllDataRowIdData:{},fullDataRowIdData:{},visibleDataRowIdData:{},footerFullDataRowData:{},sourceDataRowIdData:{},fullColumnIdData:{},fullColumnFieldData:{},mergeHeaderList:[],mergeHeaderMaps:{},mergeHeaderCellMaps:{},mergeBodyList:[],mergeBodyMaps:{},mergeBodyCellMaps:{},mergeFooterList:[],mergeFooterMaps:{},mergeFooterCellMaps:{},rowExpandedMaps:{},rowExpandLazyLoadedMaps:{},rowGroupExpandedMaps:{},treeExpandedMaps:{},treeExpandLazyLoadedMaps:{},selectCheckboxMaps:{},pendingRowMaps:{},insertRowMaps:{},removeRowMaps:{},cvCacheMaps:{},tHeaderHeight:0,tBodyHeight:0,tFooterHeight:0,teleportToWrapperElem:null,popupToWrapperElem:null,inited:!1,tooltipTimeout:null,initStatus:!1,isActivated:!1}}function createReactData(){return{staticColumns:[],tableGroupColumn:[],tableColumn:[],tableData:[],scrollXLoad:!1,scrollYLoad:!1,overflowY:!0,overflowX:!1,scrollbarWidth:0,scrollbarHeight:0,lastScrollTime:0,rowHeight:0,parentHeight:0,isGroup:!1,isAllOverflow:!1,isAllSelected:!1,isIndeterminate:!1,currentRow:null,currentColumn:null,selectRadioRow:null,footerTableData:[],rowGroupColumn:null,expandColumn:null,checkboxColumn:null,radioColumn:null,treeNodeColumn:null,hasFixedColumn:!1,upDataFlag:0,reColumnFlag:0,initStore:{filter:!1,import:!1,export:!1,custom:!1},customStore:{btnEl:null,isAll:!1,isIndeterminate:!1,activeBtn:!1,activeWrapper:!1,visible:!1,maxHeight:0,oldSortMaps:{},oldFixedMaps:{},oldVisibleMaps:{}},customColumnList:[],filterStore:{isAllSelected:!1,isIndeterminate:!1,style:null,column:null,visible:!1,maxHeight:null},columnStore:{leftList:[],centerList:[],rightList:[],resizeList:[],pxList:[],pxMinList:[],autoMinList:[],scaleList:[],scaleMinList:[],autoList:[],remainList:[]},ctxMenuStore:{selected:null,visible:!1,showChild:!1,selectChild:null,list:[],style:null},editStore:{indexs:{columns:[]},titles:{columns:[]},selected:{row:null,column:null},copyed:{cut:!1,rows:[],columns:[]},actived:{row:null,column:null},focused:{row:null,column:null}},tooltipStore:{row:null,column:null,content:null,visible:!1,type:null,currOpts:{}},validStore:{visible:!1},validErrorMaps:{},importStore:{inited:!1,file:null,type:"",modeList:[],typeList:[],filename:"",visible:!1},importParams:{mode:"",types:null,message:!0},exportStore:{inited:!1,name:"",modeList:[],typeList:[],columns:[],isPrint:!1,hasFooter:!1,hasMerge:!1,hasTree:!1,hasColgroup:!1,visible:!1},exportParams:{filename:"",sheetName:"",mode:"",type:"",isColgroup:!1,isMerge:!1,isAllExpand:!1,useStyle:!1,original:!1,message:!0,isHeader:!1,isTitle:!1,isFooter:!1},visiblwRowsFlag:1,isRowGroupStatus:!1,rowGroupList:[],aggHandleFields:[],aggHandleAggColumns:[],rowGroupExpandedFlag:1,rowExpandedFlag:1,treeExpandedFlag:1,updateCheckboxFlag:1,pendingRowFlag:1,insertRowFlag:1,removeRowFlag:1,mergeHeadFlag:1,mergeBodyFlag:1,mergeFootFlag:1,rowHeightStore:{large:52,default:48,medium:44,small:40,mini:36},scrollVMLoading:!1,scrollYHeight:0,scrollYTop:0,isScrollYBig:!1,scrollXLeft:0,scrollXWidth:0,isScrollXBig:!1,lazScrollLoading:!1,rowExpandHeightFlag:1,calcCellHeightFlag:1,resizeHeightFlag:1,resizeWidthFlag:1,isCustomStatus:!1,isCrossDragRow:!1,dragRow:null,isCrossDragCol:!1,dragCol:null,dragTipText:"",isDragResize:!1,isRowLoading:!1,isColLoading:!1}}let getAllConvertColumns=(e,t)=>{let l=[];return e.forEach(e=>{e.parentId=t?t.id:null,e.visible&&(e.children&&e.children.length&&e.children.some(e=>e.visible)?(l.push(e),l.push(...getAllConvertColumns(e.children,e))):l.push(e))}),l},convertHeaderColumnToRows=e=>{let t=1,o=(l,e)=>{if(e&&(l.level=e.level+1,t<l.level)&&(t=l.level),l.children&&l.children.length&&l.children.some(e=>e.visible)){let t=0;l.children.forEach(e=>{e.visible&&(o(e,l),t+=e.colSpan)}),l.colSpan=t}else l.colSpan=1},l=(e.forEach(e=>{e.level=1,o(e)}),[]);for(let e=0;e<t;e++)l.push([]);return getAllConvertColumns(e).forEach(e=>{e.children&&e.children.length&&e.children.some(e=>e.visible)?e.rowSpan=1:e.rowSpan=t-e.level+1,l[e.level-1].push(e)}),l};function convertHeaderToGridRows(t){var l=t.length,i=t[0].reduce((e,t)=>e+t.colSpan,0),n=[],a=[];for(let e=0;e<l;e++){var o=[],r=[];for(let e=0;e<i;e++)o.push(!1),r.push("");n.push(o),a.push(r)}for(let r=0;r<l;r++){let e=0;for(var u of t[r]){var{colSpan:s,rowSpan:d}=u;let o=-1;for(let l=e;l<=i-s;l++){let t=!0;for(let e=0;e<s;e++)if(n[r][l+e]){t=!1;break}if(t){o=l;break}}if(-1===o){for(let l=0;l<=i-s;l++){let t=!0;for(let e=0;e<s;e++)if(n[r][l+e]){t=!1;break}if(t){o=l;break}}if(-1===o)break}for(let t=r;t<r+d;t++)for(let e=o;e<o+s;e++)n[t][e]=!0,a[t][e]=u;e=o+s}}return a}function restoreScrollLocation(e,t,l){var o=e;return t||l?(o.intoRunScroll=!1,o.inVirtualScroll=!1,o.inWheelScroll=!1,o.inHeaderScroll=!1,o.inBodyScroll=!1,o.inFooterScroll=!1,o.scrollRenderType="",e.scrollTo(t,l)):e.clearScroll()}function toTreePathSeq(e){return e.map((e,t)=>t%2==0?Number(e)+1:".").join("")}function getRowUniqueId(){return _xeUtils.default.uniqueId("row_")}function hasDeepKey(e){return-1<e.indexOf(".")}function getRowkey(e){e=e.currKeyField;return e}function getRowid(e,t){var{isCurrDeepKey:e,currKeyField:l}=e;return t?encodeRowid((e?getDeepRowIdByKey:getFastRowIdByKey)(t,l)):""}function createHandleUpdateRowId(e){let{isCurrDeepKey:t,currKeyField:l}=e,o=t?updateDeepRowKey:updateFastRowKey;return{rowKey:l,handleUpdateRowId(e){return e?o(e,l):""}}}function createHandleGetRowId(e){let{isCurrDeepKey:t,currKeyField:l}=e,o=t?getDeepRowIdByKey:getFastRowIdByKey;return{rowKey:l,handleGetRowId(e){return e?encodeRowid(o(e,l)):""}}}function encodeRowid(e){return _xeUtils.default.eqNull(e)?"":encodeURIComponent(e)}function getDeepRowIdByKey(e,t){return _xeUtils.default.get(e,t)}function updateDeepRowKey(e,t){let l=encodeRowid(getDeepRowIdByKey(e,t));return(0,_utils.eqEmptyValue)(l)&&(l=getRowUniqueId(),_xeUtils.default.set(e,t,l)),l}function getFastRowIdByKey(e,t){return e[t]}function updateFastRowKey(e,t){let l=encodeRowid(getFastRowIdByKey(e,t));return(0,_utils.eqEmptyValue)(l)&&(l=getRowUniqueId(),e[t]=l),l}function getPaddingLeftRightSize(e){return e?(e=getComputedStyle(e),_xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)):0}function getElementMarginAndWidth(e){var t,l;return e?(l=getComputedStyle(e),t=_xeUtils.default.toNumber(l.marginLeft),l=_xeUtils.default.toNumber(l.marginRight),e.offsetWidth+t+l):0}function getCalcHeight(e){return"unset"!==e&&e||0}function handleFieldOrColumn(e,t){return t?_xeUtils.default.isString(t)||_xeUtils.default.isNumber(t)?e.getColumnByField(""+t):t:null}function handleRowidOrRow(e,t){return t?(t=_xeUtils.default.isString(t)||_xeUtils.default.isNumber(t)?t:getRowid(e,t),e.getRowById(t)):null}function getCellRestHeight(e,t,l,o){return e.resizeHeight||t.height||l.height||e.height||o}function assembleColumn(e){var t=e.$xeTable,l=t.staticColumns,{$el:e,$xeColumn:o,columnConfig:r}=e,i=o?o.columnConfig:null;i?("vxe-table-column"===o.$options._componentTag?(0,_log.errLog)("vxe.error.groupTag",[`<vxe-table-colgroup title=${o.title} ...>`,`<vxe-table-column title=${o.title} ...>`]):"vxe-column"===o.$options._componentTag&&(0,_log.warnLog)("vxe.error.groupTag",[`<vxe-colgroup title=${o.title} ...>`,`<vxe-column title=${o.title} ...>`]),i.children||(i.children=[]),r.defaultParentId=i.id,i.children.splice(_xeUtils.default.arrayIndexOf(o.$el.children,e),0,r)):l.splice(_xeUtils.default.arrayIndexOf(t.$refs.hideColumn.children,e),0,r)}function destroyColumn(e){var t=e.$xeTable.staticColumns;let l=e.columnConfig;e=_xeUtils.default.findTree(t,e=>e===l);e&&e.items.splice(e.index,1)}function getRootColumn(e,t){var l=e.fullColumnIdData;if(!t)return null;let o=t.parentId;for(;l[o];){let e=l[o].column;if(!(o=e.parentId))return e}return t}function toFilters(e,i){return e&&(_xeUtils.default.isArray(e)?e.map(({label:e,value:t,data:l,resetValue:o,checked:r})=>({label:e,value:t,data:l,resetValue:o,checked:!!r,_checked:!!r,_colId:i})):[])}function getColReMinWidth(e){var{$table:t,column:l,cell:o}=e,r=t,{showHeaderOverflow:t,resizableOpts:i}=t,i=i.minWidth;if(i){e=_xeUtils.default.isFunction(i)?i(e):i;if("auto"!==e)return Math.max(1,_xeUtils.default.toNumber(e))}var n,a,u,s,i=r.elemStore,{showHeaderOverflow:e,minWidth:r}=l,l=_xeUtils.default.isUndefined(e)||_xeUtils.default.isNull(e)?t:e,t="title"===l||(!0===l||"tooltip"===l)||"ellipsis"===l;let d=_xeUtils.default.floor(1.8*(_xeUtils.default.toNumber(getComputedStyle(o).fontSize)||14))+(getPaddingLeftRightSize(o)+getPaddingLeftRightSize((0,_dom.queryElement)(o,".vxe-cell")));if(t&&(e=getElementMarginAndWidth((0,_dom.queryElement)(o,".vxe-cell--drag-handle")),l=getElementMarginAndWidth((0,_dom.queryElement)(o,".vxe-cell--checkbox")),t=getElementMarginAndWidth((0,_dom.queryElement)(o,".vxe-cell--required-icon")),n=getElementMarginAndWidth((0,_dom.queryElement)(o,".vxe-cell--edit-icon")),a=getElementMarginAndWidth((0,_dom.queryElement)(o,".vxe-cell-title-prefix-icon")),u=getElementMarginAndWidth((0,_dom.queryElement)(o,".vxe-cell-title-suffix-icon")),s=getElementMarginAndWidth((0,_dom.queryElement)(o,".vxe-cell--sort")),o=getElementMarginAndWidth((0,_dom.queryElement)(o,".vxe-cell--filter")),d+=e+l+t+n+a+u+o+s),r){e=getRefElem(i["main-body-scroll"]);if(e){if((0,_dom.isScale)(r))return l=(e.clientWidth-1)/100,Math.max(d,Math.floor(_xeUtils.default.toInteger(r)*l));if((0,_dom.isPx)(r))return Math.max(d,_xeUtils.default.toInteger(r))}}return d}function getFirstChildColumn(e){var t=e.children;return t&&t.length?getFirstChildColumn(_xeUtils.default.first(t)):e}function getLastChildColumn(e){var t=e.children;return t&&t.length?getFirstChildColumn(_xeUtils.default.last(t)):e}function getCellValue(e,t){return _xeUtils.default.get(e,t.field)}function setCellValue(e,t,l){return _xeUtils.default.set(e,t.field,l)}function getRefElem(e){return e?e.$el||e:null}function clearTableDefaultStatus(e){var t=e,l=(e.initStatus=!1,[e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearPendingRow()]);return e.clearFilter&&l.push(e.clearFilter()),e.clearSelected&&(t.keyboardConfig||t.mouseConfig)&&l.push(e.clearSelected()),e.clearCellAreas&&t.mouseConfig&&l.push(e.clearCellAreas(),e.clearCopyCellArea()),Promise.all(l).then(()=>e.clearScroll())}function clearTableAllStatus(e){return e.clearFilter&&e.clearFilter(),clearTableDefaultStatus(e)}function isColumnInfo(e){return e instanceof _columnInfo.ColumnInfo}function getColumnList(e){let t=[];return e.forEach(e=>{t.push(...e.children&&e.children.length?getColumnList(e.children):[e])}),t}function createColumn(e,t,l){return isColumnInfo(t)?t:new _columnInfo.ColumnInfo(e,t,l)}function rowToVisible(l,o){var e=l.showOverflow,{scrollYLoad:t,scrollYTop:r}=l,{elemStore:i,afterFullData:n,fullAllDataRowIdData:a,isResizeCellHeight:u}=l,s=l.computeRowOpts,d=l.computeCellOpts,c=l.computeDefaultRowHeight,g=l.computeLeftFixedWidth,m=l.computeRightFixedWidth,i=getRefElem(i["main-body-scroll"]),p=getRowid(l,o);if(i){var f=i.clientHeight,h=i.scrollTop,i=i.querySelector(`[rowid="${p}"]`);if(i){r=i.offsetTop+(t?r:0),i=i.clientHeight;if(r<h||h+f<r)return l.scrollTo(null,r);if(f+h<=r+i)return l.scrollTo(null,h+i)}else if(t){if(!(u||d.height||s.height)&&e)return l.scrollTo(null,(l.findRowIndexOf(n,o)-1)*c);let t=0;r=a[p],i=r.resizeHeight||d.height||s.height||r.height||c;for(let e=0;e<n.length;e++){var x=n[e],R=getRowid(l,x);if(x===o||R===p)break;x=a[R];t+=x.resizeHeight||d.height||s.height||x.height||c}return t<h?l.scrollTo(null,t-g-1):l.scrollTo(null,t+i-(f-m-1))}}return Promise.resolve()}function colToVisible(l,o,t){var{scrollXLoad:r,scrollXLeft:i}=l,{elemStore:n,visibleColumn:a}=l,u=l.computeLeftFixedWidth,s=l.computeRightFixedWidth,n=getRefElem(n["main-body-scroll"]);if(!o.fixed&&n){var d=n.clientWidth,c=n.scrollLeft;let e=null;if(t&&(t=getRowid(l,t),e=n.querySelector(`[rowid="${t}"] .`+o.id)),e=e||n.querySelector("."+o.id)){t=e.offsetLeft+(r?i:0),n=e.clientWidth;if(t<c+u)return l.scrollTo(t-u-1);if(d-s<t+n-c)return l.scrollTo(t+n-(d-s-1))}else if(r){let t=0;i=o.renderWidth;for(let e=0;e<a.length;e++){var g=a[e];if(g===o||g.id===o.id)break;t+=g.renderWidth}return t<c?l.scrollTo(t-u-1):l.scrollTo(t+i-(d-s-1))}}return Promise.resolve()}exports.convertHeaderColumnToRows=convertHeaderColumnToRows;

package/lib/table/style/style.css

@@ -2512,12 +2512,12 @@
 }
 
 /*header*/
-.vxe-table .vxe-table--header-wrapper {
-  color: var(--vxe-ui-table-header-font-color);
-}
 .vxe-table {
   /*排序*/
 }
+.vxe-table .vxe-table--header-wrapper {
+  color: var(--vxe-ui-table-header-font-color);
+}
 .vxe-table .vxe-cell--sort {
   text-align: center;
   position: relative;
@@ -2871,6 +2871,21 @@
   color: var(--vxe-ui-font-color);
   font-family: var(--vxe-ui-font-family);
   direction: ltr;
+  /*边框*/
+  /*边框线*/
+  /*树形节点*/
+  /*行分组*/
+  /*单元格高度*/
+  /*溢出列*/
+  /*展开行*/
+  /*拖拽列*/
+  /*拖拽行把柄*/
+  /*暂无数据*/
+  /*校验不通过*/
+  /*已废弃，旧的校验样式**/
+  /*单元格标记删除状态*/
+  /*单元格编辑状态*/
+  /*可编辑*/
 }
 .vxe-table--render-default .vxe-table--body-wrapper {
   background-color: var(--vxe-ui-layout-background-color);
@@ -3039,9 +3054,6 @@
 .vxe-table--render-default .vxe-body--row.row--hover.row--current > .vxe-body--column {
   background-color: var(--vxe-ui-table-row-hover-current-background-color);
 }
-.vxe-table--render-default {
-  /*边框*/
-}
 .vxe-table--render-default.border--default.sy-pos--right .vxe-table--scroll-y-top-corner, .vxe-table--render-default.border--full.sy-pos--right .vxe-table--scroll-y-top-corner, .vxe-table--render-default.border--outer.sy-pos--right .vxe-table--scroll-y-top-corner, .vxe-table--render-default.border--inner.sy-pos--right .vxe-table--scroll-y-top-corner {
   background-image: linear-gradient(var(--vxe-ui-table-border-color), var(--vxe-ui-table-border-color)), linear-gradient(var(--vxe-ui-table-border-color), var(--vxe-ui-table-border-color));
   background-repeat: no-repeat;
@@ -3406,9 +3418,6 @@
   width: 0;
   float: left;
 }
-.vxe-table--render-default {
-  /*边框线*/
-}
 .vxe-table--render-default .vxe-table--border-line {
   position: absolute;
   top: 0;
@@ -3419,9 +3428,6 @@
   pointer-events: none;
   border: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
 }
-.vxe-table--render-default {
-  /*树形节点*/
-}
 .vxe-table--render-default .vxe-tree--line-wrapper {
   position: relative;
   display: block;
@@ -3468,9 +3474,6 @@
           user-select: none;
   cursor: pointer;
 }
-.vxe-table--render-default {
-  /*行分组*/
-}
 .vxe-table--render-default .vxe-row-group--node-btn:hover {
   color: var(--vxe-ui-font-color);
 }
@@ -3479,9 +3482,6 @@
   color: var(--vxe-ui-font-lighten-color);
   transition: transform 0.1s ease-in-out;
 }
-.vxe-table--render-default {
-  /*单元格高度*/
-}
 .vxe-table--render-default .vxe-body--column.col--ellipsis > .vxe-cell .vxe-row-group-cell,
 .vxe-table--render-default .vxe-body--column.col--ellipsis > .vxe-cell .vxe-tree-cell {
   overflow: hidden;
@@ -3502,9 +3502,6 @@
   flex-direction: row;
   align-items: center;
 }
-.vxe-table--render-default {
-  /*溢出列*/
-}
 .vxe-table--render-default .vxe-header--column:not(.col--active).col--ellipsis > .vxe-cell,
 .vxe-table--render-default .vxe-body--column:not(.col--active).col--ellipsis > .vxe-cell,
 .vxe-table--render-default .vxe-footer--column:not(.col--active).col--ellipsis > .vxe-cell {
@@ -3538,9 +3535,6 @@
   flex-direction: row;
   align-items: center;
 }
-.vxe-table--render-default {
-  /*展开行*/
-}
 .vxe-table--render-default .vxe-table--row-expanded-wrapper {
   position: absolute;
   top: 0;
@@ -3607,18 +3601,12 @@
   overflow: auto;
   outline: 0;
 }
-.vxe-table--render-default {
-  /*拖拽列*/
-}
 .vxe-table--render-default .vxe-table--column.col--drag-move {
   transition: transform 0.5s ease;
 }
 .vxe-table--render-default .vxe-table--column.col--drag-origin > .vxe-cell {
   opacity: 0.3;
 }
-.vxe-table--render-default {
-  /*拖拽行把柄*/
-}
 .vxe-table--render-default .vxe-cell--drag-handle {
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -3682,9 +3670,6 @@
 .vxe-table--render-default.size--mini .vxe-cell--radio {
   font-size: var(--vxe-radio-font-size-mini);
 }
-.vxe-table--render-default {
-  /*暂无数据*/
-}
 .vxe-table--render-default .vxe-table--empty-placeholder,
 .vxe-table--render-default .vxe-table--empty-block {
   color: var(--vxe-ui-input-placeholder-color);
@@ -3725,9 +3710,6 @@
 .vxe-table--render-default .vxe-body--column.col--selected {
   box-shadow: inset 0px 0px 0px 2px var(--vxe-ui-font-primary-color);
 }
-.vxe-table--render-default {
-  /*校验不通过*/
-}
 .vxe-table--render-default .vxe-body--column .vxe-cell--valid-error-tip {
   width: 100%;
   position: absolute;
@@ -3756,11 +3738,14 @@
 }
 .vxe-table--render-default .vxe-body--column .vxe-cell--valid-error-theme-normal {
   color: var(--vxe-ui-table-validate-error-color);
-  background-color: var(--vxe-ui-table-validate-error-background-color);
+  background-color: var(--vxe-ui-table-validate-error-theme-normal-background-color);
 }
 .vxe-table--render-default .vxe-body--column.col--active, .vxe-table--render-default .vxe-body--column.col--selected {
   position: relative;
 }
+.vxe-table--render-default .vxe-body--column.col--valid-error.show--valid-bg {
+  background-color: var(--vxe-ui-table-validate-error-cell-background-color);
+}
 .vxe-table--render-default .vxe-body--column.col--valid-error .vxe-default-input,
 .vxe-table--render-default .vxe-body--column.col--valid-error .vxe-default-textarea,
 .vxe-table--render-default .vxe-body--column.col--valid-error .vxe-default-select {
@@ -3781,9 +3766,6 @@
 .vxe-table--render-default.valid-msg--full .vxe-body--row:last-child .vxe-cell--valid-error-tip {
   top: calc(100% - 1.3em);
 }
-.vxe-table--render-default {
-  /*已废弃，旧的校验样式**/
-}
 .vxe-table--render-default.old-cell-valid .vxe-body--column.col--valid-error .vxe-cell--valid-error-tip {
   width: 320px;
   position: absolute;
@@ -3811,9 +3793,6 @@
   transform: translateX(0);
   text-align: left;
 }
-.vxe-table--render-default {
-  /*单元格标记删除状态*/
-}
 .vxe-table--render-default .vxe-body--row.row--pending {
   color: var(--vxe-ui-table-validate-error-color);
   text-decoration: line-through;
@@ -3832,9 +3811,6 @@
   border-bottom: 1px solid var(--vxe-ui-table-validate-error-color);
   z-index: 1;
 }
-.vxe-table--render-default {
-  /*单元格编辑状态*/
-}
 .vxe-table--render-default .vxe-body--row.row--new > .vxe-body--column {
   position: relative;
 }
@@ -3861,9 +3837,6 @@
   border-color: transparent var(--vxe-ui-table-cell-dirty-update-color) transparent transparent;
   transform: rotate(45deg);
 }
-.vxe-table--render-default {
-  /*可编辑*/
-}
 .vxe-table--render-default.vxe-editable.cell--highlight .vxe-body--column.col--active {
   box-shadow: inset 0px 0px 0px 2px var(--vxe-ui-font-primary-color);
 }
@@ -3887,7 +3860,7 @@
 div.vxe-table--tooltip-wrapper.vxe-table--valid-error {
   padding: 0;
   color: var(--vxe-ui-table-validate-error-color);
-  background-color: var(--vxe-ui-table-validate-error-background-color);
+  background-color: var(--vxe-ui-table-validate-error-theme-normal-background-color);
 }
 div.vxe-table--tooltip-wrapper.vxe-table--valid-error.old-cell-valid {
   padding: 8px 12px;