vxe-table 3.7.0-beta.19 → 3.7.0-beta.20

package/packages/table/src/cell.js

@@ -692,7 +692,9 @@ export const Cell = {
           },
           on: {
             click (evnt) {
-              $table.triggerFilterEvent(evnt, params.column, params)
+              if ($table.triggerFilterEvent) {
+                $table.triggerFilterEvent(evnt, params.column, params)
+              }
             }
           }
         })

package/packages/table/src/table.js

@@ -803,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(',')])
       }
     }
 

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

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

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

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/types/v-x-e-table/index.d.ts

@@ -9,7 +9,7 @@ import { VxeGlobalCommands } from './commands'
 import { VxeGlobalFormats } from './formats'
 import { VxeGlobalMenus } from './menus'
 import { VxeGlobalValidators } from './validators'
-import { VxeGlobalConfigMethod } from './setup'
+import { VxeGlobalConfigMethod } from './config'
 
 /* eslint-disable no-use-before-define */
 
@@ -17,7 +17,7 @@ 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;
 
-export const setup: VxeGlobalConfigMethod
+export const config: VxeGlobalConfigMethod
 export const interceptor: VxeGlobalInterceptor
 export const renderer: VxeGlobalRenderer
 export const commands: VxeGlobalCommands
@@ -31,6 +31,12 @@ export const t: VxeGlobalI18n
 export const _t: VxeGlobalTranslate
 export const use: VxeGlobalUse
 
+/**
+ * 请使用 config
+ * @deprecated
+ */
+export const setup: VxeGlobalConfigMethod
+
 export interface VXETablePluginObject {
   install(vxetable: VXETableCore, ...options: any[]): void;
   [key: string]: any;
@@ -41,11 +47,6 @@ export type VXETableVersion = 'v1' | 'v2' | 'v3' | 'v4'
 export const v: VXETableVersion
 
 export interface VXETableCore {
-  /**
-   * 已被 version 替换
-   * @deprecated
-   */
-  v: VXETableVersion;
   /**
    * 版本号
    */
@@ -53,7 +54,7 @@ export interface VXETableCore {
   /**
    * 设置全局参数/获取所有参数
    */
-  setup: VxeGlobalConfigMethod;
+  config: VxeGlobalConfigMethod;
   /**
    * Table interceptor
    */
@@ -105,6 +106,17 @@ export interface VXETableCore {
    */
   t: VxeGlobalI18n;
   _t: VxeGlobalTranslate;
+
+  /**
+   * 已被 version 替换
+   * @deprecated
+   */
+  v: VXETableVersion;
+  /**
+   * 请使用 config
+   * @deprecated
+   */
+  setup: VxeGlobalConfigMethod;
 }
 
 /**
@@ -118,6 +130,6 @@ export * from './commands'
 export * from './formats'
 export * from './menus'
 export * from './validators'
-export * from './setup'
+export * from './config'
 
 export default VXETable

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

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.setup=setup;var _conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function setup(e){return _xeUtils.default.merge(_conf.default,e)}