diff --git a/.env b/.env index 812a14d..f843557 100644 --- a/.env +++ b/.env @@ -8,7 +8,7 @@ VITE_SUBTITLE = 快速开发web应用的模板工具 # 部署路径: 当为 ./ 时路由模式需为 hash VITE_BASE = / # 接口前缀:参见 axios 的 baseURL -VITE_API = https://appnify.app.juetan.cn/ +VITE_API = http://127.0.0.1:3030/ # 首页路径 VITE_HOME_PATH = /home # 路由模式:web(路径) hash(锚点) @@ -24,7 +24,7 @@ VITE_PORT = 3020 # 代理前缀 VITE_PROXY_PREFIX = /api,/upload # 代理地址 -VITE_PROXY = https://appnify.app.juetan.cn/ +VITE_PROXY = http://127.0.0.1:3030/ # API文档 说明:需返回符合 OPENAPI 规范的json内容 VITE_OPENAPI = http://127.0.0.1:3030/openapi.json # 文件后缀 说明:设为dev时会优先加载index.dev.vue文件,否则回退至index.vue文件 diff --git a/src/components/AnForm/hooks/useForm.tsx b/src/components/AnForm/hooks/useForm.tsx index 386ce54..5b4792d 100644 --- a/src/components/AnForm/hooks/useForm.tsx +++ b/src/components/AnForm/hooks/useForm.tsx @@ -1,3 +1,4 @@ +import { merge } from 'lodash-es'; import { AnForm, AnFormInstance, AnFormProps } from '../components/Form'; import { FormItem, useItems } from './useItems'; @@ -17,7 +18,8 @@ export type FormUseOptions = Partial> & { }; export function useFormProps(options: FormUseOptions): Required { - const { model = {}, items: _items = [], submit = () => null, formProps = {} } = options; + const { model: _model = {}, items: _items = [], submit = () => null, formProps = {} } = options; + const model = merge({ id: undefined }, _model); const items = useItems(_items ?? [], model); return { model, diff --git a/src/pages/content/media/index.vue b/src/pages/content/media/index.vue index 0d5dbef..1666bec 100644 --- a/src/pages/content/media/index.vue +++ b/src/pages/content/media/index.vue @@ -19,11 +19,11 @@