测试flask登录接口

.env.development

@@ -14,7 +14,8 @@ VITE_PROXY=[["/api","http://localhost:3000"],["/upload","http://localhost:3001/u
 VITE_DROP_CONSOLE = false
 
 # Basic interface address SPA
-VITE_GLOB_API_URL= http://localhost:8000/api
+# VITE_GLOB_API_URL= http://localhost:8000/api
+VITE_GLOB_API_URL= http://localhost:8888/admin
 # VITE_GLOB_API_URL=/api
 
 # File upload address， optional

mock/sys/menu.ts

@@ -79,7 +79,7 @@ const testRoute = {
   redirect: '/table/basic',
   meta: {
     icon: 'ant-design:table-outlined',
-    title: '测试',
+    title: '前台测试',
   },
   children: [
     {

mock/sys/user.ts

@@ -6,7 +6,7 @@ function createFakeUserList() {
     {
       userId: '1',
       username: 'vben',
-      realName: '超级管理员',
+      nickname: '超级管理员',
       desc: '管理员',
       password: '123456',
       token: 'fakeToken1',
@@ -21,7 +21,7 @@ function createFakeUserList() {
       userId: '2',
       username: 'test',
       password: '123456',
-      realName: '测试管理员',
+      nickname: '测试管理员',
       desc: '普通管理员',
       token: 'fakeToken2',
       roles: [
@@ -35,7 +35,7 @@ function createFakeUserList() {
       userId: '2',
       username: 'admin',
       password: '123456',
-      realName: '测试管理员',
+      nickname: '测试管理员',
       desc: '普通管理员',
       token: 'fakeToken2',
       roles: [
@@ -67,13 +67,13 @@ export default [
       if (!checkUser) {
         return resultError('帐户或密码不正确！');
       }
-      const { userId, username: _username, token, realName, desc, roles } = checkUser;
+      const { userId, username: _username, token, nickname, desc, roles } = checkUser;
       return resultSuccess({
         roles,
         userId,
         username: _username,
         token,
-        realName,
+        nickname,
         desc,
       });
     },

server/api/models.py

@@ -4,7 +4,7 @@ from django.utils import timezone
 
 class User(models.Model):
     username = models.CharField(max_length=20, unique=True, null=False)
-    realName = models.CharField(max_length=20, null=True)
+    nickname = models.CharField(max_length=20, null=True)
     password = models.CharField(max_length=32, null=False)
     roleName = models.CharField(max_length=32, null=True)
     value = models.CharField(max_length=32, null=True)

server/api/views.py

@@ -135,21 +135,25 @@ class login(View):
         print(user)
         if user:
             res = format_login_result(user)
-            return JsonResponse({'code': 0, 'msg': 'success', 'result': res}, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 1, 'msg': 'success', 'result': res}, json_dumps_params={"ensure_ascii": False})
         else:
-            return JsonResponse({'code': 1, 'error': '用户名或密码不正确'}, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 0, 'error': '用户名或密码不正确'}, json_dumps_params={"ensure_ascii": False})
 
 
 class getUserInfoById(View):
-    def get(self, request):
-        userid = request.GET.get('userId')
+    def post(self, request):
+        userid = json.loads(request.body).get('userId')
+        print('====================udsaersadf======')
+        print(userid)
+        print('====================udsaersadf======')
+
         user = User.objects.all().filter(id=userid)
         if user:
             # res = {'codeList': ['1000', '3000', '5000']}
             res = format_useinfo(user)
-            return JsonResponse({'code': 0, 'result': res, }, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 1, 'result': res, }, json_dumps_params={"ensure_ascii": False})
         else:
-            return JsonResponse({'code': 1, 'type': 'error', 'message': 'no role,create role'}, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 0, 'type': 'error', 'message': 'no role,create role'}, json_dumps_params={"ensure_ascii": False})
 
 
 class getUserList(View):
@@ -157,9 +161,9 @@ class getUserList(View):
         users = User.objects.all()
         if users:
             res = format_uselist(users)
-            return JsonResponse({'code': 0, 'result': res, }, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 1, 'result': res, }, json_dumps_params={"ensure_ascii": False})
         else:
-            return JsonResponse({'code': 1, 'type': 'error', 'message': 'no role,create role'}, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 0, 'type': 'error', 'message': 'no role,create role'}, json_dumps_params={"ensure_ascii": False})
 
 
 class addUser(APIView):
@@ -174,19 +178,19 @@ class addUser(APIView):
             user['token'] = user.get('username') + 'token'
             userObj = User.objects.create(**user)
             userObj.menus.set(menus)
-            return JsonResponse({'code': 0, 'result': {'data': '角色创建成功'}}, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 1, 'result': {'data': '角色创建成功'}}, json_dumps_params={"ensure_ascii": False})
         else:
             print(userSer.errors)
-            return JsonResponse({'code': 1, 'type': 'error', 'message': '字段校验未通过', "result": userSer.errors}, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 0, 'type': 'error', 'message': '字段校验未通过', "result": userSer.errors}, json_dumps_params={"ensure_ascii": False})
 
         # if User.objects.all().filter(username=data.get('username')):
-        #     return JsonResponse({'code': 1, 'type': 'error', 'message': '该角色名已被占用'}, json_dumps_params={"ensure_ascii": False})
+        #     return JsonResponse({'code': 0, 'type': 'error', 'message': '该角色名已被占用'}, json_dumps_params={"ensure_ascii": False})
         # else:
         #     data['token'] = data.get('username') + 'token'
         #     userObj = User.objects.create(**data)
         #     userObj.menus.set(menus)
 
-        #     return JsonResponse({'code': 0, 'result': {'data': '角色创建成功'}}, json_dumps_params={"ensure_ascii": False})
+        #     return JsonResponse({'code': 1, 'result': {'data': '角色创建成功'}}, json_dumps_params={"ensure_ascii": False})
 
 
 class editUser(APIView):
@@ -198,18 +202,18 @@ class editUser(APIView):
         user = User.objects.all().filter(id=data.get('id')).first()
 
         if not userSer.is_valid() and user.username != data.get('username'):
-            return JsonResponse({'code': 1, 'type': 'error', 'message': '字段校验未通过', 'result': userSer.errors}, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 0, 'type': 'error', 'message': '字段校验未通过', 'result': userSer.errors}, json_dumps_params={"ensure_ascii": False})
         else:
             menuIdList = data.pop('menus')
             menus = Menu.objects.all().filter(id__in=menuIdList)
             user.username = data.get('username')
             user.password = data.get('password')
-            user.realName = data.get('realName')
+            user.nickname = data.get('nickname')
             user.status = data.get('status')
             user.detail = data.get('detail')
             user.menus.set(menus)
             user.save()
-            return JsonResponse({'code': 0, 'type': 'error', 'message': '修改成功', 'result': {'data': '修改成功'}}, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 1, 'type': 'error', 'message': '修改成功', 'result': {'data': '修改成功'}}, json_dumps_params={"ensure_ascii": False})
 
 
 class deleteUser(View):
@@ -219,12 +223,12 @@ class deleteUser(View):
         try:
             if user:
                 user.delete()
-                return JsonResponse({'code': 0, 'result': {'data': '删除角色成功'}}, json_dumps_params={"ensure_ascii": False})
+                return JsonResponse({'code': 1, 'result': {'data': '删除角色成功'}}, json_dumps_params={"ensure_ascii": False})
             else:
-                return JsonResponse({'code': 1, 'type': 'error', 'message': '查无此人'}, json_dumps_params={"ensure_ascii": False})
+                return JsonResponse({'code': 0, 'type': 'error', 'message': '查无此人'}, json_dumps_params={"ensure_ascii": False})
         except Exception as e:
             print(e)
-            return JsonResponse({'code': 1, 'type': 'error', 'message': e}, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 0, 'type': 'error', 'message': e}, json_dumps_params={"ensure_ascii": False})
 
 
 class getMenuListById(View):
@@ -240,14 +244,14 @@ class getMenuListById(View):
         # 匹配查询 id__in=[1,2,3]
         querySetMenu = Menu.objects.all().filter(id__in=menuIdList)
         menus = format_menus(querySetMenu, True)
-        return JsonResponse({'code': 0, 'result': menus})
+        return JsonResponse({'code': 1, 'result': menus})
 
 
 class getAllMenuList(View):
     def get(self, request):
         querySetObj = Menu.objects.all()
         menus = format_menus(querySetObj, False)
-        return JsonResponse({'code': 0, 'result': {'format': True, 'menus': menus}}, json_dumps_params={"ensure_ascii": False})
+        return JsonResponse({'code': 1, 'result': {'format': True, 'menus': menus}}, json_dumps_params={"ensure_ascii": False})
 
 
 class addMenu(APIView):
@@ -263,9 +267,9 @@ class addMenu(APIView):
                 parent = Menu.objects.all().filter(id=parentId).first()
                 data['parent'] = parent
             menuObj = Menu.objects.create(**data)
-            return JsonResponse({'code': 0, 'result': {'data': '菜单添加成功'}}, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 1, 'result': {'data': '菜单添加成功'}}, json_dumps_params={"ensure_ascii": False})
         else:
-            return JsonResponse({'code': 1, 'type': 'error', 'message': '字段校验未通过', "result": menuSer.errors}, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 0, 'type': 'error', 'message': '字段校验未通过', "result": menuSer.errors}, json_dumps_params={"ensure_ascii": False})
 
 
 class editMenu(APIView):
@@ -286,9 +290,9 @@ class editMenu(APIView):
             menu.detail = data.get('detail')
             menu.parent = Menu.objects.all().filter(id=data.get('parent')).first()
             menu.save()
-            return JsonResponse({'code': 0, 'result': {'data': '菜单修改成功'}}, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 1, 'result': {'data': '菜单修改成功'}}, json_dumps_params={"ensure_ascii": False})
         else:
-            return JsonResponse({'code': 1, 'type': 'error', 'message': '字段校验未通过', "result": menuSer.errors}, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 0, 'type': 'error', 'message': '字段校验未通过', "result": menuSer.errors}, json_dumps_params={"ensure_ascii": False})
 
 
 class deleteMenu(View):
@@ -298,12 +302,12 @@ class deleteMenu(View):
         try:
             if menu:
                 menu.delete()
-                return JsonResponse({'code': 0, 'result': {'data': '删除菜单成功'}}, json_dumps_params={"ensure_ascii": False})
+                return JsonResponse({'code': 1, 'result': {'data': '删除菜单成功'}}, json_dumps_params={"ensure_ascii": False})
             else:
-                return JsonResponse({'code': 1, 'type': 'error', 'message': '没有找到匹配菜单'}, json_dumps_params={"ensure_ascii": False})
+                return JsonResponse({'code': 0, 'type': 'error', 'message': '没有找到匹配菜单'}, json_dumps_params={"ensure_ascii": False})
         except Exception as e:
             print(e)
-            return JsonResponse({'code': 1, 'type': 'error', 'message': 'server error'}, json_dumps_params={"ensure_ascii": False})
+            return JsonResponse({'code': 0, 'type': 'error', 'message': 'server error'}, json_dumps_params={"ensure_ascii": False})
 
 
 class FileUpload(View):

src/api/sys/model/userModel.ts

@@ -17,7 +17,7 @@ export interface AddUserParams {
   username: string;
   password: string;
   // 真实名字
-  realName: string;
+  nickname: string;
 
   status?: boolean;
   // 介绍
@@ -29,7 +29,7 @@ export interface EditUserParams {
   username: string;
   password: string;
   // 真实名字
-  realName: string;
+  nickname: string;
 
   status?: boolean;
   // 介绍
@@ -69,7 +69,7 @@ export interface GetUserInfoByUserIdModel {
   // 用户名
   username: string;
   // 真实名字
-  realName: string;
+  nickname: string;
 
   status: boolean;
   // 介绍

src/api/sys/user.ts

@@ -12,14 +12,22 @@ import {
 import { ErrorMessageMode } from '/@/utils/http/axios/types';
 
 enum Api {
-  // post请求结尾不加斜杠 python报错
-  Login = '/login/',
-  GetUserInfoById = '/getUserInfoById/',
-  GetUserList = '/getUserList/',
-  AddUser = '/addUser/',
-  EditUser = '/editUser/',
-  DeleteUser = '/deleteUser/',
-  GetPermCodeByUserId = '/getPermCodeByUserId/',
+  // post请求结尾不加斜杠 django报错
+  //   Login = '/login/',
+  //   GetUserInfoById = '/getUserInfoById/',
+  //   GetUserList = '/getUserList/',
+  //   AddUser = '/addUser/',
+  //   EditUser = '/editUser/',
+  //   DeleteUser = '/deleteUser/',
+  //   GetPermCodeByUserId = '/getPermCodeByUserId/',
+
+  Login = '/login',
+  GetUserInfoById = '/getUserInfoById',
+  GetUserList = '/getUserList',
+  AddUser = '/addUser',
+  EditUser = '/editUser',
+  DeleteUser = '/deleteUser',
+  GetPermCodeByUserId = '/getPermCodeByUserId',
 }
 
 /**
@@ -56,7 +64,7 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal')
 export function getUserInfoById(params: GetUserInfoByUserIdParams) {
   return defHttp.request<GetUserInfoByUserIdModel>({
     url: Api.GetUserInfoById,
-    method: 'GET',
+    method: 'POST',
     params,
   });
 }

src/components/Upload/src/BasicUpload.vue

@@ -4,7 +4,7 @@
       <a-button type="primary" @click="openUploadModal" preIcon="carbon:cloud-upload">
         {{ t('component.upload.upload') }}
       </a-button>
-      <Tooltip placement="bottom" v-if="showPreview">
+      <!-- <Tooltip placement="bottom" v-if="showPreview">
         <template #title>
           {{ t('component.upload.uploaded') }}
           <template v-if="fileListRef.length">
@@ -17,7 +17,7 @@
             {{ fileListRef.length }}
           </template>
         </a-button>
-      </Tooltip>
+      </Tooltip> -->
     </a-button-group>
 
     <UploadModal

src/components/Upload/src/UploadModal.vue

@@ -122,6 +122,9 @@
 
       // 上传前校验
       function beforeUpload(file: File) {
+        console.log("===========file===========")
+        console.log(file)
+        console.log("===========file===========")
         const { size, name } = file;
         const { maxSize } = props;
         const accept = unref(getAccept);

src/enums/httpEnum.ts

@@ -2,8 +2,8 @@
  * @description: Request result set
  */
 export enum ResultEnum {
-  SUCCESS = 0,
-  ERROR = 1,
+  SUCCESS = 1,
+  ERROR = 0,
   TIMEOUT = 401,
   TYPE = 'success',
 }
@@ -22,10 +22,16 @@ export enum RequestEnum {
  * @description:  contentTyp
  */
 export enum ContentTypeEnum {
+  //   // json
+  //   JSON = 'application/json;charset=UTF-8',
+  //   // form-data qs
+  //   FORM_URLENCODED = 'application/x-www-form-urlencoded;charset=UTF-8',
+  //   // form-data  upload
+  //   FORM_DATA = 'multipart/form-data;charset=UTF-8',
   // json
-  JSON = 'application/json;charset=UTF-8',
+  JSON = 'application/x-www-form-urlencoded',
   // form-data qs
-  FORM_URLENCODED = 'application/x-www-form-urlencoded;charset=UTF-8',
+  FORM_URLENCODED = 'application/x-www-form-urlencoded',
   // form-data  upload
   FORM_DATA = 'multipart/form-data;charset=UTF-8',
 }

src/layouts/default/header/components/lock/LockModal.vue

@@ -10,7 +10,7 @@
       <div :class="`${prefixCls}__header`">
         <img :src="headerImg" :class="`${prefixCls}__header-img`" />
         <p :class="`${prefixCls}__header-name`">
-          {{ getRealName }}
+          {{ getNickname }}
         </p>
       </div>
 
@@ -42,8 +42,8 @@
       const { t } = useI18n();
       const { prefixCls } = useDesign('header-lock-modal');
 
-      const getRealName = computed(() => {
-        return userStore.getUserInfoState?.realName;
+      const getNickname = computed(() => {
+        return userStore.getUserInfoState?.nickname;
       });
       const [register, { closeModal }] = useModalInner();
 
@@ -74,7 +74,7 @@
       return {
         t,
         prefixCls,
-        getRealName,
+        getNickname,
         register,
         registerForm,
         handleLock,

src/layouts/default/header/components/user-dropdown/index.vue

@@ -3,7 +3,7 @@
     <span :class="[prefixCls, `${prefixCls}--${theme}`]">
       <img :class="`${prefixCls}__header`" :src="headerImg" />
       <span :class="`${prefixCls}__info`">
-        <span :class="`${prefixCls}__name`" class="truncate">{{ getUserInfo.realName }}</span>
+        <span :class="`${prefixCls}__name`" class="truncate">{{ getUserInfo.nickname }}</span>
       </span>
     </span>
 
@@ -71,8 +71,8 @@
       const { getShowDoc } = useHeaderSetting();
 
       const getUserInfo = computed(() => {
-        const { realName = '', desc } = userStore.getUserInfoState || {};
-        return { realName, desc };
+        const { nickname = '', desc } = userStore.getUserInfoState || {};
+        return { nickname, desc };
       });
 
       const [register, { openModal }] = useModal();

src/locales/lang/en/routes/permission.ts

@@ -1,5 +1,5 @@
 export default {
-  management: 'permission management',
+  management: 'permission',
   role: 'role',
   menu: 'menu',
 };

src/locales/lang/en/routes/table.ts

@@ -2,4 +2,6 @@ export default {
   table: 'Table',
   basic: 'BasicTable',
   edit: 'editTable',
+  test: 'test',
+  toggletest: 'toggletest',
 };

src/locales/lang/zh_CN/routes/table.ts

@@ -2,4 +2,6 @@ export default {
   table: '表格',
   basic: '基础表格',
   edit: '表格模板',
+  test: '测试',
+  toggletest: '权限测试',
 };

src/router/menus/modules/test.ts

@@ -1,14 +1,14 @@
 import type { MenuModule } from '/@/router/types';
-
+import { t } from '/@/hooks/web/useI18n';
 const menu: MenuModule = {
   orderNo: 3,
   menu: {
     path: '/test',
-    name: '测试',
+    name: t('routes.table.test'),
     children: [
       {
         path: 'basic',
-        name: '测试功能',
+        name: t('routes.table.toggletest'),
       },
     ],
   },

src/router/routes/modules/test.ts

@@ -1,5 +1,6 @@
 import type { AppRouteModule } from '/@/router/types';
 import { LAYOUT } from '/@/router/constant';
+import { t } from '/@/hooks/web/useI18n';
 
 const test: AppRouteModule = {
   path: '/test',
@@ -8,7 +9,7 @@ const test: AppRouteModule = {
   redirect: '/table/basic',
   meta: {
     icon: 'ant-design:table-outlined',
-    title: 'Table',
+    title: t('routes.table.test'),
   },
   children: [
     {
@@ -16,7 +17,7 @@ const test: AppRouteModule = {
       name: 'testBasic',
       component: () => import('/@/views/test/index.vue'),
       meta: {
-        title: '测试功能',
+        title: t('routes.table.toggletest'),
         icon: 'bx:bx-home',
       },
     },

src/settings/projectSetting.ts

@@ -20,7 +20,8 @@ const setting: ProjectConfig = {
   settingButtonPosition: SettingButtonPositionEnum.AUTO,
 
   // Permission mode  ROLE--前端权限 BACK--后端权限
-  permissionMode: PermissionModeEnum.BACK,
+  // permissionMode: PermissionModeEnum.BACK,
+  permissionMode: PermissionModeEnum.ROLE,
 
   // Permission-related cache is stored in sessionStorage or localStorage
   permissionCacheType: CacheTypeEnum.LOCAL,

src/store/modules/user.ts

@@ -108,14 +108,16 @@ class User extends VuexModule {
       const data = await loginApi(loginParams, mode);
 
       const { token, userId } = data;
-      console.log('-------------dafdas-----------');
-      console.log(data);
+
       // save token
       this.commitTokenState(token);
 
       // get user info
       const userInfo = await this.getUserInfoAction({ userId });
-
+      console.log('========route=========');
+      console.log(goHome);
+      console.log(PageEnum.BASE_HOME);
+      console.log('=========route========');
       goHome && (await router.replace(PageEnum.BASE_HOME));
       return userInfo;
     } catch (error) {

src/utils/http/axios/Axios.ts

@@ -142,7 +142,10 @@ export class VAxios {
     }
 
     formData.append(params.name || 'file', params.file, params.filename);
-
+    console.log(config);
+    console.log(config);
+    console.log(formData);
+    console.log(formData);
     return this.axiosInstance.request<T>({
       ...config,
       method: 'POST',
@@ -191,6 +194,7 @@ export class VAxios {
 
   request<T = any>(config: AxiosRequestConfig, options?: RequestOptions): Promise<T> {
     let conf: AxiosRequestConfig = cloneDeep(config);
+
     const transform = this.getTransform();
 
     const { requestOptions } = this.options;
@@ -201,7 +205,9 @@ export class VAxios {
     if (beforeRequestHook && isFunction(beforeRequestHook)) {
       conf = beforeRequestHook(conf, opt);
     }
-
+    console.log('====================confg');
+    console.log(conf);
+    console.log('====================confg');
     conf = this.supportFormData(conf);
 
     return new Promise((resolve, reject) => {

src/views/CurrentPermissionMode.vue

@@ -1,33 +0,0 @@
-<template>
-  <div class="mt-2">
-    当前权限模式：
-    <a-button type="link">
-      {{ permissionMode === PermissionModeEnum.BACK ? '后台权限模式' : '前端角色权限模式' }}
-    </a-button>
-    <a-button class="ml-4" @click="togglePermissionMode" type="primary"> 切换权限模式 </a-button>
-    <Divider />
-  </div>
-</template>
-<script lang="ts">
-  import { defineComponent, computed } from 'vue';
-  import { appStore } from '/@/store/modules/app';
-  import { PermissionModeEnum } from '/@/enums/appEnum';
-  import { Divider } from 'ant-design-vue';
-  import { usePermission } from '/@/hooks/web/usePermission';
-  export default defineComponent({
-    name: 'CurrentPermissionMode',
-    components: { Divider },
-    setup() {
-      const permissionMode = computed(() => {
-        return appStore.getProjectConfig.permissionMode;
-      });
-      const { togglePermissionMode } = usePermission();
-
-      return {
-        permissionMode,
-        PermissionModeEnum,
-        togglePermissionMode,
-      };
-    },
-  });
-</script>

src/views/permission/role/add.vue

@@ -68,7 +68,7 @@
           }
         },
         {
-          field: 'realName',
+          field: 'nickname',
           component: 'Input',
           label: '姓名',
           labelWidth: adaptWidth.labelWidth,
@@ -136,7 +136,7 @@
         // 方式2
         modelRef.value = {
           username: data.username,
-          realName: data.realName,
+          nickname: data.nickname,
           password: data.password,
           status: data.status,
           detail: data.detail,

src/views/permission/role/index.vue

@@ -61,7 +61,7 @@
     },
     {
       title: '姓名',
-      dataIndex: 'realName',
+      dataIndex: 'nickname',
       // editRow: true,
       width: 160,
     },
@@ -150,7 +150,7 @@
           detail: '',
           menus: [],
           roleName: '',
-          realName: '',
+          nickname: '',
           status: true
         });
       }

src/views/sys/lock/LockPage.vue

@@ -30,7 +30,7 @@
           <div :class="`${prefixCls}-entry__header enter-x`">
             <img :src="headerImg" :class="`${prefixCls}-entry__header-img`" />
             <p :class="`${prefixCls}-entry__header-name`">
-              {{ realName }}
+              {{ nickname }}
             </p>
           </div>
           <InputPassword
@@ -106,9 +106,9 @@
 
       const { t } = useI18n();
 
-      const realName = computed(() => {
-        const { realName } = userStore.getUserInfoState || {};
-        return realName;
+      const nickname = computed(() => {
+        const { nickname } = userStore.getUserInfoState || {};
+        return nickname;
       });
 
       /**
@@ -139,7 +139,7 @@
 
       return {
         goLogin,
-        realName,
+        nickname,
         unLock,
         errMsgRef,
         loadingRef,

src/views/sys/login/LoginForm.vue

@@ -145,7 +145,7 @@
           if (userInfo) {
             notification.success({
               message: t('sys.login.loginSuccessTitle'),
-              description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.realName}`,
+              description: `${t('sys.login.loginSuccessDesc')}: ${userInfo.nickname}`,
               duration: 3,
             });
           }

src/views/table/editTable/add.vue

@@ -1,89 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="register" @ok="confirm" title="添加xxx">
-    <BasicForm @register="registerForm" :model="model" />
-  </BasicModal>
-</template>
-<script lang="ts">
-  import { defineComponent, ref } from 'vue';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
-  import { adapt } from '/@/utils/adapt'
-
-  export default defineComponent({
-    components: { BasicModal, BasicForm },
-    setup() {
-      const modelRef = ref({});
-      const adaptWidth = adapt()
-
-      const schemas: FormSchema[] = [
-        {
-          field: 'name',
-          component: 'Input',
-          label: '姓名',
-          labelWidth: adaptWidth.labelWidth,
-          colProps: {
-            span: adaptWidth.elContainer,
-          }
-        },
-        {
-          field: 'addr',
-          component: 'Input',
-          label: '地址',
-          labelWidth: adaptWidth.labelWidth,
-
-          colProps: {
-            span: adaptWidth.elContainer,
-          },
-        },
-      ];
-
-      const [
-        registerForm,
-        {
-          getFieldsValue,
-          // setProps
-        },
-      ] = useForm({
-        labelWidth: 120,
-        schemas,
-        showActionButtonGroup: false,
-        actionColOptions: {
-          span: 24,
-        },
-      });
-      const [register, { closeModal } ] = useModalInner((data) => {
-        // 方式1
-        // setFieldsValue({
-        //   field2: data.data,
-        //   field1: data.info,
-        // });
-
-        // 方式2
-        modelRef.value = { name: data.data, addr: data.info };
-
-        // setProps({
-        //   model:{ field2: data.data, field1: data.info }
-        // })
-      });
-
-      function confirm() {
-        console.log('确定')
-        console.log(getFieldsValue())  // 表单数据
-
-        closeModal()  // 关闭弹窗
-      }
-      return { register, schemas, registerForm, model: modelRef,confirm, adaptWidth };
-    },
-  });
-</script>
-<style lang='less'>
-.ant-form-item-label {
-  text-align: center !important;
-}
-@media (max-width: 639px) {
-  .ant-form-item-label {
-  line-height: 2.5715 !important;
-  text-align: center !important;
- }
-}
-</style>