vxe-table 3.8.8-beta.8 → 3.8.8

package/packages/checkbox-group/index.js

@@ -1,10 +1,12 @@
 import VxeCheckboxGroupComponent from '../checkbox/src/group'
+import VxeUI from '../v-x-e-table'
 
 export const VxeCheckboxGroup = Object.assign(VxeCheckboxGroupComponent, {
   install (Vue) {
     Vue.component(VxeCheckboxGroupComponent.name, VxeCheckboxGroupComponent)
   }
 })
+VxeUI.component(VxeCheckboxGroupComponent)
 
 export const CheckboxGroup = VxeCheckboxGroup
 

package/packages/colgroup/index.js

@@ -1,4 +1,5 @@
 import VxeTableColgroupComponent from '../table/src/group'
+import VxeUI from '../v-x-e-table'
 
 export const VxeColgroup = Object.assign(VxeTableColgroupComponent, {
   install (Vue) {
@@ -7,6 +8,7 @@ export const VxeColgroup = Object.assign(VxeTableColgroupComponent, {
     Vue.component('VxeTableColgroup', VxeTableColgroupComponent)
   }
 })
+VxeUI.component(VxeTableColgroupComponent)
 
 export const Colgroup = VxeColgroup
 

package/packages/column/index.js

@@ -1,4 +1,5 @@
 import VxeTableColumnComponent from '../table/src/column'
+import VxeUI from '../v-x-e-table'
 
 export const VxeColumn = Object.assign(VxeTableColumnComponent, {
   install (Vue) {
@@ -7,6 +8,7 @@ export const VxeColumn = Object.assign(VxeTableColumnComponent, {
     Vue.component('VxeTableColumn', VxeTableColumnComponent)
   }
 })
+VxeUI.component(VxeTableColumnComponent)
 
 export const Column = VxeColumn
 

package/packages/export/src/mixin.js

@@ -861,11 +861,12 @@ function handleImport ($xetable, content, opts) {
 }
 
 function handleFileImport ($xetable, file, opts) {
+  const { importOpts } = $xetable
   const { importMethod, afterImportMethod } = opts
   const { type, filename } = UtilTools.parseFile(file)
 
   // 检查类型，如果为自定义导出，则不需要校验类型
-  if (!importMethod && !XEUtils.includes(VXETable.globalConfs.importTypes, type)) {
+  if (!importMethod && !XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)) {
     if (opts.message !== false) {
       // 检测弹窗模块
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
@@ -1043,13 +1044,13 @@ export function handlePrint ($xetable, opts, content) {
 }
 
 function handleExportAndPrint ($xetable, options, isPrint) {
-  const { initStore, customOpts, collectColumn, footerTableData, treeConfig, mergeList, isGroup, exportParams } = $xetable
+  const { initStore, customOpts, collectColumn, footerTableData, treeConfig, mergeList, isGroup, exportParams, exportOpts } = $xetable
   const selectRecords = $xetable.getCheckboxRecords()
   const hasFooter = !!footerTableData.length
   const hasTree = treeConfig
   const hasMerge = !hasTree && mergeList.length
   const defOpts = Object.assign({ message: true, isHeader: true }, options)
-  const types = defOpts.types || VXETable.globalConfs.exportTypes
+  const types = defOpts.types || XEUtils.keys(exportOpts._typeMaps)
   const modes = defOpts.modes
   const checkMethod = customOpts.checkMethod
   const exportColumns = collectColumn.slice(0)
@@ -1281,7 +1282,7 @@ export default {
       }
 
       // 检查类型，如果为自定义导出，则不需要校验类型
-      if (!opts.exportMethod && !XEUtils.includes(VXETable.globalConfs.exportTypes, type)) {
+      if (!opts.exportMethod && !XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)) {
         if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
           errLog('vxe.error.notType', [type])
         }
@@ -1355,11 +1356,12 @@ export default {
       return handleFileImport(this, file, opts)
     },
     _importData (options) {
+      const { importOpts } = this
       const opts = Object.assign({
-        types: VXETable.globalConfs.importTypes
+        types: XEUtils.keys(importOpts._typeMaps)
         // beforeImportMethod: null,
         // afterImportMethod: null
-      }, this.importOpts, options)
+      }, importOpts, options)
       const { beforeImportMethod, afterImportMethod } = opts
       if (beforeImportMethod) {
         beforeImportMethod({ options: opts, $table: this })
@@ -1423,7 +1425,12 @@ export default {
       })
     },
     _openImport (options) {
-      const defOpts = Object.assign({ mode: 'insert', message: true, types: VXETable.globalConfs.importTypes }, options, this.importOpts)
+      const { importOpts } = this
+      const defOpts = Object.assign({
+        mode: 'insert',
+        message: true,
+        types: XEUtils.keys(importOpts._typeMaps)
+      }, options, importOpts)
       const { types } = defOpts
       const isTree = !!this.getTreeStatus()
       if (isTree) {

package/packages/form/index.js

@@ -1,10 +1,12 @@
 import VxeFormComponent from './src/form'
+import VxeUI from '../v-x-e-table'
 
 export const VxeForm = Object.assign(VxeFormComponent, {
   install (Vue) {
     Vue.component(VxeFormComponent.name, VxeFormComponent)
   }
 })
+VxeUI.component(VxeFormComponent)
 
 export const Form = VxeForm
 

package/packages/form-gather/index.js

@@ -1,10 +1,12 @@
 import VxeFormGatherComponent from '../form/src/form-gather'
+import VxeUI from '../v-x-e-table'
 
 export const VxeFormGather = Object.assign(VxeFormGatherComponent, {
   install (Vue) {
     Vue.component(VxeFormGatherComponent.name, VxeFormGatherComponent)
   }
 })
+VxeUI.component(VxeFormGatherComponent)
 
 export const FormGather = VxeFormGather
 

package/packages/form-item/index.js

@@ -1,10 +1,12 @@
 import VxeFormItemComponent from '../form/src/form-item'
+import VxeUI from '../v-x-e-table'
 
 export const VxeFormItem = Object.assign(VxeFormItemComponent, {
   install (Vue) {
     Vue.component(VxeFormItemComponent.name, VxeFormItemComponent)
   }
 })
+VxeUI.component(VxeFormItemComponent)
 
 export const FormItem = VxeFormItem
 

package/packages/grid/index.js

@@ -1,13 +1,14 @@
 import VxeGridComponent from './src/grid'
-import VXETable from '../v-x-e-table'
+import VxeUI from '../v-x-e-table'
 
 export const VxeGrid = Object.assign(VxeGridComponent, {
   install (Vue) {
-    VXETable.Grid = VxeGridComponent
-    VXETable.GridComponent = VxeGridComponent
+    VxeUI.Grid = VxeGridComponent
+    VxeUI.GridComponent = VxeGridComponent
     Vue.component(VxeGridComponent.name, VxeGridComponent)
   }
 })
+VxeUI.component(VxeGridComponent)
 
 export const Grid = VxeGrid
 

package/packages/icon/index.js

@@ -1,10 +1,12 @@
 import VxeIconComponent from './src/icon'
+import VxeUI from '../v-x-e-table'
 
 export const VxeIcon = Object.assign(VxeIconComponent, {
   install (Vue) {
     Vue.component(VxeIconComponent.name, VxeIconComponent)
   }
 })
+VxeUI.component(VxeIconComponent)
 
 export const Icon = VxeIcon
 

package/packages/input/index.js

@@ -1,10 +1,12 @@
 import VxeInputComponent from './src/input'
+import VxeUI from '../v-x-e-table'
 
 export const VxeInput = Object.assign(VxeInputComponent, {
   install (Vue) {
     Vue.component(VxeInputComponent.name, VxeInputComponent)
   }
 })
+VxeUI.component(VxeInputComponent)
 
 export const Input = VxeInput
 

package/packages/list/index.js

@@ -1,10 +1,12 @@
 import VxeListComponent from './src/list'
+import VxeUI from '../v-x-e-table'
 
 export const VxeList = Object.assign(VxeListComponent, {
   install (Vue) {
     Vue.component(VxeListComponent.name, VxeListComponent)
   }
 })
+VxeUI.component(VxeListComponent)
 
 export const List = VxeList
 

package/packages/loading/index.js

@@ -1,10 +1,12 @@
 import VxeLoadingComponent from './src/loading'
+import VxeUI from '../v-x-e-table'
 
 export const VxeLoading = Object.assign(VxeLoadingComponent, {
   install (Vue) {
     Vue.component(VxeLoadingComponent.name, VxeLoadingComponent)
   }
 })
+VxeUI.component(VxeLoadingComponent)
 
 export const Loading = VxeLoading
 

package/packages/modal/index.js

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils'
 import VXEModalComponent, { allActivedModals } from './src/modal'
-import VXETable from '../v-x-e-table'
+import VxeUI from '../v-x-e-table'
 
 /* eslint-disable @typescript-eslint/no-use-before-define */
 
@@ -96,10 +96,10 @@ shortcutTypes.forEach((type, index) => {
 
 export const VxeModal = Object.assign(VXEModalComponent, {
   install (Vue) {
-    VXETable._modal = 1
+    VxeUI._modal = 1
     Vue.component(VXEModalComponent.name, VXEModalComponent)
     ModalClass = Vue.extend(VXEModalComponent)
-    VXETable.modal = ModalController
+    VxeUI.modal = ModalController
     // 兼容老版本
     if (!Vue.prototype.$vxe) {
       Vue.prototype.$vxe = { modal: ModalController }
@@ -109,6 +109,8 @@ export const VxeModal = Object.assign(VXEModalComponent, {
   }
 })
 
+VxeUI.component(VXEModalComponent)
+
 export const Modal = VxeModal
 
 export default VxeModal

package/packages/optgroup/index.js

@@ -1,10 +1,12 @@
 import VxeOptgroupComponent from '../select/src/optgroup'
+import VxeUI from '../v-x-e-table'
 
 export const VxeOptgroup = Object.assign(VxeOptgroupComponent, {
   install (Vue) {
     Vue.component(VxeOptgroupComponent.name, VxeOptgroupComponent)
   }
 })
+VxeUI.component(VxeOptgroupComponent)
 
 export const Optgroup = VxeOptgroup
 

package/packages/option/index.js

@@ -1,10 +1,12 @@
 import VxeOptionComponent from '../select/src/option'
+import VxeUI from '../v-x-e-table'
 
 export const VxeOption = Object.assign(VxeOptionComponent, {
   install (Vue) {
     Vue.component(VxeOptionComponent.name, VxeOptionComponent)
   }
 })
+VxeUI.component(VxeOptionComponent)
 
 export const Option = VxeOption
 

package/packages/pager/index.js

@@ -1,10 +1,12 @@
 import VxePagerComponent from './src/pager'
+import VxeUI from '../v-x-e-table'
 
 export const VxePager = Object.assign(VxePagerComponent, {
   install (Vue) {
     Vue.component(VxePagerComponent.name, VxePagerComponent)
   }
 })
+VxeUI.component(VxePagerComponent)
 
 export const Pager = VxePager
 

package/packages/pulldown/index.js

@@ -1,10 +1,12 @@
 import VxePulldownComponent from './src/pulldown'
+import VxeUI from '../v-x-e-table'
 
 export const VxePulldown = Object.assign(VxePulldownComponent, {
   install (Vue) {
     Vue.component(VxePulldownComponent.name, VxePulldownComponent)
   }
 })
+VxeUI.component(VxePulldownComponent)
 
 export const Pulldown = VxePulldown
 

package/packages/radio/index.js

@@ -1,10 +1,12 @@
 import VxeRadioComponent from './src/radio'
+import VxeUI from '../v-x-e-table'
 
 export const VxeRadio = Object.assign(VxeRadioComponent, {
   install (Vue) {
     Vue.component(VxeRadioComponent.name, VxeRadioComponent)
   }
 })
+VxeUI.component(VxeRadioComponent)
 
 export const Radio = VxeRadio
 

package/packages/radio-button/index.js

@@ -1,10 +1,12 @@
 import VxeRadioButtonComponent from '../radio/src/button'
+import VxeUI from '../v-x-e-table'
 
 export const VxeRadioButton = Object.assign(VxeRadioButtonComponent, {
   install (Vue) {
     Vue.component(VxeRadioButtonComponent.name, VxeRadioButtonComponent)
   }
 })
+VxeUI.component(VxeRadioButtonComponent)
 
 export const RadioButton = VxeRadioButton
 

package/packages/radio-group/index.js

@@ -1,10 +1,12 @@
 import VxeRadioGroupComponent from '../radio/src/group'
+import VxeUI from '../v-x-e-table'
 
 export const VxeRadioGroup = Object.assign(VxeRadioGroupComponent, {
   install (Vue) {
     Vue.component(VxeRadioGroupComponent.name, VxeRadioGroupComponent)
   }
 })
+VxeUI.component(VxeRadioGroupComponent)
 
 export const RadioGroup = VxeRadioGroup
 

package/packages/select/index.js

@@ -1,6 +1,7 @@
 import VxeSelectComponent from './src/select'
 import VxeOptionComponent from './src/option'
 import VxeOptgroupComponent from './src/optgroup'
+import VxeUI from '../v-x-e-table'
 
 export const VxeSelect = Object.assign(VxeSelectComponent, {
   Option: VxeOptionComponent,
@@ -11,6 +12,7 @@ export const VxeSelect = Object.assign(VxeSelectComponent, {
     Vue.component(VxeOptgroupComponent.name, VxeOptgroupComponent)
   }
 })
+VxeUI.component(VxeSelectComponent)
 
 export const Select = VxeSelect
 

package/packages/switch/index.js

@@ -1,10 +1,12 @@
 import VxeSwitchComponent from './src/switch'
+import VxeUI from '../v-x-e-table'
 
 export const VxeSwitch = Object.assign(VxeSwitchComponent, {
   install (Vue) {
     Vue.component(VxeSwitchComponent.name, VxeSwitchComponent)
   }
 })
+VxeUI.component(VxeSwitchComponent)
 
 export const Switch = VxeSwitch
 

package/packages/table/index.js

@@ -1,6 +1,6 @@
 import VxeTableComponent from './src/table'
 import VxeTableBodyComponent from './src/body'
-import VXETable from '../v-x-e-table'
+import VxeUI from '../v-x-e-table'
 
 export const VxeTable = Object.assign(VxeTableComponent, {
   install (Vue) {
@@ -9,25 +9,26 @@ export const VxeTable = Object.assign(VxeTableComponent, {
       delete window.VXETableMixin
     }
     if (typeof window !== 'undefined' && window.VxeTableExtendCellArea && window.VxeTableExtendCellArea.init) {
-      window.VxeTableExtendCellArea.init(VXETable)
+      window.VxeTableExtendCellArea.init(VxeUI)
       delete window.VxeTableExtendCellArea
     } else if (typeof window !== 'undefined' && window.VXETablePro && window.VXETablePro.init) {
-      window.VXETablePro.init(VXETable)
+      window.VXETablePro.init(VxeUI)
       delete window.VXETablePro
     }
-    VXETable.Vue = Vue
-    VXETable.Table = VxeTableComponent
-    VXETable.TableComponent = VxeTableComponent
+    VxeUI.Vue = Vue
+    VxeUI.Table = VxeTableComponent
+    VxeUI.TableComponent = VxeTableComponent
     if (!Vue.prototype.$vxe) {
-      Vue.prototype.$vxe = { t: VXETable.t, _t: VXETable._t }
+      Vue.prototype.$vxe = { t: VxeUI.t, _t: VxeUI._t }
     } else {
-      Vue.prototype.$vxe.t = VXETable.t
-      Vue.prototype.$vxe._t = VXETable._t
+      Vue.prototype.$vxe.t = VxeUI.t
+      Vue.prototype.$vxe._t = VxeUI._t
     }
     Vue.component(VxeTableComponent.name, VxeTableComponent)
     Vue.component(VxeTableBodyComponent.name, VxeTableBodyComponent)
   }
 })
+VxeUI.component(VxeTableComponent)
 
 export const Table = VxeTable
 

package/packages/table/src/table.js

@@ -822,11 +822,11 @@ export default {
       // }
       // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
       const { exportConfig, exportOpts, importConfig, importOpts } = this
-      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 (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), importOpts.types)) {
+        warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).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(',')])
+      if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), exportOpts.types)) {
+        warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')])
       }
     }
 

package/packages/textarea/index.js

@@ -1,10 +1,12 @@
 import VxeTextareaComponent from './src/textarea'
+import VxeUI from '../v-x-e-table'
 
 export const VxeTextarea = Object.assign(VxeTextareaComponent, {
   install (Vue) {
     Vue.component(VxeTextareaComponent.name, VxeTextareaComponent)
   }
 })
+VxeUI.component(VxeTextareaComponent)
 
 export const Textarea = VxeTextarea
 

package/packages/toolbar/index.js

@@ -1,10 +1,12 @@
 import VxeToolbarComponent from './src/toolbar'
+import VxeUI from '../v-x-e-table'
 
 export const VxeToolbar = Object.assign(VxeToolbarComponent, {
   install (Vue) {
     Vue.component(VxeToolbarComponent.name, VxeToolbarComponent)
   }
 })
+VxeUI.component(VxeToolbarComponent)
 
 export const Toolbar = VxeToolbar
 

package/packages/tooltip/index.js

@@ -1,12 +1,13 @@
 import VxeTooltipComponent from './src/tooltip'
-import VXETable from '../v-x-e-table'
+import VxeUI from '../v-x-e-table'
 
 export const VxeTooltip = Object.assign(VxeTooltipComponent, {
   install (Vue) {
-    VXETable._tooltip = 1
+    VxeUI._tooltip = 1
     Vue.component(VxeTooltipComponent.name, VxeTooltipComponent)
   }
 })
+VxeUI.component(VxeTooltipComponent)
 
 export const Tooltip = VxeTooltip
 

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

@@ -7,7 +7,7 @@ import { commands } from './src/commands'
 import { menus } from './src/menus'
 import { formats } from './src/formats'
 import { validators } from './src/validators'
-import { setTheme } from './src/theme'
+import { setTheme, getTheme } from './src/theme'
 import { UtilTools } from '../tools/utils'
 import { errLog, warnLog } from '../tools/log'
 
@@ -17,11 +17,11 @@ export function use (Plugin, options) {
   /* eslint-disable @typescript-eslint/no-use-before-define */
   if (Plugin && Plugin.install) {
     if (installedPlugins.indexOf(Plugin) === -1) {
-      Plugin.install(VXETable, options)
+      Plugin.install(VxeUI, options)
       installedPlugins.push(Plugin)
     }
   }
-  return VXETable
+  return VxeUI
 }
 
 /**
@@ -31,22 +31,22 @@ function reg (key) {
   /* eslint-disable @typescript-eslint/no-use-before-define */
   // 检测安装顺序是否正确
   if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-    if (VXETable.Table) {
+    if (VxeUI.Table) {
       errLog('vxe.error.useErr', [key])
     }
   }
-  VXETable[`_${key}`] = 1
+  VxeUI[`_${key}`] = 1
 }
 
-function getExportOrImpotType (types, flag) {
-  const rest = []
-  XEUtils.objectEach(types, (val, type) => {
-    if (val === 0 || val === flag) {
-      rest.push(type)
-    }
-  })
-  return rest
-}
+// function getExportOrImpotType (types, flag) {
+//   const rest = []
+//   XEUtils.objectEach(types, (val, type) => {
+//     if (val === 0 || val === flag) {
+//       rest.push(type)
+//     }
+//   })
+//   return rest
+// }
 
 /**
  * 全局参数设置
@@ -61,7 +61,7 @@ export const setConfig = (options) => {
     }
     XEUtils.merge(GlobalConfig, options)
   }
-  return VXETable
+  return VxeUI
 }
 
 class VXETableConfig {
@@ -83,14 +83,14 @@ class VXETableConfig {
    * 获取所有导出类型
    */
   get exportTypes () {
-    return getExportOrImpotType(GlobalConfig.export.types, 1)
+    return XEUtils.keys(GlobalConfig.table.exportConfig._typeMaps)
   }
 
   /**
    * 获取所有导入类型
    */
   get importTypes () {
-    return getExportOrImpotType(GlobalConfig.export.types, 2)
+    return XEUtils.keys(GlobalConfig.table.importConfig._typeMaps)
   }
 }
 
@@ -133,14 +133,30 @@ export function setIcon (options) {
   if (options) {
     Object.assign(GlobalConfig.icon, options)
   }
-  return VXETable
+  return VxeUI
 }
 
 export const globalStore = {}
 
-export const VXETable = {
+const components = {}
+
+export function getComponent (name) {
+  return components[name] || null
+}
+
+export function component (comp) {
+  if (comp && comp.name) {
+    components[comp.name] = comp
+  }
+}
+
+export const version = process.env.VUE_APP_VXE_TABLE_VERSION
+export const tableVersion = version
+
+export const VxeUI = {
   v,
-  version: process.env.VUE_APP_VXE_TABLE_VERSION,
+  version,
+  tableVersion,
   reg,
   use,
   setConfig,
@@ -154,6 +170,10 @@ export const VXETable = {
   validators,
   t,
   _t,
+  setTheme,
+  getTheme,
+  getComponent,
+  component,
 
   // 已废弃
   config,
@@ -161,7 +181,7 @@ export const VXETable = {
   globalConfs
 }
 
-export const VxeUI = VXETable
+export const VXETable = VxeUI
 
 setTheme('light')
 
@@ -171,4 +191,6 @@ export * from './src/commands'
 export * from './src/menus'
 export * from './src/formats'
 
-export default VXETable
+export * from './src/theme'
+
+export default VxeUI

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

@@ -100,7 +100,12 @@ export default {
       showAsterisk: true
     },
     importConfig: {
-      _typeMaps: {},
+      _typeMaps: {
+        csv: 1,
+        html: 1,
+        xml: 1,
+        txt: 1
+      },
       modes: ['insert', 'covering']
     },
     exportConfig: {

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

@@ -5,6 +5,7 @@ export function setTheme (name) {
   if (!theme || theme === 'default') {
     theme = 'light'
   }
+  GlobalConfig.theme = theme
   if (typeof document !== 'undefined') {
     const documentElement = document.documentElement
     if (documentElement) {
@@ -12,3 +13,7 @@ export function setTheme (name) {
     }
   }
 }
+
+export function getTheme () {
+  return GlobalConfig.theme
+}