添加接口admin前缀

.env.development

@@ -15,6 +15,7 @@ VITE_DROP_CONSOLE = false
 
 # Basic interface address SPA
 # VITE_GLOB_API_URL= http://localhost:8000/api
+# VITE_GLOB_API_URL=http://139.186.154.72:8888/
 VITE_GLOB_API_URL=http://localhost:8888/admin
 # VITE_GLOB_API_URL=/api
 

.env.production

@@ -13,6 +13,7 @@ VITE_DROP_CONSOLE = true
 VITE_BUILD_COMPRESS = 'none'
 
 # Basic interface address SPA
+# VITE_GLOB_API_URL=http://139.186.154.72:8888/
 VITE_GLOB_API_URL=http://localhost:8888/admin
 
 # File upload address， optional

src/api/sys/general.ts

@@ -10,10 +10,10 @@ import {
 } from './model/generalModel';
 
 enum Api {
-  GroupUrl = 'general/group/', // 系统配置分组
-  ConfigUrl = 'general/config/', // 系统配置表
-  FileUrl = 'general/file/', // 上传文件
-  ConfigNameExistUrl = 'general/exist', // 检测变量名是否已经存在
+  GroupUrl = '/general/group/', // 系统配置分组
+  ConfigUrl = '/general/config/', // 系统配置表
+  FileUrl = '/general/file/', // 上传文件
+  ConfigNameExistUrl = '/general/exist', // 检测变量名是否已经存在
 }
 
 /**

src/api/sys/menu.ts

@@ -2,7 +2,7 @@ import { defHttp } from '/@/utils/http/axios';
 import { getMenuListResultModel } from './model/menuModel';
 
 enum Api {
-  GetMenuList = 'admin/menu/',
+  GetMenuList = '/menu/',
 }
 
 /**

src/api/sys/user.ts

@@ -22,12 +22,12 @@ import {
 import { ErrorMessageMode } from '/@/utils/http/axios/types';
 
 enum Api {
-  LoginUrl = 'admin/login',
-  AdminUrl = 'admin/',
-  MyInfoUrl = 'admin/my',
-  GroupUrl = 'admin/group/',
-  RuleUrl = 'admin/rule/',
-  MenuUrl = 'admin/menu/',
+  LoginUrl = '/login',
+  AdminUrl = '/',
+  MyInfoUrl = '/my',
+  GroupUrl = '/group/',
+  RuleUrl = '/rule/',
+  MenuUrl = '/menu/',
 }
 
 /**

src/router/routes/modules/permission.ts → src/router/routes/modules/admin.ts

@@ -3,22 +3,22 @@ import type { AppRouteModule } from '/@/router/types';
 import { LAYOUT } from '/@/router/constant';
 import { t } from '/@/hooks/web/useI18n';
 
-const permission: AppRouteModule = {
-  path: '/permission',
-  name: 'Permission',
+const admin: AppRouteModule = {
+  path: '/admin',
+  name: 'admin',
   component: LAYOUT,
-  redirect: '/permission/admin',
+  redirect: '/admin/admin',
   meta: {
     icon: 'bx:bx-lock',
-    title: t('routes.permission.management'),
+    title: t('routes.admin.admin'),
   },
   children: [
     {
       path: 'admin',
       name: 'Admin',
-      component: () => import('/@/views/permission/admin/index.vue'),
+      component: () => import('/@/views/admin/admin/index.vue'),
       meta: {
-        title: t('routes.permission.admin'),
+        title: t('routes.admin.index'),
         affix: false,
         icon: 'bx:bx-lock',
       },
@@ -26,9 +26,9 @@ const permission: AppRouteModule = {
     {
       path: 'logs',
       name: 'Logs',
-      component: () => import('/@/views/permission/admin_log/index.vue'),
+      component: () => import('/@/views/admin/logs/index.vue'),
       meta: {
-        title: t('routes.permission.logs'),
+        title: t('routes.admin.logs'),
         affix: false,
         icon: 'bx:bx-lock',
       },
@@ -36,9 +36,9 @@ const permission: AppRouteModule = {
     {
       path: 'group',
       name: 'Group',
-      component: () => import('/@/views/permission/group/index.vue'),
+      component: () => import('/@/views/admin/group/index.vue'),
       meta: {
-        title: t('routes.permission.group'),
+        title: t('routes.admin.group'),
         affix: false,
         icon: 'bx:bx-lock',
       },
@@ -46,9 +46,9 @@ const permission: AppRouteModule = {
     {
       path: 'rule',
       name: 'Rule',
-      component: () => import('/@/views/permission/rule/index.vue'),
+      component: () => import('/@/views/admin/rule/index.vue'),
       meta: {
-        title: t('routes.permission.rule'),
+        title: t('routes.admin.rule'),
         affix: false,
         icon: 'bx:bx-lock',
       },
@@ -56,4 +56,4 @@ const permission: AppRouteModule = {
   ],
 };
 
-export default permission;
+export default admin;

src/router/routes/modules/conventional.ts

@@ -3,35 +3,35 @@ import type { AppRouteModule } from '/@/router/types';
 import { LAYOUT } from '/@/router/constant';
 import { t } from '/@/hooks/web/useI18n';
 
-const conventional: AppRouteModule = {
-  path: '/conventional',
-  name: 'Conventional',
+const general: AppRouteModule = {
+  path: '/general',
+  name: 'General',
   component: LAYOUT,
-  redirect: '/conventional/system',
+  redirect: '/general/config',
   meta: {
     icon: 'eva:settings-outline',
-    title: t('routes.conventional.conventional'),
+    title: t('routes.general.conventional'),
   },
   children: [
     // {
     //   path: 'person',
     //   name: 'Person',
-    //   component: () => import('/@/views/conventional/person/index.vue'),
+    //   component: () => import('/@/views/general/person/index.vue'),
     //   meta: {
-    //     title: t('routes.conventional.person'),
+    //     title: t('routes.general.person'),
     //     icon: 'ri:user-settings-line',
     //   },
     // },
     {
-      path: 'system',
-      name: 'System',
-      component: () => import('/@/views/conventional/system/index.vue'),
+      path: 'config',
+      name: 'Config',
+      component: () => import('/@/views/general/config/index.vue'),
       meta: {
-        title: t('routes.conventional.system'),
+        title: t('routes.general.system'),
         icon: 'ri:list-settings-line',
       },
     },
   ],
 };
 
-export default conventional;
+export default general;

src/views/admin/rule/data.ts

@@ -128,7 +128,7 @@ export const schemas: FormSchema[] = [
     },
   },
   {
-    field: 'path',
+    field: 'url',
     component: 'Input',
     label: '路径',
     labelWidth: adaptWidth.labelWidth,
@@ -158,12 +158,12 @@ export const schemas: FormSchema[] = [
       }
       return true;
     },
-    required: ({ values }) => {
-      if (values.pid || !values.ismenu) {
-        return false;
-      }
-      return true;
-    },
+    // required: ({ values }) => {
+    //   if (values.pid || !values.ismenu) {
+    //     return false;
+    //   }
+    //   return true;
+    // },
   },
   {
     field: 'ismenu',

src/views/admin/rule/popup.vue

@@ -65,10 +65,15 @@
       });
 
       async function handleSubmit() {
-        console.log('确定');
         try {
           const data = await validate();
           let menuChange = false;
+          data.condition = [];
+          if (data.redirect) {
+            data.condition.redirect = data.redirect;
+          }
+          data.condition = JSON.stringify(data.condition);
+          delete data.redirect;
           if (state.rule_id) {
             data.id = state.rule_id;
             if (data.ismenu !== state.ismenu) {

src/views/general/config/customComponents/ArrayCom.vue

@@ -6,7 +6,12 @@
       <div class="value-head">键值</div>
     </div>
     <div class="array-item">
-      <div class="content-item" v-for="(item, index) in list" :key="index">
+      <div
+        class="content-item"
+        v-for="(item, index) in list"
+        :key="index"
+        :data-no="JSON.stringify(item)"
+      >
         <div class="name-content">
           <Input v-model:value="item.name" @change="onChange" />
         </div>
@@ -43,8 +48,11 @@
       console.log(`props`, props.value);
       const state = reactive({
         list: [] as Data[],
+        sortList: [] as Data[],
       });
 
+      var sortCom: any = null;
+
       // 初始化 sortable 实现拖动
       function initSortable() {
         // for (let k in props.value) {
@@ -58,7 +66,7 @@
         });
         // state.list = props.value as object[];
         const el = document.querySelector('.array-item') as any;
-        Sortable.create(el, {
+        sortCom = Sortable.create(el, {
           handle: '.drag-btn',
           sort: true, // boolean 定义是否列表单元是否可以在列表容器内进行拖拽排序
           delay: 0, // number 定义鼠标选中列表单元可以开始拖动的延迟时间；
@@ -71,6 +79,7 @@
           chosenClass: 'sortable-chosen', // 被选中项的css 类名
           dragClass: 'sortable-drag', // 正在被拖拽中的css类名
           group: { name: 'name', pull: true, put: true },
+          dataIdAttr: 'data-no',
 
           // 拖拽完成
           onUpdate: function (evt) {
@@ -78,16 +87,18 @@
             console.log(`移动前的位置索引`, evt.oldIndex);
             console.log(`移动后的位置索引`, evt.newIndex);
             // // const newIndex = evt.newIndex as number;
-            const oldIndex = evt.oldIndex as number;
-            const newIndex = evt.newIndex as number;
-            const current = state.list[oldIndex];
-            state.list.splice(oldIndex, 1);
-            state.list.splice(newIndex, 0, current);
-            console.log(`state.list`, state.list);
-            const data = formatList();
-            console.log(`data`, data);
-            emit('change', data);
-            initSortable();
+            // const oldIndex = evt.oldIndex as number;
+            // const newIndex = evt.newIndex as number;
+            // const current = state.list[oldIndex];
+            // console.log(`state.list.length === before`, state.list.length);
+            // state.list.splice(oldIndex, 1);
+            // console.log(`state.list.length`, state.list.length);
+            // state.list.splice(newIndex, 0, current);
+            // console.log(`state.list`, state.list);
+            const res = sortCom.toArray();
+            state.sortList = res.map((item) => JSON.parse(item));
+            state.list = state.sortList;
+            console.log(`拖动后的数据`, state.sortList);
           },
         });
       }

src/views/general/config/data.ts

@@ -139,6 +139,7 @@ export const columns: BasicColumn[] = [
           });
         case 'array':
           const onArrayChange = (val) => {
+            console.log(`val`, val);
             record.value = val;
           };
           return h(ArrayCom, {

src/views/general/config/index.vue

@@ -188,7 +188,6 @@
               }
             }
           });
-          return;
           await editConfigInfo(params).then(() => {
             getTableAction().reload();
             success('修改成功!');