From e263e45f617b82dc92968435339b048cfb4bac4e Mon Sep 17 00:00:00 2001
From: JamesChenX <eurekajameschen@gmail.com>
Date: Sat, 28 Oct 2023 13:31:03 +0800
Subject: [PATCH] Fix the group question pane is missing in turms-admin

---
 .../src/components/pages/content/group/index.vue | 12 ++++++------
 .../pages/content/group/info/index.vue           |  6 +++---
 .../pages/content/template/modal-form.vue        | 16 ----------------
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/turms-admin/ui/src/components/pages/content/group/index.vue b/turms-admin/ui/src/components/pages/content/group/index.vue
index 0bb689318e..3144804809 100644
--- a/turms-admin/ui/src/components/pages/content/group/index.vue
+++ b/turms-admin/ui/src/components/pages/content/group/index.vue
@@ -7,7 +7,7 @@
             key="1"
             :tab="$t('groupInfo')"
         >
-            <content-group-info-pane />
+            <content-group-info-tabs />
         </a-tab-pane>
         <a-tab-pane
             key="2"
@@ -25,7 +25,7 @@
             key="4"
             :tab="$t('groupEnrollment')"
         >
-            <content-group-enrollment-pane />
+            <content-group-enrollment-tabs />
         </a-tab-pane>
         <a-tab-pane
             key="5"
@@ -37,19 +37,19 @@
 </template>
 
 <script>
-import ContentGroupInfoPane from './info/index.vue';
+import ContentGroupInfoTabs from './info/index.vue';
 import ContentGroupMemberPane from './content-group-member-pane.vue';
 import ContentGroupBlocklistPane from './content-group-blocklist-pane.vue';
-import ContentGroupEnrollmentPane from './entrollment/index.vue';
+import ContentGroupEnrollmentTabs from './entrollment/index.vue';
 import ContentGroupTypePane from './content-group-type-pane.vue';
 
 export default {
     name: 'content-group-tabs',
     components: {
-        ContentGroupInfoPane,
+        ContentGroupInfoTabs,
         ContentGroupMemberPane,
         ContentGroupBlocklistPane,
-        ContentGroupEnrollmentPane,
+        ContentGroupEnrollmentTabs,
         ContentGroupTypePane
     }
 };
diff --git a/turms-admin/ui/src/components/pages/content/group/info/index.vue b/turms-admin/ui/src/components/pages/content/group/info/index.vue
index 506a520ad7..e7051e810b 100644
--- a/turms-admin/ui/src/components/pages/content/group/info/index.vue
+++ b/turms-admin/ui/src/components/pages/content/group/info/index.vue
@@ -7,7 +7,7 @@
             key="1"
             :tab="$t('basicInfo')"
         >
-            <content-group-base-info-pane />
+            <content-group-info-pane />
         </a-tab-pane>
         <a-tab-pane
             key="2"
@@ -19,13 +19,13 @@
 </template>
 
 <script>
-import ContentGroupBaseInfoPane from './content-group-info-pane.vue';
+import ContentGroupInfoPane from './content-group-info-pane.vue';
 import ContentGroupQuestionPane from './content-group-question-pane.vue';
 
 export default {
     name: 'content-group-info-tabs',
     components: {
-        ContentGroupBaseInfoPane,
+        ContentGroupInfoPane,
         ContentGroupQuestionPane
     }
 };
diff --git a/turms-admin/ui/src/components/pages/content/template/modal-form.vue b/turms-admin/ui/src/components/pages/content/template/modal-form.vue
index 8cae4a93b0..247cbb80e9 100644
--- a/turms-admin/ui/src/components/pages/content/template/modal-form.vue
+++ b/turms-admin/ui/src/components/pages/content/template/modal-form.vue
@@ -130,22 +130,6 @@ export default {
             loading: false,
             parsedFormState: {},
             showNoFieldForUpdateError: false,
-            formItemLayout: {
-                labelCol: {
-                    xs: { span: 24 },
-                    sm: { span: 4 }
-                },
-                wrapperCol: {
-                    xs: { span: 24 },
-                    sm: { span: 20 }
-                }
-            },
-            formItemLayoutWithOutLabel: {
-                wrapperCol: {
-                    xs: { span: 24, offset: 0 },
-                    sm: { span: 20, offset: 4 }
-                }
-            },
             dynamicInputId: 1
         };
     },