diff --git a/src/components/AnTable/components/Table.tsx b/src/components/AnTable/components/Table.tsx index ce93287..a44ee62 100644 --- a/src/components/AnTable/components/Table.tsx +++ b/src/components/AnTable/components/Table.tsx @@ -1,10 +1,9 @@ -import { AnForm, AnFormInstance, AnFormProps } from '@/components/AnForm'; -import { AnFormModal, AnFormModalInstance, AnFormModalProps } from '@/components/AnForm'; -import { TableColumnData, TableData, Table, Button, PaginationProps, TableInstance } from '@arco-design/web-vue'; +import { AnForm, AnFormInstance, AnFormModal, AnFormModalInstance, AnFormModalProps, AnFormProps } from '@/components/AnForm'; +import AniEmpty from '@/components/empty/AniEmpty.vue'; +import { Button, PaginationProps, Table, TableColumnData, TableData, TableInstance } from '@arco-design/web-vue'; import { isArray, isFunction, merge } from 'lodash-es'; import { InjectionKey, PropType, Ref, defineComponent, ref } from 'vue'; import { PluginContainer } from '../hooks/useTablePlugin'; -import AniEmpty from '@/components/empty/AniEmpty.vue'; type DataFn = (filter: { page: number; size: number; [key: string]: any }) => any | Promise; diff --git a/src/pages/system/user/components/password.tsx b/src/pages/system/user/components/password.tsx index 1995fe8..116f5f3 100644 --- a/src/pages/system/user/components/password.tsx +++ b/src/pages/system/user/components/password.tsx @@ -17,7 +17,7 @@ export const usePassworModal = () => { field: "password", label: ({ model }) => ( - 设置 {model.nickname} 的新密码: + 设置 {model.nickname} 的新密码: ), type: "input", diff --git a/src/types/auto-component.d.ts b/src/types/auto-component.d.ts index dcec7a1..8fa1457 100644 --- a/src/types/auto-component.d.ts +++ b/src/types/auto-component.d.ts @@ -17,7 +17,6 @@ declare module '@vue/runtime-core' { ACheckbox: typeof import('@arco-design/web-vue')['Checkbox'] ACheckboxGroup: typeof import('@arco-design/web-vue')['CheckboxGroup'] AConfigProvider: typeof import('@arco-design/web-vue')['ConfigProvider'] - ADatePicker: typeof import('@arco-design/web-vue')['DatePicker'] ADivider: typeof import('@arco-design/web-vue')['Divider'] ADoption: typeof import('@arco-design/web-vue')['Doption'] ADrawer: typeof import('@arco-design/web-vue')['Drawer'] @@ -54,8 +53,6 @@ declare module '@vue/runtime-core' { ASpace: typeof import('@arco-design/web-vue')['Space'] ASpin: typeof import('@arco-design/web-vue')['Spin'] ASwitch: typeof import('@arco-design/web-vue')['Switch'] - ATabPane: typeof import('@arco-design/web-vue')['TabPane'] - ATabs: typeof import('@arco-design/web-vue')['Tabs'] ATag: typeof import('@arco-design/web-vue')['Tag'] ATextarea: typeof import('@arco-design/web-vue')['Textarea'] ATooltip: typeof import('@arco-design/web-vue')['Tooltip'] diff --git a/src/utils/delConfirm.ts b/src/utils/delConfirm.ts index beb1019..c4479a1 100644 --- a/src/utils/delConfirm.ts +++ b/src/utils/delConfirm.ts @@ -10,7 +10,7 @@ export const delOptions: ModalConfig = { content: '危险操作,确定删除该数据吗?', maskClosable: false, closable: false, - okText: '确定', + okText: '确定删除', okButtonProps: { status: 'danger', },