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

package/packages/filter/index.js

@@ -1,15 +1,17 @@
 import Table from '../table'
 import VXETable from '../v-x-e-table'
-import Panel from './src/panel'
+import PanelComponent from './src/panel'
 import mixin from './src/mixin'
 
-export const Filter = {
-  Panel,
+export const VxeTableFilterModule = {
+  Panel: PanelComponent,
   install (Vue) {
     VXETable.reg('filter')
     Table.mixins.push(mixin)
-    Vue.component(Panel.name, Panel)
+    Vue.component(PanelComponent.name, PanelComponent)
   }
 }
 
-export default Filter
+export const Filter = VxeTableFilterModule
+
+export default VxeTableFilterModule

package/packages/filter/src/panel.js

@@ -5,7 +5,7 @@ import XEUtils from 'xe-utils'
 import { getSlotVNs } from '../../tools/vn'
 
 export default {
-  name: 'VxeTableFilter',
+  name: 'VxeTableFilterPanel',
   props: {
     filterStore: Object
   },

package/packages/form/index.d.ts

@@ -1,4 +1,4 @@
-import { Form } from '../../types/form'
+import { VxeForm } from '../../types/form'
 
 export * from '../../types/form'
-export default Form
+export default VxeForm

package/packages/form/index.js

@@ -1,9 +1,11 @@
-import VxeForm from './src/form'
+import VxeFormComponent from './src/form'
 
-export const Form = Object.assign(VxeForm, {
+export const VxeForm = Object.assign(VxeFormComponent, {
   install (Vue) {
-    Vue.component(VxeForm.name, VxeForm)
+    Vue.component(VxeFormComponent.name, VxeFormComponent)
   }
 })
 
-export default Form
+export const Form = VxeForm
+
+export default VxeForm

package/packages/form-gather/index.d.ts

@@ -1,4 +1,4 @@
-import { FormGather } from '../../types/form-gather'
+import { VxeFormGather } from '../../types/form-gather'
 
 export * from '../../types/form-gather'
-export default FormGather
+export default VxeFormGather

package/packages/form-gather/index.js

@@ -1,9 +1,11 @@
-import VxeFormGather from '../form/src/form-gather'
+import VxeFormGatherComponent from '../form/src/form-gather'
 
-export const FormGather = Object.assign(VxeFormGather, {
+export const VxeFormGather = Object.assign(VxeFormGatherComponent, {
   install (Vue) {
-    Vue.component(VxeFormGather.name, VxeFormGather)
+    Vue.component(VxeFormGatherComponent.name, VxeFormGatherComponent)
   }
 })
 
-export default FormGather
+export const FormGather = VxeFormGather
+
+export default VxeFormGather

package/packages/form-item/index.d.ts

@@ -1,4 +1,4 @@
-import { FormItem } from '../../types/form-item'
+import { VxeFormItem } from '../../types/form-item'
 
 export * from '../../types/form-item'
-export default FormItem
+export default VxeFormItem

package/packages/form-item/index.js

@@ -1,9 +1,11 @@
-import VxeFormItem from '../form/src/form-item'
+import VxeFormItemComponent from '../form/src/form-item'
 
-export const FormItem = Object.assign(VxeFormItem, {
+export const VxeFormItem = Object.assign(VxeFormItemComponent, {
   install (Vue) {
-    Vue.component(VxeFormItem.name, VxeFormItem)
+    Vue.component(VxeFormItemComponent.name, VxeFormItemComponent)
   }
 })
 
-export default FormItem
+export const FormItem = VxeFormItem
+
+export default VxeFormItem

package/packages/grid/index.d.ts

@@ -1,4 +1,4 @@
-import { Grid } from '../../types/grid'
+import { VxeGrid } from '../../types/grid'
 
 export * from '../../types/grid'
-export default Grid
+export default VxeGrid

package/packages/grid/index.js

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

package/packages/icon/index.d.ts

@@ -1,4 +1,4 @@
-import { Icon } from '../../types/icon'
+import { VxeIcon } from '../../types/icon'
 
 export * from '../../types/icon'
-export default Icon
+export default VxeIcon

package/packages/icon/index.js

@@ -1,9 +1,11 @@
-import VxeIcon from './src/icon'
+import VxeIconComponent from './src/icon'
 
-export const Icon = Object.assign(VxeIcon, {
+export const VxeIcon = Object.assign(VxeIconComponent, {
   install (Vue) {
-    Vue.component(VxeIcon.name, VxeIcon)
+    Vue.component(VxeIconComponent.name, VxeIconComponent)
   }
 })
 
-export default Icon
+export const Icon = VxeIcon
+
+export default VxeIcon

package/packages/input/index.d.ts

@@ -1,4 +1,4 @@
-import { Input } from '../../types/input'
+import { VxeInput } from '../../types/input'
 
 export * from '../../types/input'
-export default Input
+export default VxeInput

package/packages/input/index.js

@@ -1,9 +1,11 @@
-import VxeInput from './src/input'
+import VxeInputComponent from './src/input'
 
-export const Input = Object.assign(VxeInput, {
+export const VxeInput = Object.assign(VxeInputComponent, {
   install (Vue) {
-    Vue.component(VxeInput.name, VxeInput)
+    Vue.component(VxeInputComponent.name, VxeInputComponent)
   }
 })
 
-export default Input
+export const Input = VxeInput
+
+export default VxeInput

package/packages/keyboard/index.d.ts

@@ -1,4 +1,4 @@
-import { Keyboard } from '../../types/keyboard'
+import { VxeTableKeyboardModule } from '../../types/module/keyboard'
 
-export * from '../../types/keyboard'
-export default Keyboard
+export * from '../../types/module/keyboard'
+export default VxeTableKeyboardModule

package/packages/keyboard/index.js

@@ -2,11 +2,13 @@ import Table from '../table'
 import mixin from './src/mixin'
 import VXETable from '../v-x-e-table'
 
-export const Keyboard = {
+export const VxeTableKeyboardModule = {
   install () {
     VXETable.reg('keyboard')
     Table.mixins.push(mixin)
   }
 }
 
-export default Keyboard
+export const Keyboard = VxeTableKeyboardModule
+
+export default VxeTableKeyboardModule

package/packages/list/index.d.ts

@@ -1,4 +1,4 @@
-import { List } from '../../types/list'
+import { VxeList } from '../../types/list'
 
 export * from '../../types/list'
-export default List
+export default VxeList

package/packages/list/index.js

@@ -1,9 +1,11 @@
-import VxeList from './src/list'
+import VxeListComponent from './src/list'
 
-export const List = Object.assign(VxeList, {
+export const VxeList = Object.assign(VxeListComponent, {
   install (Vue) {
-    Vue.component(VxeList.name, VxeList)
+    Vue.component(VxeListComponent.name, VxeListComponent)
   }
 })
 
-export default List
+export const List = VxeList
+
+export default VxeList

package/packages/loading/index.d.ts

@@ -1,4 +1,4 @@
-import { Loading } from '../../types/loading'
+import { VxeLoading } from '../../types/loading'
 
 export * from '../../types/loading'
-export default Loading
+export default VxeLoading

package/packages/loading/index.js

@@ -1,9 +1,11 @@
-import VxeLoading from './src/loading'
+import VxeLoadingComponent from './src/loading'
 
-export const Loading = Object.assign(VxeLoading, {
+export const VxeLoading = Object.assign(VxeLoadingComponent, {
   install (Vue) {
-    Vue.component(VxeLoading.name, VxeLoading)
+    Vue.component(VxeLoadingComponent.name, VxeLoadingComponent)
   }
 })
 
+export const Loading = VxeLoading
+
 export default VxeLoading

package/packages/locale/lang/en-US.js

@@ -188,6 +188,12 @@ export default {
       confirm: 'Confirm',
       cancel: 'Cancel'
     },
+    custom: {
+      cstmTitle: 'Column Settings',
+      cstmRestore: 'Restore default',
+      cstmCancel: 'Cancelar',
+      cstmConfirm: 'Confirm'
+    },
     import: {
       modes: {
         covering: 'Covering',

package/packages/locale/lang/es-ES.js

@@ -180,6 +180,12 @@ export default {
       confirm: 'Confirmar',
       cancel: 'Cancelar'
     },
+    custom: {
+      cstmTitle: 'Column Settings',
+      cstmRestore: 'Restore default',
+      cstmCancel: 'Cancelar',
+      cstmConfirm: 'Confirm'
+    },
     import: {
       modes: {
         covering: 'Cubriendo',

package/packages/locale/lang/ja-JP.js

@@ -188,6 +188,12 @@ export default {
       confirm: '完了',
       cancel: 'キャンセル'
     },
+    custom: {
+      cstmTitle: 'Column Settings',
+      cstmRestore: 'Restore default',
+      cstmCancel: 'Cancelar',
+      cstmConfirm: 'Confirm'
+    },
     import: {
       modes: {
         covering: 'カバー',

package/packages/locale/lang/pt-BR.js

@@ -180,6 +180,12 @@ export default {
       confirm: 'Confirmar',
       cancel: 'Cancelar'
     },
+    custom: {
+      cstmTitle: 'Column Settings',
+      cstmRestore: 'Restore default',
+      cstmCancel: 'Cancelar',
+      cstmConfirm: 'Confirm'
+    },
     import: {
       modes: {
         covering: 'Sobrescrever',

package/packages/locale/lang/zh-CN.js

@@ -188,6 +188,12 @@ export default {
       confirm: '确认',
       cancel: '取消'
     },
+    custom: {
+      cstmTitle: '列设置',
+      cstmRestore: '恢复默认',
+      cstmCancel: '取消',
+      cstmConfirm: '确定'
+    },
     import: {
       modes: {
         covering: '覆盖',

package/packages/locale/lang/zh-TC.js

@@ -188,6 +188,12 @@ export default {
       confirm: '確認',
       cancel: '取消'
     },
+    custom: {
+      cstmTitle: '列設定',
+      cstmRestore: '恢復默認',
+      cstmCancel: '取消',
+      cstmConfirm: '確認'
+    },
     import: {
       modes: {
         covering: '覆盖',

package/packages/menu/index.d.ts

@@ -1,4 +1,4 @@
-import { Menu } from '../../types/menu'
+import { VxeTableMenuModule } from '../../types/module/menu'
 
-export * from '../../types/menu'
-export default Menu
+export * from '../../types/module/menu'
+export default VxeTableMenuModule

package/packages/menu/index.js

@@ -3,7 +3,7 @@ import VXETable from '../v-x-e-table'
 import Panel from './src/panel'
 import mixin from './src/mixin'
 
-export const Menu = {
+export const VxeTableMenuModule = {
   Panel,
   install (Vue) {
     VXETable.reg('menu')
@@ -12,4 +12,6 @@ export const Menu = {
   }
 }
 
-export default Menu
+export const Menu = VxeTableMenuModule
+
+export default VxeTableMenuModule

package/packages/menu/src/panel.js

@@ -1,7 +1,7 @@
 import { getFuncText } from '../../tools/utils'
 
 export default {
-  name: 'VxeTableContextMenu',
+  name: 'VxeTableMenuPanel',
   props: {
     ctxMenuStore: Object,
     ctxMenuOpts: Object

package/packages/modal/index.d.ts

@@ -1,4 +1,4 @@
-import { Modal } from '../../types/modal'
+import { VxeModal } from '../../types/modal'
 
 export * from '../../types/modal'
-export default Modal
+export default VxeModal

package/packages/modal/index.js

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

package/packages/modal/src/modal.js

@@ -248,7 +248,7 @@ export default {
           return h('span', {
             class: `${type}-resize`,
             attrs: {
-              type: type
+              type
             },
             on: {
               mousedown: this.dragEvent

package/packages/optgroup/index.d.ts

@@ -1,4 +1,4 @@
-import { Optgroup } from '../../types/optgroup'
+import { VxeOptgroup } from '../../types/optgroup'
 
 export * from '../../types/optgroup'
-export default Optgroup
+export default VxeOptgroup

package/packages/optgroup/index.js

@@ -1,9 +1,11 @@
-import VxeOptgroup from '../select/src/optgroup'
+import VxeOptgroupComponent from '../select/src/optgroup'
 
-export const Optgroup = Object.assign(VxeOptgroup, {
+export const VxeOptgroup = Object.assign(VxeOptgroupComponent, {
   install (Vue) {
-    Vue.component(VxeOptgroup.name, VxeOptgroup)
+    Vue.component(VxeOptgroupComponent.name, VxeOptgroupComponent)
   }
 })
 
-export default Optgroup
+export const Optgroup = VxeOptgroup
+
+export default VxeOptgroup

package/packages/option/index.d.ts

@@ -1,4 +1,4 @@
-import { Option } from '../../types/option'
+import { VxeOption } from '../../types/option'
 
 export * from '../../types/option'
-export default Option
+export default VxeOption

package/packages/option/index.js

@@ -1,9 +1,11 @@
-import VxeOption from '../select/src/option'
+import VxeOptionComponent from '../select/src/option'
 
-export const Option = Object.assign(VxeOption, {
+export const VxeOption = Object.assign(VxeOptionComponent, {
   install (Vue) {
-    Vue.component(VxeOption.name, VxeOption)
+    Vue.component(VxeOptionComponent.name, VxeOptionComponent)
   }
 })
 
-export default Option
+export const Option = VxeOption
+
+export default VxeOption

package/packages/pager/index.d.ts

@@ -1,4 +1,4 @@
-import { Pager } from '../../types/pager'
+import { VxePager } from '../../types/pager'
 
 export * from '../../types/pager'
-export default Pager
+export default VxePager

package/packages/pager/index.js

@@ -1,9 +1,11 @@
-import VxePager from './src/pager'
+import VxePagerComponent from './src/pager'
 
-export const Pager = Object.assign(VxePager, {
+export const VxePager = Object.assign(VxePagerComponent, {
   install (Vue) {
-    Vue.component(VxePager.name, VxePager)
+    Vue.component(VxePagerComponent.name, VxePagerComponent)
   }
 })
 
-export default Pager
+export const Pager = VxePager
+
+export default VxePager

package/packages/pulldown/index.d.ts

@@ -1,4 +1,4 @@
-import { Pulldown } from '../../types/pulldown'
+import { VxePulldown } from '../../types/pulldown'
 
 export * from '../../types/pulldown'
-export default Pulldown
+export default VxePulldown

package/packages/pulldown/index.js

@@ -1,9 +1,11 @@
-import VxePulldown from './src/pulldown'
+import VxePulldownComponent from './src/pulldown'
 
-export const Pulldown = Object.assign(VxePulldown, {
+export const VxePulldown = Object.assign(VxePulldownComponent, {
   install (Vue) {
-    Vue.component(VxePulldown.name, VxePulldown)
+    Vue.component(VxePulldownComponent.name, VxePulldownComponent)
   }
 })
 
-export default Pulldown
+export const Pulldown = VxePulldown
+
+export default VxePulldown

package/packages/radio/index.d.ts

@@ -1,4 +1,4 @@
-import { Radio } from '../../types/radio'
+import { VxeRadio } from '../../types/radio'
 
 export * from '../../types/radio'
-export default Radio
+export default VxeRadio

package/packages/radio/index.js

@@ -1,9 +1,11 @@
-import VxeRadio from './src/radio'
+import VxeRadioComponent from './src/radio'
 
-export const Radio = Object.assign(VxeRadio, {
+export const VxeRadio = Object.assign(VxeRadioComponent, {
   install (Vue) {
-    Vue.component(VxeRadio.name, VxeRadio)
+    Vue.component(VxeRadioComponent.name, VxeRadioComponent)
   }
 })
 
-export default Radio
+export const Radio = VxeRadio
+
+export default VxeRadio

package/packages/radio/src/group.js

@@ -5,6 +5,7 @@ export default {
   name: 'VxeRadioGroup',
   props: {
     value: [String, Number, Boolean],
+    type: String,
     options: Array,
     optionProps: Object,
     disabled: Boolean,
@@ -44,12 +45,13 @@ export default {
     }
   },
   render (h) {
-    const { $scopedSlots, options, valueField, labelField } = this
+    const { $scopedSlots, options, type, valueField, labelField } = this
     const defaultSlot = $scopedSlots.default
+    const btnComp = type === 'button' ? 'vxe-radio-button' : 'vxe-radio'
     return h('div', {
       class: 'vxe-radio-group'
     }, defaultSlot ? defaultSlot.call(this, {}) : (options ? options.map(item => {
-      return h('vxe-radio', {
+      return h(btnComp, {
         props: {
           label: item[valueField],
           content: item[labelField]

package/packages/radio-button/index.d.ts

@@ -1,4 +1,4 @@
-import { RadioButton } from '../../types/radio-button'
+import { VxeRadioButton } from '../../types/radio-button'
 
 export * from '../../types/radio-button'
-export default RadioButton
+export default VxeRadioButton

package/packages/radio-button/index.js

@@ -1,9 +1,11 @@
-import VxeRadioButton from '../radio/src/button'
+import VxeRadioButtonComponent from '../radio/src/button'
 
-export const RadioButton = Object.assign(VxeRadioButton, {
+export const VxeRadioButton = Object.assign(VxeRadioButtonComponent, {
   install (Vue) {
-    Vue.component(VxeRadioButton.name, VxeRadioButton)
+    Vue.component(VxeRadioButtonComponent.name, VxeRadioButtonComponent)
   }
 })
 
-export default RadioButton
+export const RadioButton = VxeRadioButton
+
+export default VxeRadioButton

package/packages/radio-group/index.d.ts

@@ -1,4 +1,4 @@
-import { RadioGroup } from '../../types/radio-group'
+import { VxeRadioGroup } from '../../types/radio-group'
 
 export * from '../../types/radio-group'
-export default RadioGroup
+export default VxeRadioGroup

package/packages/radio-group/index.js

@@ -1,9 +1,11 @@
-import VxeRadioGroup from '../radio/src/group'
+import VxeRadioGroupComponent from '../radio/src/group'
 
-export const RadioGroup = Object.assign(VxeRadioGroup, {
+export const VxeRadioGroup = Object.assign(VxeRadioGroupComponent, {
   install (Vue) {
-    Vue.component(VxeRadioGroup.name, VxeRadioGroup)
+    Vue.component(VxeRadioGroupComponent.name, VxeRadioGroupComponent)
   }
 })
 
-export default RadioGroup
+export const RadioGroup = VxeRadioGroup
+
+export default VxeRadioGroup