diff --git a/.env b/.env index 1ead4d4..75a1446 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ # 应用配置 # ===================================================================================== # 网站标题 -VITE_TITLE = 绝弹管理后台 +VITE_TITLE = Appnify # 网站副标题 VITE_SUBTITLE = 快速开发web应用的模板工具 # API接口前缀:参见 axios 的 baseURL diff --git a/src/components/error/page-403.vue b/src/components/error/page-403.vue index 99d0c7c..b95cbfb 100644 --- a/src/components/error/page-403.vue +++ b/src/components/error/page-403.vue @@ -30,13 +30,4 @@ const router = useRouter(); - - - -{ - "meta": { - "title": "404", - "icon": "icon-park-outline-home" - } -} - + \ No newline at end of file diff --git a/src/components/form/form-modal.tsx b/src/components/form/form-modal.tsx index c5d0bfe..92e264f 100644 --- a/src/components/form/form-modal.tsx +++ b/src/components/form/form-modal.tsx @@ -132,7 +132,7 @@ export const FormModal = defineComponent({ content = ( @@ -144,7 +144,7 @@ export const FormModal = defineComponent({ if (typeof props.trigger === "object") { content = ( ); } diff --git a/src/components/form/use-form-modal.tsx b/src/components/form/use-form-modal.tsx index b549ffd..e709109 100644 --- a/src/components/form/use-form-modal.tsx +++ b/src/components/form/use-form-modal.tsx @@ -1,5 +1,5 @@ import { Modal } from "@arco-design/web-vue"; -import { assign } from "lodash-es"; +import { assign, merge } from "lodash-es"; import { reactive } from "vue"; import { useForm } from "./use-form"; import { FormModalProps } from "./form-modal"; @@ -7,6 +7,7 @@ import { FormModalProps } from "./form-modal"; const defaults: Partial> = { width: 1080, titleAlign: "start", + closable: false }; /** @@ -18,5 +19,5 @@ export const useFormModal = (options: FormModalProps): FormModalProps & { model: const form = useForm({ model, items }); - return reactive(assign({ modalProps: { ...defaults } }, { ...options, ...form })); + return reactive(merge({ modalProps: { ...defaults } }, { ...options, ...form })); }; diff --git a/src/components/table/use-table.tsx b/src/components/table/use-table.tsx index 6f855bb..1f579a5 100644 --- a/src/components/table/use-table.tsx +++ b/src/components/table/use-table.tsx @@ -167,11 +167,11 @@ export const useTable = (optionsOrFn: UseTableOptions | (() => UseTableOptions)) if (item.extend) { const createItem = createItems.find((i) => i.field === item.extend); if (createItem) { - searchItems.push(merge({ itemProps: { hideLabel: true } }, createItem, item)); + searchItems.push(merge({}, createItem, item)); continue; } } - searchItems.push(merge({ itemProps: { hideLabel: true } }, item)); + searchItems.push(merge({}, item)); } searchItems.push(config.searchItemSubmit); options.search.items = searchItems; diff --git a/src/constants/index.ts b/src/constants/index.ts index 52add17..aa19c62 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -1,2 +1 @@ -export * from "./gender"; export * from "./defineConstants"; diff --git a/src/pages/_layout/components/menu.vue b/src/pages/_layout/components/menu.vue index 7c0c1b7..c179c26 100644 --- a/src/pages/_layout/components/menu.vue +++ b/src/pages/_layout/components/menu.vue @@ -47,7 +47,7 @@ export default defineComponent({ render() { return (

{{ appStore.title }} - 开发版 + + 开发版 +

+ + + + + +