feat: 11

src/api/sys/model/projectModel.ts

@@ -34,7 +34,6 @@ export type ProjectUpdateOrCreateParams = {
   insideCategory: string
   categoryId?: string
   category: string
-  staffId: string
   staffName: string
   remark: string
   status: string

src/store/modules/office.ts

@@ -42,7 +42,7 @@ export const useOfficeStore = defineStore({
     // 获取办事处对应员工列表
     async getStaffWithCategoryIdAction(params: OfficeListParams) {
       const { staff = [] } = await getOfficeList(params)
-      this.setStaffList(staff.map(item => ({ value: item.sid, label: item.username })))
+      this.setStaffList(staff.map(item => ({ value: item.username, label: item.username })))
     },
     checkStaffList() {
       if (!this.getCategories.length) {

src/store/modules/permission.ts

@@ -1,37 +1,37 @@
-import type { AppRouteRecordRaw, Menu } from '/@/router/types';
+import type { AppRouteRecordRaw, Menu } from '/@/router/types'
 
-import { defineStore } from 'pinia';
-import { store } from '/@/store';
-import { useI18n } from '/@/hooks/web/useI18n';
-import { useUserStore } from './user';
-import { useAppStoreWidthOut } from './app';
-import { toRaw } from 'vue';
-import { transformObjToRoute, flatMultiLevelRoutes } from '/@/router/helper/routeHelper';
-import { transformRouteToMenu } from '/@/router/helper/menuHelper';
+import { defineStore } from 'pinia'
+import { store } from '/@/store'
+import { useI18n } from '/@/hooks/web/useI18n'
+import { useUserStore } from './user'
+import { useAppStoreWidthOut } from './app'
+import { toRaw } from 'vue'
+import { transformObjToRoute, flatMultiLevelRoutes } from '/@/router/helper/routeHelper'
+import { transformRouteToMenu } from '/@/router/helper/menuHelper'
 
-import projectSetting from '/@/settings/projectSetting';
+import projectSetting from '/@/settings/projectSetting'
 
-import { PermissionModeEnum } from '/@/enums/appEnum';
+import { PermissionModeEnum } from '/@/enums/appEnum'
 
-import { asyncRoutes } from '/@/router/routes';
-import { ERROR_LOG_ROUTE, PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
+import { asyncRoutes } from '/@/router/routes'
+import { ERROR_LOG_ROUTE, PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic'
 
-import { filter } from '/@/utils/helper/treeHelper';
+import { filter } from '/@/utils/helper/treeHelper'
 
-import { getMenuListById } from '/@/api/sys/menu';
-import { getPermCodeByUserId } from '/@/api/sys/user';
+import { getMenuListById } from '/@/api/sys/menu'
+import { getPermCodeByUserId } from '/@/api/sys/user'
 
-import { useMessage } from '/@/hooks/web/useMessage';
+import { useMessage } from '/@/hooks/web/useMessage'
 
 interface PermissionState {
   // Permission code list
-  permCodeList: string[];
+  permCodeList: string[]
   // Whether the route has been dynamically added
-  isDynamicAddedRoute: boolean;
+  isDynamicAddedRoute: boolean
   // To trigger a menu update
-  lastBuildMenuTime: number;
+  lastBuildMenuTime: number
   // Backstage menu list
-  backMenuList: Menu[];
+  backMenuList: Menu[]
 }
 export const usePermissionStore = defineStore({
   id: 'app-permission',
@@ -42,110 +42,112 @@ export const usePermissionStore = defineStore({
     // To trigger a menu update
     lastBuildMenuTime: 0,
     // Backstage menu list
-    backMenuList: [],
+    backMenuList: []
   }),
   getters: {
     getPermCodeList() {
-      return this.permCodeList;
+      return this.permCodeList
     },
     getBackMenuList() {
-      return this.backMenuList;
+      return this.backMenuList
     },
     getLastBuildMenuTime() {
-      return this.lastBuildMenuTime;
+      return this.lastBuildMenuTime
     },
     getIsDynamicAddedRoute() {
-      return this.isDynamicAddedRoute;
-    },
+      return this.isDynamicAddedRoute
+    }
   },
   actions: {
     setPermCodeList(codeList: string[]) {
-      this.permCodeList = codeList;
+      this.permCodeList = codeList
     },
 
     setBackMenuList(list: Menu[]) {
-      this.backMenuList = list;
+      this.backMenuList = list
     },
 
     setLastBuildMenuTime() {
-      this.lastBuildMenuTime = new Date().getTime();
+      this.lastBuildMenuTime = new Date().getTime()
     },
 
     setDynamicAddedRoute(added: boolean) {
-      this.isDynamicAddedRoute = added;
+      this.isDynamicAddedRoute = added
     },
     resetState(): void {
-      this.isDynamicAddedRoute = false;
-      this.permCodeList = [];
-      this.backMenuList = [];
-      this.lastBuildMenuTime = 0;
+      this.isDynamicAddedRoute = false
+      this.permCodeList = []
+      this.backMenuList = []
+      this.lastBuildMenuTime = 0
     },
     async changePermissionCode(userId: string) {
-      const codeList = await getPermCodeByUserId({ userId });
-      this.setPermCodeList(codeList);
+      const codeList = await getPermCodeByUserId({ userId })
+      this.setPermCodeList(codeList)
     },
     async buildRoutesAction(id?: number | string): Promise<AppRouteRecordRaw[]> {
-      const { t } = useI18n();
-      const userStore = useUserStore();
-      const appStore = useAppStoreWidthOut();
+      const { t } = useI18n()
+      const userStore = useUserStore()
+      const appStore = useAppStoreWidthOut()
+
+      let routes: AppRouteRecordRaw[] = []
+      const roleList = toRaw(userStore.getRoleList)
+      console.log(roleList)
 
-      let routes: AppRouteRecordRaw[] = [];
-      const roleList = toRaw(userStore.getRoleList);
-      const { permissionMode = projectSetting.permissionMode } = appStore.getProjectConfig;
+      const { permissionMode = projectSetting.permissionMode } = appStore.getProjectConfig
       // role permissions
       if (permissionMode === PermissionModeEnum.ROLE) {
         const routeFilter = (route: AppRouteRecordRaw) => {
-          const { meta } = route;
-          const { roles } = meta || {};
-          if (!roles) return true;
-          return roleList.some((role) => roles.includes(role));
-        };
-        routes = filter(asyncRoutes, routeFilter);
-        routes = routes.filter(routeFilter);
+          const { meta } = route
+          const { roles } = meta || {}
+          if (!roles) return true
+          return roleList?.some(role => roles.includes(role))
+        }
+        routes = filter(asyncRoutes, routeFilter)
+        routes = routes.filter(routeFilter)
         // Convert multi-level routing to level 2 routing
-        routes = flatMultiLevelRoutes(routes);
+        routes = flatMultiLevelRoutes(routes)
         //  If you are sure that you do not need to do background dynamic permissions, please comment the entire judgment below
       } else if (permissionMode === PermissionModeEnum.BACK) {
-        const { createMessage } = useMessage();
+        const { createMessage } = useMessage()
 
         createMessage.loading({
           content: t('sys.app.menuLoading'),
-          duration: 1,
-        });
+          duration: 1
+        })
         // Here to get the background routing menu logic to modify by yourself
-        const paramId = id || userStore.getUserInfo?.userId;
+        const paramId = id || userStore.getUserInfo?.userId
 
         // !Simulate to obtain permission codes from the background,
         // this function may only need to be executed once, and the actual project can be put at the right time by itself
-        let routeList: AppRouteRecordRaw[] = [];
+        let routeList: AppRouteRecordRaw[] = []
         try {
-          this.changePermissionCode('1');
-          routeList = (await getMenuListById({ id: paramId })) as AppRouteRecordRaw[];
+          this.changePermissionCode('1')
+          routeList = (await getMenuListById({ id: paramId })) as AppRouteRecordRaw[]
         } catch (error) {
-          console.error(error);
+          console.error(error)
         }
 
         if (!paramId) {
-          throw new Error('paramId is undefined!');
+          throw new Error('paramId is undefined!')
         }
 
         // Dynamically introduce components
-        routeList = transformObjToRoute(routeList);
+        routeList = transformObjToRoute(routeList)
 
         //  Background routing to menu structure
-        const backMenuList = transformRouteToMenu(routeList);
-        this.setBackMenuList(backMenuList);
+        const backMenuList = transformRouteToMenu(routeList)
+        this.setBackMenuList(backMenuList)
 
-        routeList = flatMultiLevelRoutes(routeList);
-        routes = [PAGE_NOT_FOUND_ROUTE, ...routeList];
+        routeList = flatMultiLevelRoutes(routeList)
+        routes = [PAGE_NOT_FOUND_ROUTE, ...routeList]
       }
-      routes.push(ERROR_LOG_ROUTE);
-      return routes;
-    },
-  },
-});
+      routes.push(ERROR_LOG_ROUTE)
+      return routes
+    }
+  }
+})
 
 // Need to be used outside the setup
 export function usePermissionStoreWidthOut() {
-  return usePermissionStore(store);
+  return usePermissionStore(store)
 }

src/utils/http/axios/index.ts

@@ -149,7 +149,7 @@ const transform: AxiosTransform = {
   requestInterceptors: config => {
     // 请求之前处理config
     const token = getToken()
-    if (token) {
+    if (token && config.method !== 'GET') {
       // x-csrf-token
       config.headers['X-Csrf-Token'] = token
     }

src/views/dashboard/project-detail/components/account.vue

@@ -165,8 +165,13 @@
           okText: '确认添加'
         })
         await nextTick()
+        updateSchema({
+          field: 'account',
+          componentProps: {
+            disabled: false
+          }
+        })
         removeSchemaByFiled('password')
-
         appendSchemaByField(
           {
             field: 'password',

src/views/dashboard/project-detail/components/info.vue

@@ -107,7 +107,7 @@
           required: true
         },
         {
-          field: 'staffId',
+          field: 'staffName',
           component: 'Select',
           disabledLabelWidth: true,
           componentProps: {
@@ -198,7 +198,7 @@
         name: string
         insideCategory: string
         category: string
-        staffId: string
+        staffName: string
         remark: string
         status: string
       }) => {
@@ -206,8 +206,7 @@
           ...values,
           id: props.info.id,
           insideCategory: '',
-          category: '',
-          staffName: ''
+          category: ''
         }
         if (values.insideCategory) {
           newVal.insideCategory = options.value.find(item => item.value === values.insideCategory)?.label || ''
@@ -215,9 +214,9 @@
         if (values.category) {
           newVal.category = options.value.find(item => item.value === values.category)?.label || ''
         }
-        if (values.staffId) {
-          newVal.staffName = staffOptions.value.find(item => item.value === values.staffId)?.label || ''
-        }
+        // if (values.staffName) {
+        //   newVal.staffName = staffOptions.value.find(item => item.value === values.staffId)?.label || ''
+        // }
         try {
           await updateProject(newVal)
         } catch (error) {

src/views/dashboard/workbench/tableData.tsx

@@ -8,7 +8,11 @@ export function getProjectTableColumns(): BasicColumn[] {
       dataIndex: 'code',
       width: 100,
       fixed: 'left',
-      customRender: ({ text, record }) => <router-link to={`/dashboard/project/${record.id}`}>{text}</router-link>
+      customRender: ({ text, record }) => (
+        <router-link to={`/dashboard/project/${record.id}`}>
+          <span class="text-primary">{text}</span>
+        </router-link>
+      )
     },
     {
       title: '项目名称',

src/views/sys/login/LoginForm.vue

@@ -147,7 +147,7 @@
               password: data.password
             })
           )
-          console.log('userInfo', userInfo)
+          // console.log('userInfo', userInfo)
 
           if (userInfo) {
             notification.success({