vxe-table 4.2.8 → 4.3.0-beta.10

package/packages/export/src/export-panel.ts

@@ -153,7 +153,7 @@ export default defineComponent({
 
     const renderVN = () => {
       const { defaultOptions, storeData } = props
-      const { isAll, isIndeterminate } = reactData
+      const { isAll: isAllChecked, isIndeterminate: isAllIndeterminate } = reactData
       const { hasTree, hasMerge, isPrint, hasColgroup } = storeData
       const { isHeader } = defaultOptions
       const cols: any[] = []
@@ -164,12 +164,14 @@ export default defineComponent({
       XEUtils.eachTree(storeData.columns, (column: any) => {
         const colTitle = formatText(column.getTitle(), 1)
         const isColGroup = column.children && column.children.length
+        const isChecked = column.checked
+        const indeterminate = column.halfChecked
         cols.push(
           h('li', {
             class: ['vxe-export--panel-column-option', `level--${column.level}`, {
               'is--group': isColGroup,
-              'is--checked': column.checked,
-              'is--indeterminate': column.halfChecked,
+              'is--checked': isChecked,
+              'is--indeterminate': indeterminate,
               'is--disabled': column.disabled
             }],
             title: colTitle,
@@ -180,13 +182,7 @@ export default defineComponent({
             }
           }, [
             h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+              class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
             }),
             h('span', {
               class: 'vxe-checkbox--label'
@@ -295,20 +291,14 @@ export default defineComponent({
                         }, [
                           h('li', {
                             class: ['vxe-export--panel-column-option', {
-                              'is--checked': isAll,
-                              'is--indeterminate': isIndeterminate
+                              'is--checked': isAllChecked,
+                              'is--indeterminate': isAllIndeterminate
                             }],
                             title: GlobalConfig.i18n('vxe.table.allTitle'),
                             onClick: allColumnEvent
                           }, [
                             h('span', {
-                              class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-                            }),
-                            h('span', {
-                              class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-                            }),
-                            h('span', {
-                              class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+                              class: ['vxe-checkbox--icon', isAllIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
                             }),
                             h('span', {
                               class: 'vxe-checkbox--label'

package/packages/filter/index.d.ts

@@ -1,4 +1,4 @@
-import { Filter } from '../../types/filter'
+import { VxeModuleFilter } from '../../types/filter'
 
 export * from '../../types/filter'
-export default Filter
+export default VxeModuleFilter

package/packages/filter/index.ts

@@ -4,7 +4,7 @@ import PanelComponent from './src/panel'
 import filterHook from './src/hook'
 import { dynamicApp } from '../dynamics'
 
-export const Filter = {
+export const VxeModuleFilter = {
   Panel: PanelComponent,
   install (app: App) {
     VXETable.hooks.add('$tableFilter', filterHook)
@@ -12,6 +12,8 @@ export const Filter = {
   }
 }
 
+export const Filter = VxeModuleFilter
+
 dynamicApp.component(PanelComponent.name, PanelComponent)
 
-export default Filter
+export default VxeModuleFilter

package/packages/filter/src/panel.ts

@@ -121,14 +121,16 @@ export default defineComponent({
           }, compConf.renderFilter(filterRender, params))
         ]
       }
+      const isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some((item: any) => item._checked)
+      const isAllIndeterminate = multiple && filterStore.isIndeterminate
       return [
         h('ul', {
           class: 'vxe-table--filter-header'
         }, [
           h('li', {
             class: ['vxe-table--filter-option', {
-              'is--checked': multiple ? filterStore.isAllSelected : !filterStore.options.some((item: any) => item._checked),
-              'is--indeterminate': multiple && filterStore.isIndeterminate
+              'is--checked': isAllChecked,
+              'is--indeterminate': isAllIndeterminate
             }],
             title: GlobalConfig.i18n(multiple ? 'vxe.table.allTitle' : 'vxe.table.allFilter'),
             onClick: (evnt: MouseEvent) => {
@@ -136,13 +138,7 @@ export default defineComponent({
             }
           }, (multiple ? [
             h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+              class: ['vxe-checkbox--icon', isAllIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
             })
           ] : []).concat([
             h('span', {
@@ -156,6 +152,8 @@ export default defineComponent({
             maxHeight: `${maxHeight}px`
           } : {}
         }, filterStore.options.map((item: any) => {
+          const isChecked = item._checked
+          const isIndeterminate = false
           return h('li', {
             class: ['vxe-table--filter-option', {
               'is--checked': item._checked
@@ -166,13 +164,7 @@ export default defineComponent({
             }
           }, (multiple ? [
             h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+              class: ['vxe-checkbox--icon', isIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
             })
           ] : []).concat([
             h('span', {

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.ts

@@ -2,12 +2,14 @@ import { App } from 'vue'
 import VxeFormComponent from './src/form'
 import { dynamicApp } from '../dynamics'
 
-export const Form = Object.assign(VxeFormComponent, {
+export const VxeForm = Object.assign(VxeFormComponent, {
   install (app: App) {
     app.component(VxeFormComponent.name, VxeFormComponent)
   }
 })
 
+export const Form = VxeForm
+
 dynamicApp.component(VxeFormComponent.name, VxeFormComponent)
 
-export default Form
+export default VxeForm

package/packages/form/src/form-config-item.ts

@@ -3,10 +3,11 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { VXETable } from '../../v-x-e-table'
 import { getFuncText, isEnableConf } from '../../tools/utils'
+import { getSlotVNs } from '../../tools/vn'
 import { renderTitle } from './render'
 import { isActivetem } from './util'
 
-import { VxeFormConstructor, VxeFormDefines, VxeFormPrivateMethods } from '../../../types/all'
+import { VxeFormConstructor, VxeFormDefines, VxeFormPrivateMethods, SlotVNodeType } from '../../../types/all'
 
 const VxeFormConfigItem = defineComponent({
   name: 'VxeFormConfigItem',
@@ -68,11 +69,11 @@ const VxeFormConfigItem = defineComponent({
           class: ['vxe-form--gather vxe-row', item.id, span ? `vxe-col--${span} is--span` : '', className ? (XEUtils.isFunction(className) ? className(params) : className) : '']
         }, childVNs) : createCommentVNode()
       }
-      let contentVNs: any[] = []
+      let contentVNs: SlotVNodeType[] = []
       if (defaultSlot) {
         contentVNs = $xeform.callSlot(defaultSlot, params)
       } else if (compConf && compConf.renderItemContent) {
-        contentVNs = compConf.renderItemContent(itemRender, params)
+        contentVNs = getSlotVNs(compConf.renderItemContent(itemRender, params))
       } else if (field) {
         contentVNs = [XEUtils.toValueString(XEUtils.get(data, field))]
       }

package/packages/form/src/form-item.ts

@@ -3,10 +3,11 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { VXETable } from '../../v-x-e-table'
 import { getFuncText, isEnableConf } from '../../tools/utils'
+import { getSlotVNs } from '../../tools/vn'
 import { createItem, watchItem, destroyItem, assemItem, XEFormItemProvide, isActivetem } from './util'
 import { renderTitle } from './render'
 
-import { VxeFormConstructor, VxeFormDefines, VxeFormItemPropTypes, VxeFormPrivateMethods } from '../../../types/all'
+import { SlotVNodeType, VxeFormConstructor, VxeFormDefines, VxeFormItemPropTypes, VxeFormPrivateMethods } from '../../../types/all'
 
 export const formItemProps = {
   title: String as PropType<VxeFormItemPropTypes.Title>,
@@ -92,11 +93,11 @@ export default defineComponent({
           isRequired = itemRules.some((rule) => rule.required)
         }
       }
-      let contentVNs: any[] = []
+      let contentVNs: SlotVNodeType[] = []
       if (defaultSlot) {
         contentVNs = $xeform.callSlot(defaultSlot, params)
       } else if (compConf && compConf.renderItemContent) {
-        contentVNs = compConf.renderItemContent(itemRender, params)
+        contentVNs = getSlotVNs(compConf.renderItemContent(itemRender, params))
       } else if (field) {
         contentVNs = [`${XEUtils.get(data, field)}`]
       }

package/packages/form/src/form.ts

@@ -1,4 +1,4 @@
-import { defineComponent, h, ref, Ref, resolveComponent, ComponentOptions, createCommentVNode, provide, computed, reactive, watch, nextTick, PropType, VNode, onMounted } from 'vue'
+import { defineComponent, h, ref, Ref, resolveComponent, ComponentOptions, createCommentVNode, provide, computed, reactive, watch, nextTick, PropType, onMounted } from 'vue'
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { VXETable } from '../../v-x-e-table'
@@ -9,6 +9,7 @@ import { createItem, handleFieldOrItem, isHiddenItem, isActivetem } from './util
 import { useSize } from '../../hooks/size'
 import VxeFormConfigItem from './form-config-item'
 import VxeLoading from '../../loading/index'
+import { getSlotVNs } from '../../tools/vn'
 
 import { VxeFormConstructor, VxeFormPropTypes, VxeFormEmits, FormReactData, FormMethods, FormPrivateRef, VxeFormPrivateMethods, VxeFormDefines, VxeFormItemPropTypes, VxeTooltipInstance, FormInternalData, VxeFormPrivateComputed } from '../../../types/all'
 
@@ -83,6 +84,7 @@ export default defineComponent({
     titleAsterisk: { type: Boolean as PropType<VxeFormPropTypes.TitleAsterisk>, default: () => GlobalConfig.form.titleAsterisk },
     titleOverflow: { type: [Boolean, String] as PropType<VxeFormPropTypes.TitleOverflow>, default: null },
     className: [String, Function] as PropType<VxeFormPropTypes.ClassName>,
+    readonly: Boolean as PropType<VxeFormPropTypes.Readonly>,
     items: Array as PropType<VxeFormPropTypes.Items>,
     rules: Object as PropType<VxeFormPropTypes.Rules>,
     preventSubmit: { type: Boolean as PropType<VxeFormPropTypes.PreventSubmit>, default: () => GlobalConfig.form.preventSubmit },
@@ -153,13 +155,13 @@ export default defineComponent({
       getComputeMaps: () => computeMaps
     } as unknown as VxeFormConstructor & VxeFormPrivateMethods
 
-    const callSlot = (slotFunc: ((params: any) => any) | string | null, params: any): VNode[] => {
+    const callSlot = (slotFunc: ((params: any) => any) | string | null, params: any) => {
       if (slotFunc) {
         if (XEUtils.isString(slotFunc)) {
           slotFunc = slots[slotFunc] || null
         }
         if (XEUtils.isFunction(slotFunc)) {
-          return slotFunc(params)
+          return getSlotVNs(slotFunc(params))
         }
       }
       return []
@@ -241,7 +243,7 @@ export default defineComponent({
             if (compConf && compConf.itemResetMethod) {
               compConf.itemResetMethod({ data, field, property: field, item, $form: $xeform })
             } else if (field) {
-              XEUtils.set(data, field, resetValue === null ? getResetValue(XEUtils.get(data, field), undefined) : resetValue)
+              XEUtils.set(data, field, resetValue === null ? getResetValue(XEUtils.get(data, field), undefined) : XEUtils.clone(resetValue, true))
             }
           }
         })

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.ts

@@ -2,12 +2,14 @@ import { App } from 'vue'
 import VxeFormGatherComponent from '../form/src/form-gather'
 import { dynamicApp } from '../dynamics'
 
-export const FormGather = Object.assign(VxeFormGatherComponent, {
+export const VxeFormGather = Object.assign(VxeFormGatherComponent, {
   install (app: App) {
     app.component(VxeFormGatherComponent.name, VxeFormGatherComponent)
   }
 })
 
+export const FormGather = VxeFormGather
+
 dynamicApp.component(VxeFormGatherComponent.name, VxeFormGatherComponent)
 
-export default FormGather
+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.ts

@@ -2,12 +2,14 @@ import { App } from 'vue'
 import VxeFormItemComponent from '../form/src/form-item'
 import { dynamicApp } from '../dynamics'
 
-export const FormItem = Object.assign(VxeFormItemComponent, {
+export const VxeFormItem = Object.assign(VxeFormItemComponent, {
   install (app: App) {
     app.component(VxeFormItemComponent.name, VxeFormItemComponent)
   }
 })
 
+export const FormItem = VxeFormItem
+
 dynamicApp.component(VxeFormItemComponent.name, VxeFormItemComponent)
 
-export default FormItem
+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.ts

@@ -2,12 +2,14 @@ import { App } from 'vue'
 import VxeGridComponent from './src/grid'
 import { dynamicApp } from '../dynamics'
 
-export const Grid = Object.assign(VxeGridComponent, {
+export const VxeGrid = Object.assign(VxeGridComponent, {
   install (app: App) {
     app.component(VxeGridComponent.name, VxeGridComponent)
   }
 })
 
+export const Grid = VxeGrid
+
 dynamicApp.component(VxeGridComponent.name, VxeGridComponent)
 
-export default Grid
+export default VxeGrid

package/packages/grid/src/grid.ts

@@ -9,6 +9,7 @@ import tableComponentProps from '../../table/src/props'
 import tableComponentEmits from '../../table/src/emits'
 import { useSize } from '../../hooks/size'
 import { GlobalEvent, hasEventKey, EVENT_KEYS } from '../../tools/event'
+import { getSlotVNs } from '../../tools/vn'
 
 import { TableMethods, VxeGridConstructor, VxeGridEmits, GridReactData, VxeGridPropTypes, VxeToolbarPropTypes, GridMethods, GridPrivateMethods, VxeGridPrivateComputed, VxeGridPrivateMethods, VxePagerInstance, VxeToolbarInstance, GridPrivateRef, VxeFormInstance, VxeTableProps, VxeTableConstructor, VxeTableMethods, VxeTablePrivateMethods, VxeTableEvents, VxePagerEvents, VxeFormEvents, VxeTableDefines, VxeTableEventProps, VxeFormItemProps, VxeGridProps } from '../../../types/all'
 
@@ -1024,7 +1025,7 @@ export default defineComponent({
             slotFunc = slots[slotFunc] || null
           }
           if (XEUtils.isFunction(slotFunc)) {
-            return slotFunc(params)
+            return getSlotVNs(slotFunc(params))
           }
         }
         return []

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.ts

@@ -1,6 +1,15 @@
-export const Icon = {
-  /* eslint-disable @typescript-eslint/no-empty-function */
-  install () {}
-}
+import { App } from 'vue'
+import VxeIconComponent from './src/icon'
+import { dynamicApp } from '../dynamics'
 
-export default Icon
+export const VxeIcon = Object.assign(VxeIconComponent, {
+  install (app: App) {
+    app.component(VxeIconComponent.name, VxeIconComponent)
+  }
+})
+
+export const Icon = VxeIcon
+
+dynamicApp.component(VxeIcon.name, VxeIcon)
+
+export default VxeIcon

package/packages/icon/src/icon.ts

@@ -0,0 +1,24 @@
+import { defineComponent, h, PropType } from 'vue'
+
+import { VxeIconPropTypes, VxeIconEmits } from '../../../types/all'
+
+export default defineComponent({
+  name: 'VxeIcon',
+  props: {
+    name: String as PropType<VxeIconPropTypes.Name>
+  },
+  emits: [
+    'click'
+  ] as VxeIconEmits,
+  setup (props, { emit }) {
+    const clickEvent = (evnt: KeyboardEvent) => {
+      emit('click', { $event: evnt })
+    }
+    return () => {
+      return h('i', {
+        class: `vxe-icon-${props.name}`,
+        onClick: clickEvent
+      })
+    }
+  }
+})

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.ts

@@ -2,12 +2,14 @@ import { App } from 'vue'
 import VxeInputConstructor from './src/input'
 import { dynamicApp } from '../dynamics'
 
-export const Input = Object.assign(VxeInputConstructor, {
+export const VxeInput = Object.assign(VxeInputConstructor, {
   install (app: App) {
     app.component(VxeInputConstructor.name, VxeInputConstructor)
   }
 })
 
+export const Input = VxeInput
+
 dynamicApp.component(VxeInputConstructor.name, VxeInputConstructor)
 
-export default Input
+export default VxeInput

package/packages/input/src/input.ts

@@ -1952,7 +1952,7 @@ export default defineComponent({
               onClick: datePrevEvent
             }, [
               h('i', {
-                class: 'vxe-icon--caret-left'
+                class: 'vxe-icon-caret-left'
               })
             ]),
             h('span', {
@@ -1960,7 +1960,7 @@ export default defineComponent({
               onClick: dateTodayMonthEvent
             }, [
               h('i', {
-                class: 'vxe-icon--dot'
+                class: 'vxe-icon-dot'
               })
             ]),
             h('span', {
@@ -1970,7 +1970,7 @@ export default defineComponent({
               onClick: dateNextEvent
             }, [
               h('i', {
-                class: 'vxe-icon--caret-right'
+                class: 'vxe-icon-caret-right'
               })
             ]),
             multiple && computeSupportMultiples.value ? h('span', {

package/packages/keyboard/index.d.ts

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

package/packages/keyboard/index.ts

@@ -1,10 +1,12 @@
 import keyboardHook from './src/hook'
 import { VXETable } from '../v-x-e-table'
 
-export const Keyboard = {
+export const VxeModuleKeyboard = {
   install () {
     VXETable.hooks.add('$tableKeyboard', keyboardHook)
   }
 }
 
-export default Keyboard
+export const Keyboard = VxeModuleKeyboard
+
+export default VxeModuleKeyboard

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.ts

@@ -2,12 +2,14 @@ import { App } from 'vue'
 import VxeListComponent from './src/list'
 import { dynamicApp } from '../dynamics'
 
-export const List = Object.assign(VxeListComponent, {
+export const VxeList = Object.assign(VxeListComponent, {
   install (app: App) {
     app.component(VxeListComponent.name, VxeListComponent)
   }
 })
 
+export const List = VxeList
+
 dynamicApp.component(VxeListComponent.name, VxeListComponent)
 
-export default List
+export default VxeList

package/packages/loading/index.ts

@@ -1,10 +1,12 @@
 import { App } from 'vue'
-import VxeLoading from './src/loading'
+import VxeLoadingComponent from './src/loading'
 
-export const Loading = Object.assign(VxeLoading, {
+export const VxeLoading = Object.assign(VxeLoadingComponent, {
   install (app: App) {
-    app.component(VxeLoading.name, VxeLoading)
+    app.component(VxeLoadingComponent.name, VxeLoadingComponent)
   }
 })
 
+export const Loading = VxeLoading
+
 export default VxeLoading

package/packages/menu/index.d.ts

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

package/packages/menu/index.ts

@@ -4,7 +4,7 @@ import PanelComponent from './src/panel'
 import menuHook from './src/hooks'
 import { dynamicApp } from '../dynamics'
 
-export const Menu = {
+export const VxeModuleMenu = {
   Panel: PanelComponent,
   install (app: App) {
     VXETable.hooks.add('$tableMenu', menuHook)
@@ -12,6 +12,8 @@ export const Menu = {
   }
 }
 
+export const Menu = VxeModuleMenu
+
 dynamicApp.component(PanelComponent.name, PanelComponent)
 
-export default Menu
+export default VxeModuleMenu

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.ts

@@ -96,13 +96,15 @@ const ModalController = {
 
 export const modal = ModalController
 
-export const Modal = Object.assign(VxeModalComponent, {
+export const VxeModal = Object.assign(VxeModalComponent, {
   install: function (app: App) {
     app.component(VxeModalComponent.name, VxeModalComponent)
     VXETable.modal = ModalController
   }
 })
 
+export const Modal = VxeModal
+
 dynamicApp.component(VxeModalComponent.name, VxeModalComponent)
 
-export default Modal
+export default VxeModal