vxe-table 3.19.39 → 3.20.0-beta.1

package/packages/table/src/util.ts

@@ -142,6 +142,260 @@ export function createInternalData (): TableInternalData {
   }
 }
 
+export function createReactData (): TableReactData {
+  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: any, parentColumn?: any) => {
   const result: any[] = []
   columns.forEach((column: any) => {

package/packages/ui/index.ts

@@ -76,7 +76,7 @@ VxeUI.setConfig({
       enterable: true
     },
     validConfig: {
-      showMessage: true,
+      showErrorMessage: true,
       autoClear: true,
       autoPos: true,
       message: 'inline',

package/packages/ui/src/dom.ts

@@ -212,3 +212,25 @@ export function triggerEvent (targetElem: Element, type: string) {
 export function isNodeElement (elem: any): elem is HTMLElement {
   return elem && elem.nodeType === 1
 }
+
+export function scrollTopTo (diffNum: number, cb: (progress: number) => void) {
+  const duration = Math.abs(diffNum)
+  const startTime = performance.now()
+  let countTop = 0
+  const step = (timestamp: number) => {
+    let progress = (timestamp - startTime) / duration
+    if (progress < 0) {
+      progress = 0
+    } else if (progress > 1) {
+      progress = 1
+    }
+    const easedProgress = Math.pow(progress, 2)
+    const offsetTop = Math.floor((diffNum * easedProgress)) - countTop
+    countTop += offsetTop
+    cb(offsetTop)
+    if (progress < 1) {
+      requestAnimationFrame(step)
+    }
+  }
+  requestAnimationFrame(step)
+}

package/styles/components/table.scss

@@ -2454,13 +2454,16 @@ $btnThemeList: (
     }
     .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);
     }
     &.col--active,
     &.col--selected {
       position: relative;
     }
     &.col--valid-error {
+      &.show--valid-bg {
+        background-color: var(--vxe-ui-table-validate-error-cell-background-color);
+      }
       .vxe-default-input,
       .vxe-default-textarea,
       .vxe-default-select {
@@ -2651,7 +2654,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);
     &.old-cell-valid {
       padding: 8px 12px;
       background-color: #f56c6c;

package/styles/theme/base.scss

@@ -80,7 +80,8 @@
   --vxe-ui-table-menu-background-color: #fff;
 
   --vxe-ui-table-validate-error-color: #f56c6c;
-  --vxe-ui-table-validate-error-background-color: var(--vxe-ui-layout-background-color);
+  --vxe-ui-table-validate-error-cell-background-color: rgba(245, 108,108, 0.1);
+  --vxe-ui-table-validate-error-theme-normal-background-color: var(--vxe-ui-layout-background-color);
 
   /*toolbar*/
   --vxe-ui-toolbar-custom-active-background-color: #D9DADB;