From f76f2072c8fe7c658053911ecef0e5bdf86740d9 Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Mon, 26 Sep 2022 16:20:17 +0800
Subject: [PATCH] feat: add name attribute for formkit component

Signed-off-by: Ryan Wang <i@ryanc.cc>
---
 .../components/AttachmentGroupEditingModal.vue        |  1 +
 .../components/AttachmentPolicyEditingModal.vue       |  1 +
 src/modules/contents/pages/SinglePageEditor.vue       |  2 +-
 .../pages/components/SinglePageSettingModal.vue       |  9 ++++++++-
 src/modules/contents/posts/PostEditor.vue             |  2 +-
 .../categories/components/CategoryEditingModal.vue    | 11 +++++++----
 .../contents/posts/components/PostSettingModal.vue    |  7 ++++++-
 .../posts/tags/components/TagEditingModal.vue         |  4 ++++
 .../interface/menus/components/MenuEditingModal.vue   |  1 +
 .../menus/components/MenuItemEditingModal.vue         |  2 ++
 .../system/roles/components/RoleEditingModal.vue      |  1 +
 .../system/users/components/UserEditingModal.vue      |  6 ++++++
 12 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/modules/contents/attachments/components/AttachmentGroupEditingModal.vue b/src/modules/contents/attachments/components/AttachmentGroupEditingModal.vue
index 131ea6f7..e43c3511 100644
--- a/src/modules/contents/attachments/components/AttachmentGroupEditingModal.vue
+++ b/src/modules/contents/attachments/components/AttachmentGroupEditingModal.vue
@@ -127,6 +127,7 @@ watch(
         v-model="formState.spec.displayName"
         label="名称"
         type="text"
+        name="displayName"
         validation="required"
       ></FormKit>
     </FormKit>
diff --git a/src/modules/contents/attachments/components/AttachmentPolicyEditingModal.vue b/src/modules/contents/attachments/components/AttachmentPolicyEditingModal.vue
index 2991bfc2..408bd817 100644
--- a/src/modules/contents/attachments/components/AttachmentPolicyEditingModal.vue
+++ b/src/modules/contents/attachments/components/AttachmentPolicyEditingModal.vue
@@ -205,6 +205,7 @@ const onVisibleChange = (visible: boolean) => {
         v-model="formState.spec.displayName"
         label="名称"
         type="text"
+        name="displayName"
         validation="required"
       ></FormKit>
       <FormKitSchema :schema="formSchema" />
diff --git a/src/modules/contents/pages/SinglePageEditor.vue b/src/modules/contents/pages/SinglePageEditor.vue
index 7ddd0fc9..c735a24c 100644
--- a/src/modules/contents/pages/SinglePageEditor.vue
+++ b/src/modules/contents/pages/SinglePageEditor.vue
@@ -32,7 +32,7 @@ const initialFormState: SinglePageRequest = {
       cover: "",
       deleted: false,
       published: false,
-      publishTime: undefined,
+      publishTime: "",
       pinned: false,
       allowComment: true,
       visible: "PUBLIC",
diff --git a/src/modules/contents/pages/components/SinglePageSettingModal.vue b/src/modules/contents/pages/components/SinglePageSettingModal.vue
index 89c292fb..77181806 100644
--- a/src/modules/contents/pages/components/SinglePageSettingModal.vue
+++ b/src/modules/contents/pages/components/SinglePageSettingModal.vue
@@ -15,7 +15,7 @@ const initialFormState: SinglePageRequest = {
       cover: "",
       deleted: false,
       published: false,
-      publishTime: undefined,
+      publishTime: "",
       pinned: false,
       allowComment: true,
       visible: "PUBLIC",
@@ -186,6 +186,7 @@ watchEffect(() => {
             v-model="formState.page.spec.title"
             label="标题"
             type="text"
+            name="title"
             validation="required"
           ></FormKit>
           <FormKit
@@ -201,6 +202,7 @@ watchEffect(() => {
               { label: '是', value: true },
               { label: '否', value: false },
             ]"
+            name="autoGenerate"
             label="自动生成摘要"
             type="radio"
           >
@@ -208,6 +210,7 @@ watchEffect(() => {
           <FormKit
             v-if="!formState.page.spec.excerpt.autoGenerate"
             v-model="formState.page.spec.excerpt.raw"
+            name="raw"
             label="自定义摘要"
             type="textarea"
           ></FormKit>
@@ -227,6 +230,7 @@ watchEffect(() => {
               { label: '是', value: true },
               { label: '否', value: false },
             ]"
+            name="allowComment"
             label="禁止评论"
             type="radio"
           ></FormKit>
@@ -255,16 +259,19 @@ watchEffect(() => {
             v-model="formState.page.spec.publishTime"
             label="发表时间"
             type="datetime-local"
+            name="publishTime"
           ></FormKit>
           <FormKit
             v-model="formState.page.spec.template"
             label="自定义模板"
             type="text"
+            name="template"
           ></FormKit>
           <FormKit
             v-model="formState.page.spec.cover"
             label="封面图"
             type="text"
+            name="cover"
           ></FormKit>
         </FormKit>
       </VTabItem>
diff --git a/src/modules/contents/posts/PostEditor.vue b/src/modules/contents/posts/PostEditor.vue
index 1ac1250a..5c087132 100644
--- a/src/modules/contents/posts/PostEditor.vue
+++ b/src/modules/contents/posts/PostEditor.vue
@@ -47,7 +47,7 @@ const initialFormState: PostRequest = {
       cover: "",
       deleted: false,
       published: false,
-      publishTime: undefined,
+      publishTime: "",
       pinned: false,
       allowComment: true,
       visible: "PUBLIC",
diff --git a/src/modules/contents/posts/categories/components/CategoryEditingModal.vue b/src/modules/contents/posts/categories/components/CategoryEditingModal.vue
index 4de2453f..8f7e08ae 100644
--- a/src/modules/contents/posts/categories/components/CategoryEditingModal.vue
+++ b/src/modules/contents/posts/categories/components/CategoryEditingModal.vue
@@ -36,9 +36,9 @@ const initialFormState: Category = {
   spec: {
     displayName: "",
     slug: "",
-    description: undefined,
-    cover: undefined,
-    template: undefined,
+    description: "",
+    cover: "",
+    template: "",
     priority: 0,
     children: [],
   },
@@ -134,6 +134,7 @@ watch(
       <FormKit
         id="displayNameInput"
         v-model="formState.spec.displayName"
+        name="displayName"
         label="名称"
         type="text"
         validation="required"
@@ -141,19 +142,21 @@ watch(
       <FormKit
         v-model="formState.spec.slug"
         help="通常作为分类访问地址标识"
+        name="slug"
         label="别名"
         type="text"
         validation="required"
       ></FormKit>
-      <FormKit label="上级目录" type="select"></FormKit>
       <FormKit
         v-model="formState.spec.cover"
         help="需要主题适配以支持"
+        name="cover"
         label="封面图"
         type="text"
       ></FormKit>
       <FormKit
         v-model="formState.spec.description"
+        name="description"
         help="需要主题适配以支持"
         label="描述"
         type="textarea"
diff --git a/src/modules/contents/posts/components/PostSettingModal.vue b/src/modules/contents/posts/components/PostSettingModal.vue
index a07abf1a..48570f02 100644
--- a/src/modules/contents/posts/components/PostSettingModal.vue
+++ b/src/modules/contents/posts/components/PostSettingModal.vue
@@ -17,7 +17,7 @@ const initialFormState: PostRequest = {
       cover: "",
       deleted: false,
       published: false,
-      publishTime: undefined,
+      publishTime: "",
       pinned: false,
       allowComment: true,
       visible: "PUBLIC",
@@ -220,6 +220,7 @@ watchEffect(() => {
             v-model="formState.post.spec.title"
             label="标题"
             type="text"
+            name="title"
             validation="required"
           ></FormKit>
           <FormKit
@@ -249,6 +250,7 @@ watchEffect(() => {
               { label: '是', value: true },
               { label: '否', value: false },
             ]"
+            name="autoGenerate"
             label="自动生成摘要"
             type="radio"
           >
@@ -257,6 +259,7 @@ watchEffect(() => {
             v-if="!formState.post.spec.excerpt.autoGenerate"
             v-model="formState.post.spec.excerpt.raw"
             label="自定义摘要"
+            name="raw"
             type="textarea"
           ></FormKit>
         </FormKit>
@@ -307,10 +310,12 @@ watchEffect(() => {
           <FormKit
             v-model="formState.post.spec.template"
             label="自定义模板"
+            name="template"
             type="text"
           ></FormKit>
           <FormKit
             v-model="formState.post.spec.cover"
+            name="cover"
             label="封面图"
             type="text"
           ></FormKit>
diff --git a/src/modules/contents/posts/tags/components/TagEditingModal.vue b/src/modules/contents/posts/tags/components/TagEditingModal.vue
index d5a6b0cd..8c83f116 100644
--- a/src/modules/contents/posts/tags/components/TagEditingModal.vue
+++ b/src/modules/contents/posts/tags/components/TagEditingModal.vue
@@ -146,6 +146,7 @@ watch(
       <FormKit
         id="displayNameInput"
         v-model="formState.spec.displayName"
+        name="displayName"
         label="名称"
         type="text"
         validation="required"
@@ -154,17 +155,20 @@ watch(
         v-model="formState.spec.slug"
         help="通常作为标签访问地址标识"
         label="别名"
+        name="slug"
         type="text"
         validation="required"
       ></FormKit>
       <FormKit
         v-model="formState.spec.color"
+        name="color"
         help="需要主题适配以支持"
         label="颜色"
         type="color"
       ></FormKit>
       <FormKit
         v-model="formState.spec.cover"
+        name="cover"
         help="需要主题适配以支持"
         label="封面图"
         type="text"
diff --git a/src/modules/interface/menus/components/MenuEditingModal.vue b/src/modules/interface/menus/components/MenuEditingModal.vue
index 67727353..1edd54fd 100644
--- a/src/modules/interface/menus/components/MenuEditingModal.vue
+++ b/src/modules/interface/menus/components/MenuEditingModal.vue
@@ -122,6 +122,7 @@ watch(
         help="可根据此名称查询菜单项"
         label="菜单名称"
         type="text"
+        name="displayName"
         validation="required"
       ></FormKit>
     </FormKit>
diff --git a/src/modules/interface/menus/components/MenuItemEditingModal.vue b/src/modules/interface/menus/components/MenuItemEditingModal.vue
index 7b660d76..073c4d6c 100644
--- a/src/modules/interface/menus/components/MenuItemEditingModal.vue
+++ b/src/modules/interface/menus/components/MenuItemEditingModal.vue
@@ -319,6 +319,7 @@ watch(
         v-model="formState.spec.displayName"
         label="名称"
         type="text"
+        name="displayName"
         validation="required"
       ></FormKit>
       <FormKit
@@ -326,6 +327,7 @@ watch(
         v-model="formState.spec.href"
         label="链接地址"
         type="text"
+        name="href"
         validation="required"
       ></FormKit>
 
diff --git a/src/modules/system/roles/components/RoleEditingModal.vue b/src/modules/system/roles/components/RoleEditingModal.vue
index 3af14949..3ffb6216 100644
--- a/src/modules/system/roles/components/RoleEditingModal.vue
+++ b/src/modules/system/roles/components/RoleEditingModal.vue
@@ -137,6 +137,7 @@ const handleResetForm = () => {
             help="角色别名，用于区分角色，不能重复，创建之后不能修改"
             label="别名"
             type="text"
+            name="name"
             :disabled="isUpdateMode"
             validation="required"
           ></FormKit>
diff --git a/src/modules/system/users/components/UserEditingModal.vue b/src/modules/system/users/components/UserEditingModal.vue
index bc20a4e5..3d3645f0 100644
--- a/src/modules/system/users/components/UserEditingModal.vue
+++ b/src/modules/system/users/components/UserEditingModal.vue
@@ -201,6 +201,7 @@ const handleRawModeChange = () => {
           :disabled="isUpdateMode"
           label="用户名"
           type="text"
+          name="name"
           validation="required"
         ></FormKit>
         <FormKit
@@ -208,12 +209,14 @@ const handleRawModeChange = () => {
           v-model="formState.spec.displayName"
           label="显示名称"
           type="text"
+          name="displayName"
           validation="required"
         ></FormKit>
         <FormKit
           v-model="formState.spec.email"
           label="电子邮箱"
           type="email"
+          name="email"
           validation="required"
         ></FormKit>
         <FormKit
@@ -226,16 +229,19 @@ const handleRawModeChange = () => {
           v-model="formState.spec.phone"
           label="手机号"
           type="text"
+          name="phone"
         ></FormKit>
         <FormKit
           v-model="formState.spec.avatar"
           label="头像"
           type="text"
+          name="avatar"
         ></FormKit>
         <FormKit
           v-model="formState.spec.bio"
           label="描述"
           type="textarea"
+          name="bio"
         ></FormKit>
       </FormKit>
     </div>