vxe-table 3.8.7-beta.6 → 3.8.7-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.8.7-beta.6",
+  "version": "3.8.7-beta.8",
   "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -26,7 +26,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "dom-zindex": "^1.0.2",
+    "dom-zindex": "^1.0.4",
     "xe-utils": "^3.5.26"
   },
   "devDependencies": {

package/packages/all.js

@@ -1,5 +1,5 @@
 import XEUtils from 'xe-utils'
-import { VXETable } from './v-x-e-table'
+import { setConfig } from './v-x-e-table'
 import { setTheme } from './v-x-e-table/src/theme'
 
 import { Filter } from './filter'
@@ -84,16 +84,16 @@ const components = [
 // 默认安装
 export function install (Vue, options) {
   if (XEUtils.isPlainObject(options)) {
-    VXETable.setConfig(options)
+    setConfig(options)
     if (options.theme) {
-      setTheme(options)
+      setTheme(options.theme)
     }
   }
   components.map(component => component.install(Vue))
 }
 
 // 默认中文
-VXETable.setConfig({
+setConfig({
   i18n: (key, args) => XEUtils.toFormatString(XEUtils.get(zhCN, key), args)
 })
 

package/packages/form/src/form.js

@@ -141,17 +141,10 @@ export default {
     }
   },
   created () {
-    this.$nextTick(() => {
-      const { items } = this
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        if (this.customLayout && this.items) {
-          errLog('vxe.error.errConflicts', ['custom-layout', 'items'])
-        }
-      }
-      if (items) {
-        this.loadItem(items)
-      }
-    })
+    const { items } = this
+    if (items && items.length) {
+      this.loadItem(items)
+    }
   },
   render (h) {
     const { _e, loading, className, data, vSize, tooltipOpts, formItems, customLayout } = this

package/packages/table/src/methods.js

@@ -1197,8 +1197,14 @@ const Methods = {
     } else {
       const { selectCheckboxMaps, fullDataRowIdData } = this
       XEUtils.each(selectCheckboxMaps, (row, rowid) => {
-        if (isFull ? fullDataRowIdData[rowid] : afterFullRowMaps[rowid]) {
-          rowList.push(row)
+        if (isFull) {
+          if (fullDataRowIdData[rowid]) {
+            rowList.push(fullDataRowIdData[rowid].row)
+          }
+        } else {
+          if (afterFullRowMaps[rowid]) {
+            rowList.push(afterFullRowMaps[rowid])
+          }
         }
       })
     }

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

@@ -54,7 +54,7 @@ function getExportOrImpotType (types, flag) {
 export const setConfig = (options) => {
   if (options) {
     if (options.theme) {
-      setTheme(options)
+      setTheme(options.theme)
     }
     if (options.zIndex) {
       DomZIndex.setCurrent(options.zIndex)
@@ -163,7 +163,7 @@ export const VXETable = {
 
 export const VxeUI = VXETable
 
-setTheme(globalStore)
+setTheme('light')
 
 export * from './src/interceptor'
 export * from './src/renderer'

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

@@ -96,9 +96,16 @@ export default {
       showAsterisk: true
     },
     importConfig: {
+      _typeMaps: {},
       modes: ['insert', 'covering']
     },
     exportConfig: {
+      _typeMaps: {
+        csv: 1,
+        html: 1,
+        xml: 1,
+        txt: 1
+      },
       modes: ['current', 'selected']
     },
     printConfig: {

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

@@ -1,11 +1,14 @@
 import GlobalConfig from '../../v-x-e-table/src/conf'
 
-export function setTheme (options) {
-  const theme = (options ? options.theme : null) || GlobalConfig.theme || 'default'
+export function setTheme (name) {
+  let theme = name || GlobalConfig.theme
+  if (!theme || theme === 'default') {
+    theme = 'light'
+  }
   if (typeof document !== 'undefined') {
     const documentElement = document.documentElement
     if (documentElement) {
-      documentElement.setAttribute('data-vxe-table-theme', theme)
+      documentElement.setAttribute('data-vxe-ui-theme', theme)
     }
   }
 }

package/packages/validator/src/mixin.js

@@ -128,18 +128,18 @@ export default {
       const validRest = {}
       const { editRules, afterFullData, visibleColumn, treeConfig, treeOpts } = this
       const childrenField = treeOpts.children || treeOpts.childrenField
-      let validDatas
+      let validList
       if (rows === true) {
-        validDatas = afterFullData
+        validList = afterFullData
       } else if (rows) {
         if (XEUtils.isFunction(rows)) {
           cb = rows
         } else {
-          validDatas = XEUtils.isArray(rows) ? rows : [rows]
+          validList = XEUtils.isArray(rows) ? rows : [rows]
         }
       }
-      if (!validDatas) {
-        validDatas = this.getInsertRecords().concat(this.getUpdateRecords())
+      if (!validList) {
+        validList = this.getInsertRecords().concat(this.getUpdateRecords())
       }
       const rowValidErrs = []
       this.lastCallTime = Date.now()
@@ -188,9 +188,9 @@ export default {
           }
         }
         if (treeConfig) {
-          XEUtils.eachTree(validDatas, handleVaild, { children: childrenField })
+          XEUtils.eachTree(validList, handleVaild, { children: childrenField })
         } else {
-          validDatas.forEach(handleVaild)
+          validList.forEach(handleVaild)
         }
         return Promise.all(rowValidErrs).then(() => {
           const ruleProps = Object.keys(validRest)
@@ -279,7 +279,7 @@ export default {
       const { editRules } = this
       const { property } = column
       const errorRules = []
-      const syncVailds = []
+      const syncValidList = []
       if (property && editRules) {
         const rules = XEUtils.get(editRules, property)
         if (rules) {
@@ -324,7 +324,7 @@ export default {
                     errorRules.push(new Rule({ type: 'custom', trigger, content: customValid.message, rule: new Rule(rule) }))
                   } else if (customValid.catch) {
                     // 如果为异步校验（注：异步校验是并发无序的）
-                    syncVailds.push(
+                    syncValidList.push(
                       customValid.catch(e => {
                         this.validRuleErr = true
                         errorRules.push(new Rule({ type: 'custom', trigger, content: e && e.message ? e.message : (rule.content || rule.message), rule: new Rule(rule) }))
@@ -352,7 +352,7 @@ export default {
           })
         }
       }
-      return Promise.all(syncVailds).then(() => {
+      return Promise.all(syncValidList).then(() => {
         if (errorRules.length) {
           const rest = { rules: errorRules, rule: errorRules[0] }
           return Promise.reject(rest)
@@ -384,9 +384,9 @@ export default {
           })
         })
       } else if (rowList.length) {
-        const rowidList = rowList.map(row => `${getRowid(this, row)}`)
+        const rowIdList = rowList.map(row => `${getRowid(this, row)}`)
         XEUtils.each(validErrorMaps, (item, key) => {
-          if (rowidList.indexOf(key.split(':')[0]) > -1) {
+          if (rowIdList.indexOf(key.split(':')[0]) > -1) {
             validErrMaps[key] = item
           }
         })

package/styles/table.scss

@@ -609,7 +609,7 @@
     }
   }
   &.cell--area {
-    .vxe-table--main-wrapper {
+    .vxe-body--row {
       user-select: none;
     }
   }

package/types/module/export.d.ts

@@ -20,6 +20,9 @@ export declare class Export extends VXETableComponent {}
  * 导出参数
  */
 export interface TableExportConfig {
+  // 内置属性
+  _typeMaps?: Record<string, number>
+
   /**
    * 文件名
    */
@@ -110,6 +113,9 @@ export interface ExportParams extends TableExportConfig {
  * 导入参数
  */
 export interface TableImportConfig {
+  // 内置属性
+  _typeMaps?: Record<string, number>
+
   /**
    * 可选文件类型列表
    */

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

@@ -57,6 +57,7 @@ export interface VxeGlobalIcon {
 }
 
 export type VxeGlobalConfigMethod = (options?: VXETableConfigOptions) => VxeGlobalStore
+export type VxeGlobalThemeMethod = (name?: '' | 'light' | 'dark') => VxeGlobalStore
 
 /**
  * @deprecated
@@ -81,6 +82,7 @@ export interface VxeGlobalStore {
 export const globalStore: VxeGlobalStore
 
 export const setConfig: VxeGlobalConfigMethod
+export const setTheme: VxeGlobalThemeMethod
 /**
  * 请使用 setConfig
  * @deprecated
@@ -125,6 +127,7 @@ export interface VXETableCore {
    * 设置全局参数/获取所有参数
    */
   setConfig: VxeGlobalConfigMethod;
+  setTheme: VxeGlobalThemeMethod
   setIcon: typeof setIcon
   /**
    * 读取内部数据