diff --git a/.env.development b/.env.development index a069028..84593ba 100644 --- a/.env.development +++ b/.env.development @@ -9,7 +9,7 @@ # 只在开发模式中被载入 # 网站前缀 -# VITE_BASE_API_URL = http://192.168.2.33:8089/server/ +# VITE_BASE_API_URL = http://192.168.2.3:8089/server/ VITE_BASE_API_URL = http://43.137.2.78:8085/server/ # base api diff --git a/components.d.ts b/components.d.ts index 7658ee4..ec1710a 100644 --- a/components.d.ts +++ b/components.d.ts @@ -24,6 +24,9 @@ declare module '@vue/runtime-core' { ALayout: typeof import('ant-design-vue/es')['Layout'] ALayoutContent: typeof import('ant-design-vue/es')['LayoutContent'] ALayoutSider: typeof import('ant-design-vue/es')['LayoutSider'] + AList: typeof import('ant-design-vue/es')['List'] + AListItem: typeof import('ant-design-vue/es')['ListItem'] + AListItemMeta: typeof import('ant-design-vue/es')['ListItemMeta'] AModal: typeof import('ant-design-vue/es')['Modal'] ApiSelect: typeof import('./src/components/core/schema-form/src/components/ApiSelect.vue')['default'] ARow: typeof import('ant-design-vue/es')['Row'] @@ -34,6 +37,7 @@ declare module '@vue/runtime-core' { ATabPane: typeof import('ant-design-vue/es')['TabPane'] ATabs: typeof import('ant-design-vue/es')['Tabs'] ATag: typeof import('ant-design-vue/es')['Tag'] + ATextarea: typeof import('ant-design-vue/es')['Textarea'] ATooltip: typeof import('ant-design-vue/es')['Tooltip'] ATree: typeof import('ant-design-vue/es')['Tree'] ATypographyText: typeof import('ant-design-vue/es')['TypographyText'] diff --git a/src/App.vue b/src/App.vue index 6a631bc..023e1f5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -17,7 +17,6 @@ const { getAntdLocale } = useLocale(); watchEffect(() => { - if (route.meta?.title) { // 翻译网页标题 document.title = transformI18n(route.meta.title); @@ -31,8 +30,18 @@ align-items: center; } - .anticon svg{ + .anticon svg { display: block !important; } - + + .ant-input[disabled] { + color: #333333 !important; + } + + .ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector { + color: #333333 !important; + } + .ant-select-disabled.ant-select-multiple .ant-select-selection-item { + color: #333333 !important; + } diff --git a/src/api/login/model.d.ts b/src/api/login/model.d.ts index 35079d7..74a2caf 100644 --- a/src/api/login/model.d.ts +++ b/src/api/login/model.d.ts @@ -37,6 +37,7 @@ declare namespace API { password: string; account: string; sex?: number; + company?: string; }; /** 登录成功结果 */ diff --git a/src/api/user/model.d.ts b/src/api/user/model.d.ts index 0267247..d29190f 100644 --- a/src/api/user/model.d.ts +++ b/src/api/user/model.d.ts @@ -18,6 +18,7 @@ declare namespace API { state: number; remark: string; createTime: string; + company: string; isAdmin: number; email: string; auditState?: number; @@ -33,6 +34,7 @@ declare namespace API { state: number; remark: string; isAdmin: number; + company: string; email: string; }; diff --git a/src/components/core/schema-form/src/hooks/useFormEvents.ts b/src/components/core/schema-form/src/hooks/useFormEvents.ts index cb6bdb3..af61341 100644 --- a/src/components/core/schema-form/src/hooks/useFormEvents.ts +++ b/src/components/core/schema-form/src/hooks/useFormEvents.ts @@ -204,7 +204,6 @@ export function useFormEvents(formActionContext: UseFormActionContext) { } }); }); - unref(formPropsRef).schemas = uniqBy(schemas, 'field'); }; diff --git a/src/utils/common.ts b/src/utils/common.ts index 7c3c0cb..aa5758f 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -1,4 +1,5 @@ import dayjs from 'dayjs'; +import { message } from 'ant-design-vue'; /** * @description 处理首字母大写 abc => Abc @@ -39,6 +40,8 @@ export const copyText = (text: string) => { copyInput.select(); document.execCommand('copy'); copyInput.remove(); + // 添加提示 + message.success('复制成功'); resolve(true); }); }; diff --git a/src/views/client/entrance/index.vue b/src/views/client/entrance/index.vue index 87f39d2..2bd3818 100644 --- a/src/views/client/entrance/index.vue +++ b/src/views/client/entrance/index.vue @@ -8,7 +8,7 @@ - + - {{ item.stateText }} - - + + - --> - + - +