diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index c3a585a..8bf4329 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -1,6 +1,6 @@ @@ -226,6 +231,7 @@ defineExpose(defaultExpose) :is-col="getProps.isCol" :schema="newSchema" @register="formRegister" + @validate="onFormValidate" /> diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index 9ec10c9..448daf5 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -182,7 +182,7 @@ export default defineComponent({ ) : undefined } - const rnderTreeTableColumn = (columnsChildren: TableColumn[]) => { + const renderTreeTableColumn = (columnsChildren: TableColumn[]) => { const { align, headerAlign, showOverflowTooltip } = unref(getProps) return columnsChildren.map((v) => { const props = { ...v } @@ -198,7 +198,7 @@ export default defineComponent({ {{ default: (data: TableSlotDefault) => v.children && v.children.length - ? rnderTableColumn(v.children) + ? renderTableColumn(v.children) : // @ts-ignore getSlot(slots, v.field, data) || v?.formatter?.(data.row, data.column, data.row[v.field], data.$index) || @@ -211,7 +211,7 @@ export default defineComponent({ }) } - const rnderTableColumn = (columnsChildren?: TableColumn[]) => { + const renderTableColumn = (columnsChildren?: TableColumn[]) => { const { columns, reserveIndex, @@ -253,7 +253,7 @@ export default defineComponent({ {{ default: (data: TableSlotDefault) => v.children && v.children.length - ? rnderTreeTableColumn(v.children) + ? renderTreeTableColumn(v.children) : // @ts-ignore getSlot(slots, v.field, data) || v?.formatter?.(data.row, data.column, data.row[v.field], data.$index) || @@ -278,7 +278,7 @@ export default defineComponent({ {...unref(getBindValue)} > {{ - default: () => rnderTableColumn(), + default: () => renderTableColumn(), // @ts-ignore append: () => getSlot(slots, 'append') }} diff --git a/src/router/index.ts b/src/router/index.ts index 57e380e..5dc50e8 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -159,42 +159,34 @@ export const asyncRouterMap: AppRouteRecordRaw[] = [ } ] }, - // { - // path: 'table', - // component: getParentLayout(), - // redirect: '/components/table/default-table', - // name: 'TableDemo', - // meta: { - // title: t('router.table'), - // alwaysShow: true - // }, - // children: [ - // { - // path: 'default-table', - // component: () => import('@/views/Components/Table/DefaultTable.vue'), - // name: 'DefaultTable', - // meta: { - // title: t('router.defaultTable') - // } - // }, - // { - // path: 'use-table', - // component: () => import('@/views/Components/Table/UseTableDemo.vue'), - // name: 'UseTable', - // meta: { - // title: 'UseTable' - // } - // }, - // { - // path: 'ref-table', - // component: () => import('@/views/Components/Table/RefTable.vue'), - // name: 'RefTable', - // meta: { - // title: 'RefTable' - // } - // } - // ] - // }, + { + path: 'table', + component: getParentLayout(), + redirect: '/components/table/default-table', + name: 'TableDemo', + meta: { + title: t('router.table'), + alwaysShow: true + }, + children: [ + { + path: 'default-table', + component: () => import('@/views/Components/Table/DefaultTable.vue'), + name: 'DefaultTable', + meta: { + title: t('router.defaultTable') + } + } + // { + // path: 'use-table', + // component: () => import('@/views/Components/Table/UseTableDemo.vue'), + // name: 'UseTable', + // meta: { + // title: 'UseTable' + // } + // } + ] + }, { path: 'editor-demo', component: getParentLayout(), diff --git a/src/views/Components/Form/UseFormDemo.vue b/src/views/Components/Form/UseFormDemo.vue index b070941..7e11c39 100644 --- a/src/views/Components/Form/UseFormDemo.vue +++ b/src/views/Components/Form/UseFormDemo.vue @@ -4,7 +4,7 @@ import { ContentWrap } from '@/components/ContentWrap' import { useI18n } from '@/hooks/web/useI18n' import { useForm } from '@/hooks/web/useForm' import { reactive, unref, ref } from 'vue' -import { ElButton, ElInput } from 'element-plus' +import { ElButton, ElInput, FormItemProp } from 'element-plus' import { useValidator } from '@/hooks/web/useValidator' import { getDictOneApi } from '@/api/common' @@ -257,6 +257,10 @@ const inoutValidation = async () => { console.log(val) }) } + +const formValidate = (prop: FormItemProp, isValid: boolean, message: string) => { + console.log(prop, isValid, message) +} @@ -301,7 +305,7 @@ const inoutValidation = async () => { - + diff --git a/src/views/Components/Table/RefTable.vue b/src/views/Components/Table/RefTable.vue deleted file mode 100644 index 95506bb..0000000 --- a/src/views/Components/Table/RefTable.vue +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - {{ t('tableDemo.show') }} {{ t('tableDemo.pagination') }} - - - {{ t('tableDemo.hidden') }} {{ t('tableDemo.pagination') }} - - - {{ t('tableDemo.reserveIndex') }} - {{ t('tableDemo.restoreIndex') }} - - {{ t('tableDemo.showSelections') }} - {{ t('tableDemo.hiddenSelections') }} - - {{ t('tableDemo.changeTitle') }} - - {{ t('tableDemo.showExpandedRows') }} - {{ t('tableDemo.hiddenExpandedRows') }} - - {{ t('tableDemo.selectAllNone') }} - - - - - - {{ t('tableDemo.action') }} - - - - - - {{ t('tableDemo.title') }}:{{ data.row.title }} - {{ t('tableDemo.author') }}:{{ data.row.author }} - {{ t('tableDemo.displayTime') }}:{{ data.row.display_time }} - - - - -