diff --git a/apps/web-antd/src/components/description/index.ts b/apps/web-antd/src/components/description/index.ts deleted file mode 100644 index 46a851f1..00000000 --- a/apps/web-antd/src/components/description/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export { default as Description } from './src/description.vue'; -export * from './src/typing'; -export { useDescription } from './src/useDescription'; diff --git a/apps/web-antd/src/components/description/src/description.vue b/apps/web-antd/src/components/description/src/description.vue deleted file mode 100644 index 669a0164..00000000 --- a/apps/web-antd/src/components/description/src/description.vue +++ /dev/null @@ -1,205 +0,0 @@ - diff --git a/apps/web-antd/src/components/description/src/typing.ts b/apps/web-antd/src/components/description/src/typing.ts deleted file mode 100644 index bb3376c9..00000000 --- a/apps/web-antd/src/components/description/src/typing.ts +++ /dev/null @@ -1,48 +0,0 @@ -import type { DescriptionsProps } from 'antdv-next/es/descriptions'; -import type { JSX } from 'vue/jsx-runtime'; - -import type { CSSProperties, VNode } from 'vue'; - -import type { Recordable } from '@vben/types'; - -export interface DescItem { - labelMinWidth?: number; - contentMinWidth?: number; - labelStyle?: CSSProperties; - field: string; - label: JSX.Element | string | VNode; - // Merge column - span?: number; - show?: (...arg: any) => boolean; - // render - render?: ( - val: any, - data: Recordable, - ) => Element | JSX.Element | number | string | undefined | VNode; -} - -export interface DescriptionProps extends DescriptionsProps { - // Whether to include the collapse component - useCollapse?: boolean; - /** - * item configuration - * @type DescItem - */ - schema: DescItem[]; - /** - * 数据 - * @type object - */ - data: Recordable; -} - -export interface DescInstance { - setDescProps(descProps: Partial, delay?: boolean): void; -} - -export type Register = (descInstance: DescInstance) => void; - -/** - * @description: - */ -export type UseDescReturnType = [Register, DescInstance]; diff --git a/apps/web-antd/src/components/description/src/useDescription.ts b/apps/web-antd/src/components/description/src/useDescription.ts deleted file mode 100644 index 6c5584a7..00000000 --- a/apps/web-antd/src/components/description/src/useDescription.ts +++ /dev/null @@ -1,47 +0,0 @@ -import type { - DescInstance, - DescriptionProps, - UseDescReturnType, -} from './typing'; - -import { getCurrentInstance, ref, unref } from 'vue'; - -/** - * @deprecated 使用antd原生组件替代 下个版本将会移除 - */ -export function useDescription( - props?: Partial, -): UseDescReturnType { - if (!getCurrentInstance()) { - throw new Error( - 'useDescription() can only be used inside setup() or functional components!', - ); - } - const desc = ref(null); - const loaded = ref(false); - - function register(instance: DescInstance) { - // if (unref(loaded) && import.meta.env.PROD) { - // return; - // } - desc.value = instance; - props && instance.setDescProps(props); - loaded.value = true; - } - - const methods: DescInstance = { - setDescProps: ( - descProps: Partial, - delay = false, - ): void => { - if (!delay) { - unref(desc)?.setDescProps(descProps); - return; - } - // 奇怪的问题 在modal中需要setTimeout才会生效 - setTimeout(() => unref(desc)?.setDescProps(descProps)); - }, - }; - - return [register, methods]; -} diff --git a/apps/web-antd/src/views/system/user/user-info-modal.vue b/apps/web-antd/src/views/system/user/user-info-modal.vue index 6cffddb2..ac74874c 100644 --- a/apps/web-antd/src/views/system/user/user-info-modal.vue +++ b/apps/web-antd/src/views/system/user/user-info-modal.vue @@ -1,4 +1,6 @@ - - - - {{ currentUser.userId }} - - - - - - {{ mixInfo }} - - - {{ currentUser.phonenumber || '-' }} - - - {{ currentUser.email || '-' }} - - - - - {{ item }} - - - - - - - - - {{ item }} - - - - - - - {{ currentUser.createTime }} - - - {{ currentUser.loginIp ?? '-' }} - - - {{ currentUser.loginDate ?? '-' }} - - {{ diffLoginTime }}前 - - - - {{ currentUser.remark ?? '-' }} - - + diff --git a/apps/web-antd/src/views/system/user/user-reset-pwd-modal.vue b/apps/web-antd/src/views/system/user/user-reset-pwd-modal.vue index 02783522..ff2ec06b 100644 --- a/apps/web-antd/src/views/system/user/user-reset-pwd-modal.vue +++ b/apps/web-antd/src/views/system/user/user-reset-pwd-modal.vue @@ -1,11 +1,13 @@ @@ -95,17 +108,7 @@ async function handleClosed() { title="重置密码" > - - - {{ currentUser.userId }} - - - {{ currentUser.userName }} - - - {{ currentUser.nickName }} - - +