Merge pull request #152 from suyuan32/dev

Dev
suyuan32 · Dec 20, 2023 · 527ef18 · 527ef18
2 parents 3777f32 + 50c2f4b
commit 527ef18
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simple-admin",
-  "version": "1.2.5",
+  "version": "1.2.8",
   "homepage": "https://github.com/suyuan32/simple-admin-backend-ui",
   "bugs": {
     "url": "https://github.com/suyuan32/simple-admin-backend-ui/issues"

diff --git a/src/api/sys/model/apiModel.ts b/src/api/sys/model/apiModel.ts
@@ -7,12 +7,13 @@ export interface ApiInfo {
   id?: number;
   createdAt?: number;
   updatedAt?: number;
-  trans: string;
+  trans?: string;
   path: string;
-  description: string;
+  description?: string;
   group: string;
   method: string;
   isRequired: boolean;
+  serviceName: string;
 }
 
 /**

diff --git a/src/locales/lang/en/sys.ts b/src/locales/lang/en/sys.ts
@@ -177,6 +177,7 @@ export default {
     description: 'Description',
     method: 'Method',
     group: 'Group',
+    serviceName: 'Service Name',
     // action
     addApi: 'Add API',
     editApi: 'Edit API',

diff --git a/src/locales/lang/zh-CN/sys.ts b/src/locales/lang/zh-CN/sys.ts
@@ -170,6 +170,7 @@ export default {
     description: '描述',
     method: '方法',
     group: '分组',
+    serviceName: '所属服务',
     // action
     addApi: '添加接口',
     editApi: '编辑接口',

diff --git a/src/views/dashboard/workbench/components/data.ts b/src/views/dashboard/workbench/components/data.ts
@@ -52,5 +52,5 @@ export const navItems: NavItem[] = [
 
 export const systemInfoData = [
   ['sys.sys.Name', 'Simple Admin'],
-  ['sys.sys.version', 'V 1.2.5'],
+  ['sys.sys.version', 'V 1.2.8'],
 ];
diff --git a/src/views/sys/api/api.data.ts b/src/views/sys/api/api.data.ts
@@ -17,6 +17,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'group',
     width: 20,
   },
+  {
+    title: t('sys.apis.serviceName'),
+    dataIndex: 'serviceName',
+    width: 20,
+  },
   {
     title: t('sys.apis.description'),
     dataIndex: 'trans',
@@ -65,6 +70,13 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 8 },
     rules: [{ max: 200 }],
   },
+  {
+    field: 'serviceName',
+    label: t('sys.apis.serviceName'),
+    component: 'Input',
+    colProps: { span: 8 },
+    rules: [{ max: 20 }],
+  },
   {
     field: 'group',
     label: t('sys.apis.group'),
@@ -110,6 +122,12 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     rules: [{ max: 200 }],
   },
+  {
+    field: 'serviceName',
+    label: t('sys.apis.serviceName'),
+    component: 'Input',
+    rules: [{ max: 20 }],
+  },
   {
     field: 'group',
     label: t('sys.apis.group'),

diff --git a/src/views/sys/dictionary/dictionary.data.ts b/src/views/sys/dictionary/dictionary.data.ts
@@ -13,6 +13,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'trans',
     width: 100,
   },
+  {
+    title: t('sys.dictionary.name'),
+    dataIndex: 'name',
+    width: 100
+  },
   {
     title: t('common.status'),
     dataIndex: 'status',

diff --git a/src/views/sys/role/role.data.ts b/src/views/sys/role/role.data.ts
@@ -8,7 +8,7 @@ import { ApiInfo } from '/@/api/sys/model/apiModel';
 import { ApiAuthorityInfo } from '/@/api/sys/model/authorityModel';
 import { formatToDateTime } from '/@/utils/dateUtil';
 import { updateRole } from '/@/api/sys/role';
-import { union } from 'lodash-es';
+import { cloneDeep, union } from 'lodash-es';
 
 const { t } = useI18n();
 
@@ -132,14 +132,17 @@ export const formSchema: FormSchema[] = [
  */
 
 export function convertApiTreeData(params: ApiInfo[]): DataNode[] {
+  const finalData: DataNode[] = []
   const apiData: DataNode[] = [];
   if (params.length === 0) {
     return apiData;
   }
 
-  const apiMap = new Map<string, boolean>();
+  const apiMap = new Map<string, string>();
+  const serviceMap = new Map<string, boolean>();
   for (let i = 0; i < params.length; i++) {
-    apiMap.set(params[i].group, true);
+    apiMap.set(params[i].group, params[i].serviceName);    
+    serviceMap.set(params[i].serviceName, true);
   }
 
   for (const k of apiMap.keys()) {
@@ -152,7 +155,7 @@ export function convertApiTreeData(params: ApiInfo[]): DataNode[] {
     for (let i = 0; i < params.length; i++) {
       if (params[i].group == k) {
         apiTmp.children?.push({
-          title: t(params[i].trans),
+          title: params[i].trans,
           key: params[i].id as number,
           disableCheckbox: params[i].isRequired,
         });
@@ -161,7 +164,24 @@ export function convertApiTreeData(params: ApiInfo[]): DataNode[] {
 
     apiData.push(apiTmp);
   }
-  return apiData;
+
+  for (const k1 of serviceMap.keys()) {
+    const svcTmp: DataNode = {
+      title: k1,
+      key: k1,
+      children: [],
+    };
+
+    for (let i = 0; i < apiData.length; i++) {
+      if (apiMap.get(apiData[i].title) === k1) {
+        svcTmp.children?.push(cloneDeep(apiData[i]));
+      }
+    }
+
+    finalData.push(svcTmp);
+  }
+
+  return finalData;
 }
 
 /**
@@ -176,6 +196,7 @@ export function convertApiCheckedKeysToReq(checked: number[], data: ApiInfo[]):
       pureDigit.push(checked[i]);
     }
   }
+
   // sort data
   data.sort(function (a, b) {
     if (a.id !== undefined && b.id !== undefined) return a.id - b.id;