From e990fa17add60fd3a1a564764c143aaac8d876d9 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: Mon, 22 Apr 2024 22:37:15 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E7=BB=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1group-config=20=3D>=20group?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/search-form.vue                 |  2 +-
 src/locales/langs/en-us.ts                            |  2 +-
 src/locales/langs/zh-cn.ts                            |  2 +-
 src/router/elegant/imports.ts                         |  2 +-
 src/router/elegant/routes.ts                          | 11 +++++------
 src/router/elegant/transform.ts                       |  6 +++---
 src/typings/elegant-router.d.ts                       |  6 +++---
 src/views/{group-config => group}/index.vue           |  8 ++++----
 .../modules/group-operate-drawer.vue}                 |  2 +-
 .../modules/group-search.vue}                         |  2 +-
 10 files changed, 21 insertions(+), 22 deletions(-)
 rename src/views/{group-config => group}/index.vue (94%)
 rename src/views/{group-config/modules/groupConfig-operate-drawer.vue => group/modules/group-operate-drawer.vue} (99%)
 rename src/views/{group-config/modules/groupConfig-search.vue => group/modules/group-search.vue} (96%)

diff --git a/src/components/common/search-form.vue b/src/components/common/search-form.vue
index ac5395f..7441d5f 100644
--- a/src/components/common/search-form.vue
+++ b/src/components/common/search-form.vue
@@ -43,7 +43,7 @@ async function search() {
     <NForm ref="formRef" :model="model" label-placement="left" :label-width="80" :show-feedback="appStore.isMobile">
       <NGrid responsive="screen" item-responsive>
         <slot></slot>
-        <NFormItemGi span="24 m:12 m:6" class="pr-24px lg:p-t-0 md:p-t-16px">
+        <NFormItemGi :y-gap="8" span="24 m:12 m:6" class="pr-24px lg:p-t-0 md:p-t-16px">
           <NSpace class="min-w-172px w-full" justify="end">
             <NButton @click="reset">
               <template #icon>
diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index 4adaba6..4d205f1 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -196,7 +196,7 @@ const local: App.I18n.Schema = {
     exception_403: '403',
     exception_404: '404',
     exception_500: '500',
-    'group-config': 'Group Config'
+    group: 'Group Config'
   },
   page: {
     common: {
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 0486735..ed747b6 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -174,7 +174,7 @@ const local: App.I18n.Schema = {
     'function_super-page': '超级管理员可见',
     pods: '在线机器',
     namepase: '命名空间',
-    'group-config': '组管理',
+    group: '组管理',
     manage: '系统管理',
     manage_user: '用户管理',
     notify: '告警通知',
diff --git a/src/router/elegant/imports.ts b/src/router/elegant/imports.ts
index 4d910c5..288fb0f 100644
--- a/src/router/elegant/imports.ts
+++ b/src/router/elegant/imports.ts
@@ -28,7 +28,7 @@ export const views: Record<LastLevelRouteKey, RouteComponent | (() => Promise<Ro
   "function_super-page": () => import("@/views/function/super-page/index.vue"),
   function_tab: () => import("@/views/function/tab/index.vue"),
   "function_toggle-auth": () => import("@/views/function/toggle-auth/index.vue"),
-  "group-config": () => import("@/views/group-config/index.vue"),
+  group: () => import("@/views/group/index.vue"),
   home: () => import("@/views/home/index.vue"),
   manage_menu: () => import("@/views/manage/menu/index.vue"),
   manage_role: () => import("@/views/manage/role/index.vue"),
diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts
index d821cd9..802f7ba 100644
--- a/src/router/elegant/routes.ts
+++ b/src/router/elegant/routes.ts
@@ -168,13 +168,12 @@ export const generatedRoutes: GeneratedRoute[] = [
     ]
   },
   {
-    name: 'group-config',
-    path: '/group-config',
-    component: 'layout.base$view.group-config',
+    name: 'group',
+    path: '/group',
+    component: 'layout.base$view.group',
     meta: {
-      title: 'group-config',
-      i18nKey: 'route.group-config',
-      order: 40
+      title: 'group',
+      i18nKey: 'route.group'
     }
   },
   {
diff --git a/src/router/elegant/transform.ts b/src/router/elegant/transform.ts
index d1dc1dd..92b8704 100644
--- a/src/router/elegant/transform.ts
+++ b/src/router/elegant/transform.ts
@@ -114,14 +114,14 @@ function transformElegantRouteToVueRoute(
     }
 
   }
-  
+
   // add redirect to child
   if (children?.length && !vueRoute.redirect) {
     vueRoute.redirect = {
       name: children[0].name
     };
   }
-  
+
   if (children?.length) {
     const childRoutes = children.flatMap(child => transformElegantRouteToVueRoute(child, layouts, views));
 
@@ -161,7 +161,7 @@ const routeMap: RouteMap = {
   "function_super-page": "/function/super-page",
   "function_tab": "/function/tab",
   "function_toggle-auth": "/function/toggle-auth",
-  "group-config": "/group-config",
+  "group": "/group",
   "home": "/home",
   "login": "/login/:module(pwd-login)?",
   "manage": "/manage",
diff --git a/src/typings/elegant-router.d.ts b/src/typings/elegant-router.d.ts
index 7e02934..d90b22d 100644
--- a/src/typings/elegant-router.d.ts
+++ b/src/typings/elegant-router.d.ts
@@ -35,7 +35,7 @@ declare module "@elegant-router/types" {
     "function_super-page": "/function/super-page";
     "function_tab": "/function/tab";
     "function_toggle-auth": "/function/toggle-auth";
-    "group-config": "/group-config";
+    "group": "/group";
     "home": "/home";
     "login": "/login/:module(pwd-login)?";
     "manage": "/manage";
@@ -99,7 +99,7 @@ declare module "@elegant-router/types" {
     | "500"
     | "about"
     | "function"
-    | "group-config"
+    | "group"
     | "home"
     | "login"
     | "manage"
@@ -140,7 +140,7 @@ declare module "@elegant-router/types" {
     | "function_super-page"
     | "function_tab"
     | "function_toggle-auth"
-    | "group-config"
+    | "group"
     | "home"
     | "manage_menu"
     | "manage_role"
diff --git a/src/views/group-config/index.vue b/src/views/group/index.vue
similarity index 94%
rename from src/views/group-config/index.vue
rename to src/views/group/index.vue
index cfdc3e8..d0440f9 100644
--- a/src/views/group-config/index.vue
+++ b/src/views/group/index.vue
@@ -5,8 +5,8 @@ import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { useTable, useTableOperate } from '@/hooks/common/table';
 import { groupConfigIdModeRecord, groupConfigStatusRecord, yesOrNoRecord } from '@/constants/business';
-import GroupConfigOperateDrawer from './modules/groupConfig-operate-drawer.vue';
-import GroupConfigSearch from './modules/groupConfig-search.vue';
+import GroupOperateDrawer from './modules/group-operate-drawer.vue';
+import GroupSearch from './modules/group-search.vue';
 
 const appStore = useAppStore();
 
@@ -148,7 +148,7 @@ function edit(id: string) {
 
 <template>
   <div class="min-h-500px flex-col-stretch gap-16px overflow-hidden lt-sm:overflow-auto">
-    <GroupConfigSearch v-model:model="searchParams" @reset="resetSearchParams" @search="getData" />
+    <GroupSearch v-model:model="searchParams" @reset="resetSearchParams" @search="getData" />
     <NCard
       :title="$t('page.groupConfig.title')"
       :bordered="false"
@@ -178,7 +178,7 @@ function edit(id: string) {
         :pagination="mobilePagination"
         class="sm:h-full"
       />
-      <GroupConfigOperateDrawer
+      <GroupOperateDrawer
         v-model:visible="drawerVisible"
         :operate-type="operateType"
         :row-data="editingData"
diff --git a/src/views/group-config/modules/groupConfig-operate-drawer.vue b/src/views/group/modules/group-operate-drawer.vue
similarity index 99%
rename from src/views/group-config/modules/groupConfig-operate-drawer.vue
rename to src/views/group/modules/group-operate-drawer.vue
index c245d14..a1ca05c 100644
--- a/src/views/group-config/modules/groupConfig-operate-drawer.vue
+++ b/src/views/group/modules/group-operate-drawer.vue
@@ -7,7 +7,7 @@ import { groupConfigIdModeOptions, groupConfigStatusOptions, groupConfigYesOrNoO
 import { fetchAddGroupConfig, fetchEditGroupConfig, fetchGetPartitionTableList } from '@/service/api/group-config';
 
 defineOptions({
-  name: 'GroupConfigOperateDrawer'
+  name: 'GroupOperateDrawer'
 });
 
 interface Props {
diff --git a/src/views/group-config/modules/groupConfig-search.vue b/src/views/group/modules/group-search.vue
similarity index 96%
rename from src/views/group-config/modules/groupConfig-search.vue
rename to src/views/group/modules/group-search.vue
index a25edcf..b585bd6 100644
--- a/src/views/group-config/modules/groupConfig-search.vue
+++ b/src/views/group/modules/group-search.vue
@@ -2,7 +2,7 @@
 import { $t } from '@/locales';
 
 defineOptions({
-  name: 'GroupConfigSearch'
+  name: 'GroupSearch'
 });
 
 interface Emits {