删除默认角色字段

Author: yluiop123

src/locale/en-US.ts

@@ -42,7 +42,6 @@ export default {
     'page.system.user.header.email': 'Email',
     'page.system.user.header.phone': 'Phone',
     'page.system.user.header.groupName': 'GroupName',
-    'page.system.user.header.defaultRole': 'DefaultRole',
     'page.system.user.header.status': 'Status',
     'page.system.user.header.createTime': 'Create Time',
     'page.system.role.header.name': 'RoleName',

src/locale/zh-CN.ts

@@ -42,7 +42,6 @@ export default {
     'page.system.user.header.email': '邮箱',
     'page.system.user.header.phone': '手机号',
     'page.system.user.header.groupName': '组织',
-    'page.system.user.header.defaultRole': '默认角色',
     'page.system.user.header.status': '状态',
     'page.system.user.header.createTime': '创建时间',
     'page.system.role.header.name': '角色名称',

src/mock/login/user.ts

@@ -33,7 +33,6 @@ const handlers = [
           group: "01",
           groupName: localeMap[locale]["groupName"],
           name: "YL",
-          defaultRole: "super",
           roles: [
             { role: "super", name: localeMap[locale]["super"] },
             { role: "admin", name: localeMap[locale]["admin"] },

src/mock/system/user.ts

@@ -33,7 +33,6 @@ type User = {
   email: string;
   group: string;
   groupName: string;
-  defaultRole: string;
   status: "0" | "1";
   create: string;
   update: string;
@@ -94,7 +93,6 @@ function getUserList(locale: string) {
       email: `user${userId}@example.com`,
       group: dataArray[i % 6].id,
       groupName: dataArray[i % 6].name,
-      defaultRole: "admin",
       status: "1",
       phone: `${13800000000 + i}`,
       create: "2025-01-01 23:59:59",

src/pages/system/user/add-dialog.tsx

@@ -46,13 +46,13 @@ export default function Index(props: {open: boolean,setOpen:(open:boolean)=>void
             validate: z.string(),
             type: "group"
         },
-        {
-            name: "defaultRole",
-            label: "page.system.user.header.defaultRole",
-            defaultValue: "all",
-            validate: z.string(),
-            type: "role"
-        },
+        // {
+        //     name: "roles",
+        //     label: "page.system.user.header.defaultRole",
+        //     defaultValue: "all",
+        //     validate: z.string(),
+        //     type: "role"
+        // },
     ]
     const schemaShape = fields.reduce((acc, field) => {
         acc[field.name] = field.validate || z.string().optional();

src/pages/system/user/edit-dialog.tsx

@@ -48,13 +48,13 @@ export default function Index(props: {setOpen: (open: boolean) => void, open: bo
             validate: z.string(),
             type: "group"
         },
-        {
-            name: "defaultRole",
-            label: "page.system.user.header.defaultRole",
-            defaultValue: "",
-            validate: z.string(),
-            type: "role"
-        },
+        // {
+        //     name: "defaultRole",
+        //     label: "page.system.user.header.defaultRole",
+        //     defaultValue: "",
+        //     validate: z.string(),
+        //     type: "role"
+        // },
     ]
     const [values, setValues] = useState<Record<string, unknown>>({});
 

src/pages/system/user/index.tsx

@@ -135,7 +135,6 @@ export default function User() {
         email: string
         group: string
         groupName: string
-        defaultRole: string
         status: "0" | "1"
         create: string
         update: string
@@ -217,13 +216,6 @@ export default function User() {
                 <div >{row.getValue("groupName")}</div>
             ),
         },
-        {
-            accessorKey: "defaultRole",
-            header: intl.formatMessage({ id: 'page.system.user.header.defaultRole' }),
-            cell: ({ row }) => (
-                <div >{row.getValue("defaultRole")}</div>
-            ),
-        },
         {
             accessorKey: "create",
             header: intl.formatMessage({ id: 'page.system.user.header.createTime' }),

src/store/user.ts

@@ -12,7 +12,6 @@ type UserInfo = {
   group?: string;
   groupName?: string;
   name?: string;
-  defaultRole?: string;
   roles?: {
     role: string;
     name: string;
@@ -50,7 +49,7 @@ const useUserStore = create<GlobalInfo>()((set, get) => ({
     const res = await axios.get("/user/userInfo");
     if (res.data.data) {
       const userInfo: UserInfo = res.data.data;
-      userInfo.currentRole = userInfo.defaultRole;
+      userInfo.currentRole = "all";
       const currentPermission = [
         ...(userInfo.userPermissions||[]),
         ...(userInfo.rolePermissions||[]).filter(