flame-plus 0.1.13 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flame-plus",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "private": false,
   "description": "基于 element-plus 的组件库",
   "main": "packages/index.ts",
@@ -20,6 +20,7 @@
     "core-js": "^3.6.5",
     "editor": "1.0.0",
     "element-plus": "^2.1.8",
+    "flame-request": "^1.0.1",
     "html-loader": "^3.1.0",
     "monaco-editor": "0.30.*",
     "monaco-editor-esm-webpack-plugin": "^2.0.2",

package/packages/components/base/flmButton/flmButton.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, PropType, computed } from 'vue'
-import { ButtonConfig, buttonDefaultConfig } from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+import { ButtonConfig, buttonDefaultConfig } from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['buttonClick'],
@@ -22,7 +22,7 @@ export default defineComponent({
       <el-button
         {...buttonConfig.value}
         onClick={() => ctx.emit('buttonClick')}
-      >{buttonConfig.value.text || '点击'}</el-button>
+      >{buttonConfig.value.buttonText || '点击'}</el-button>
     )
   },
 })

package/packages/components/base/flmCascader/flmCascader.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, PropType, computed, reactive } from 'vue'
-import { CascaderConfig, CascaderDefaultEvent, cascaderDefaultConfig } from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+import { CascaderConfig, CascaderDefaultEvent, cascaderDefaultConfig } from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['change', 'expand-change', 'blur', 'focus', 'visible-change', 'remove-tag'],

package/packages/components/base/flmCheckbox/flmCheckbox.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, PropType, reactive, computed } from 'vue'
-import { CheckboxConfig, CheckboxDefaultEvent, checkboxDefaultConfig } from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+import { CheckboxConfig, CheckboxDefaultEvent, checkboxDefaultConfig } from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['change'],

package/packages/components/base/flmCheckbox/flmCheckboxGroup.vue

@@ -1,12 +1,12 @@
 <script lang="tsx">
 import { defineComponent, PropType, ref, Ref, computed } from 'vue'
-import { flmCheckbox } from '../../index'
+import { flmCheckbox } from '@/components'
 import {
   CheckboxConfig,
   CheckboxGroupConfig,
   checkboxGroupDefaultConfig
-} from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+} from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   components: { flmCheckbox },

package/packages/components/base/flmColorPicker/flmColorPicker.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, PropType, reactive, computed } from 'vue'
-import { ColorPickerConfig, ColorPickerDefaultEvent, colorPickerDefaultConfig } from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+import { ColorPickerConfig, ColorPickerDefaultEvent, colorPickerDefaultConfig } from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['change'],

package/packages/components/base/flmDatePicker/flmDatePicker.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, PropType, computed, reactive } from 'vue'
-import { DatePickerConfig, DatePickerDefaultEvent, datePickerDefaultConfig } from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+import { DatePickerConfig, DatePickerDefaultEvent, datePickerDefaultConfig } from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: [

package/packages/components/base/flmDialog/flmDialog.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, PropType, reactive, computed } from 'vue'
-import { DialogConfig, DialogDefaultEvent, dialogDefaultConfig } from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+import { DialogConfig, DialogDefaultEvent, dialogDefaultConfig } from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['open', 'opened', 'close', 'closed', 'open-auto-focus', 'close-auto-focus'],

package/packages/components/base/flmInput/flmInput.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, PropType, reactive, computed } from 'vue'
-import { InputConfig, InputDefaultEvent, inputDefaultConfig } from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+import { InputConfig, InputDefaultEvent, inputDefaultConfig } from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['blur', 'focus', 'change', 'input', 'clear'],

package/packages/components/base/flmInputNumber/flmInputNumber.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, PropType, computed, reactive } from 'vue'
-import { InputNumberConfig, InputNumberDefaultEvent, inputNumberDefaultConfig } from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+import { InputNumberConfig, InputNumberDefaultEvent, inputNumberDefaultConfig } from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['change', 'blur', 'focus'],

package/packages/components/base/flmPagination/flmPagination.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, PropType, reactive, computed } from 'vue'
-import { PaginationConfig, PaginationDefaultEvent, paginationDefaultConfig } from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+import { PaginationConfig, PaginationDefaultEvent, paginationDefaultConfig } from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['size-change', 'current-change', 'prev-click', 'next-click'],

package/packages/components/base/flmRadio/flmRadio.vue

@@ -6,8 +6,8 @@ import {
   RadioGroupDefaultEvent,
   radioDefaultConfig,
   radioGroupDefaultConfig
-} from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+} from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['change'],

package/packages/components/base/flmRate/flmRate.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, PropType, computed, reactive } from 'vue'
-import { RateConfig, RateDefaultEvent, rateDefaultConfig } from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+import { RateConfig, RateDefaultEvent, rateDefaultConfig } from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['change'],

package/packages/components/base/flmRead/flmRead.vue

@@ -6,7 +6,7 @@
 
 <script lang="ts" setup>
 import { defineProps, PropType } from 'vue'
-import { ReadConfig } from '../../../model/flmComponentConfig'
+import { ReadConfig } from '@/model/flmComponentConfig'
 
 const props = defineProps({
   // 默认设置

package/packages/components/base/flmSelect/flmSelect.vue

@@ -6,8 +6,8 @@ import {
   OptionGroupConfig,
   OptionConfig,
   selectDefaultConfig
-} from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+} from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['change', 'visible-change', 'remove-tag', 'clear', 'blur', 'focus'],

package/packages/components/base/flmSlider/flmSlider.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, PropType, computed, reactive } from 'vue'
-import { SliderConfig, SliderDefaultEvent, sliderDefaultConfig } from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+import { SliderConfig, SliderDefaultEvent, sliderDefaultConfig } from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['change', 'input'],

package/packages/components/base/flmSwitch/flmSwitch.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, PropType, computed } from 'vue'
-import { SwitchConfig, switchDefaultConfig } from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+import { SwitchConfig, switchDefaultConfig } from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['change'],

package/packages/components/base/flmTimePicker/flmTimePicker.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, PropType, computed, reactive } from 'vue'
-import { TimePickerConfig, TimePickerDefaultEvent, timePickerDefaultConfig } from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+import { TimePickerConfig, TimePickerDefaultEvent, timePickerDefaultConfig } from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['change', 'blur', 'focus', 'visible-change' ],

package/packages/components/base/flmTimeSelect/flmTimeSelect.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, PropType, computed, reactive } from 'vue'
-import { TimeSelectConfig, timeSelectDefaultConfig } from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+import { TimeSelectConfig, timeSelectDefaultConfig } from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['change', 'blur', 'focus'],

package/packages/components/base/flmTransfer/flmTransfer.vue

@@ -1,7 +1,7 @@
 <script lang="tsx">
 import { defineComponent, PropType, computed, reactive } from 'vue'
-import { TransferConfig, TransferDefaultEvent, transferDefaultConfig } from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+import { TransferConfig, TransferDefaultEvent, transferDefaultConfig } from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: ['change', 'left-check-change', 'right-check-change'],

package/packages/components/complex/flmForm/flmForm.vue

@@ -27,7 +27,7 @@ import {
   flmTimePicker,
   flmTimeSelect,
   flmTransfer,
-} from '../../index'
+} from '@/components'
 import {
   ControlTypes,
   ControlConfig,
@@ -37,8 +37,8 @@ import {
   FormItemConfig,
   FormButtonConfig,
   formDefaultConfig
-} from '../../../model/flmComponentConfig'
-import { filterConfig, isValidKey } from '../../../utils'
+} from '@/model/flmComponentConfig'
+import { filterConfig, isValidKey } from '@/utils'
 
 export default defineComponent({
   components: {
@@ -59,7 +59,7 @@ export default defineComponent({
     flmTimeSelect,
     flmTransfer,
   },
-  emits: ['submit', 'cancel', 'customEvent'],
+  emits: ['submit', 'cancel', 'reset', 'customEvent'],
   props: {
     // 默认设置
     config: {
@@ -72,7 +72,7 @@ export default defineComponent({
     let formModel: FormModel = reactive({})  // 表单数据
 
     // 监听表单配置的 model，变化后更新组件内部 formModel
-    watch(() => props.config.model, (newModel: FormModel) => upadateFormModel(newModel))
+    watch(() => props.config.model, (newModel: FormModel) => updateFormModel(newModel))
 
     // 监听组件内部 formModel，变化后更新控件 value
     watch(formModel, (newModel: FormModel) => updateControl(newModel))
@@ -80,7 +80,7 @@ export default defineComponent({
     onMounted(() => {
       if (props.config?.model && Object.keys(props.config?.model).length) {
         updateControl(props.config.model)
-        upadateFormModel(props.config.model)
+        updateFormModel(props.config.model)
       }
     })
 
@@ -107,7 +107,7 @@ export default defineComponent({
      * @date 2022-05-09
      * @param {FormModel} model
      */
-    const upadateFormModel = (model: FormModel) => {
+    const updateFormModel = (model: FormModel) => {
       Object.entries(model).forEach(([key, value]: Array<any>) => formModel[key] = value)
     }
 
@@ -122,10 +122,10 @@ export default defineComponent({
     /**
      * 表单方法调用
      * @date 2022-04-14
-     * @param {'submit' | 'cancel' | string} event 方法名（默认方法直接调用；自定义方法回传方法名及表单数据）
+     * @param {'submit' | 'cancel' | 'reset' | string} event 方法名（默认方法直接调用；自定义方法回传方法名及表单数据）
      */
     const formEvent = (event: FormButtonConfig['event']) => {
-      const defaultEvent: Record<FormButtonConfig['event'], Function> = { submit, cancel }
+      const defaultEvent: Record<FormButtonConfig['event'], Function> = { submit, cancel, reset }
       isValidKey(event, defaultEvent)
         ? defaultEvent[event]()
         : emit('customEvent', { event, formModel })
@@ -142,7 +142,6 @@ export default defineComponent({
 
     // 取消
     const cancel = () => {
-      reset()
       emit('cancel', formModel)
     }
 
@@ -151,6 +150,7 @@ export default defineComponent({
       const formRef: any = instance?.refs['formRef']
       if (!formRef) return
       formRef.resetFields()
+      emit('reset', formModel)
     }
 
     /**
@@ -171,7 +171,7 @@ export default defineComponent({
           if (isValidKey('isSlot', item)) {
             const { isSlot, ...itemConfig } = item
             return (
-              <el-form-item {...itemConfig}>
+              <el-form-item class={`form-${item.prop}`} {...itemConfig}>
                 {(slots[item.prop]?.({ prop: item.prop, formModel }))}
               </el-form-item>
             )
@@ -179,7 +179,7 @@ export default defineComponent({
             const { controlType, controlConfig, ...itemConfig } = item
             if (controlType && controlConfig) {
               return (
-                <el-form-item {...itemConfig}>
+                <el-form-item class={`form-${item.prop}`} {...itemConfig}>
                   {controlDom(item.prop, controlType, controlConfig)}
                 </el-form-item>
               )
@@ -198,7 +198,7 @@ export default defineComponent({
     const buttonsDom = (buttons: FormConfig['buttons'] = []) => {
       if (buttons.length) {
         return (
-          <el-form-item>
+          <el-form-item class="form-buttons">
             {buttons.map(({ event, ...config }: FormButtonConfig) =>
               <flm-button config={config} onButtonClick={() => formEvent(event)} />
             )}
@@ -211,13 +211,16 @@ export default defineComponent({
 
     // 表单设置
     const formConfig = computed((): FormConfig => filterConfig(formDefaultConfig, props.config))
-    const { items = [], buttons = [], model, ...defaultConfig } = formConfig.value
-    return () => (
-      <el-form ref='formRef' {...defaultConfig} model={formModel}>
-        {formItemsDom(items)}
-        {buttonsDom(buttons)}
-      </el-form>
-    )
+    const formDom = () => {
+      const { items = [], buttons = [], model, ...defaultConfig } = formConfig.value
+      return (
+        <el-form ref='formRef' {...defaultConfig} model={formModel}>
+          {formItemsDom(items)}
+          {buttonsDom(buttons)}
+        </el-form>
+      )
+    }
+    return () => (formDom())
   },
 })
 </script>

package/packages/components/complex/flmSearch/flmSearch.vue

@@ -5,7 +5,7 @@
       ref="searchDefaultRef"
       :config="defaultConfig"
       @submit="searchSubmit"
-      @cancel="searchCancel"
+      @reset="searchReset"
       @customEvent="searchCustomEvent"
     >
       <template v-for="defaultSlot in defaultSlots" #[defaultSlot]="{ prop, formModel }">
@@ -37,15 +37,15 @@
 </template>
 
 <script lang="ts" setup>
-import { defineProps, PropType, ref, Ref, computed, ComputedRef } from 'vue'
-import { flmForm } from '../../index'
-import { FormConfig, FormItemConfig } from '../../../model/flmComponentConfig'
-import { isValidKey } from '../../../utils'
+import { PropType, ref, Ref, computed, ComputedRef } from 'vue'
+import { flmForm } from '@/components'
+import { ButtonType, FormItemConfig, SearchConfig } from '@/model/flmComponentConfig'
+import { isValidKey } from '@/utils'
 
-const emit = defineEmits(['searchSubmit', 'searchCancel', 'searchCustomEvent'])
+const emit = defineEmits(['searchSubmit', 'searchReset', 'searchCustomEvent'])
 const props = defineProps({
   config: {
-    type: Object as PropType<FormConfig>,
+    type: Object as PropType<SearchConfig>,
     default() {
       return {}
     }
@@ -57,38 +57,38 @@ const searchExtraRef: Ref<any> = ref()         // 额外搜索栏实例
 
 let showExtra: Ref<boolean> = ref(false)       // 显示额外搜索条件
 let hasExtra: Ref<boolean> = ref(false)        // 有额外搜索条件
-let extraFormModel: Ref<FormConfig> = ref({})  // 额外搜索条件
+let extraFormModel: Ref<SearchConfig> = ref({})  // 额外搜索条件
 
-const maxFormItem = 3  // 默认搜索栏最大条件数
+const maxFormItem = computed(() => props.config.maxFormItem || 3) // 默认搜索栏最大条件数
 
 // 默认搜索栏设置
-const defaultConfig: ComputedRef<FormConfig> = computed(() => {
+const defaultConfig: ComputedRef<SearchConfig> = computed(() => {
   const { items = [], buttons, ...config } = props.config
-  hasExtra.value = items.length > maxFormItem
-  hasExtra.value && buttons?.unshift({ 'text': '更多', 'event': 'openDrawer' })  // 搜索条件大于最大数量，插入更多按钮
+  hasExtra.value = items.length > maxFormItem.value
+  hasExtra.value && buttons?.unshift({ 'buttonText': '更多', 'event': 'openDrawer' })  // 搜索条件大于最大数量，插入更多按钮
   return {
     ...config,
     inline: true,
-    items: items.slice(0, maxFormItem),
+    items: items.slice(0, maxFormItem.value),
     buttons
   }
 })
 // 额外搜索栏设置
-const extraConfig: ComputedRef<FormConfig> = computed(() => {
+const extraConfig: ComputedRef<SearchConfig> = computed(() => {
   const { items, buttons, ...config } = props.config
   return {
     ...config,
     inline: false,
-    items: items?.slice(maxFormItem),
+    items: items?.slice(maxFormItem.value),
     // 插入额外搜索栏按钮
     buttons: [
       {
-        'text': '取消',
+        'buttonText': '取消',
         'event': 'cancel'
       },
       {
-        'type': 'primary',
-        'text': '搜索',
+        'type': ButtonType['primary'],
+        'buttonText': '搜索',
         'event': 'submit'
       }
     ]
@@ -96,30 +96,35 @@ const extraConfig: ComputedRef<FormConfig> = computed(() => {
 })
 
 // 获取表格插槽
-const getFormSlots = (items: FormConfig['items'] = []): Array<string> => {
-  return items
-    .map(({ prop, isSlot }: FormItemConfig) => isSlot && prop)
-    .filter(item => item)
+const getFormSlots = (items: SearchConfig['items'] = []): Array<string> => {
+  let slots: Array<string> = []
+  items.forEach((item: FormItemConfig) => {
+    if (isValidKey('isSlot', item)) {
+      const { prop } = item
+      prop && typeof(prop) === 'string' && slots.push(prop)
+    }
+  })
+  return slots
 }
 // 默认搜索栏插槽
-const defaultSlots = computed((): Array<string> => getFormSlots(props.config.items.slice(0, maxFormItem)))
+const defaultSlots = computed((): Array<string> => getFormSlots(props.config.items?.slice(0, maxFormItem.value)) ?? [])
 // 额外搜索栏插槽
-const extraSlots = computed((): Array<string> => getFormSlots(props.config.items.slice(maxFormItem)))
+const extraSlots = computed((): Array<string> => getFormSlots(props.config.items?.slice(maxFormItem.value)) ?? [])
 
 // 搜索栏提交
-const searchSubmit = (formModel: FormConfig['model']) => {
+const searchSubmit = (formModel: SearchConfig['model']) => {
   emit('searchSubmit', { ...formModel, ...extraFormModel.value })
 }
 
 // 搜索栏取消
-const searchCancel = () => {
+const searchReset = () => {
   searchExtraRef.value?.reset()
-  const extraFormMoadel = searchExtraRef.value?.formModel ?? {}
-  emit('searchCancel', { ...extraFormMoadel, ...searchDefaultRef.value.formModel })
+  const extraFormModel = searchExtraRef.value?.formModel ?? {}
+  emit('searchReset', { ...extraFormModel, ...searchDefaultRef.value.formModel })
 }
 
 // 搜索栏自定义操作
-const searchCustomEvent = ({ event, formModel }: { event: string, formModel: FormConfig['model']}) => {
+const searchCustomEvent = ({ event, formModel }: { event: string, formModel: SearchConfig['model']}) => {
   const customEvent: Record<string, Function> = { openDrawer }
   if (isValidKey(event, customEvent)) {
     customEvent[event](formModel)
@@ -132,11 +137,9 @@ const openDrawer = () => showExtra.value = true    // 打开额外搜索栏弹
 const closeDrawer = () => showExtra.value = false  // 关闭额外搜索栏弹窗
 
 // 额外搜索栏提交
-const drawerSubmit = (formModel: FormConfig['model']) => {
+const drawerSubmit = (formModel: SearchConfig['model']) => {
   formModel && (extraFormModel.value = formModel)
   emit('searchSubmit', { ...searchDefaultRef.value.formModel, ...formModel })
   closeDrawer()
 }
-</script>
-
-<style lang="scss"></style>
+</script>

package/packages/components/complex/flmTable/flmTable.vue

@@ -1,12 +1,13 @@
 <script lang="tsx">
-import { defineComponent, PropType, computed } from 'vue'
+import { defineComponent, PropType, reactive, computed } from 'vue'
 import {
   TableConfig,
   TableColumnConfig,
+  TableDefaultEvent,
   tableDefaultConfig,
   tableColumnDefaultConfig
-} from '../../../model/flmComponentConfig'
-import { filterConfig } from '../../../utils'
+} from '@/model/flmComponentConfig'
+import { filterConfig } from '@/utils'
 
 export default defineComponent({
   emits: [
@@ -37,6 +38,44 @@ export default defineComponent({
     },
   },
   setup(props, { slots, emit }) {
+    // 表格默认事件
+    const tableDefaultEvent: TableDefaultEvent = reactive({
+      onSelect: (selection: any, row: any) => emit('select', { selection, row }),
+      onSelectAll: (selection: any) => emit('select-all', selection),
+      onSelectionChange: (row: any, column: any, cell: any, event: any) => emit('selection-change', { row, column, cell, event }),
+      onCellMouseEnter: (row: any, column: any, cell: any, event: any) => emit('cell-mouse-enter', { row, column, cell, event }),
+      onCellMouseLeave: (row: any, column: any, cell: any, event: any) => emit('cell-mouse-leave', { row, column, cell, event }),
+      onCellClick: (row: any, column: any, cell: any, event: any) => emit('cell-click', { row, column, cell, event }),
+      onCellDblclick: (row: any, column: any, cell: any, event: any) => emit('cell-dblclick', { row, column, cell, event }),
+      onCellContextmenu: (row: any, column: any, cell: any, event: any) => emit('cell-contextmenu', { row, column, cell, event }),
+      onRowClick: (row: any, column: any, event: any) => emit('row-click', { row, column, event }),
+      onRowContextmenu: (row: any, column: any, event: any) => emit('row-contextmenu', { row, column, event }),
+      onRowDblclick: (row: any, column: any, event: any) => emit('row-dblclick', { row, column, event }),
+      onHeaderClick: (column: any, event: any) => emit('header-click', { column, event }),
+      onHeaderContextmenu: (column: any, event: any) => emit('header-contextmenu', { column, event }),
+      onSortChange: ({ column, prop, order }: any) => emit('sort-change', { column, prop, order }),
+      onFilterChange: (filters: any) => emit('filter-change', filters),
+      onCurrentChange: (currentRow: any, oldCurrentRow: any) => emit('current-change', { currentRow, oldCurrentRow }),
+      onHeaderDragend: (newWidth: any, oldWidth: any, column: any, event: any) => emit('header-dragend', { newWidth, oldWidth, column, event }),
+      onExpandChange: (row: any, expanded: any) => emit('expand-change', { row, expanded }),
+    })
+    
+    /**
+     * 表格
+     * @date 2022-09-29
+     * @param {TableConfig} tableConfig 表格配置
+     * @returns {any} 表格dom
+     */
+    const tableDom = (tableConfig: TableConfig) => {
+      const { columns = [], ...defaultConfig } = tableConfig
+      return (
+        <el-table
+          {...defaultConfig}
+          {...tableDefaultEvent}
+        >{tableColumnDom(columns)}</el-table>
+      )
+    }
+
     /**
      * 表格元素
      * @date 2022-04-14
@@ -61,30 +100,7 @@ export default defineComponent({
 
     // 表单设置
     const tableConfig = computed((): TableConfig => filterConfig(tableDefaultConfig, props.config))
-    const { columns = [], ...defaultConfig } = tableConfig.value
-    return () => (
-      <el-table
-        {...defaultConfig}
-        onSelect={(selection: any, row: any) => emit('select', { selection, row })}
-        onSelectAll={(selection: any) => emit('select-all', selection)}
-        onSelectionChange={(row: any, column: any, cell: any, event: any) => emit('selection-change', { row, column, cell, event })}
-        onCellMouseEnter={(row: any, column: any, cell: any, event: any) => emit('cell-mouse-enter', { row, column, cell, event })}
-        onCellMouseLeave={(row: any, column: any, cell: any, event: any) => emit('cell-mouse-leave', { row, column, cell, event })}
-        onCellClick={(row: any, column: any, cell: any, event: any) => emit('cell-click', { row, column, cell, event })}
-        onCellDblclick={(row: any, column: any, cell: any, event: any) => emit('cell-dblclick', { row, column, cell, event })}
-        onCellContextmenu={(row: any, column: any, cell: any, event: any) => emit('cell-contextmenu', { row, column, cell, event })}
-        onRowClick={(row: any, column: any, event: any) => emit('row-click', { row, column, event })}
-        onRowContextmenu={(row: any, column: any, event: any) => emit('row-contextmenu', { row, column, event })}
-        onRowDblclick={(row: any, column: any, event: any) => emit('row-dblclick', { row, column, event })}
-        onHeaderClick={(column: any, event: any) => emit('header-click', { column, event })}
-        onHeaderContextmenu={(column: any, event: any) => emit('header-contextmenu', { column, event })}
-        onSortChange={({ column, prop, order }: any) => emit('sort-change', { column, prop, order })}
-        onFilterChange={(filters: any) => emit('filter-change', filters)}
-        onCurrentChange={(currentRow: any, oldCurrentRow: any) => emit('current-change', { currentRow, oldCurrentRow })}
-        onHeaderDragend={(newWidth: any, oldWidth: any, column: any, event: any) => emit('header-dragend', { newWidth, oldWidth, column, event })}
-        onExpandChange={(row: any, expanded: any) => emit('expand-change', { row, expanded })}
-      >{tableColumnDom(columns)}</el-table>
-    )
+    return () => (tableDom(tableConfig.value))
   },
 })
 </script>

package/packages/components/complex/flmToolbar/flmToolbar.vue

@@ -12,7 +12,7 @@
       trigger="click"
       @command="toolbarClick"
     >
-      <flm-button :config="{ ...config.publicConfig, text: '更多' }" />
+      <flm-button :config="{ ...config.publicConfig, buttonText: '更多' }" />
       <template #dropdown>
         <el-dropdown-menu>
           <el-dropdown-item
@@ -20,7 +20,7 @@
             :config="buttonConfig"
             :key="buttonConfig.event"
             :command="buttonConfig.event"
-          >{{ buttonConfig.text }}</el-dropdown-item>
+          >{{ buttonConfig.buttonText }}</el-dropdown-item>
         </el-dropdown-menu>
       </template>
     </el-dropdown>
@@ -29,8 +29,8 @@
 
 <script lang="ts" setup>
 import { defineEmits, defineProps, PropType, computed, ComputedRef } from 'vue'
-import { flmButton } from '../../index'
-import { ToolbarConfig, ToolbarButtonConfig } from '../../../model/flmComponentConfig'
+import { flmButton } from '@/components'
+import { ToolbarConfig, ToolbarButtonConfig } from '@/model/flmComponentConfig'
 
 const emit = defineEmits(['toolbarClick'])
 const props = defineProps({