vxe-table 3.7.0-beta.8 → 3.7.0

package/packages/table/src/table.js

@@ -304,14 +304,14 @@ export default {
       isAllSelected: false,
       // 复选框属性，有选中且非全选状态
       isIndeterminate: false,
-      // 复选框属性，已选中的行
-      selectCheckboxRows: [],
+      // 复选框属性，已选中的行集合
+      selectCheckboxMaps: {},
       // 当前行
       currentRow: null,
       // 单选框属性，选中列
       currentColumn: null,
       // 单选框属性，选中行
-      selectRow: null,
+      selectRadioRow: null,
       // 表尾合计数据
       footerTableData: [],
       // 展开列信息
@@ -319,16 +319,16 @@ export default {
       hasFixedColumn: false,
       // 树节点列信息
       treeNodeColumn: null,
-      // 已展开的行
-      rowExpandeds: [],
-      // 懒加载中的展开行的列表
-      expandLazyLoadeds: [],
-      // 已展开树节点
-      treeExpandeds: [],
-      // 懒加载中的树节点的列表
-      treeLazyLoadeds: [],
-      // 树节点不确定状态的列表
-      treeIndeterminates: [],
+      // 已展开的行集合
+      rowExpandedMaps: {},
+      // 懒加载中的展开行的集合
+      rowExpandLazyLoadedMaps: {},
+      // 已展开树节点集合
+      treeExpandedMaps: {},
+      // 懒加载中的树节点的集合
+      treeExpandLazyLoadedMaps: {},
+      // 树节点不确定状态的集合
+      treeIndeterminateMaps: {},
       // 合并单元格的对象集
       mergeList: [],
       // 合并表尾数据的对象集
@@ -743,6 +743,8 @@ export default {
       // 完整数据、条件处理后
       tableFullData: [],
       afterFullData: [],
+      // 列表条件处理后数据集合
+      afterFullRowMaps: {},
       // 收集的列配置（带分组）
       collectColumn: [],
       // 完整所有列（不带分组）
@@ -775,7 +777,7 @@ export default {
       if (this.editConfig && editOpts.showStatus && !this.keepSource) {
         warnLog('vxe.error.reqProp', ['keep-source'])
       }
-      if (treeConfig && treeOpts.line && (!(this.rowKey || rowOpts.useKey) || !showOverflow)) {
+      if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(this.rowKey || rowOpts.useKey) || !showOverflow)) {
         warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow'])
       }
       if (this.showFooter && !this.footerMethod) {
@@ -801,11 +803,11 @@ export default {
       // }
       // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
       const { exportConfig, exportOpts, importConfig, importOpts } = this
-      if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(VXETable.config.importTypes, importOpts.types)) {
-        warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => XEUtils.includes(VXETable.config.importTypes, type)).join(',') || VXETable.config.importTypes.join(',')])
+      if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(VXETable.globalConfs.importTypes, importOpts.types)) {
+        warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => XEUtils.includes(VXETable.globalConfs.importTypes, type)).join(',') || VXETable.globalConfs.importTypes.join(',')])
       }
-      if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(VXETable.config.exportTypes, exportOpts.types)) {
-        warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => XEUtils.includes(VXETable.config.exportTypes, type)).join(',') || VXETable.config.exportTypes.join(',')])
+      if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(VXETable.globalConfs.exportTypes, exportOpts.types)) {
+        warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => XEUtils.includes(VXETable.globalConfs.exportTypes, type)).join(',') || VXETable.globalConfs.exportTypes.join(',')])
       }
     }
 
@@ -832,6 +834,12 @@ export default {
           return
         }
       }
+      if (this.treeConfig && treeOpts.children) {
+        warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField'])
+      }
+      if (this.treeConfig && treeOpts.line) {
+        warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine'])
+      }
       if (this.mouseOpts.area && this.mouseOpts.selected) {
         warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected'])
       }
@@ -876,9 +884,15 @@ export default {
       if (this.emptyRender && !XEUtils.isObject(this.emptyRender)) {
         warnLog('vxe.error.errProp', [`table.empty-render=${this.emptyRender}`, 'table.empty-render={}'])
       }
-      // if (this.editConfig && this.editConfig.activeMethod) {
-      //   warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod'])
-      // }
+      if (this.editConfig && this.editOpts.activeMethod) {
+        warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod'])
+      }
+      if (this.treeConfig && this.checkboxOpts.isShiftKey) {
+        errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey'])
+      }
+      if (this.checkboxOpts.halfField) {
+        warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField'])
+      }
     }
 
     // 检查是否有安装需要的模块
@@ -1033,7 +1047,7 @@ export default {
         'is--header': showHeader,
         'is--footer': showFooter,
         'is--group': isGroup,
-        'is--tree-line': treeConfig && treeOpts.line,
+        'is--tree-line': treeConfig && (treeOpts.showLine || treeOpts.line),
         'is--fixed-left': leftList.length,
         'is--fixed-right': rightList.length,
         'is--animat': !!this.animat,

package/packages/table/src/util.js

@@ -157,8 +157,10 @@ function countTreeExpand (prevRow, params) {
     return count
   }
   const { $table } = params
-  const rowChildren = prevRow[$table.treeOpts.children]
-  if ($table.isTreeExpandByRow(prevRow)) {
+  const { treeOpts } = $table
+  const childrenField = treeOpts.children || treeOpts.childrenField
+  const rowChildren = prevRow[childrenField]
+  if (rowChildren && $table.isTreeExpandByRow(prevRow)) {
     for (let index = 0; index < rowChildren.length; index++) {
       count += countTreeExpand(rowChildren[index], params)
     }

package/packages/toolbar/src/toolbar.js

@@ -352,7 +352,7 @@ export default {
     }
   },
   created () {
-    const { refresh, refreshOpts } = this
+    const { refresh, refreshOpts, customOpts } = this
     this.$nextTick(() => {
       const $xetable = this.fintTable()
       const queryMethod = refreshOpts.queryMethod || refreshOpts.query
@@ -363,6 +363,9 @@ export default {
         $xetable.connect(this)
       }
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (customOpts.isFooter) {
+          warnLog('vxe.error.notValidators', ['custom.isFooter', 'custom.showFooter'])
+        }
         if (this.buttons) {
           this.buttons.forEach(item => {
             const { buttonRender } = item

package/packages/tools/utils.js

@@ -1,10 +1,8 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../v-x-e-table/src/conf'
+import DomZIndex from 'dom-zindex'
 import { warnLog, errLog } from '../tools/log'
 
-let zindexIndex = 0
-let lastZindex = 1
-
 export function isEnableConf (conf) {
   return conf && conf.enabled !== false
 }
@@ -31,11 +29,10 @@ export function getColumnList (columns) {
 
 export const UtilTools = {
   nextZIndex () {
-    lastZindex = GlobalConfig.zIndex + zindexIndex++
-    return lastZindex
+    return DomZIndex.getNext()
   },
   getLastZIndex () {
-    return lastZindex
+    return DomZIndex.getCurrent()
   },
   getColumnList,
   getClass (property, params) {

package/packages/v-x-e-table/index.js

@@ -6,7 +6,7 @@ import { commands } from './src/commands'
 import { menus } from './src/menus'
 import { formats } from './src/formats'
 import { validators } from './src/validators'
-import { setup } from './src/setup'
+import { config } from './src/config'
 import { UtilTools } from '../tools/utils'
 import { errLog } from '../tools/log'
 
@@ -76,7 +76,9 @@ class VXETableConfig {
     return getExportOrImpotType(GlobalConfig.export.types, 2)
   }
 }
-export const config = new VXETableConfig()
+
+// 已废弃
+export const globalConfs = new VXETableConfig()
 
 export function t (key, args) {
   return GlobalConfig.i18n(key, args)
@@ -87,6 +89,7 @@ export function _t (key, args) {
 }
 
 export const v = 'v3'
+export const setup = config
 
 export const VXETable = {
   v,
@@ -94,13 +97,13 @@ export const VXETable = {
   reg,
   use,
   setup,
+  config,
   interceptor,
   renderer,
   commands,
   formats,
   menus,
   validators,
-  config,
   t,
   _t
 }
@@ -110,6 +113,6 @@ export * from './src/renderer'
 export * from './src/commands'
 export * from './src/menus'
 export * from './src/formats'
-export * from './src/setup'
+export * from './src/config'
 
 export default VXETable

package/packages/v-x-e-table/src/commands.js

@@ -21,7 +21,9 @@ class VXECommandsStore {
     const conf = this.store[name]
     // 兼容
     if (XEUtils.isFunction(render)) {
-      // warnLog('vxe.error.delProp', ['callback', 'commandMethod'])
+      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      //   warnLog('vxe.error.delProp', ['commands -> callback', 'commandMethod'])
+      // }
       render = {
         commandMethod: render
       }

package/packages/v-x-e-table/src/conf.js

@@ -76,9 +76,9 @@ export default {
     treeConfig: {
       rowField: 'id',
       parentField: 'parentId',
-      children: 'children',
-      hasChild: 'hasChild',
-      mapChildren: '_X_ROW_CHILD',
+      childrenField: 'children',
+      hasChildField: 'hasChild',
+      mapChildrenField: '_X_ROW_CHILD',
       indent: 20,
       showIcon: true
     },
@@ -119,12 +119,12 @@ export default {
       isReplace: true
     },
     scrollX: {
-      enabled: true,
+      // enabled: false,
       gt: 60
       // oSize: 0
     },
     scrollY: {
-      enabled: true,
+      // enabled: false,
       gt: 100
       // oSize: 0
     }

package/packages/v-x-e-table/src/{setup.js → config.js}

@@ -1,9 +1,9 @@
-import GlobalConfig from '../../v-x-e-table/src/conf'
+import GlobalConfig from './conf'
 import XEUtils from 'xe-utils'
 
 /**
  * 全局参数设置
  */
-export function setup (options) {
+export function config (options) {
   return XEUtils.merge(GlobalConfig, options)
 }

package/packages/v-x-e-table/src/formats.js

@@ -21,9 +21,11 @@ class VXEFormatsStore {
     const conf = this.store[name]
     // 兼容
     if (XEUtils.isFunction(render)) {
-      // warnLog('vxe.error.delProp', ['callback', 'formatMethod'])
+      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      //   warnLog('vxe.error.delProp', ['formats -> callback', 'cellFormatMethod'])
+      // }
       render = {
-        formatMethod: render
+        cellFormatMethod: render
       }
     }
 

package/packages/v-x-e-table/src/menus.js

@@ -21,7 +21,9 @@ class VXEMenusStore {
     const conf = this.store[name]
     // 兼容
     if (XEUtils.isFunction(render)) {
-      // warnLog('vxe.error.delProp', ['callback', 'menuMethod'])
+      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      //   warnLog('vxe.error.delProp', ['menus -> callback', 'menuMethod'])
+      // }
       render = {
         menuMethod: render
       }

package/packages/v-x-e-table/src/renderer.js

@@ -104,8 +104,8 @@ function getNativeOns (renderOpts, params) {
   XEUtils.objectEach(nativeEvents, (func, key) => {
     nativeOns[key] = function (...args) {
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        if (!XEUtils.isFunction(key)) {
-          errLog('vxe.error.errFunc', [key])
+        if (!XEUtils.isFunction(func)) {
+          errLog('vxe.error.errFunc', [func])
         }
       }
       func(params, ...args)
@@ -123,8 +123,8 @@ function getOns (renderOpts, params, inputFunc, changeFunc) {
   XEUtils.objectEach(events, (func, key) => {
     ons[key] = function (...args) {
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        if (!XEUtils.isFunction(key)) {
-          errLog('vxe.error.errFunc', [key])
+        if (!XEUtils.isFunction(func)) {
+          errLog('vxe.error.errFunc', [func])
         }
       }
       func(params, ...args)

package/packages/validator/src/mixin.js

@@ -65,12 +65,22 @@ export default {
      * 完整校验，和 validate 的区别就是会给有效数据中的每一行进行校验
      */
     _fullValidate (rows, cb) {
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (XEUtils.isFunction(cb)) {
+          warnLog('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)'])
+        }
+      }
       return this.beginValidate(rows, cb, true)
     },
     /**
      * 快速校验，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
      */
     _validate (rows, cb) {
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (XEUtils.isFunction(cb)) {
+          warnLog('vxe.error.notValidators', ['validate(rows, callback)', 'validate(rows)'])
+        }
+      }
       return this.beginValidate(rows, cb)
     },
     /**
@@ -102,6 +112,7 @@ export default {
     beginValidate (rows, cb, isFull) {
       const validRest = {}
       const { editRules, afterFullData, treeConfig, treeOpts } = this
+      const childrenField = treeOpts.children || treeOpts.childrenField
       let vaildDatas
       if (rows === true) {
         vaildDatas = afterFullData
@@ -155,7 +166,7 @@ export default {
           }
         }
         if (treeConfig) {
-          XEUtils.eachTree(vaildDatas, handleVaild, treeOpts)
+          XEUtils.eachTree(vaildDatas, handleVaild, { children: childrenField })
         } else {
           vaildDatas.forEach(handleVaild)
         }

package/styles/button.scss

@@ -334,12 +334,14 @@ $btnThemeList: (
   border-radius: $vxe-border-radius;
   border: 1px solid $vxe-input-border-color;
   box-shadow: 0 1px 6px rgba(0,0,0,.2);
-  & > .vxe-button {
-    margin-left: 0;
-    margin-top: 0.4em;
+  & > .vxe-button.type--text,
+  & > .vxe-button.type--button {
     display: block;
     width: 100%;
     border: 0;
+    margin: 0.4em 0 0 0;
+  }
+  & > .vxe-button {
     &.type--text {
       padding: 2px 8px;
     }

package/styles/css-variable.scss

@@ -233,13 +233,13 @@
   --vxe-input-height-medium: #{$vxe-input-height-medium};
   --vxe-input-height-small: #{$vxe-input-height-small};
   --vxe-input-height-mini: #{$vxe-input-height-mini};
+  --vxe-input-count-color: #{$vxe-input-count-color};
+  --vxe-input-count-background-color: #{$vxe-input-count-background-color};
+  --vxe-input-count-error-color: #{$vxe-input-count-error-color};
 
   /*textarea*/
   --vxe-textarea-line-height: #{$vxe-textarea-line-height};
   --vxe-textarea-background-color: #{$vxe-textarea-background-color};
-  --vxe-textarea-count-color: #{$vxe-textarea-count-color};
-  --vxe-textarea-count-background-color: #{$vxe-textarea-count-background-color};
-  --vxe-textarea-count-error-color: #{$vxe-textarea-count-error-color};
 
   /*form*/
   --vxe-form-item-min-height-default: #{$vxe-form-item-min-height-default};

package/styles/form.scss

@@ -138,6 +138,20 @@
       }
     }
   }
+  &.is--vertical {
+    .vxe-form--item-inner {
+      flex-direction: column;
+      align-items: initial;
+      .vxe-form--item-title {
+        height: 2em;
+        line-height: 2em;
+        padding-right: 0;
+      }
+      .vxe-form--item-title-content {
+        flex-grow: initial;
+      }
+    }
+  }
   &.is--span {
     .vxe-default-input:not([type="submit"]):not([type="reset"]),
     .vxe-default-textarea,

package/styles/input.scss

@@ -81,6 +81,18 @@ $iconWidth: 1.6em;
   }
 }
 
+.vxe-input--count {
+  position: absolute;
+  top: 1px;
+  right: 0.5em;
+  height: calc(100% - 2px);
+  color: var($vxe-input-count-color);
+  background-color: var($vxe-input-count-background-color);
+  &.is--error {
+    color: var($vxe-input-count-error-color);
+  }
+}
+
 // 前缀图标
 .vxe-input {
   .vxe-input--prefix {
@@ -106,6 +118,14 @@ $iconWidth: 1.6em;
     .vxe-input--inner {
       padding-right: $iconWidth + 0.2em;
     }
+    &.is--count {
+      .vxe-input--inner {
+        padding-right: 5em;
+      }
+    }
+    .vxe-input--count {
+      right: $iconWidth + 0.5em;
+    }
   }
   &.is--left {
     .vxe-input--inner {
@@ -122,6 +142,11 @@ $iconWidth: 1.6em;
       text-align: right;
     }
   }
+  &.is--count {
+    .vxe-input--inner {
+      padding-right: 3.4em;
+    }
+  }
   &.is--controls {
     &.type--search,
     &.type--password,

package/styles/table.scss

@@ -454,10 +454,14 @@
   font-family: $vxe-font-family;
   direction: ltr;
   .vxe-table--body-wrapper {
-    background-color: $vxe-table-body-background-color;
+    table {
+      background-color: $vxe-table-body-background-color;
+    }
   }
   .vxe-table--footer-wrapper {
-    background-color: $vxe-table-footer-background-color;
+    table {
+      background-color: $vxe-table-footer-background-color;
+    }
   }
   .vxe-table--header,
   .vxe-table--body,
@@ -1300,6 +1304,13 @@
   }
 }
 
+.vxe-table--tooltip-wrapper {
+  &.vxe-table--valid-error {
+    background-color: #f56c6c;
+    color: #fff;
+  }
+}
+
 /*footer*/
 .vxe-table--footer-wrapper {
   color: $vxe-table-footer-font-color;

package/styles/textarea.scss

@@ -60,10 +60,10 @@
   bottom: 0.2em;
   right: 1.4em;
   padding-left: 0.2em;
-  color: $vxe-textarea-count-color;
-  background-color: $vxe-textarea-count-background-color;
+  color: $vxe-input-count-color;
+  background-color: $vxe-input-count-background-color;
   &.is--error {
-    color: $vxe-textarea-count-error-color;
+    color: $vxe-input-count-error-color;
   }
 }
 

package/styles/tooltip.scss

@@ -125,11 +125,3 @@
     }
   }
 }
-
-/*valid error*/
-.vxe-table--tooltip-wrapper {
-  &.vxe-table--valid-error {
-    background-color: #f56c6c;
-    color: #fff;
-  }
-}

package/styles/variable.scss

@@ -230,13 +230,13 @@ $vxe-input-height-default: $vxe-button-height-default !default;
 $vxe-input-height-medium: $vxe-button-height-medium !default;
 $vxe-input-height-small: $vxe-button-height-small !default;
 $vxe-input-height-mini: $vxe-button-height-mini !default;
+$vxe-input-count-color: #999 !default;
+$vxe-input-count-background-color: #fff !default;
+$vxe-input-count-error-color: $vxe-table-validate-error-color !default;
 
 /*textarea*/
 $vxe-textarea-line-height: 1.5715 !default;
 $vxe-textarea-background-color: #fff !default;
-$vxe-textarea-count-color: #999 !default;
-$vxe-textarea-count-background-color: #fff !default;
-$vxe-textarea-count-error-color: $vxe-table-validate-error-color !default;
 
 /*form*/
 $vxe-form-item-min-height-default: 36px !default;

package/types/all.d.ts

@@ -1,9 +1,9 @@
 import Vue from 'vue'
 
 import { ModalController } from './modal'
-import { VXETableSetupOptions, VXETableCore, VxeGlobalTranslate, VxeGlobalI18n } from './v-x-e-table'
+import { VXETableConfigOptions, VXETableCore, VxeGlobalTranslate, VxeGlobalI18n } from './v-x-e-table'
 
-export function install(app: typeof Vue, options?: VXETableSetupOptions): void;
+export function install(app: typeof Vue, options?: VXETableConfigOptions): void;
 
 export interface VXETableClipboard {
   text: string;

package/types/form-item.d.ts

@@ -40,6 +40,7 @@ export class FormItem extends VXETableComponent {
    * 后缀配置项
    */
   titleSuffix?: FormItemTitleOptions;
+  vertical?: boolean
   showTitle?: boolean
   /**
    * 重置时的默认值

package/types/form.d.ts

@@ -14,6 +14,7 @@ export declare class Form extends VXETableComponent {
   titleAlign?: 'left' | 'center' | 'right';
   titleWidth?: string | number;
   titleColon?: boolean;
+  vertical?: boolean
   items?: FormItemOptions[];
   rules?: FormVaildRules;
   preventSubmit?: boolean;