vxe-table 3.8.7-beta.2 → 3.8.7-beta.4

package/packages/validator/src/mixin.js

@@ -128,20 +128,20 @@ export default {
       const validRest = {}
       const { editRules, afterFullData, visibleColumn, treeConfig, treeOpts } = this
       const childrenField = treeOpts.children || treeOpts.childrenField
-      let vaildDatas
+      let validDatas
       if (rows === true) {
-        vaildDatas = afterFullData
+        validDatas = afterFullData
       } else if (rows) {
         if (XEUtils.isFunction(rows)) {
           cb = rows
         } else {
-          vaildDatas = XEUtils.isArray(rows) ? rows : [rows]
+          validDatas = XEUtils.isArray(rows) ? rows : [rows]
         }
       }
-      if (!vaildDatas) {
-        vaildDatas = this.getInsertRecords().concat(this.getUpdateRecords())
+      if (!validDatas) {
+        validDatas = this.getInsertRecords().concat(this.getUpdateRecords())
       }
-      const rowValids = []
+      const rowValidErrs = []
       this.lastCallTime = Date.now()
       this.validRuleErr = false // 如果为快速校验，当存在某列校验不通过时将终止执行
       this.clearValidate()
@@ -184,15 +184,15 @@ export default {
                 )
               }
             })
-            rowValids.push(Promise.all(colVailds))
+            rowValidErrs.push(Promise.all(colVailds))
           }
         }
         if (treeConfig) {
-          XEUtils.eachTree(vaildDatas, handleVaild, { children: childrenField })
+          XEUtils.eachTree(validDatas, handleVaild, { children: childrenField })
         } else {
-          vaildDatas.forEach(handleVaild)
+          validDatas.forEach(handleVaild)
         }
-        return Promise.all(rowValids).then(() => {
+        return Promise.all(rowValidErrs).then(() => {
           const ruleProps = Object.keys(validRest)
           this.validErrorMaps = this.handleErrMsgMode(validErrMaps)
           return this.$nextTick().then(() => {
@@ -237,9 +237,9 @@ export default {
               const column = firstErrParams.column
               const rowIndex = afterFullData.indexOf(row)
               const columnIndex = visibleColumn.indexOf(column)
-              const locatRow = rowIndex > 0 ? afterFullData[rowIndex - 1] : row
-              const locatColumn = columnIndex > 0 ? visibleColumn[rowIndex - 1] : column
-              this.scrollToRow(locatRow, locatColumn).then(posAndFinish)
+              const targetRow = rowIndex > 0 ? afterFullData[rowIndex - 1] : row
+              const targetColumn = columnIndex > 0 ? visibleColumn[columnIndex - 1] : column
+              this.scrollToRow(targetRow, targetColumn).then(posAndFinish)
             }
           })
         })
@@ -377,9 +377,9 @@ export default {
         validErrMaps = Object.assign({}, validErrorMaps)
         rowList.forEach(row => {
           colList.forEach((column) => {
-            const vaildKey = `${getRowid(this, row)}:${column.id}`
-            if (validErrMaps[vaildKey]) {
-              delete validErrMaps[vaildKey]
+            const validKey = `${getRowid(this, row)}:${column.id}`
+            if (validErrMaps[validKey]) {
+              delete validErrMaps[validKey]
             }
           })
         })

package/styles/form.scss

@@ -13,6 +13,20 @@
   text-align: left;
 }
 
+.vxe-form--item-row {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  $spans: 4.16667%, 8.33333%, 12.5%, 16.66667%, 20.83333%, 25%, 29.16667%, 33.33333%,
+          37.5%, 41.66667%, 45.83333%, 50%, 54.16667%, 58.33333%, 62.5%, 66.66667%,
+          70.83333%, 75%, 79.16667%, 83.33333%, 87.5%, 91.66667%, 95.83333%, 100%;
+  @for $index from 0 to length($spans) {
+    & > .vxe-form--item-col_#{$index + 1} {
+      width: nth($spans, $index + 1);
+    }
+  }
+}
+
 .vxe-form-slots {
   display: none;
 }
@@ -106,6 +120,9 @@
   .vxe-form--item {
     display: none;
     padding: 0.5em 0.8em 0.5em 0;
+    &.is--vertical {
+      padding: 0.25em 0 0.25em 0;
+    }
     &.is--active {
       &:not(.is--hidden) {
         display: inline-flex;
@@ -217,6 +234,7 @@
     padding: 0 0.8em;
   }
   .vxe-default-textarea {
+    height: calc($vxe-button-height-default * 2);
     padding: 0.3em 0.6em;
   }
   .vxe-default-input[type="number"] {
@@ -302,10 +320,12 @@
       line-height: $vxe-button-height-medium - 2px;
     }
     .vxe-default-input,
-    .vxe-default-input,
     .vxe-default-select {
       height: $vxe-button-height-medium;
     }
+    .vxe-default-textarea {
+      height: calc($vxe-button-height-medium * 2);
+    }
   }
   &.size--small {
     font-size: $vxe-font-size-small;
@@ -317,10 +337,12 @@
       line-height: $vxe-button-height-small - 2px;
     }
     .vxe-default-input,
-    .vxe-default-input,
     .vxe-default-select {
       height: $vxe-button-height-small;
     }
+    .vxe-default-textarea {
+      height: calc($vxe-button-height-small * 2);
+    }
   }
   &.size--mini {
     font-size: $vxe-font-size-mini;
@@ -332,9 +354,11 @@
       line-height: $vxe-button-height-mini - 2px;
     }
     .vxe-default-input,
-    .vxe-default-input,
     .vxe-default-select {
       height: $vxe-button-height-mini;
     }
+    .vxe-default-textarea {
+      height: calc($vxe-button-height-mini * 2);
+    }
   }
 }

package/styles/icon.scss

@@ -697,7 +697,7 @@ $btnThemeList: (
   content: "\e785";
 }
 
-.vxe-icon-warnion-circle-fill:before {
+.vxe-icon-warning-circle-fill:before {
   content: "\e848";
 }
 

package/styles/old-icon.scss

@@ -711,3 +711,8 @@
     transform: rotate(45deg);
   }
 }
+
+// 已废弃
+.vxe-icon-warnion-circle-fill:before {
+  content: "\e848";
+}

package/styles/switch.scss

@@ -23,6 +23,7 @@
     .vxe-switch--icon {
       left: 100%;
       transform: translateX(-1.4em);
+      color: $vxe-primary-color;
     }
   }
   &.is--off {
@@ -33,6 +34,7 @@
     .vxe-switch--icon {
       left: 0.2em;
       transform: translateX(0);
+      color: $vxe-switch-close-background-color;
     }
   }
   &.is--on .vxe-switch--label-off,
@@ -63,11 +65,17 @@
       .vxe-switch--button {
         background-color: $vxe-primary-lighten-color;
       }
+      .vxe-switch--icon {
+        color: $vxe-primary-lighten-color;
+      }
     }
     &.is--off {
       .vxe-switch--button {
         background-color: $vxe-switch-disabled-background-color;
       }
+      .vxe-switch--icon {
+        color: $vxe-switch-disabled-background-color;
+      }
     }
   }
   .vxe-switch--button {
@@ -93,6 +101,8 @@
     left: 0;
     width: 1.2em;
     height: 1.2em;
+    line-height: 1.4em;
+    text-align: center;
     border-radius: 50%;
     background-color: $vxe-switch-icon-background-color;
   }

package/types/form-item.d.ts

@@ -1,5 +1,5 @@
 import { VXETableComponent } from './component'
-import { Form } from './form'
+import { Form, FormRule } from './form'
 import { RenderParams, RenderOptions, OptionProps, OptionGroupProps } from './v-x-e-table'
 
 /* eslint-disable no-use-before-define */
@@ -119,6 +119,7 @@ export interface FormItemOptions {
    * 项渲染配置项
    */
   itemRender?: FormItemRenderOptions;
+  rules: FormRule[]
 }
 
 export interface FormItemTitleOptions {

package/types/v-x-e-table/index.d.ts

@@ -1,3 +1,4 @@
+import { SizeType } from '../component'
 import { ModalController } from '../modal'
 import { SaveFileFunction, ReadFileFunction, PrintFunction } from '../module/export'
 
@@ -7,10 +8,65 @@ import { VxeGlobalCommands } from './commands'
 import { VxeGlobalFormats } from './formats'
 import { VxeGlobalMenus } from './menus'
 import { VxeGlobalValidators } from './validators'
-import { VxeGlobalConfigMethod } from './config'
 
 /* eslint-disable no-use-before-define */
 
+interface DefaultOptions {
+  size?: SizeType;
+  [key: string]: any;
+}
+
+export interface VXETableConfigOptions {
+  /**
+   * 扩展插件授权码
+   */
+  authId?: string
+  size?: SizeType;
+  zIndex?: number;
+  version?: number;
+  emptyCell?: string;
+  icon?: VxeGlobalIcon;
+  table?: any;
+  grid?: any;
+  export?: {
+    types?: {
+      [key: string]: 0 | 1 | 2;
+    }
+    [key: string]: any;
+  };
+  tooltip?: DefaultOptions;
+  pager?: any;
+  form?: DefaultOptions;
+  input?: DefaultOptions;
+  textarea?: DefaultOptions;
+  select?: DefaultOptions;
+  toolbar?: any;
+  button?: DefaultOptions;
+  radio?: DefaultOptions;
+  checkbox?: DefaultOptions;
+  switch?: DefaultOptions;
+  modal?: DefaultOptions;
+  list?: DefaultOptions;
+  translate?(key: string, args?: any): string;
+  i18n?(key: string, args?: any): string;
+  [key: string]: any;
+}
+
+export interface VxeGlobalIcon {
+  [ket: string]: string
+}
+
+export type VxeGlobalConfigMethod = (options?: VXETableConfigOptions) => VxeGlobalStore
+
+/**
+ * @deprecated
+ */
+export type VXETableSetupOptions = (options?: VXETableConfigOptions) => Required<VXETableConfigOptions>
+/**
+ * @deprecated
+ */
+export type VxeGlobalSetup = (options?: VXETableConfigOptions) => Required<VXETableConfigOptions>;
+
 export type VxeGlobalI18n = (key: string, args?: any) => number | string;
 export type VxeGlobalTranslate = (key: string, args?: any) => string;
 export type VxeGlobalUse = (plugin: VXETablePluginObject, ...options: any[]) => VXETableCore;
@@ -24,8 +80,12 @@ export interface VxeGlobalStore {
 }
 export const globalStore: VxeGlobalStore
 
-export const config: VxeGlobalConfigMethod
 export const setConfig: VxeGlobalConfigMethod
+/**
+ * 请使用 setConfig
+ * @deprecated
+ */
+export const config: VXETableSetupOptions
 export const interceptor: VxeGlobalInterceptor
 export const renderer: VxeGlobalRenderer
 export const commands: VxeGlobalCommands
@@ -40,10 +100,12 @@ export const _t: VxeGlobalTranslate
 export const use: VxeGlobalUse
 
 /**
- * 请使用 config
+ * 请使用 setConfig
  * @deprecated
  */
-export const setup: VxeGlobalConfigMethod
+export const setup: VXETableSetupOptions
+
+export function setIcon(options?: VxeGlobalIcon): VXETableCore
 
 export interface VXETablePluginObject {
   install(vxetable: VXETableCore, ...options: any[]): void;
@@ -63,6 +125,7 @@ export interface VXETableCore {
    * 设置全局参数/获取所有参数
    */
   setConfig: VxeGlobalConfigMethod;
+  setIcon: typeof setIcon
   /**
    * 读取内部数据
    */
@@ -119,17 +182,21 @@ export interface VXETableCore {
   t: VxeGlobalI18n;
   _t: VxeGlobalTranslate;
 
-  config: VxeGlobalConfigMethod;
+  /**
+   * 请使用 setConfig
+   * @deprecated
+   */
+  config: VXETableSetupOptions;
   /**
    * 已被 version 替换
    * @deprecated
    */
   v: VXETableVersion;
   /**
-   * 请使用 config
+   * 请使用 setConfig
    * @deprecated
    */
-  setup: VxeGlobalConfigMethod;
+  setup: VXETableSetupOptions;
 }
 
 /**
@@ -143,6 +210,5 @@ export * from './commands'
 export * from './formats'
 export * from './menus'
 export * from './validators'
-export * from './config'
 
 export default VXETable

package/types/v-x-e-table/renderer.d.ts

@@ -78,6 +78,12 @@ export interface RendererMapOptions {
   itemResetMethod?(params: FormItemResetParams): void;
 
   // 空内容渲染
+  renderTableEmptyView?(h: CreateElement, renderOpts: TableEmptyRender, params: EmptyRenderParams): SlotVNodeType | SlotVNodeType[];
+
+  /**
+   * 已废弃，请使用 renderTableEmptyView
+   * @deprecated
+   */
   renderEmpty?(h: CreateElement, renderOpts: TableEmptyRender, params: EmptyRenderParams): SlotVNodeType | SlotVNodeType[];
 
   [key: string]: any;

package/lib/v-x-e-table/src/config.js

@@ -1,27 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.config = void 0;
-exports.setConfig = setConfig;
-var _conf = _interopRequireDefault(require("./conf"));
-var _domZindex = _interopRequireDefault(require("dom-zindex"));
-var _xeUtils = _interopRequireDefault(require("xe-utils"));
-var _theme = require("./theme");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/**
- * 全局参数设置
- */
-function setConfig(options) {
-  if (options) {
-    if (options.theme) {
-      (0, _theme.setTheme)(options);
-    }
-    if (options.zIndex) {
-      _domZindex.default.setCurrent(options.zIndex);
-    }
-  }
-  return _xeUtils.default.merge(_conf.default, options);
-}
-var config = exports.config = setConfig;

package/lib/v-x-e-table/src/config.min.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.config=void 0,exports.setConfig=setConfig;var _conf=_interopRequireDefault(require("./conf")),_domZindex=_interopRequireDefault(require("dom-zindex")),_xeUtils=_interopRequireDefault(require("xe-utils")),_theme=require("./theme");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function setConfig(e){return e&&(e.theme&&(0,_theme.setTheme)(e),e.zIndex)&&_domZindex.default.setCurrent(e.zIndex),_xeUtils.default.merge(_conf.default,e)}var config=exports.config=setConfig;

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

@@ -1,21 +0,0 @@
-import GlobalConfig from './conf'
-import DomZIndex from 'dom-zindex'
-import XEUtils from 'xe-utils'
-import { setTheme } from './theme'
-
-/**
- * 全局参数设置
- */
-export function setConfig (options) {
-  if (options) {
-    if (options.theme) {
-      setTheme(options)
-    }
-    if (options.zIndex) {
-      DomZIndex.setCurrent(options.zIndex)
-    }
-  }
-  return XEUtils.merge(GlobalConfig, options)
-}
-
-export const config = setConfig

package/types/v-x-e-table/config.d.ts

@@ -1,55 +0,0 @@
-import { SizeType } from '../component'
-
-interface DefaultOptions {
-  size?: SizeType;
-  [key: string]: any;
-}
-
-export interface VXETableConfigOptions {
-  /**
-   * 扩展插件授权码
-   */
-  authId?: string
-  size?: SizeType;
-  zIndex?: number;
-  version?: number;
-  emptyCell?: string;
-  icon?: {
-    [key: string]: string;
-  };
-  table?: any;
-  grid?: any;
-  export?: {
-    types?: {
-      [key: string]: 0 | 1 | 2;
-    }
-    [key: string]: any;
-  };
-  tooltip?: DefaultOptions;
-  pager?: any;
-  form?: DefaultOptions;
-  input?: DefaultOptions;
-  textarea?: DefaultOptions;
-  select?: DefaultOptions;
-  toolbar?: any;
-  button?: DefaultOptions;
-  radio?: DefaultOptions;
-  checkbox?: DefaultOptions;
-  switch?: DefaultOptions;
-  modal?: DefaultOptions;
-  list?: DefaultOptions;
-  translate?(key: string, args?: any): string;
-  i18n?(key: string, args?: any): string;
-  [key: string]: any;
-}
-
-export type VxeGlobalConfigMethod = (options?: VXETableConfigOptions) => Required<VXETableConfigOptions>
-
-/**
- * @deprecated
- */
-export type VXETableSetupOptions = VXETableConfigOptions
-/**
- * @deprecated
- */
-export type VxeGlobalSetup = VxeGlobalConfigMethod;