功能变化: 优化个人中心修改密码后强制退出登录状态

backend/dvadmin/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

web/src/views/system/dept/components/DeptUserCom/api.ts

@@ -5,13 +5,13 @@ type GetListType = PageQuery & { show_all: string };
 
 export const apiPrefix = '/api/system/user/';
 
-export function GetDept(query: PageQuery) {
+// export function GetDept(query: PageQuery) {
-	return request({
+// 	return request({
-		url: '/api/system/dept/dept_lazy_tree/',
+// 		url: '/api/system/dept/dept_all/',
-		method: 'get',
+// 		method: 'get',
-		params: query,
+// 		params: query,
-	});
+// 	});
-}
+// }
 
 export function GetList(query: GetListType) {
 	return request({

web/src/views/system/dept/components/DeptUserCom/crud.tsx

@@ -220,7 +220,10 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 						label: 'name',
 					}),
 					column: {
-						minWidth: 150, //最小列宽
+						minWidth: 200, //最小列宽
+						formatter({value,row,index}){
+							return row.dept_name_all
+						}
 					},
 					form: {
 						rules: [
@@ -259,7 +262,11 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 						label: 'name',
 					}),
 					column: {
-						minWidth: 100, //最小列宽
+						minWidth: 200, //最小列宽
+						formatter({value,row,index}){
+							const values = row.role_info.map((item:any) => item.name);
+							return values.join(',')
+						}
 					},
 					form: {
 						rules: [
@@ -382,6 +389,10 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 					form: {
 						show: false,
 					},
+					column:{
+						width:150,
+						showOverflowTooltip: true,
+					}
 				},
 			},
 		},

web/src/views/system/user/api.ts

@@ -5,7 +5,7 @@ export const apiPrefix = '/api/system/user/';
 
 export function GetDept(query: PageQuery) {
     return request({
-        url: "/api/system/dept/dept_lazy_tree/",
+        url: "/api/system/dept/all_dept/",
         method: 'get',
         params: query,
     });

web/src/views/system/user/crud.tsx

@@ -218,7 +218,10 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps)
                         label: 'name'
                     }),
                     column: {
-                        minWidth: 150, //最小列宽
+                        minWidth: 200, //最小列宽
+                        formatter({value,row,index}){
+                            return row.dept_name_all
+                        }
                     },
                     form: {
                         rules: [
@@ -253,7 +256,11 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps)
                         label: 'name',
                     }),
                     column: {
-                        minWidth: 100, //最小列宽
+                        minWidth: 200, //最小列宽
+                        formatter({value,row,index}){
+                            const values = row.role_info.map((item:any) => item.name);
+                            return values.join(',')
+                        }
                     },
                     form: {
                         rules: [