From 6f15c2f6696a46cf2daac55de716284f2e32fba6 Mon Sep 17 00:00:00 2001
From: sheng <15292050171@163.com>
Date: Tue, 10 Oct 2023 15:44:13 +0800
Subject: [PATCH 01/40] =?UTF-8?q?feat(=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?):=20=E9=87=8D=E8=AE=BE=E5=AF=86=E7=A0=81=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/.env.development                          |  2 +-
 .../system/dept/components/DeptUserCom/api.ts | 16 +++--
 .../dept/components/DeptUserCom/crud.tsx      |  1 +
 .../dept/components/DeptUserCom/index.vue     | 67 ++++++++++++++++++-
 4 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/web/.env.development b/web/.env.development
index 1c3ca5db3..c200ba42c 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 本地环境接口地址
-VITE_API_URL = 'http://127.0.0.1:8000'
+VITE_API_URL = 'http://huge-dream.natapp1.cc/'
 
 # 是否启用按钮权限
 VITE_PM_ENABLED = true
diff --git a/web/src/views/system/dept/components/DeptUserCom/api.ts b/web/src/views/system/dept/components/DeptUserCom/api.ts
index 561fa1044..28602c720 100644
--- a/web/src/views/system/dept/components/DeptUserCom/api.ts
+++ b/web/src/views/system/dept/components/DeptUserCom/api.ts
@@ -1,13 +1,13 @@
 import { request, downloadFile } from '/@/utils/service';
 import { PageQuery, AddReq, DelReq, EditReq, InfoReq } from '@fast-crud/fast-crud';
 
-type GetListType = PageQuery & { show_all: string }
+type GetListType = PageQuery & { show_all: string };
 
 export const apiPrefix = '/api/system/user/';
 
 export function GetDept(query: PageQuery) {
 	return request({
-		url: "/api/system/dept/dept_lazy_tree/",
+		url: '/api/system/dept/dept_lazy_tree/',
 		method: 'get',
 		params: query,
 	});
@@ -55,8 +55,8 @@ export function exportData(params: any) {
 	return downloadFile({
 		url: apiPrefix + 'export_data/',
 		params: params,
-		method: 'get'
-	})
+		method: 'get',
+	});
 }
 
 export function getDeptInfoById(id: string, type: string) {
@@ -65,3 +65,11 @@ export function getDeptInfoById(id: string, type: string) {
 		method: 'get',
 	});
 }
+
+export function resetPwd(id: number, data: { [key: string]: string }) {
+	return request({
+		url: `/api/system/user/${id}/reset_password/`,
+		method: 'put',
+		data,
+	});
+}
diff --git a/web/src/views/system/dept/components/DeptUserCom/crud.tsx b/web/src/views/system/dept/components/DeptUserCom/crud.tsx
index 36bc11ba1..fb2e155af 100644
--- a/web/src/views/system/dept/components/DeptUserCom/crud.tsx
+++ b/web/src/views/system/dept/components/DeptUserCom/crud.tsx
@@ -103,6 +103,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 						},
 						click: (ctx: any) => {
 							const { row } = ctx;
+							context?.handleResetPwdOpen(row);
 						},
 					},
 				},
diff --git a/web/src/views/system/dept/components/DeptUserCom/index.vue b/web/src/views/system/dept/components/DeptUserCom/index.vue
index d05522d68..922a8fb23 100644
--- a/web/src/views/system/dept/components/DeptUserCom/index.vue
+++ b/web/src/views/system/dept/components/DeptUserCom/index.vue
@@ -43,16 +43,31 @@
 			<importExcel api="api/system/user/">导入 </importExcel>
 		</template>
 	</fs-crud>
+
+	<el-dialog v-model="resetPwdVisible" title="重设密码" width="400px" draggable :before-close="handleResetPwdClose">
+		<div>
+			<el-input v-model="resetPwdFormState.newPassword" type="password" placeholder="请输入密码" show-password style="margin-bottom: 20px" />
+			<el-input v-model="resetPwdFormState.newPassword2" type="password" placeholder="请再次输入密码" show-password />
+		</div>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="handleResetPwdClose">取消</el-button>
+				<el-button type="primary" @click="handleResetPwdSubmit"> 保存 </el-button>
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script lang="ts" setup name="user">
-import { ref, onMounted } from 'vue';
+import { ref, reactive, onMounted } from 'vue';
 import { useExpose, useCrud } from '@fast-crud/fast-crud';
+import { Md5 } from 'ts-md5';
 import { createCrudOptions } from './crud';
 import importExcel from '/@/components/importExcel/index.vue';
 import * as echarts from 'echarts';
 import { ECharts, EChartsOption, init } from 'echarts';
-import { getDeptInfoById } from './api';
+import { getDeptInfoById, resetPwd } from './api';
+import { warningNotification, successNotification } from '/@/utils/message';
 import { HeadDeptInfoType } from '../../types';
 
 let deptCountChart: ECharts;
@@ -72,6 +87,13 @@ let isShowChildFlag = ref(false);
 let deptInfo = ref<Partial<HeadDeptInfoType>>({});
 let showCount = ref(false);
 
+let resetPwdVisible = ref(false);
+let resetPwdFormState = reactive({
+	id: 0,
+	newPassword: '',
+	newPassword2: '',
+});
+
 /**
  * 初始化顶部部门折线图
  */
@@ -189,6 +211,45 @@ const handleSwitchChange = () => {
 	handleDoRefreshUser(currentDeptId.value);
 };
 
+const handleResetPwdOpen = ({ id }: { id: number }) => {
+	resetPwdFormState.id = id;
+	resetPwdVisible.value = true;
+};
+const handleResetPwdClose = () => {
+	resetPwdVisible.value = false;
+	resetPwdFormState.id = 0;
+	resetPwdFormState.newPassword = '';
+	resetPwdFormState.newPassword2 = '';
+};
+const handleResetPwdSubmit = async () => {
+	if (!resetPwdFormState.id) {
+		warningNotification('请选择用户！');
+		return;
+	}
+	if (!resetPwdFormState.newPassword || !resetPwdFormState.newPassword2) {
+		warningNotification('请输入密码！');
+		return;
+	}
+	if (resetPwdFormState.newPassword !== resetPwdFormState.newPassword2) {
+		warningNotification('两次输入密码不一致');
+		return;
+	}
+	const pwdRegex = new RegExp('(?=.*[0-9])(?=.*[a-zA-Z]).{8,30}');
+	if (!pwdRegex.test(resetPwdFormState.newPassword) || !pwdRegex.test(resetPwdFormState.newPassword2)) {
+		warningNotification('您的密码复杂度太低(密码中必须包含字母、数字)');
+		return;
+	}
+	const res = await resetPwd(resetPwdFormState.id, {
+		newPassword: Md5.hashStr(resetPwdFormState.newPassword),
+		newPassword2: Md5.hashStr(resetPwdFormState.newPassword2),
+	});
+
+	if (res?.code === 2000) {
+		successNotification(res.msg || '修改成功！');
+		handleResetPwdClose();
+	}
+};
+
 onMounted(() => {
 	crudExpose.doRefresh();
 	deptCountChart = init(deptCountBar.value as HTMLElement);
@@ -201,7 +262,7 @@ defineExpose({
 });
 
 // 你的crud配置
-const { crudOptions } = createCrudOptions({ crudExpose, context: { getDeptInfo, isShowChildFlag } });
+const { crudOptions } = createCrudOptions({ crudExpose, context: { getDeptInfo, isShowChildFlag, handleResetPwdOpen } });
 
 // 初始化crud配置
 const { resetCrudOptions } = useCrud({
-- 
Gitee


From ddf9fcd8e86496b4797fb7afc7d5132dde3d0f0f Mon Sep 17 00:00:00 2001
From: sheng <15292050171@163.com>
Date: Tue, 10 Oct 2023 16:11:49 +0800
Subject: [PATCH 02/40] =?UTF-8?q?feat(=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?):=20=E6=9F=A5=E8=AF=A2=E6=A1=86=E5=A4=9A=E8=A1=8C=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/system/dept/components/DeptUserCom/crud.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/src/views/system/dept/components/DeptUserCom/crud.tsx b/web/src/views/system/dept/components/DeptUserCom/crud.tsx
index fb2e155af..0eaa096e7 100644
--- a/web/src/views/system/dept/components/DeptUserCom/crud.tsx
+++ b/web/src/views/system/dept/components/DeptUserCom/crud.tsx
@@ -72,6 +72,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 			},
 			search: {
 				container: {
+					layout: 'multi-line',
 					action: {
 						col: {
 							span: 10,
-- 
Gitee


From 802ee7f50ea957c542d16abc07f66ae92e82fea5 Mon Sep 17 00:00:00 2001
From: china_ahhui <ahhuiguys@163.com>
Date: Tue, 10 Oct 2023 17:12:33 +0800
Subject: [PATCH 03/40] =?UTF-8?q?fix(=E8=AE=BE=E7=BD=AE):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Denv=E7=9A=84=E5=BC=95=E5=85=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/application/settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/application/settings.py b/backend/application/settings.py
index b311baef0..9e39c040b 100644
--- a/backend/application/settings.py
+++ b/backend/application/settings.py
@@ -15,8 +15,6 @@ import sys
 from pathlib import Path
 from datetime import timedelta
 
-from conf.env import *
-
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
@@ -24,6 +22,8 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 # ******************** 动态配置 ******************** #
 # ================================================= #
 
+from conf.env import *
+
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
 
-- 
Gitee


From 97f7bfd3f0fcb6dcf52b956ae372de8a32fc2a98 Mon Sep 17 00:00:00 2001
From: china_ahhui <ahhuiguys@163.com>
Date: Tue, 10 Oct 2023 17:15:40 +0800
Subject: [PATCH 04/40] =?UTF-8?q?chore(=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86):=20=E6=B7=BB=E5=8A=A0=E4=BA=86=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E7=9A=84=E7=BA=A6=E6=9D=9F?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E5=85=81=E8=AE=B8=E8=B6=85=E7=AE=A1=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/views/user.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/dvadmin/system/views/user.py b/backend/dvadmin/system/views/user.py
index 1d71c4e38..8f4a57c99 100644
--- a/backend/dvadmin/system/views/user.py
+++ b/backend/dvadmin/system/views/user.py
@@ -352,6 +352,8 @@ class UserViewSet(CustomModelViewSet):
         """
         密码重置
         """
+        if not self.request.user.is_superuser:
+            return ErrorResponse(msg="只允许超级管理员对其进行密码重置")
         instance = Users.objects.filter(id=pk).first()
         data = request.data
         new_pwd = data.get("newPassword")
-- 
Gitee


From 996d644d9bd2e6663591736518065f5b9eb88fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Thu, 19 Oct 2023 15:36:07 +0800
Subject: [PATCH 05/40] =?UTF-8?q?=E5=88=A0=E9=99=A4=20.DS=5FStore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store | Bin 8196 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 9c53772040050d34c20ea9ea6485bbd7208e3ca5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHM&rcgi6n+m#yoM$$1RAJPX%$~0L1<`GQmLxg7*K=K6oL@}C8@jX9o#L;jJ3Pq
z07CM)J@pT0?mhKdDgQt&x#m{oPe`skRPCD|4#to}FIA$<Nb|loGw*vl^R2z(Spxu;
zccN*4F#vF=N^}RvoKobttS3s3>FFm#;sY??5G^L67A7a6ZHHCBDqt0`3RnfK0&jx?
zv}eoWykXzhqt;pltOD<)0`mFbQI+T$Y-v=F4l?QpK-fp!s*q3T0LAeP`UYDX6_s-8
z(*qhRnj;2kI*ofWoX|Je(x~Zxnht2LjOK)b>gvSvR5+lo(ORp3Rp6uo^6XxK5CW*d
zR_FO$gft?*OgE`c{i6zb0K*W0FwrSoB~QRMG{|PepMpJVCHfseI|u&Nm81Vyj;gxu
zZWrh0E=~cyfkl{u1^5;!uy8zD&GK=_EYDKZ60B-QSM2YUxihv1E0pyn%)=eRDVo1|
zhtZxtNJggyz0jmNhsX2c$EQby&8!h7D%T%jBZ;&8+O_A{)7y9EY{4lw1J1+B529Jg
zgM23|2kCv;S`{J*+kOzP#jII%N9F|2gP5~a5#oqZ$b)+^k3_R9c6gL2Zbc6`MW<MG
z#|{przqm2!eLC~`;iPwPV|r%NyZ+hC;bGAkEq(IkN_8vQ=He%sITbVyS2(BJudTcn
zX3cSJ*Q^GgwO8}Pb=&JH_78k;?);!TG<;!bWN38s!;531;~$M*s=61#pte;{<viy^
zBGPiQ!|vD9II1*)TFmR~IeU~>;(b<ihr2>oSoGad*Xmw_Vn&WSRJyNI#<<G2w7HqF
ze7(cpsJeq$Efq<!EV4L{1>bm(k;;oX+g{|Gg08qr3NJO}P`1X>jPL|!{b3S>ELq}Z
zk>_H2BS_PL*I9W_M#^k8!Ix7eGp)zu%e9ndUuh9b{_VDNMLRB(v;$D`XSC~#w7U#q
zag__siY0&9^f)j<AJsdsMqk%`_yvB2-{1*6g+JjX{EY=1$ICc@*YPWy#ann6SFnZ=
z#`vS=_q1=Z{IGTu%&1{*@opvMiQskWK~Ea0zQLA8m4%Gjg$eEcPrBG*6?m5v=+%=Q
zljr}1H^2XXmzHGbY89{w{6___Z@w~LCX(9KPa(@)-lO_GRas<QOQWKYIrc+<+OPjG
bB;TV@$?*-gG*S;0`yxQeV2xGae^uaL9?K<m

-- 
Gitee


From 3b84773a7d35cfb35196085886c4883e7e586b88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Thu, 19 Oct 2023 16:01:16 +0800
Subject: [PATCH 06/40] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0requirements.tx?=
 =?UTF-8?q?t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/conf/env.example.py |  2 --
 backend/requirements.txt    | 49 ++++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/backend/conf/env.example.py b/backend/conf/env.example.py
index 117e200cb..1e0a03960 100644
--- a/backend/conf/env.example.py
+++ b/backend/conf/env.example.py
@@ -47,5 +47,3 @@ ALLOWED_HOSTS = ["*"]
 CUSTOM_APPS = [
     "dvadmin.system",
 ]
-# daphne启动命令
-#daphne application.asgi:application -b 0.0.0.0 -p 8000
diff --git a/backend/requirements.txt b/backend/requirements.txt
index b6b068d7f..ed7cab79a 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -1,31 +1,30 @@
-Django==4.1.5
-django-comment-migrate==0.1.7
-django-cors-headers==3.13.0
-django-filter==21.1
+Django==4.2.6
+jango-comment-migrate==0.1.7
+django-cors-headers==4.3.0
+django-filter==23.3
 django-ranged-response==0.2.0
 djangorestframework==3.14.0
 django-restql==0.15.3
-django-simple-captcha==0.5.17
-django-timezone-field==5.0
-djangorestframework-simplejwt==5.2.2
-drf-yasg==1.21.4
-mysqlclient==2.1.1
-pypinyin==0.48.0
-ua-parser==0.16.1
-pyparsing==3.0.9
-openpyxl==3.0.10
-requests==2.28.2
-typing-extensions==4.4.0
-smmap==5.0.0
-tzlocal==4.1
+django-simple-captcha==0.5.20
+django-timezone-field==6.0.1
+djangorestframework-simplejwt==5.3.0
+drf-yasg==1.21.7
+mysqlclient==2.2.0
+pypinyin==0.49.0
+ua-parser==0.18.0
+pyparsing==3.1.1
+openpyxl==3.1.2
+requests==2.31.0
+typing-extensions==4.8.0
+tzlocal==5.1
 channels==4.0.0
-channels-redis==4.0.0
-websockets==10.4
+channels-redis==4.1.0
+websockets==11.0.3
 user-agents==2.2.0
 six==1.16.0
-whitenoise==6.3.0
-psycopg2==2.9.5
-uvicorn==0.21.1
-gunicorn==20.1.0
-gevent==22.10.2
-Pillow==8.3.2
+whitenoise==6.6.0
+psycopg2==2.9.9
+uvicorn==0.23.2
+gunicorn==21.2.0
+gevent==23.9.1
+Pillow==10.1.0
-- 
Gitee


From 564e9a112b6f01e664029ebc6215e39eb49089c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Thu, 19 Oct 2023 16:01:59 +0800
Subject: [PATCH 07/40] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0requirements.tx?=
 =?UTF-8?q?t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/requirements.txt b/backend/requirements.txt
index ed7cab79a..d4b0ded5f 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -1,5 +1,5 @@
 Django==4.2.6
-jango-comment-migrate==0.1.7
+django-comment-migrate==0.1.7
 django-cors-headers==4.3.0
 django-filter==23.3
 django-ranged-response==0.2.0
-- 
Gitee


From 075d457dc7e0d6e6f38490f73631a44a2f2aacee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Thu, 19 Oct 2023 16:10:05 +0800
Subject: [PATCH 08/40] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=97?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/application/settings.py        |  3 +++
 web/.env.development                   |  2 +-
 web/package.json                       |  1 +
 web/src/views/system/columns/index.vue | 14 +++++++-------
 web/src/views/system/role/crud.tsx     |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/backend/application/settings.py b/backend/application/settings.py
index 9e39c040b..f59140fa4 100644
--- a/backend/application/settings.py
+++ b/backend/application/settings.py
@@ -44,6 +44,9 @@ DEBUG = locals().get("DEBUG", True)
 ALLOWED_HOSTS = locals().get("ALLOWED_HOSTS", ["*"])
 
 # Application definition
+CUSTOM_APPS = [
+    "dvadmin.system",
+]
 
 INSTALLED_APPS = [
     "django.contrib.auth",
diff --git a/web/.env.development b/web/.env.development
index c200ba42c..dc36b291b 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 本地环境接口地址
-VITE_API_URL = 'http://huge-dream.natapp1.cc/'
+VITE_API_URL = 'http://127.0.0.1:8001'
 
 # 是否启用按钮权限
 VITE_PM_ENABLED = true
diff --git a/web/package.json b/web/package.json
index 6bb8ef90d..31afb85a8 100644
--- a/web/package.json
+++ b/web/package.json
@@ -44,6 +44,7 @@
 		"splitpanes": "^3.1.5",
 		"tailwindcss": "^3.2.7",
 		"ts-md5": "^1.3.1",
+		"upgrade": "^1.1.0",
 		"vue": "^3.2.45",
 		"vue-clipboard3": "^2.0.0",
 		"vue-cropper": "^1.0.8",
diff --git a/web/src/views/system/columns/index.vue b/web/src/views/system/columns/index.vue
index cd7722e12..21a781711 100644
--- a/web/src/views/system/columns/index.vue
+++ b/web/src/views/system/columns/index.vue
@@ -1,17 +1,17 @@
 <template>
 	<fs-page class="columns">
 		<el-row class="columns-el-row" :gutter="10">
-			<el-col :span="4">
+			<el-col :span="6">
 				<div class="columns-box columns-left">
 					<ItemCom title="角色" type="role" showPagination @fetchData="fetchRoleData" @itemClick="handleClick" />
 				</div>
 			</el-col>
-      <el-col :span="4">
-        <div class="columns-box columns-left">
-          <ItemCom title="菜单" type="menu" showPagination @fetchData="fetchMenuData" @itemClick="handleClick" />
-        </div>
-      </el-col>
-			<el-col :span="6">
+<!--      <el-col :span="4">-->
+<!--        <div class="columns-box columns-left">-->
+<!--          <ItemCom title="菜单" type="menu" showPagination @fetchData="fetchMenuData" @itemClick="handleClick" />-->
+<!--        </div>-->
+<!--      </el-col>-->
+			<el-col :span="8">
 				<div class="columns-box columns-center">
 					<ItemCom title="模型表" type="model" label="showText" value="key" @fetchData="fetchModelData" @itemClick="handleClick" />
 				</div>
diff --git a/web/src/views/system/role/crud.tsx b/web/src/views/system/role/crud.tsx
index e9522afc6..b97878548 100644
--- a/web/src/views/system/role/crud.tsx
+++ b/web/src/views/system/role/crud.tsx
@@ -50,7 +50,7 @@ export const createCrudOptions = function ({
 			rowHandle: {
 				//固定右侧
 				fixed: 'right',
-				width: 260,
+				width: 320,
 				buttons: {
 					view: {
 						show: true,
-- 
Gitee


From 8e107d9944c982015aac6e5bc8dc7da48673dc8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Thu, 19 Oct 2023 16:55:19 +0800
Subject: [PATCH 09/40] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=A4=B4=E5=83=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/.env.development                       |   2 +-
 web/src/assets/img/headerImage.png         | Bin 0 -> 9356 bytes
 web/src/layout/navBars/breadcrumb/user.vue |   4 ++--
 web/src/utils/setIconfont.ts               |   1 -
 4 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 web/src/assets/img/headerImage.png

diff --git a/web/.env.development b/web/.env.development
index dc36b291b..1c3ca5db3 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 本地环境接口地址
-VITE_API_URL = 'http://127.0.0.1:8001'
+VITE_API_URL = 'http://127.0.0.1:8000'
 
 # 是否启用按钮权限
 VITE_PM_ENABLED = true
diff --git a/web/src/assets/img/headerImage.png b/web/src/assets/img/headerImage.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3eb252d438ae5228742ca42639018f440513111
GIT binary patch
literal 9356
zcmV;7By-z|P)<h;3K|Lk000e1NJLTq0077U0077c1^@s6tyr#}001BWNkl<ZcwX&&
z36xw%mF0c8FIAaYnJJZaYqca>vXNw2k}Zr4#&+8@n=zPXZ|G^p!%nxM8JIq&nPzFA
z2gYzbhl3k%vo+YP2E1V#yvgz=YjbHUZKaYWWoG44`E&noPGqU1T5|cBmCMhJA3i>^
zobe;xyAk)te-ZD!AQ+`-2qY3bJCF1#m9Y}6E+mkT!M$MW1#vGxz2LKdj{V&~CJaZw
zlmIvZI{T;iJ8=S_IKVNG={NxcR&osV_R^WADIs~oB)R@GR-c(I;Y4=18Tpm0(kce8
z1koxmuL4ouj62ZO07n2C0P{XF(Ex!5%rNik?X@2yqJpL-j7lXDFbGoP#9(H7bToa1
zs;XBr(`!K3On|+{W?E96feaYii1;y+$@G}7$FYrw(k<z{OFA(KQe_|oA!4KHD+{W6
zHJDz*giU%SM723-5T+VJ(|<PzQUbFuvxnm8H>%7xgKz@@j@qHs{}aqe5pX{d?&<S5
ze@jH8`j@)35*h?Ki+422eFancEnxL#fUX5#Ywb|9x3}Wz0)7Z&y4Td}_?4e1)?SJ9
z(Yw?HiN`sZSCyL?cpHeW24K<0u(Vx@Jiw2DO!rvf_?5>)p|(rZCIO@*NI0JQ5LA8-
z2v@ZU_m1k88IO^PejM;Pzt>TMH$Yfv2*S+nNFw$3Q1K}c<~IO4`I=yy0O1>ckMp}k
zl#~I0t|v$=#{N8%j|2F~`GYtahPIhHau_h(Ve&Y>)khR<W>4*IyK4!OOeW{1^K?5i
z{*DOlb_3mw{WD{f2;X&B`0H-B`(!uj*mVSn#nQ|3T=*P_-VMOojf18`ow8uQ+d}5A
zdcBT=I+U+&k-CN;V`mqse`Vk{0H(STF&>-=0>Z834!_6wg>E@h=?a2GV#?pB;BOFU
z&P+zvc(ySJFfdGvPXv6fUo@u0_O;T{1c^q|OAAoHZ*14LZvs{7nHi5*VEQ|s&oQV^
z39C!hkpy98$4FfHJcIsGwiEB_L#nSD;)I^SU-5ffUnZiAzND)zO~(-=98F&bsNV(Q
zg6irSHFSdjV~{QM--12PKj}s$4T5wGK}6g|B%b;=0G|NRF>-4d1DUEY82|3~IzLN9
z`A$&0BPQBNDs@32quxtI8#)10L&nMoF!S?dqc;a!t|7f+rF(*m#FK9-sPrQu^ynQ-
zL%tdiV2%-)|Hkii{Go=YT3%JR1QCHs;duI+1paW#Q87Af83GJ^C*W~@TCWDYE(ucH
zzNNx%0lK(lBV}~dMg(||nayw1<94v_2ojDew=nPnBDmT(Vn)|3Mt~U#0q@t_;i9ex
z5{fEcA;M=`JT^vmx<Y{eCE#`cvtC5f4MD=O<PQLPpI(45<Y*rP4BQ#?x`a<%+e_OC
zQas;?rTz<qx3(P(Lje6C!1#sV>wIUs^Ln+FAi`xN983Ly2-oOmWDH64g8={0?{U4E
zh_daHsci&d=AKAACEN}!Z<q2$za4?V<EqDb)2w0&*4CG{5G0Y{S=oZ}ClIY|y~;+9
z9ftt(P7ArN@p>uJYS~*(ka(N}Sx!Agz=f?=*66Qu5ny1zM$WAs4~1K)MN0|7%+5$m
zc^X8Qwo*x>ukJvAnO_WeU0aDrX_ZDTBM38_!?D!EL=XwujA9^A7Xl&(E8ulr*Q(vE
zmJuWzRqg@d=DJWZ9x@P^hyddk0iWybtpKGZ1PR4bcN$KItr$*u`VdZzL9gp0&DOZ-
z1PMh`|3t)JYPKRq`|=?`gxmcd*Vme<c~c1zi7B@-@Y7~0V6-ha0t9-u-|PHwvruRn
zLBi4W>p|)t0hpU5ywR?K0DuBux+&mwJkSg@nnIAV5Lw=9xU4s0$c#3pBEXEK*-mTv
zoX#VSMyKHf5!<<unDQKmUe#z}jrI%#${}#}jAUb@w|^T>kZ@G_8VLVj45fiUs}W%0
zF9$vD&o#2&h7u&2NWHe8a!2JoY9yFOTWv>xiRd+ckMr?HNzyQa2p_8)D+2%p8zr34
zj)6d}2r&2+v&Xf%QTLWKj3A+?BHTz`SF1useFK5UBf!58c-?PkM7s?kNGPU!lz{)+
z2!V_?3<Mg105Sh}zt8>uX4=+_2@;BDRuLCoo~a<l^9BNqM!-s@RUVIH-%Q$_F+svH
z<w*cn%tQ#|+0qE4GFc=>Q-~!}NTt$H(pe;x46?aAuDX0R+%AU!U1bEG6z=ge0cl1A
ziNut5GVqg`2w*%5FawEE1)*r7NQgu-jYKkqLP0GHPmkMyt2VBN$z)unRcQ_p@J_$i
z^|N~CS=|IFCR~UshmBjEYKNXx#z<lm;gKZ5BXLAxNvLXhGL-9K(fnDsWaXmT1(4_o
z2A>RgT+4_kRgc<r6C@l}z7E2t>*-Y1XOvV1gU3(f_;3h?ItWn;x63YBhB-l>tdMHc
zoALF4&m}Hfs=3rfka#?OVUE?kh9jajyhmcAIB?_@oDRpdJy1g}v)P2#Y`PdOhpmRE
zq^nx6lIh}l4EDMRVi@MyCfF-yqBwBmBw~r?hERLlPHeq=HB403aB5Sg^J~>*u-A;J
zVVGB*DJnCDUWwqq;gd+ETX!YjqIp4FvdXxXuF(d2O#~6i-okO^fMJ-I9tN>u>^X28
zsdRf10j^)O6!T{Hb^g1)NgC8+u-8P8P%QO%0)Med@^@^r2_=o4FCW23EZJ5a#Fp=}
zMg0I6qe=#uY+n55^g@8o<HUta=EGu^YnzyvJ|FZs|5fWiX(ou+){VrJlOQs-OwOX4
z%@wf!@Ch6lI-?bDUDfmSIC14=t6-MtEQNW*?{&>1qO_L5&`gkUO!+u~Z)$0@+v}(*
z<H(8A*grUoe1*fjPQYQ|ydW->%ywbmV?nR$4lU!Oi6F(KZ*k=~f#zyyw43XsGdXN~
zaX&^CO)sF1fa0o67sKP0$8Cjy;ef}vNK5pgCW3_HsSkkpKRRNxn<!)?mcVm64?%od
zbyMl{_Tb75E4xXhs=6@feL=7D?rIe^5hN5-_7kw8T4UY(`>AjY&+j}0v5nh}MYa=p
z2KEQNuBvZ^sssrql$)XAo^G5JT6Gf6gMWE;FN6<Ow-&d{j%zlr=~neh>SZE+bDzik
zn@UPoCrB*0TlVXi_a7d{{=+A`e)3$i`C_SD=oxq}=yh$Zn;@ZR`dT9Op{}19RTO-F
z*C0-w8R>c$)?d5?^ZNZ=ujfPsO(wd!uh;qKa!OZRLBcUb_|d;ZD#S`C``9ykFq-V1
zU8{2Axpd)dT(n}LY{UJtfY<fTnhC<p?r=O6B0!$~zcMI2wrx*WZR?hs3;|ycwydve
zw{{hQn2`#2owJE(w3K3HSCCLV^?qXhepjJUr!vp&It1Zo)$K*No!s!6b=|J!H2o@V
z`IaY$k;dm7koyKt6yrH$D6iYH22Q742305M$PWg*?&~$LAjMl~)zm2fRd>0%9Z9ir
z3>+FNI{(Q~Hmq5Sx$=1g7i=cyyxv|qJ#~yr5+EE`J`Kj#Wtb4<bQD2Odk-8(I9l@4
zv}>Ue-oUGuFX&qRDk%2JfY&w6*RV7}qRAI!&CZ_A=CEtv7*2({-{vSaS%Q7N*t|}@
z8@kJ#iA*C%D3MuBYC*)COIL<Zk6`D(5#;l=XBg=guw*sV#rT=owA|-&9GW<m(+Lt+
zzD$hIcFTZk)kBukaxHjVxnULhylyR3yQ~g>G2nIouZjc-$C7&hx~R)Euc(groO*WW
zq!))w>QB>EtRh!jwhAH{gj9w3rGU>p>EfqJD@ZiTeFaKIqyhziEGOl)jH|<D#noHZ
zNEec8fivLs(m4)HB1kx@+ycVSYXP#;>xziL`~Uo6r>oHv`RC8+!@7%>Hl=O7Hp;|r
z33}YW9+z(tK|(R*I|SUOSK*r>*XeK^+h01+jHbJy%~x++4R5cjD|FGQ#J2)o*C$F6
zL`M5VoREu?a-)<+K)PtdDR#)Y6+~A1<Jp%ELPQH1r91*#FIx?tN1jz=q8)OMATrt?
zVoE&x#7>CAL8FvMV8I+eUUktDX&{<thnypbjP{4Ph~~k^Uy^3v>s6FYgd49~2l1yQ
z<(wUIeg%>6{6l10-~Q6Un#cUQt!p8&sz3Vl-i}*+f_@Lyuf705e=qL;%S*+(Nwk#9
zFI|Dz0gsldonL2y9a1EStoFy@q0`v2|9DLUDxCSQTtAlJrJypN-*XrPhlXovqt%ri
zHXGKgoR4J-`(d|P&UGIjP2txMKd(ugB@1Tb;tS=8HZ*yhec~$VB0(Z?<w|Bep$Vxj
zsx)xu1P&h69_Jw@+RfKrR$M(M7IBy0-UGwfdvK^^D%^HKwrc4-EL$`iey<x;=4yne
zcO29d>(b+L;Ofm6w@a1Q_e;1U;Bh@&B#5ku;a(azTD<K^Yq@^wCFl>9|IEnb@)$Z9
z!Ak?j+7hDMAM|4Jf?1do^upVt%}qocl>YR-r@>Y7eTj*3<JIe>u|t^X{XviOhed*f
zqRLl@@ENTWrCaLN5=uM2zYnk5qU{YTCR=PYjZ>i*_8lHZG~W0Nbi`#jix<p>h$EjJ
z=q(=R)tjmP<-wDhe9^?Ep&m&N4T<<mevkWqj;$b3<(DA5rCTPxRz042ejg$+Z2?g?
zUw=8=&ibx7%jFBjtDMC(386?FCr*zbo~VAOq{U(`o<DedT*WKaM68Cl*9nK+3Y+!3
zEumH4a`nV2@{`{^Rkazh)ho7qr6`Ph0zTI*V+4^jIozY$_8_St3H6G_bFk%A%Nsr~
z#6_MW_JqYhXOlJxTfu5JO|x?v-uaXUpV>KxeS?)Z8&)iyi<L{~HCq&Yw9mXV;B#L(
z_K6i!(gesBsgDOA-=QfH^(}w32~N9J9|PAUDU@^;_uRj|V(S;opM|xOTszG`Cg^oJ
zD4I$wDP(!DNx18}+4~-;zQwtCeh^n}T%~J08YSF)kM5}W$vJ<HAL}GKQHK?aC>%>)
z52*Jy3gk{|=b<NF8oQ>fLV3eA>x$c?GL(bIPUEQ;_Lo&vI+qhOT}z>u@-YIwCBp=m
zs-w6FCp3~MtGYNkc=sExEPIB~ZI~sL41V?Cvt`wi?KUc6zKueX#-NK?@baM{96Bn}
zf0ZuFFPMWX)-~QZ*E6wx{>SY|XG-7FyX=B~tX?KlN+ABCSV6u`!2i(mpfyXjGm$u+
z*-<`NYU_rTSh{dlv%1%1yU*`Ef<60(O3HT8iUnA@P~4&`P5CB;V#yy8=)KaYJV8-$
zu=bmWo-OMhBGPcq@0aUR-(x4kc<h;%OHPLkYnNi~EQ#)6XTFPMJtPz}z}Mrzi!UF+
zo&%*L3a`C#4d%^~iy)O87_YzTRj^vjGQCTGPT^ScL4aN_lh)(9`aMpBqNDi3V>?Q!
zFWlONUz1Fw+^M?VX2n}xe;GzorR|gM#EAbu;h6F?fX&^hU}dcYK}7l4@3%n&Pfaa<
z{o3{DlPJ`5T>l^a=E-T7m9AVm7niSHijhS3UnDeP9y~5q5NYoq94E*NFCWG3ebeJY
zZoYma+|peI0Q~vceK>mJ%%u0lHJdNO!a06KN7GQd_%hQ;N;B^eHpo#B7RkJVjKmcD
z?$H;fLGZR4E-yL>%2u9uejf&pPbSE?yG=sLLO5T_P#8Ew;b<}fB8j#p&JXSQ3R3Pf
zOICtB_2R)vfn>sS_|}`ozQW}q2%i=<NcUd;UF9`5ksvSZIfC5>Chz~t;G|dzqN!1a
z%NNhV6=%Jfr6LF;DF`C2PLl6C0>DIqjKmfE?vcr#S#STVO~u#?*~+#Z2eE&`m2<D%
ze9^f$5Sa)9AS;aYFhG(-!Azd&6A4o4Gwba)ZiZt*k^@<YvVG?u1}4OYOngzuMG%e{
zM*4(Vzx%)mys+o+x&I?AL3RzE%hV#Wyuba%P3JI?iXe=mVg-@zK9KRzp1Oi4sVwe!
z;C#@KtTxE@2?V+L!UfoH(PBvn!n=hHvJJrbSA;Cz5mRiCakYQ{=njO>#;MCo5RvO^
z%>Cv~*KU}UAw{Zl5MUdHB)$*5uh%gx)?@f|6c0bOyEr*y-R2!%L4<qBJ0^Ty2}~mK
z>d7X$=N-!r33vBj6Y!?)QA)cey)HYfmdQ!rRAvZQiy}d;zZ|YQGnr_YLVq>Kjr2{I
zF2~9xbIu7U(iutRYQp%XAjpphc$fZ$sreF>B8cd9=fE-S7&r!5T}`&{JcNP4lbE{A
zoy)5bQHQb=2H#DgSn5s!e^?f!C+b;_Ajwn)_df6}ZoY0K+%D;oy+E9Uh-7y+Ty@E$
zX(8hGlWBRbieTV7Vw?ACApC=j1aaA|aM(*HV7u?p7qRJ8%Q363S2}3KN&2#dv!`Wq
zPi1mQWhy7R=q9k3@D&Qjl}~~3jc!s*t1eEvrEI<{VXTWJZgXeJ6%Qh?d-8<?*s^Xp
zM0(SSMXECpKt!5;oFcLGO$_xut&^&o>WS4utRkg~2pkd@e9oIKS45$}Lg-!UE)dDK
zcmbGhpja%uJP%dMYhFe8Xs@fh8=45BYGe-FPI<YAm&4RV*dhi*5JaY8ve6P^W>X|y
zjH8q)*jNm-_=FN?Ax5c=KsHy9D%|#5>QMnrD5ktjfE@WXr_6;Orwul%bnk}hjF?hG
z>|RyNLRoX8dVYX;cfjXfJD$8++QY(1c8H$Guhp_iXMZs64ftGd8^1v3t3<fH)u8L4
zKa+`y>3@t;9s$`tuf{&VCtjcvPkj)~-;;HcxE<C>ms`q;Ln*xr1+{oMC=7R*3WMGk
z^g8c8dx>XiD>FYX697|nHApfU5#e{0$rg~x=BwUc*roGkOTg>eCiOMYQwLUTZ3^c_
zi`fkE<`m~-6R%C~(upult#~pc-HI^{1dr1jAc~(mDwR2Ks@%kv(LNC`hFDS_hs2U&
ze|86}Xp4+j2*s4|5OA9;Z%M6smUC#-`h2I=OK0*>GV(YimKq-dzU}wAK01jY;iz&8
z2tV(%0d2Ot;uA~QC$bdd^GbM_;BA3k*S(Vn5{t1vk5pKeiJ(<aaoX<du}g8wl#K2q
zC07uS)8{9OO(KZ+i(!Y9rcEWcc&$Y1gnGv3m2lzZT>+o_Tp-LOe`doDDLsv4G1iUG
ztD;eUhu`b^*!WDCL=eLcDgU1D_Hz<r_iAkHnef)2$Mvg{1TpN8@&xJjRYW>x#4<xo
z6YP&^Hi%(|RJIhlbrq2=TS>WLX5Ja_xi6jg^W>OH;rbp`zCwi0bb?XYY8ktA6_G90
zy!^c3{~hqUzfh4N;Y8*lsD(YPo_w9sU$^aOiPa-InvvDtYSOeb+i0oJ={%pDdE!a>
z#G2t~atDYeEj67oftxL7x1Ea^tH)X69C$A1b#0tFf2Mt6i3*Xp@{i2;w`NbaPHn$i
zPS?f3pzymAtB6tX$$;1OO-%$zBzSgKO}$cXg)zVcy1_@w*tt44lM6PJb8c@hO}?11
z5&=R{<xfO-twDy;2z2_VmTYN6E6-zoAmDZ1P^wPJPpsm0Z#?z4V7|*BNO=TAvImj$
zp%aUAG3FHp$pm_DpV#@HH4%iFdm`~v1b{rQtaZ%vPTbWJ?(D+v$|%L`iRpmH=_8_&
zK`>=kkm4#5Relb_Ee4R45%9Y0Fq<b|qo7yJWK6(NX)GA{Nzm&md%HnJf`p>!Yl+l{
z^g7sjkxSSk9+yq`BoY2raV2Z)T1}WZW)r>6*Xw+w++3<ikg-)HxeG*V^fDRsDu*~_
z7b}S%iyn*E$`#3{Wy?-darIz+A?R~&s8pxwXoeHY%}{ZV9tT}-GKr)QBG<3pNMewq
z^h}xRxm%NwKCyBrrtBl&LcL8$J<20UBAgoaVv`u;C_@h5K+x-|I;X3yAjQwDc<KXS
z{trD)NIl9VRuHlMJN5p<R?BLTqdel{iQ%e^i6(+DvpF139V1{~wFZsf&m+*zEns1g
zCsJ7mcM_vaMu5R510L5xA}UnFMiW7bt4K`wIDl!sD%CoW{daK(iTLCaMtrM^5nEmv
zX$F5J=yiWb%XnxWHD-21V#+Xx`m{7`)H#oU_~dff%y8H&O*P=fs-a}^$mOfP7$qJa
z4*5N<c|@cs`IlybjIAQ6F97^65~DjK)df++YSQTYNCYv`xq@8xchor&%=EdS&-rDo
zkJm&H;eHa1EBgsFS8E4Gy~zkvyY{VCykxsrvsQd2)@Sf50gr155ox|lt|o$r&LXkY
zyBPeVnFuQLvyCQ5B%YEP&f0Wmyd&Uq)s#K7W`dkG*q;D!Wo^<KwFLqOLE1JCo(gzf
zHP6|)2ojH{SLRq1aqGtAel?D_L68~&YfSZ=l}u|q9>@M#o2!c;XIGJb2k^;SJCwb?
zL6FwZ01-YO^ttNF)KfP>#^Obk!vF<auX5-1Xb_~eV^@!1K2gHD33Aq8e>a0mMq;%V
z2L1Quv|EwR<}vQj*eHpGkuKU4#qiWEfhyzHfY0?`_2NAvf*1z7HrU5AGKvW-NYcnK
zU6F8Fco2(XxU)|ikGc%=hOHo?p->{Tn$*HxZBs?QT2s@N3J1bQy2DRw&u~thJin}D
zTIKOL_RVD0&3FYVeriRNA7-LEXCg>9KHH95z6MFgW)d;~z2E2l?o8)ZLkLp*)QT#<
z1mP_+6{uUDZwEQXv6G!74E!eOb-lR}bE#njDeh{;QoBG{+z7!sxs7&`Lwb@hj`+RK
zwL~=9h&j|Sf(T(oMzfcyh5U8^otZ4E0f@FU24t%EVkHr&MJ0*}$&uN7nZL)rvjIan
z_NmsWhQ`|o$COV1_&<$qw^Q2FQ{G<LGPg7E(V*A$?MBX(h7+V{kHnI{2k6E|3ff6+
z_4PXH+Nn~~S#gQvG*zuuOVNj`)*@5jR3q(<i8wcfAQ5IS$5OjNSWxSrc2a#+EkG?4
zpt3slr>df$7U1o1!{_zXtjgWL7CxZU%koA2xMKZ^n%g@aj)FljkqIWVxh~Sy+-W-=
zV4U!KovRvUcQl<KqJu~xvqmixwuu;_c3{@1J`4FA@`Zen0QsEAD^)<DkOQk~*)Gf`
z6P7PqR+9)yDvf&{c&_9#bAn!6w{>kz?Zx78ymIQ)<Y$OrK1&vp$y_9jx%jUY7K;TY
zv!$j!^iWx(`y#V>OQ6@@luMtQvVx2Q7aC2yjtcxhCwTql1rc&t<Z@XQ3V9Urd59IF
z-ZH1ZA6}34Rpd-0hClvgSK02~`{u1RiE{kJ2`GwE(=(#7#cYAuYK6__fYoY)*`n*z
z%y}YQ?f1BztXWZw4>Xk^LWWQ*^<D!1P@_C8sV3h3xm*U>YzDbp4*7iPZ~vJHW3^hb
zbg}jw?}5P+*uHbp?O&6+f9rJ{(c`jf5=lv=aC~S;Q{C#72v&;~7OM>wtF=fNp<5I7
zcdCmrwT20|1bSUfO={S5f}ADE=L!79+7W2X6Jj?flU9(;rjgHPi*`aQ%EAQ;;Bq=O
zb@i8L2XN#>sBGQqx2{Eh(5tB}@o6PKv6@-L>SA}eV7EKk@@Ynl&-#6?uQpRh(RND+
zB037kl0N|Gea%*AynR7}Y&wN>I)!|$WM=!Oi{f&*uyFo-P5s>W=!=NNl4a{&x@r-`
zztxIZ5eJVPsaCC_zl+Z@tK9*+-3hBr+bTCB0hsR!_}m|wQ5zZ`ZW%$C*%XN@zia09
zudo?1MN%k5dqNLId}fV(l2k6`cCf~u(z=s%CKN(sWTaYmP5s?wcf#fFE!r@RFMPk>
z<GPWET9Og3WdspGiQHP@nDQhMt#2f7Vuct@CXmZ$PFB&#?klz>40U0!S1O571;2Xu
zg^G2w>|}{;=E1{<QK+!P)-uJ#&Wyzhx4XCaDb}E}-S2T;RqnEz2K6zinU)en^c;_K
zFw3c@30OW;g~V!+OvWL$V)a~BEL#SXsr&^yM^2o<U!JY*m0fKoYa|-Q=`+*rp=>)e
zWHQ0&bi?K9h4}A!3IqGCaBlH>N!)tYveI&b2+d+K_UBl6n26TZs;MxzQ_3h5B~kG#
zqSkhsSwG<SBNzyj?c%vzhq3q2iK-&}^)>6z=PiG%By101gXp<9T|MaO6`Kt;Og-iu
zX1HGK^HIyc9cz%Xv9L3<D;!JRM}%v%wk*yl;?eMo&L_0?)yR6)4i2js=;N|%T)Pyj
zmzB;RUh-hDkxDeMEwPI9_V&T<(6GbD{IK8adLt3FB>`C52qN%iW=kZV5;5(!R>MCz
z8iSHdRI8@j-^(2wij(=D{O)N@axa=2z}1^pm#kaw!Jwv&n^Z~cdi8kyFqONNi}4G;
z*Lf=um3Lccl5FG6wv`~`LPTQ99SnS=l&-?XBNhwmW>>1-@hEq2_{y0PJouzGFA1B~
zf?IFeJWYhg9t_s2VSUdD+sxZH3zjJ-_6*z^^tx`Vuhqsqr3-=xbs}-)c4kaE_z}A@
z(eSC39qcs@*3vDNIyih`&tdF7P~H9*Z?Tje(u#w@=3+ze`Dcx93k(0s+XEig*PGj?
zw$^n+5Fzeax0JhtOOW{cNca?lk5spmQU`|*KCuh0gkqXiymI{tEL(Jb+qfMEgPMh{
zsUpGG7gVhd`#YNLK2nQVx*~`WJRDcHF!L|dN^;I<B3g?s9Z`4c!C|!n!l_D4JuuY6
z!C)hRH<`_Om#gQ43+DFU-H7%Y)rRf}A`}y6C8s0D2J+cV`MuFbA<*J>dV6{>Z|>Ob
z5h7mW{>OLMBtehMfwx|FS@9XY9Sqi_$b`yPtL?PQ;oUTMZeMGCWHbn@OM(cwnc05$
z*wCZdOlpe;Jvyq2*!HzM9C%^iBw~r$PyZM6`><kBUtR9(dIQSobU(Og!Mqz<<vLQU
z{<<Z|xFSbSoVY!cN_|;X)%uQLYel3*#NjwF000C>Nkl<Z^+h6uXJ0;DS8pPd;zdh3
z`zAcI*<5fsdv04WuYbn5tLg$#<3qY9h|uHssZ*C^lFH-xd`^1=l12d9RZWDR?>ZDh
zDpR}beWw$|YPCfjHuvWF^Ji7}uW8o+o$a?H2y*t5%X;+qiAU0DrMA$zHUnI#`(!$g
z-G{<8OW4T-vAf(4EuKG5c;n`4R=f=lbPPepu^AdZ^Wjt~@y$XZ--5t{=8wqWi5SjA
zYqLWZ%<jSbS)CQ?Z?)MKhokp{^XK?~)_hbO*F(n<WZZy1Iy8JwCX>2}Rkb5^7#~7$
zL+y(PLMRlpg*TW@g!L<Dwe;TgnM^k#6T95K_b!+_`&~q&k06~I6zb^7b@a@c4f&+<
zn_M=dEo`p_U|L!A%t#7@!`eb*J8AW>+8jf6r~M5J`uksMC7zA!tD^}r4#bgTL!ZxN
z)Bnt>+Ie|v&ML9%P#8+O@@ILctR7@C<(*FVKP{R+R~POgGa*b@5JUhlGBV;Di6?%W
z&7@yF6F}Patdc2U*TM2h8-!d7`+G1is9)Pdd`{Wy_J@4EJ@4r2>+1?Ph^`^XIU|1P
zmCc!4=6ktZ=Hhlu_Imq0ax#unk<wugdR{%mA)n3ec*gDUyl3`o@4<TY*W+_tN04!l
zhlhtZq_Ww&a@p*qdIY|dOa+y(WB(cCOBn2Wv^@kdtXBIo7N`B)i~9Qybqdb4$l0|7
z83$o-Xy{VT74FJrGaJgq<<tULv+IUpX&f4w?A@!k)kB0m+wAsdtWM{<x|JB?<J|QG
zIcLZpIkH40)1CQT?pjqX)SfE6+02;G{%}}<S~wp>=XTl9*VBv?I<+Z9CR4#`u{~sh
zdfVc~i_52htgTsH*OrDL<D<aL*5fBn-H}bF-q}sAE6to`7K=4*bvS;qXzrYkcFGBO
zqwtW9AQOQbI(hP%Y$pGuTrPdNNNm?AP`ja>vDL!5-D<aeZsFXyk9C7i_2?iqLB;_)
zeE6_~%+}lTh5UyK`TR=e?(!VgIx$Q{s>N#CON6`f+3cMwR;*}G&Q`4gx1gRukSQRG
zPq1S{!=EY?)DPrxnG2aa+m)r-95R{Bs?A~>fW`9t3+B!F77=w%jB_>RHT-T6qyk9H
zY&$wU{GLKC|E_#Kw~<w~M+2t1uVONrV-}0`8MDp)<3)33|I{Ew`5`k1Qp0o}92~rW
znQw&Ie3M#GH{|pAexh1Z1lG`5!>Ur=Y&M@Tna$5JtM_p}|N9jyR_HH3X~XnwY(oY?
zW{Bs$!NFHsh;CGYb)@nVmDPS`?rpWvPbO2=M5ZW+PMSam7}&0waNmWC7r#716{UXM
zAV`yje{gWHpUAq-WWpvk(OOn{o~o)IfZfdOWWWJcwG~*k5@2TLb7LV+sEJIf`1B!@
zDFa4Mq~0WgLMC&P2vIUw1_`{wVKqNBd-m)Xo1}*H&HjH`fy{@vi+YIw0000<MNUMn
GLSTZwNh&b_

literal 0
HcmV?d00001

diff --git a/web/src/layout/navBars/breadcrumb/user.vue b/web/src/layout/navBars/breadcrumb/user.vue
index a762c37aa..f4cf706d5 100644
--- a/web/src/layout/navBars/breadcrumb/user.vue
+++ b/web/src/layout/navBars/breadcrumb/user.vue
@@ -59,7 +59,7 @@
 		</div>
 		<el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
 			<span class="layout-navbars-breadcrumb-user-link">
-				<img :src="userInfos.avatar" class="layout-navbars-breadcrumb-user-link-photo mr5" />
+				<img :src="userInfos.avatar || headerImage" class="layout-navbars-breadcrumb-user-link-photo mr5" />
 				{{ userInfos.username === '' ? 'common' : userInfos.username }}
 				<el-icon class="el-icon--right">
 					<ele-ArrowDown />
@@ -90,7 +90,7 @@ import { useThemeConfig } from '/@/stores/themeConfig';
 import other from '/@/utils/other';
 import mittBus from '/@/utils/mitt';
 import { Session, Local } from '/@/utils/storage';
-
+import headerImage from '/@/assets/img/headerImage.png';
 // 引入组件
 const UserNews = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/userNews.vue'));
 const Search = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/search.vue'));
diff --git a/web/src/utils/setIconfont.ts b/web/src/utils/setIconfont.ts
index aa471044f..baa096933 100644
--- a/web/src/utils/setIconfont.ts
+++ b/web/src/utils/setIconfont.ts
@@ -2,7 +2,6 @@
 const cssCdnUrlList: Array<string> = [
 	'//at.alicdn.com/t/font_2298093_y6u00apwst.css',
 	'//at.alicdn.com/t/c/font_3882322_9ah7y8m9175.css', //dvadmin3项目用icon
-	'//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css',
 ];
 // 第三方 js url
 const jsCdnUrlList: Array<string> = [];
-- 
Gitee


From dd98b9877536237424d4d43d810b51c1a91282d6 Mon Sep 17 00:00:00 2001
From: H0nGzA1 <2505811377@qq.com>
Date: Fri, 27 Oct 2023 16:05:06 +0800
Subject: [PATCH 10/40] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0fast-crud?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/package.json b/web/package.json
index 31afb85a8..807cd61bd 100644
--- a/web/package.json
+++ b/web/package.json
@@ -10,10 +10,10 @@
 	},
 	"dependencies": {
 		"@element-plus/icons-vue": "^2.0.10",
-		"@fast-crud/fast-crud": "^1.14.7",
-		"@fast-crud/fast-extends": "^1.14.7",
-		"@fast-crud/ui-element": "^1.14.7",
-		"@fast-crud/ui-interface": "^1.14.7",
+		"@fast-crud/fast-crud": "^1.18.3",
+		"@fast-crud/fast-extends": "^1.18.3",
+		"@fast-crud/ui-element": "^1.18.3",
+		"@fast-crud/ui-interface": "^1.18.3",
 		"@vitejs/plugin-vue-jsx": "^3.0.0",
 		"@wangeditor/editor": "^5.1.23",
 		"@wangeditor/editor-for-vue": "^5.1.12",
-- 
Gitee


From b74a196c948015d5a5ed9fb3507698a61d8a247a Mon Sep 17 00:00:00 2001
From: china_ahhui <ahhuiguys@163.com>
Date: Mon, 13 Nov 2023 17:45:49 +0800
Subject: [PATCH 11/40] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E7=9A=84=E5=BF=BD=E7=95=A5=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/.gitignore b/backend/.gitignore
index a09ea3d72..047099f90 100644
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -98,3 +98,5 @@ media/
 __pypackages__/
 package-lock.json
 gunicorn.pid
+plugins/*
+!plugins/__init__.py
-- 
Gitee


From 96748da99d410940b6241fb39f0009287dfe9132 Mon Sep 17 00:00:00 2001
From: china_ahhui <ahhuiguys@163.com>
Date: Mon, 13 Nov 2023 18:27:10 +0800
Subject: [PATCH 12/40] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E7=9A=84app=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/application/settings.py | 4 ++--
 backend/conf/env.example.py     | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/backend/application/settings.py b/backend/application/settings.py
index f59140fa4..39ca00166 100644
--- a/backend/application/settings.py
+++ b/backend/application/settings.py
@@ -46,7 +46,7 @@ ALLOWED_HOSTS = locals().get("ALLOWED_HOSTS", ["*"])
 # Application definition
 CUSTOM_APPS = [
     "dvadmin.system",
-]
+] + CUSTOM_APPS
 
 INSTALLED_APPS = [
     "django.contrib.auth",
@@ -61,7 +61,7 @@ INSTALLED_APPS = [
     "drf_yasg",
     "captcha",
     'channels',
-    *locals().get("CUSTOM_APPS", []),  # 所有项目里写的app需要在env.py文件里的CUSTOM_APPS中
+    *CUSTOM_APPS,
 ]
 
 MIDDLEWARE = [
diff --git a/backend/conf/env.example.py b/backend/conf/env.example.py
index 1e0a03960..ffc6afa09 100644
--- a/backend/conf/env.example.py
+++ b/backend/conf/env.example.py
@@ -44,6 +44,4 @@ LOGIN_NO_CAPTCHA_AUTH = True
 # ================================================= #
 
 ALLOWED_HOSTS = ["*"]
-CUSTOM_APPS = [
-    "dvadmin.system",
-]
+CUSTOM_APPS = []
-- 
Gitee


From 94ad6b1bae9ad4e27054d13d75dece2d6f01a39a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Mon, 20 Nov 2023 17:02:37 +0800
Subject: [PATCH 13/40] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.更新字段管理
---
 backend/application/settings.py               |   2 +-
 backend/dvadmin/system/models.py              |  21 +-
 backend/dvadmin/system/views/column.py        |  40 +-
 backend/dvadmin/system/views/menu.py          |   3 +-
 backend/dvadmin/system/views/menu_button.py   |   3 +-
 .../views/role_menu_button_permission.py      |  46 ++-
 backend/dvadmin/utils/field_permission.py     |  14 +-
 backend/dvadmin/utils/filters.py              |   5 +-
 backend/dvadmin/utils/models.py               |   3 +-
 backend/dvadmin/utils/pagination.py           |   3 +-
 backend/dvadmin/utils/viewset.py              |  13 +-
 web/.env.development                          |   2 +-
 .../menu/components/MenuButtonCom/crud.tsx    |   2 +-
 .../menu/components/MenuButtonCom/index.vue   |   2 +-
 web/src/views/system/menu/index.vue           |  20 +-
 .../role/components/PermissionCom/api.ts      | 117 ------
 .../role/components/PermissionCom/index.vue   | 350 ------------------
 .../role/components/PermissionComCopy/api.ts  |  21 --
 .../components/PermissionComCopy/index.vue    | 235 ------------
 .../components/PermissionComCopy/types.ts     |  20 -
 .../components/PermissionComNew/index.vue     |   4 +-
 web/src/views/system/role/crud.tsx            |  34 --
 web/src/views/system/role/index.vue           |   1 -
 23 files changed, 116 insertions(+), 845 deletions(-)
 delete mode 100644 web/src/views/system/role/components/PermissionCom/api.ts
 delete mode 100644 web/src/views/system/role/components/PermissionCom/index.vue
 delete mode 100644 web/src/views/system/role/components/PermissionComCopy/api.ts
 delete mode 100644 web/src/views/system/role/components/PermissionComCopy/index.vue
 delete mode 100644 web/src/views/system/role/components/PermissionComCopy/types.ts

diff --git a/backend/application/settings.py b/backend/application/settings.py
index 39ca00166..699b77ad2 100644
--- a/backend/application/settings.py
+++ b/backend/application/settings.py
@@ -46,7 +46,7 @@ ALLOWED_HOSTS = locals().get("ALLOWED_HOSTS", ["*"])
 # Application definition
 CUSTOM_APPS = [
     "dvadmin.system",
-] + CUSTOM_APPS
+]
 
 INSTALLED_APPS = [
     "django.contrib.auth",
diff --git a/backend/dvadmin/system/models.py b/backend/dvadmin/system/models.py
index ed728ea7b..79eb23664 100644
--- a/backend/dvadmin/system/models.py
+++ b/backend/dvadmin/system/models.py
@@ -13,7 +13,6 @@ class Role(CoreModel):
     key = models.CharField(max_length=64, unique=True, verbose_name="权限字符", help_text="权限字符")
     sort = models.IntegerField(default=1, verbose_name="角色顺序", help_text="角色顺序")
     status = models.BooleanField(default=True, verbose_name="角色状态", help_text="角色状态")
-    admin = models.BooleanField(default=False, verbose_name="是否为admin", help_text="是否为admin")
 
     class Meta:
         db_table = table_prefix + "system_role"
@@ -179,21 +178,27 @@ class Menu(CoreModel):
         verbose_name_plural = verbose_name
         ordering = ("sort",)
 
-
-class Columns(CoreModel):
-    role = models.ForeignKey(to='Role', on_delete=models.CASCADE, verbose_name='角色', db_constraint=False)
-    app = models.CharField(max_length=64, verbose_name='应用名')
-    model = models.CharField(max_length=64, verbose_name='表名')
+class MenuField(CoreModel):
+    model = models.CharField(max_length=64, verbose_name='表名',null=True,blank=True)
     menu = models.ForeignKey(to='Menu', on_delete=models.CASCADE, verbose_name='菜单', db_constraint=False)
     field_name = models.CharField(max_length=64, verbose_name='模型表字段名')
     title = models.CharField(max_length=64, verbose_name='字段显示名')
+    class Meta:
+        db_table = table_prefix + "system_menu_field"
+        verbose_name = "菜单字段表"
+        verbose_name_plural = verbose_name
+        ordering = ("id",)
+
+class FieldPermission(CoreModel):
+    role = models.ForeignKey(to='Role', on_delete=models.CASCADE, verbose_name='角色', db_constraint=False)
+    field = models.ForeignKey(to='MenuField', on_delete=models.CASCADE,related_name='menu_field', verbose_name='字段', db_constraint=False)
     is_query = models.BooleanField(default=1, verbose_name='是否可查询')
     is_create = models.BooleanField(default=1, verbose_name='是否可创建')
     is_update = models.BooleanField(default=1, verbose_name='是否可更新')
 
     class Meta:
-        db_table = table_prefix + "system_columns"
-        verbose_name = "列权限表"
+        db_table = table_prefix + "system_field_permission"
+        verbose_name = "字段权限表"
         verbose_name_plural = verbose_name
         ordering = ("id",)
 
diff --git a/backend/dvadmin/system/views/column.py b/backend/dvadmin/system/views/column.py
index a23d27cdb..993be5258 100644
--- a/backend/dvadmin/system/views/column.py
+++ b/backend/dvadmin/system/views/column.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
+from django.apps import apps
 from rest_framework import serializers
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
-from dvadmin.system.models import Columns, Role
+from dvadmin.system.models import  Role, MenuField
 from dvadmin.utils.models import get_custom_app_models
 from dvadmin.utils.viewset import CustomModelViewSet
 from dvadmin.utils.serializers import CustomModelSerializer
@@ -16,7 +17,7 @@ class ColumnSerializer(CustomModelSerializer):
     """
 
     class Meta:
-        model = Columns
+        model = MenuField
         fields = '__all__'
         read_only_fields = ['id']
 
@@ -25,33 +26,34 @@ class ColumnViewSet(CustomModelViewSet):
     """
     列权限视图集
     """
-    queryset = Columns.objects.all()
+    queryset = MenuField.objects.all()
     serializer_class = ColumnSerializer
 
     def list(self, request, *args, **kwargs):
-        role_id = request.query_params.get('role')
         app_name = request.query_params.get('app')
         model_name = request.query_params.get('model')
         menu = request.query_params.get('menu')
-        if not role_id or not model_name or not app_name or not menu:
+        if  not menu:
             return SuccessResponse([])
-        queryset = self.filter_queryset(self.get_queryset().filter(role_id=role_id, model=model_name, app=app_name,menu_id=menu))
-        page = self.paginate_queryset(queryset)
-        if page is not None:
-            serializer = self.get_serializer(page, many=True, request=request)
-            return self.get_paginated_response(serializer.data)
+        queryset = self.filter_queryset(self.get_queryset().filter(menu=menu))
+        # page = self.paginate_queryset(queryset)
+        # if page is not None:
+        #     serializer = self.get_serializer(page, many=True, request=request)
+        #     return self.get_paginated_response(serializer.data)
         serializer = self.get_serializer(queryset, many=True, request=request)
         return SuccessResponse(data=serializer.data, msg="获取成功")
 
     def create(self, request, *args, **kwargs):
         payload = request.data
-        for model in get_custom_app_models(payload.get('app')):
-            if payload.get('model') == model['model']:
+        print(11,get_custom_app_models())
+        for model in apps.get_models():
+            print(model.__name__)
+            if payload.get('model') == model.__name__:
                 break
         else:
             return ErrorResponse(msg='模型表不存在')
 
-        if Columns.objects.filter(app=model['app'], model=model['model'], field_name=payload.get('field_name')).exists():
+        if MenuField.objects.filter(menu=payload.get('menu'),model=model.__name__, field_name=payload.get('field_name')).exists():
             return ErrorResponse(msg='‘%s’ 字段权限已有，不可重复创建' % payload.get('title'))
 
         return super().create(request, *args, **kwargs)
@@ -72,21 +74,21 @@ class ColumnViewSet(CustomModelViewSet):
     @action(methods=['POST'], detail=False, permission_classes=[IsAuthenticated])
     def auto_match_fields(self, request):
         """自动匹配已有的字段"""
-        role_id = request.data.get('role')
+        menu_id = request.data.get('menu')
         app_name = request.data.get('app')
         model_name = request.data.get('model')
-        if not role_id or not model_name or not app_name:
-            return DetailResponse([], msg='无操作')
+        if not menu_id or not model_name or not app_name:
+            return ErrorResponse( msg='参数错误')
         for model in get_custom_app_models(app_name):
             if model['model'] != model_name:
                 continue
             for field in model['fields']:
-                if Columns.objects.filter(
-                        role_id=role_id, app=app_name, model=model_name, field_name=field['name']
+                if MenuField.objects.filter(
+                        menu_id=menu_id, app=app_name, model=model_name, field_name=field['name']
                 ).exists():
                     continue
                 data = {
-                    'role': role_id,
+                    'menu': menu_id,
                     'app': app_name,
                     'model': model_name,
                     'field_name': field['name'],
diff --git a/backend/dvadmin/system/views/menu.py b/backend/dvadmin/system/views/menu.py
index 689964629..7ac3c40cd 100644
--- a/backend/dvadmin/system/views/menu.py
+++ b/backend/dvadmin/system/views/menu.py
@@ -119,8 +119,7 @@ class MenuViewSet(CustomModelViewSet):
     def web_router(self, request):
         """用于前端获取当前角色的路由"""
         user = request.user
-        is_admin = user.role.values_list('admin', flat=True)
-        if user.is_superuser or True in is_admin:
+        if user.is_superuser:
             queryset = self.queryset.filter(status=1)
         else:
             role_list = user.role.values_list('id', flat=True)
diff --git a/backend/dvadmin/system/views/menu_button.py b/backend/dvadmin/system/views/menu_button.py
index 94a65efb1..245b34735 100644
--- a/backend/dvadmin/system/views/menu_button.py
+++ b/backend/dvadmin/system/views/menu_button.py
@@ -63,8 +63,7 @@ class MenuButtonViewSet(CustomModelViewSet):
         :return:
         """
         is_superuser = request.user.is_superuser
-        is_admin = request.user.role.values_list('admin', flat=True)
-        if is_superuser or True in is_admin:
+        if is_superuser:
             queryset = MenuButton.objects.values_list('value',flat=True)
         else:
             role_id = request.user.role.values_list('id', flat=True)
diff --git a/backend/dvadmin/system/views/role_menu_button_permission.py b/backend/dvadmin/system/views/role_menu_button_permission.py
index 109b27be7..a8865cab2 100644
--- a/backend/dvadmin/system/views/role_menu_button_permission.py
+++ b/backend/dvadmin/system/views/role_menu_button_permission.py
@@ -11,7 +11,8 @@ from rest_framework import serializers
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
-from dvadmin.system.models import RoleMenuButtonPermission, Menu, MenuButton, Dept, RoleMenuPermission, Columns
+from dvadmin.system.models import RoleMenuButtonPermission, Menu, MenuButton, Dept, RoleMenuPermission, FieldPermission, \
+    MenuField
 from dvadmin.system.views.menu import MenuSerializer
 from dvadmin.utils.json_response import DetailResponse, ErrorResponse
 from dvadmin.utils.serializers import CustomModelSerializer
@@ -71,12 +72,41 @@ class RoleButtonPermissionSerializer(CustomModelSerializer):
         model = MenuButton
         fields = ['id','name','value','isCheck','data_range']
 
-class RoleColumnsSerializer(CustomModelSerializer):
+class RoleFieldPermissionSerializer(CustomModelSerializer):
 
     class Meta:
-        model = Columns
+        model = FieldPermission
         fields = "__all__"
 
+class RoleMenuFieldSerializer(CustomModelSerializer):
+    is_query = serializers.SerializerMethodField()
+    is_create = serializers.SerializerMethodField()
+    is_update = serializers.SerializerMethodField()
+
+    def get_is_query(self, instance):
+        params = self.request.query_params
+        queryset = instance.menu_field.filter(role=params.get('role')).first()
+        if queryset:
+            return queryset.is_query
+        return False
+
+    def get_is_create(self, instance):
+        params = self.request.query_params
+        queryset = instance.menu_field.filter(role=params.get('role')).first()
+        if queryset:
+            return queryset.is_create
+        return False
+
+    def get_is_update(self, instance):
+        params = self.request.query_params
+        queryset = instance.menu_field.filter(role=params.get('role')).first()
+        if queryset:
+            return queryset.is_update
+        return False
+    class Meta:
+        model = MenuField
+        fields = ['id','field_name','title','is_query','is_create','is_update']
+
 
 class RoleMenuPermissionSerializer(CustomModelSerializer):
     """
@@ -99,9 +129,8 @@ class RoleMenuPermissionSerializer(CustomModelSerializer):
         return  serializer.data
 
     def get_columns(self, instance):
-        params = self.request.query_params
-        col_list = Columns.objects.filter(role__id=params.get('role'),menu__id=instance['id'])
-        serializer = RoleColumnsSerializer(col_list,many=True,request=self.request)
+        col_list = MenuField.objects.filter(menu=instance['id'])
+        serializer = RoleMenuFieldSerializer(col_list,many=True,request=self.request)
         return serializer.data
 
 
@@ -165,10 +194,11 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
                 RoleMenuPermission.objects.create(role_id=pk, menu_id=menu.get('id'))
             for btn in menu.get('btns'):
                 if btn.get('isCheck'):
-                    instance = RoleMenuButtonPermission.objects.create(role_id=pk, menu_button_id=btn.get('id'),data_range=btn.get('data_range'))
+                    data_range = btn.get('data_range',0) or 0
+                    instance = RoleMenuButtonPermission.objects.create(role_id=pk, menu_button_id=btn.get('id'),data_range=data_range)
                     instance.dept.set(btn.get('dept',[]))
             for col in menu.get('columns'):
-                Columns.objects.filter(id=col.get('id')).update(is_query=col.get('is_query'),is_create=col.get('is_create'),is_update=col.get('is_update'))
+                FieldPermission.objects.update_or_create(role_id=pk,field_id=col.get('id'),is_query=col.get('is_query'),is_create=col.get('is_create'),is_update=col.get('is_update'))
         return DetailResponse(msg="授权成功")
 
 
diff --git a/backend/dvadmin/utils/field_permission.py b/backend/dvadmin/utils/field_permission.py
index 939381bd9..1c969a07e 100644
--- a/backend/dvadmin/utils/field_permission.py
+++ b/backend/dvadmin/utils/field_permission.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
+from django.db.models import F
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
-from dvadmin.system.models import Columns
+from dvadmin.system.models import FieldPermission, MenuField
 from dvadmin.utils.json_response import DetailResponse
 from dvadmin.utils.models import get_custom_app_models
 
@@ -23,16 +24,17 @@ class FieldPermissionMixin:
                 break
         if finded is False:
             return []
-        roles = request.user.role.values_list('id', flat=True)
+        print(266666,model)
         user = request.user
         if user.is_superuser==1:
-            data = Columns.objects.filter(app=model['app'], model=model['model']).values('field_name', 'is_create', 'is_query', 'is_update')
+            data = MenuField.objects.filter( model=model['model']).values('field_name')
             for item in data:
                 item['is_create'] = True
                 item['is_query'] = True
                 item['is_update'] = True
         else:
-            data= Columns.objects.filter(
-                app=model['app'], model=model['model'],role__in=roles
-            ).values('field_name', 'is_create', 'is_query', 'is_update')
+            roles = request.user.role.values_list('id', flat=True)
+            data= FieldPermission.objects.filter(
+                 field__model=model['model'],role__in=roles
+            ).values( 'is_create', 'is_query', 'is_update',field_name=F('field__field_name'))
         return DetailResponse(data=data)
\ No newline at end of file
diff --git a/backend/dvadmin/utils/filters.py b/backend/dvadmin/utils/filters.py
index dbd921fa3..06dba2e7b 100644
--- a/backend/dvadmin/utils/filters.py
+++ b/backend/dvadmin/utils/filters.py
@@ -121,13 +121,12 @@ class DataLevelPermissionsFilter(BaseFilterBackend):
             role__status=1,
             menu_button__api=re_api,
             menu_button__method=method).values(
-            'data_range',
-            role_admin=F('role__admin')
+            'data_range'
         )
         dataScope_list = []  # 权限范围列表
         for ele in role_permission_list:
                 # 判断用户是否为超级管理员角色/如果拥有[全部数据权限]则返回所有数据
-            if ele.get("data_range") == 3 or ele.get("role_admin") == True:
+            if ele.get("data_range") == 3:
                 return queryset
             dataScope_list.append(ele.get("data_range"))
         dataScope_list = list(set(dataScope_list))
diff --git a/backend/dvadmin/utils/models.py b/backend/dvadmin/utils/models.py
index 4ec619d56..8ea800723 100644
--- a/backend/dvadmin/utils/models.py
+++ b/backend/dvadmin/utils/models.py
@@ -136,10 +136,11 @@ def get_model_from_app(app_name):
 
 
 def get_custom_app_models(app_name=None):
-    """获取所有项目写的app里的models"""
+    """获取所有项目下的app里的models"""
     if app_name:
         return get_model_from_app(app_name)
     res = []
     for app in settings.CUSTOM_APPS:
+        # print(222,get_model_from_app(app))
         res.append(get_model_from_app(app))
     return res
diff --git a/backend/dvadmin/utils/pagination.py b/backend/dvadmin/utils/pagination.py
index 52bf143dc..5e80e57d4 100644
--- a/backend/dvadmin/utils/pagination.py
+++ b/backend/dvadmin/utils/pagination.py
@@ -79,6 +79,5 @@ class CustomPagination(PageNumberPagination):
             ('total', total),
             ('is_next', is_next),
             ('is_previous', is_previous),
-            ('data', data),
-            ('permission', self.request.permission_fields)
+            ('data', data)
         ]))
diff --git a/backend/dvadmin/utils/viewset.py b/backend/dvadmin/utils/viewset.py
index a46200323..6b47457ea 100644
--- a/backend/dvadmin/utils/viewset.py
+++ b/backend/dvadmin/utils/viewset.py
@@ -17,7 +17,7 @@ from dvadmin.utils.import_export_mixin import ExportSerializerMixin, ImportSeria
 from dvadmin.utils.json_response import SuccessResponse, ErrorResponse, DetailResponse
 from dvadmin.utils.permission import CustomPermission
 from dvadmin.utils.models import get_custom_app_models
-from dvadmin.system.models import Columns
+from dvadmin.system.models import FieldPermission, MenuField
 from django_restql.mixins import QueryArgumentsMixin
 
 
@@ -64,7 +64,7 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
         serializer_class = self.get_serializer_class()
         kwargs.setdefault('context', self.get_serializer_context())
         # 全部以可见字段为准
-        can_see = self.get_column_permission(serializer_class)
+        can_see = self.get_menu_field(serializer_class)
         # 排除掉序列化器级的字段
         # sub_set = set(serializer_class._declared_fields.keys()) - set(can_see)
         # for field in sub_set:
@@ -79,8 +79,8 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
         else:
             return serializer_class(*args, **kwargs)
 
-    def get_column_permission(self, serializer_class):
-        """获取列权限"""
+    def get_menu_field(self, serializer_class):
+        """获取字段权限"""
         finded = False
         for app in get_custom_app_models():
             for model in app:
@@ -91,9 +91,8 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
                 break
         if finded is False:
             return []
-        return Columns.objects.filter(
-            app=model['app'], model=model['model']
-        ).values('field_name', 'is_create', 'is_query', 'is_update')
+        return MenuField.objects.filter(model=model['model']
+        ).values('field_name', 'title')
 
     def create(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data, request=request)
diff --git a/web/.env.development b/web/.env.development
index 1c3ca5db3..dc36b291b 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 本地环境接口地址
-VITE_API_URL = 'http://127.0.0.1:8000'
+VITE_API_URL = 'http://127.0.0.1:8001'
 
 # 是否启用按钮权限
 VITE_PM_ENABLED = true
diff --git a/web/src/views/system/menu/components/MenuButtonCom/crud.tsx b/web/src/views/system/menu/components/MenuButtonCom/crud.tsx
index fe34d05b8..0270ad5fd 100644
--- a/web/src/views/system/menu/components/MenuButtonCom/crud.tsx
+++ b/web/src/views/system/menu/components/MenuButtonCom/crud.tsx
@@ -124,7 +124,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 					type: 'text',
 					search: { show: false },
 					column: {
-						width: 120,
+						width: 200,
 						sortable: true,
 					},
 					form: {
diff --git a/web/src/views/system/menu/components/MenuButtonCom/index.vue b/web/src/views/system/menu/components/MenuButtonCom/index.vue
index af2bddd56..9dddaf945 100644
--- a/web/src/views/system/menu/components/MenuButtonCom/index.vue
+++ b/web/src/views/system/menu/components/MenuButtonCom/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
+	<fs-crud ref="crudRef"  v-bind="crudBinding"> </fs-crud>
 </template>
 
 <script lang="ts" setup>
diff --git a/web/src/views/system/menu/index.vue b/web/src/views/system/menu/index.vue
index 97e26c3d5..aea35292f 100644
--- a/web/src/views/system/menu/index.vue
+++ b/web/src/views/system/menu/index.vue
@@ -14,9 +14,19 @@
 			</el-col>
 
 			<el-col :span="18">
-				<div class="menu-box menu-right-box">
-					<MenuButtonCom ref="menuButtonRef" />
-				</div>
+        <el-tabs type="border-card">
+          <el-tab-pane label="按钮配置" >
+            <div style="height: 80vh">
+              <MenuButtonCom ref="menuButtonRef" />
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="字段配置">
+            <div style="height: 80vh">
+              <MenuFieldCom ref="menuFieldRef"></MenuFieldCom>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
 			</el-col>
 		</el-row>
 
@@ -39,6 +49,7 @@ import { ElMessageBox } from 'element-plus';
 import MenuTreeCom from './components/MenuTreeCom/index.vue';
 import MenuButtonCom from './components/MenuButtonCom/index.vue';
 import MenuFormCom from './components/MenuFormCom/index.vue';
+import MenuFieldCom from './components/MenuFieldCom/index.vue';
 import { GetList, DelObj } from './api';
 import { successNotification } from '/@/utils/message';
 import { APIResponseData, MenuTreeItemType } from './types';
@@ -49,7 +60,7 @@ let drawerVisible = ref(false);
 let drawerFormData = ref<Partial<MenuTreeItemType>>({});
 let menuTreeRef = ref<InstanceType<typeof MenuTreeCom> | null>(null);
 let menuButtonRef = ref<InstanceType<typeof MenuButtonCom> | null>(null);
-
+let menuFieldRef = ref<InstanceType<typeof MenuFieldCom> | null>(null);
 const getData = () => {
 	GetList({}).then((ret: APIResponseData) => {
 		const responseData = ret.data;
@@ -67,6 +78,7 @@ const getData = () => {
  */
 const handleTreeClick = (record: MenuTreeItemType) => {
 	menuButtonRef.value?.handleRefreshTable(record);
+  menuFieldRef.value?.handleRefreshTable(record)
 };
 
 /**
diff --git a/web/src/views/system/role/components/PermissionCom/api.ts b/web/src/views/system/role/components/PermissionCom/api.ts
deleted file mode 100644
index 8e9abaad1..000000000
--- a/web/src/views/system/role/components/PermissionCom/api.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import { request } from "/@/utils/service";
-
-/**
- * 获取角色所拥有的菜单
- * @param params
- */
-export function GetMenu(params:any) {
-    return request({
-        url: '/api/system/role_menu_button_permission/role_get_menu/',
-        method: 'get',
-        params:params
-    });
-}
-
-/***
- * 新增权限
- * @param data
- * @constructor
- */
-export function SaveMenuPermission(data:any) {
-    return request({
-        url: '/api/system/role_menu_permission/save_auth/',
-        method: 'post',
-        data:data
-    });
-}
-
-
-/**
- * 获取菜单下的按钮
- * @param params
- * @constructor
- */
-export function GetMenuButton(params:any) {
-    return request({
-        url: '/api/system/role_menu_button_permission/role_menu_get_button/',
-        method: 'get',
-        params:params
-    });
-}
-
-
-/***
- * 根据角色获取已授权的菜单
- * @param params
- * @constructor
- */
-export function role_to_menu (params:any={}) {
-    return request({
-        url: '/api/system/role_menu_button_permission/role_to_menu/',
-        method: 'get',
-        params: params
-    })
-}
-
-/***
- * 根据角色获取数据权限范围
- * @constructor
- */
-export function GetDataScope (params:any={}) {
-    return request({
-        url: '/api/system/role_menu_button_permission/data_scope/',
-        method: 'get',
-        params: params
-    })
-}
-
-/***
- * 获取权限部门
- * @constructor
- */
-export function GetDataScopeDept (params:any) {
-    return request({
-        url: '/api/system/role_menu_button_permission/role_to_dept_all/',
-        method: 'get',
-        params: params
-    })
-}
-
-/***
- * 新增权限
- * @param data
- * @constructor
- */
-export function CreatePermission(data:any) {
-    return request({
-        url: '/api/system/role_menu_button_permission/',
-        method: 'post',
-        data:data
-    });
-}
-
-/***
- * 根据菜单获取菜单下按钮
- * @param params
- */
-export function getObj(params:any) {
-    return request({
-        url: '/api/system/role_menu_button_permission/menu_to_button/',
-        method: 'get',
-        params:params
-    });
-}
-
-/**
- * 删除按钮权限
- * @param data
- * @constructor
- */
-export function DeletePermission(data:any) {
-    return request({
-        url: `/api/system/role_menu_button_permission/${data.id}/`,
-        method: 'delete',
-        data:{}
-    });
-}
-
diff --git a/web/src/views/system/role/components/PermissionCom/index.vue b/web/src/views/system/role/components/PermissionCom/index.vue
deleted file mode 100644
index e1912266b..000000000
--- a/web/src/views/system/role/components/PermissionCom/index.vue
+++ /dev/null
@@ -1,350 +0,0 @@
-<template>
-	<el-drawer size="70%" v-model="drawer" direction="rtl" destroy-on-close :before-close="handleClose">
-		<template #header>
-			<div>
-				<el-tag>当前角色:{{ editedRoleInfo.name }}</el-tag>
-			</div>
-		</template>
-		<div style="padding: 1em">
-			<div style="margin-bottom: 10px">
-				<el-button type="primary" @click="onSaveAuth">保存菜单授权</el-button>
-			</div>
-			<vxe-table
-				ref="tableRef"
-				border
-				resizable
-				:row-config="{ keyField: 'menu_id' }"
-				:tree-config="{ transform: true, rowField: 'menu_id', parentField: 'parent' }"
-				:checkbox-config="{ labelField: 'menu_id', checkRowKeys: multipleTableData, checkStrictly: true }"
-				:expand-config="{ accordion: true }"
-				@toggle-row-expand="menuNodeClick"
-				:data="menuData"
-			>
-				<vxe-column type="checkbox" title="ID" width="200" tree-node></vxe-column>
-				<vxe-column field="name" title="目录/菜单"></vxe-column>
-				<vxe-column type="expand" title="已授予权限" width="120">
-					<template #content="{ row, rowIndex }">
-						<div style="padding: 10px 0px" v-if="!row.is_catalog">
-							<el-button type="primary" size="small" style="margin-bottom: 0.5em" @click="createBtnPermission">新增 </el-button>
-							<el-table size="small" :data="buttonPermissionData" border style="width: 100%">
-								<el-table-column prop="menu_button" label="权限名称" width="100">
-									<template #default="scope">
-										<div>{{ scope.row.menu_button__name }}</div>
-									</template>
-								</el-table-column>
-								<el-table-column prop="menu_button__value" label="权限值" width="150"> </el-table-column>
-								<el-table-column prop="data_range" label="权限范围" width="140">
-									<template #default="scope">
-										<div>{{ formatDataRange(scope.row.data_range) }}</div>
-									</template>
-								</el-table-column>
-								<el-table-column prop="dept" label="权限涉及部门" />
-								<el-table-column fixed="right" label="操作" width="120">
-									<template #default="scope">
-										<el-button type="danger" size="small" @click="onDeleteBtn(scope)">删除 </el-button>
-									</template>
-								</el-table-column>
-							</el-table>
-						</div>
-					</template>
-				</vxe-column>
-			</vxe-table>
-			<!--      弹窗-->
-			<el-dialog v-model="dialogFormVisible" append-to-body width="400px" title="配置按钮权限">
-				<el-form ref="buttonFormRef" :model="buttonForm" :rules="buttonRules" label-width="120px">
-					<el-form-item label="按钮" prop="menu_button">
-						<el-select v-model="buttonForm.menu_button" placeholder="请选择按钮" @change="onChangeButton">
-							<el-option v-for="(item, index) in buttonOptions" :key="index" :label="item.name" :value="item.id" />
-						</el-select>
-					</el-form-item>
-					<el-form-item label="权限范围" prop="data_range">
-						<el-select v-model="buttonForm.data_range" placeholder="请选择按钮">
-							<el-option v-for="(item, index) in dataScopeOptions" :key="index" :label="item.label" :value="item.value" />
-						</el-select>
-					</el-form-item>
-					<el-form-item label="数据部门" prop="dept" v-show="buttonForm.data_range === 4">
-						<div class="dept-tree">
-							<el-tree
-								:data="deptOptions"
-								show-checkbox
-								default-expand-all
-								:default-checked-keys="deptCheckedKeys"
-								ref="deptTree"
-								node-key="dept_id"
-								:check-strictly="true"
-								:props="{ label: 'name' }"
-							></el-tree>
-						</div>
-					</el-form-item>
-				</el-form>
-				<template #footer>
-					<span class="dialog-footer">
-						<el-button @click="dialogFormVisible = false">取消</el-button>
-						<el-button type="primary" @click="onSaveButtonForm"> 确定 </el-button>
-					</span>
-				</template>
-			</el-dialog>
-		</div>
-	</el-drawer>
-</template>
-
-<script lang="ts" setup>
-import { ref, defineExpose, reactive, toRefs } from 'vue';
-import { ElMessageBox, ElTable } from 'element-plus';
-import * as api from './api.ts';
-import type { FormRules, FormInstance } from 'element-plus';
-import { ElMessage } from 'element-plus';
-import XEUtils from 'xe-utils';
-import { VXETable, VxeTableInstance, VxeTableEvents } from 'vxe-table';
-
-interface tableRow {
-	menu_id: number;
-	name: string;
-}
-
-//抽屉是否显示
-const drawer = ref(false);
-//当前编辑的角色信息
-const editedRoleInfo = ref({});
-
-//抽屉关闭确认
-const handleClose = (done: () => void) => {
-	ElMessageBox.confirm('您确定要关闭?', {
-		confirmButtonText: '确定',
-		cancelButtonText: '取消',
-		type: 'warning',
-	})
-		.then(() => {
-			done();
-		})
-		.catch(() => {
-			// catch error
-		});
-};
-
-/*****菜单的配置项***/
-const defaultProps = {
-	children: 'children',
-	label: 'name',
-	isLeaf: 'hasChild',
-};
-
-interface Tree {
-	name: string;
-	children?: Tree[];
-	id: number;
-}
-
-let menuData = ref<Tree>();
-//获取菜单
-const getMenuData = () => {
-	api.GetMenu({}).then((res: any) => {
-		const { data } = res;
-		menuData.value = data;
-	});
-};
-
-//获取已授权的菜单
-const tableRef = ref<VxeTableInstance<tableRow>>();
-const multipleTableData = ref();
-const getRoleToMenu = () => {
-	api.role_to_menu({ role: editedRoleInfo.value.id }).then((res: any) => {
-		const { data } = res;
-		multipleTableData.value = data;
-	});
-};
-
-let isBtnPermissionShow = ref(false);
-let buttonOptions = ref<[]>();
-let editedMenuInfo = ref();
-//菜单节点点击事件
-const menuNodeClick: VxeTableEvents.ToggleRowExpand<tableRow> = ({ expanded, row }) => {
-	// isBtnPermissionShow.value = !node.is_catalog
-	if (!row.is_catalog) {
-		buttonOptions.value = [];
-		editedMenuInfo.value = row;
-		api.GetMenuButton({ menu: row.menu_id }).then((res: any) => {
-			const { data } = res;
-			buttonOptions.value = data;
-		});
-		api.getObj({ menu: row.menu_id, role: editedRoleInfo.value.id }).then((res: any) => {
-			const { data } = res;
-			buttonPermissionData.value = data;
-		});
-	}
-};
-const menuTree = ref();
-/*****菜单的配置项***/
-/***按钮授权的弹窗****/
-//是否显示新增表单
-const dialogFormVisible = ref(false);
-//部门树
-const deptTree = ref();
-//自定义部门数据
-const deptOptions = ref();
-//选中的部门数据
-const deptCheckedKeys = [];
-//按钮表单
-const buttonForm = reactive({
-	menu_button: null,
-	role: null,
-	menu: null,
-	data_range: null,
-	dept: [],
-});
-//按钮表格数据
-let buttonPermissionData = ref([]);
-//按钮表单验证
-const buttonRules = reactive<FormRules>({
-	menu_button: [{ required: true, message: '必填项' }],
-	data_range: [{ required: true, message: '必填项' }],
-});
-//新增按钮
-const buttonFormRef = ref<FormInstance>();
-const createBtnPermission = () => {
-	dialogFormVisible.value = true;
-	buttonForm.menu_button = null;
-	buttonForm.menu = null;
-	buttonForm.role = null;
-	buttonForm.data_range = null;
-	buttonForm.dept = [];
-};
-//权限范围数据
-const dataScopeOptions = ref<[]>();
-//按钮值变化事件
-const onChangeButton = (val: any) => {
-	dataScopeOptions.value = [];
-	//获取权限值范围
-	api.GetDataScope({ menu_button: val }).then((res: any) => {
-		dataScopeOptions.value = res.data;
-	});
-	//获取权限部门值
-	api.GetDataScopeDept({ menu_button: val }).then((res: any) => {
-		deptOptions.value = XEUtils.toArrayTree(res.data, { parentKey: 'parent', strict: false });
-	});
-};
-//过滤按钮名称
-const formatMenuBtn = (val: any) => {
-	let obj: any = buttonOptions.value?.find((item: any) => {
-		return item.id === val;
-	});
-	return obj ? obj.name : null;
-};
-//过滤权限范围
-const formatDataRange = (val: any) => {
-	let obj: any = [
-		{
-			value: 0,
-			label: '仅本人数据权限',
-		},
-		{
-			value: 1,
-			label: '本部门及以下数据权限',
-		},
-		{
-			value: 2,
-			label: '本部门数据权限',
-		},
-		{
-			value: 3,
-			label: '全部数据权限',
-		},
-		{
-			value: 4,
-			label: '自定义数据权限',
-		},
-	].find((item: any) => {
-		return item.value === val;
-	});
-	return obj ? obj.label : null;
-};
-//保存按钮表单
-
-const onSaveButtonForm = async () => {
-	const { id: roleId } = editedRoleInfo.value;
-	const { id: menuId } = editedMenuInfo.value;
-	const form: any = Object.assign({}, buttonForm);
-	form.role = roleId;
-	form.menu = menuId;
-	//选中的部门
-	const checkedList = deptTree.value.getCheckedKeys();
-	form.dept = checkedList;
-	if (!buttonFormRef.value) return;
-	await buttonFormRef.value.validate((valid, fields) => {
-		if (valid) {
-			api.CreatePermission(form).then((res: any) => {
-				const { data } = res;
-				buttonPermissionData.value.push(data);
-				dialogFormVisible.value = false;
-				ElMessage({
-					type: 'success',
-					message: res.msg,
-				});
-			});
-		} else {
-			ElMessage({
-				type: 'error',
-				title: '提交错误',
-				message: 'F12控制台看详情',
-			});
-			console.log('提交错误', fields);
-		}
-	});
-};
-//删除按钮权限
-const onDeleteBtn = (scope: any) => {
-	const { row, $index } = scope;
-	ElMessageBox.confirm('您是否要删除数据?', '温馨提示', {
-		confirmButtonText: '确定',
-		cancelButtonText: '取消',
-		type: 'warning',
-	})
-		.then(() => {
-			api.DeletePermission({ id: row.id }).then((res: any) => {
-				buttonPermissionData.value.splice($index, 1);
-				ElMessage({
-					type: 'success',
-					message: res.msg,
-				});
-			});
-		})
-		.catch(() => {
-			ElMessage({
-				type: 'info',
-				message: '取消删除',
-			});
-		});
-};
-/***按钮授权的弹窗****/
-//初始化数据
-const initGet = () => {
-	getMenuData();
-	getRoleToMenu();
-};
-
-/**
- * 保存授权
- */
-const onSaveAuth = () => {
-	const $table = tableRef.value;
-	if ($table) {
-		const selectRecords = $table.getCheckboxRecords();
-		const menuIdList = selectRecords.map((record: any) => record.menu_id);
-		const { id: roleId } = editedRoleInfo.value;
-		const data = {
-			role: roleId,
-			menu: menuIdList,
-		};
-		api.SaveMenuPermission(data).then((res: any) => {
-			ElMessage({
-				message: res.msg,
-				type: 'success',
-			});
-		});
-	}
-};
-
-defineExpose({ drawer, editedRoleInfo, initGet });
-</script>
-
-<style scoped></style>
diff --git a/web/src/views/system/role/components/PermissionComCopy/api.ts b/web/src/views/system/role/components/PermissionComCopy/api.ts
deleted file mode 100644
index 9d4c59002..000000000
--- a/web/src/views/system/role/components/PermissionComCopy/api.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { request } from "/@/utils/service";
-
-export function getDataPermissionRange() {
-  return request({
-    url: '/api/system/role_menu_button_permission/data_scope/',
-    method: 'get',
-  })
-}
-export function getDataPermissionDept() {
-  return request({
-    url: '/api/system/role_menu_button_permission/role_to_dept_all/',
-    method: 'get'
-  })
-}
-
-export function getDataPermissionMenu() {
-  return request({
-    url: '/api/system/role_menu_button_permission/get_role_permissions/',
-    method: 'get'
-  })
-}
\ No newline at end of file
diff --git a/web/src/views/system/role/components/PermissionComCopy/index.vue b/web/src/views/system/role/components/PermissionComCopy/index.vue
deleted file mode 100644
index 1d08e995c..000000000
--- a/web/src/views/system/role/components/PermissionComCopy/index.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<template>
-	<div class="permission-com">
-		<div class="pc-item">
-			<p class="pc-title">数据授权</p>
-			<div class="pc-cell">
-				<el-radio-group v-model="dataPermission" class="pc-data-permission">
-					<el-radio v-for="item in dataPermissionRange" :key="item.label" :label="item.value" @change="handleChange">{{ item.label }}</el-radio>
-				</el-radio-group>
-				<el-tree-select
-					v-if="dataPermission === 4"
-					node-key="id"
-					v-model="customDataPermission"
-					:props="defaultTreeProps"
-					:data="deptData"
-					multiple
-					check-strictly
-					:render-after-expand="false"
-					show-checkbox
-					class="pc-custom-dept"
-				/>
-			</div>
-		</div>
-
-		<div class="pc-item pc-menu">
-			<p class="pc-title">菜单授权</p>
-			<div>
-				<el-tree
-					:props="defaultTreeProps"
-					:data="menuData"
-					show-checkbox
-					node-key="id"
-					default-expand-all
-					:expand-on-click-node="false"
-					class="dc-menu-tree"
-				>
-					<template #default="{ node, data }">
-						<div class="pc-tree-node" :class="{ 'tree-node-label-border': !data.is_catalog }">
-							<p class="tree-node-label">{{ node.label }}</p>
-							<div v-if="!data.is_catalog">
-								<ul class="menu-permission-list">
-									<li v-for="m in data.menuPermission" :key="m.id" class="menu-permission-item">
-										<el-checkbox v-model="m.id" :label="m.name" />
-									</li>
-								</ul>
-								<ul class="menu-permission-list">
-									<li v-for="m in data.columns" :key="m.id" class="menu-permission-item">
-										<el-checkbox v-model="m.id" :label="m.title" />
-									</li>
-								</ul>
-							</div>
-						</div>
-					</template>
-				</el-tree>
-			</div>
-		</div>
-
-		<div class="pc-btn">
-			<el-button type="primary">确定</el-button>
-			<el-button>取消</el-button>
-		</div>
-	</div>
-</template>
-
-<script lang="ts" setup>
-import { ref, onMounted } from 'vue';
-import XEUtils from 'xe-utils';
-import { getDataPermissionRange, getDataPermissionDept, getDataPermissionMenu } from './api';
-import { DataPermissionRangeType, CustomDataPermissionDeptType, CustomDataPermissionMenuType } from './types';
-
-const defaultTreeProps = {
-	children: 'children',
-	label: 'name',
-	value: 'id',
-};
-
-const data: any[] = [
-	{
-		id: 1,
-		label: 'Level one 1',
-		children: [
-			{
-				id: 4,
-				label: 'Level two 1-1',
-				isPenultimate: true,
-				children: [
-					{
-						id: 9,
-						label: 'Level three 1-1-1',
-					},
-					{
-						id: 10,
-						label: 'Level three 1-1-2',
-					},
-				],
-			},
-		],
-	},
-	{
-		id: 2,
-		label: 'Level one 2',
-		isPenultimate: true,
-		children: [
-			{
-				id: 5,
-				label: 'Level two 2-1',
-			},
-			{
-				id: 6,
-				label: 'Level two 2-2',
-			},
-		],
-	},
-	{
-		id: 3,
-		label: 'Level one 3',
-		isPenultimate: true,
-		children: [
-			{
-				id: 7,
-				label: 'Level two 3-1',
-			},
-			{
-				id: 8,
-				label: 'Level two 3-2',
-			},
-		],
-	},
-];
-
-let dataPermission = ref();
-let dataPermissionRange = ref<DataPermissionRangeType[]>([]);
-let customDataPermission = ref();
-let deptData = ref<CustomDataPermissionDeptType[]>([]);
-let menuData = ref<CustomDataPermissionMenuType[]>([]);
-
-const fetchData = async () => {
-	try {
-		const resRange = await getDataPermissionRange();
-		const resMenu = await getDataPermissionMenu();
-
-		if (resRange?.code === 2000) {
-			dataPermissionRange.value = resRange.data;
-		}
-		if (resMenu?.code === 2000) {
-			console.log(resMenu.data);
-			menuData.value = resMenu.data;
-		}
-	} catch {
-		return;
-	}
-};
-
-const handleChange = async () => {
-	if (dataPermission.value === 4) {
-		const res = await getDataPermissionDept();
-		const data = XEUtils.toArrayTree(res.data, { parentKey: 'parent', strict: false });
-		deptData.value = data;
-	}
-};
-
-const handleTestClick = (node: any, data: any) => {
-	console.log(node, data);
-};
-
-onMounted(() => {
-	fetchData();
-});
-</script>
-
-<style lang="scss" scoped>
-.permission-com {
-	width: 100%;
-	height: 100%;
-	padding: 15px;
-	box-sizing: border-box;
-	.pc-item {
-		width: 100%;
-		margin-bottom: 15px;
-		border-bottom: 1px #dcdfe6 solid;
-	}
-	.pc-title {
-		font-weight: 600;
-	}
-	.pc-cell {
-		display: flex;
-		padding: 10px;
-		overflow-x: auto;
-		.pc-data-permission {
-			min-width: 800px;
-		}
-		.pc-custom-dept {
-			min-width: 200px;
-		}
-	}
-
-	.pc-menu {
-		height: calc(100% - 140px);
-		overflow-y: auto;
-	}
-
-	.pc-tree-node {
-		width: 100%;
-		display: flex;
-		align-items: center;
-
-		.tree-node-label {
-			font-size: 16px;
-			margin-right: 20px;
-		}
-		.menu-permission-list {
-			display: flex;
-			align-items: center;
-			.menu-permission-item {
-				margin-right: 10px;
-			}
-		}
-	}
-
-	.tree-node-label-border {
-		border-bottom: 1px #dcdfe6 solid;
-	}
-
-	.pc-btn {
-		padding-bottom: 15px;
-	}
-}
-</style>
-
-<style lang="scss">
-.dc-menu-tree {
-	.el-tree-node__content {
-		height: auto;
-	}
-}
-</style>
diff --git a/web/src/views/system/role/components/PermissionComCopy/types.ts b/web/src/views/system/role/components/PermissionComCopy/types.ts
deleted file mode 100644
index 6abb63da1..000000000
--- a/web/src/views/system/role/components/PermissionComCopy/types.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export interface DataPermissionRangeType {
-  label: string;
-  value: number;
-}
-
-export interface CustomDataPermissionDeptType {
-  id: number;
-  name: string;
-  patent: number;
-  children: CustomDataPermissionDeptType[]
-}
-
-export interface CustomDataPermissionMenuType {
-  id: number;
-  name: string;
-  is_catalog: boolean;
-  menuPermission: { id: number; name: string; value: string }[] | null;
-  columns: { id: number; name: string; title: string }[] | null;
-  children: CustomDataPermissionMenuType[]
-}
\ No newline at end of file
diff --git a/web/src/views/system/role/components/PermissionComNew/index.vue b/web/src/views/system/role/components/PermissionComNew/index.vue
index 0e5d159ff..db6f332f9 100644
--- a/web/src/views/system/role/components/PermissionComNew/index.vue
+++ b/web/src/views/system/role/components/PermissionComNew/index.vue
@@ -1,6 +1,8 @@
 <template>
   <el-drawer v-model="drawerVisible" title="权限配置" direction="rtl" size="60%" :close-on-click-modal="false"
-             :before-close="handleDrawerClose">
+             :before-close="handleDrawerClose"
+             :destroy-on-close="true"
+  >
     <template #header>
       <el-row>
         <el-col :span="4">
diff --git a/web/src/views/system/role/crud.tsx b/web/src/views/system/role/crud.tsx
index b97878548..8c9f56a8c 100644
--- a/web/src/views/system/role/crud.tsx
+++ b/web/src/views/system/role/crud.tsx
@@ -183,40 +183,6 @@ export const createCrudOptions = function ({
 						value: 1,
 					},
 				},
-				admin: {
-					title: '是否管理员',
-					search: { show: false },
-					type: 'dict-radio',
-					dict: dict({
-						data: [
-							{
-								label: '是',
-								value: true,
-								color: 'success',
-							},
-							{
-								label: '否',
-								value: false,
-								color: 'danger',
-							},
-						],
-					}),
-					column: {
-						minWidth: 130,
-						sortable: 'custom',
-						show: columnPermission('admin', 'is_query'),
-					},
-					addForm: {
-						show: columnPermission('admin', 'is_create'),
-					},
-					editForm: {
-						show: columnPermission('admin', 'is_update'),
-					},
-					form: {
-						rules: [{ required: true, message: '是否管理员必填' }],
-						value: false,
-					},
-				},
 				status: {
 					title: '状态',
 					search: { show: true },
diff --git a/web/src/views/system/role/index.vue b/web/src/views/system/role/index.vue
index 8e2ef4f4c..f5d40115d 100644
--- a/web/src/views/system/role/index.vue
+++ b/web/src/views/system/role/index.vue
@@ -18,7 +18,6 @@ import { useColumnPermission } from '/@/stores/columnPermission';
 import { GetPermission } from './api';
 import { useExpose, useCrud } from '@fast-crud/fast-crud';
 import { createCrudOptions } from './crud';
-import permission from './components/PermissionCom/index.vue';
 import PermissionComNew from './components/PermissionComNew/index.vue';
 
 let drawerVisible = ref(false);
-- 
Gitee


From 4ac8ed7627fc4621e5132d83e54468382b54da3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Mon, 20 Nov 2023 17:19:20 +0800
Subject: [PATCH 14/40] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.更新字段管理
---
 backend/dvadmin/system/models.py              |  2 +-
 backend/dvadmin/system/urls.py                |  4 +--
 .../system/views/{column.py => menu_field.py} | 35 +++++++------------
 backend/dvadmin/utils/field_permission.py     | 10 +++---
 backend/dvadmin/utils/models.py               |  5 +--
 backend/dvadmin/utils/viewset.py              |  9 ++---
 6 files changed, 25 insertions(+), 40 deletions(-)
 rename backend/dvadmin/system/views/{column.py => menu_field.py} (72%)

diff --git a/backend/dvadmin/system/models.py b/backend/dvadmin/system/models.py
index 79eb23664..ea7224d5f 100644
--- a/backend/dvadmin/system/models.py
+++ b/backend/dvadmin/system/models.py
@@ -179,7 +179,7 @@ class Menu(CoreModel):
         ordering = ("sort",)
 
 class MenuField(CoreModel):
-    model = models.CharField(max_length=64, verbose_name='表名',null=True,blank=True)
+    model = models.CharField(max_length=64, verbose_name='表名')
     menu = models.ForeignKey(to='Menu', on_delete=models.CASCADE, verbose_name='菜单', db_constraint=False)
     field_name = models.CharField(max_length=64, verbose_name='模型表字段名')
     title = models.CharField(max_length=64, verbose_name='字段显示名')
diff --git a/backend/dvadmin/system/urls.py b/backend/dvadmin/system/urls.py
index 4e11c0492..512c39994 100644
--- a/backend/dvadmin/system/urls.py
+++ b/backend/dvadmin/system/urls.py
@@ -16,7 +16,7 @@ from dvadmin.system.views.role_menu import RoleMenuPermissionViewSet
 from dvadmin.system.views.role_menu_button_permission import RoleMenuButtonPermissionViewSet
 from dvadmin.system.views.system_config import SystemConfigViewSet
 from dvadmin.system.views.user import UserViewSet
-from dvadmin.system.views.column import ColumnViewSet
+from dvadmin.system.views.menu_field import MenuFieldViewSet
 
 system_url = routers.SimpleRouter()
 system_url.register(r'menu', MenuViewSet)
@@ -33,7 +33,7 @@ system_url.register(r'system_config', SystemConfigViewSet)
 system_url.register(r'message_center', MessageCenterViewSet)
 system_url.register(r'role_menu_button_permission', RoleMenuButtonPermissionViewSet)
 system_url.register(r'role_menu_permission', RoleMenuPermissionViewSet)
-system_url.register(r'column', ColumnViewSet)
+system_url.register(r'column', MenuFieldViewSet)
 
 
 urlpatterns = [
diff --git a/backend/dvadmin/system/views/column.py b/backend/dvadmin/system/views/menu_field.py
similarity index 72%
rename from backend/dvadmin/system/views/column.py
rename to backend/dvadmin/system/views/menu_field.py
index 993be5258..8f6cd1aee 100644
--- a/backend/dvadmin/system/views/column.py
+++ b/backend/dvadmin/system/views/menu_field.py
@@ -11,7 +11,7 @@ from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.json_response import DetailResponse, ErrorResponse, SuccessResponse
 
 
-class ColumnSerializer(CustomModelSerializer):
+class MenuFieldSerializer(CustomModelSerializer):
     """
     列权限序列化器
     """
@@ -22,32 +22,24 @@ class ColumnSerializer(CustomModelSerializer):
         read_only_fields = ['id']
 
 
-class ColumnViewSet(CustomModelViewSet):
+class MenuFieldViewSet(CustomModelViewSet):
     """
     列权限视图集
     """
     queryset = MenuField.objects.all()
-    serializer_class = ColumnSerializer
+    serializer_class = MenuFieldSerializer
 
     def list(self, request, *args, **kwargs):
-        app_name = request.query_params.get('app')
-        model_name = request.query_params.get('model')
         menu = request.query_params.get('menu')
         if  not menu:
             return SuccessResponse([])
         queryset = self.filter_queryset(self.get_queryset().filter(menu=menu))
-        # page = self.paginate_queryset(queryset)
-        # if page is not None:
-        #     serializer = self.get_serializer(page, many=True, request=request)
-        #     return self.get_paginated_response(serializer.data)
         serializer = self.get_serializer(queryset, many=True, request=request)
         return SuccessResponse(data=serializer.data, msg="获取成功")
 
     def create(self, request, *args, **kwargs):
         payload = request.data
-        print(11,get_custom_app_models())
         for model in apps.get_models():
-            print(model.__name__)
             if payload.get('model') == model.__name__:
                 break
         else:
@@ -62,34 +54,31 @@ class ColumnViewSet(CustomModelViewSet):
     def get_models(self, request):
         """获取所有项目app下的model"""
         res = []
-        for app in get_custom_app_models():
-            for model in app:
-                res.append({
-                    'app': model['app'],
-                    'title': model['verbose'],
-                    'key': model['model']
-                })
+        for model in get_custom_app_models():
+            res.append({
+                'app': model['app'],
+                'title': model['verbose'],
+                'key': model['model']
+            })
         return DetailResponse(res)
 
     @action(methods=['POST'], detail=False, permission_classes=[IsAuthenticated])
     def auto_match_fields(self, request):
         """自动匹配已有的字段"""
         menu_id = request.data.get('menu')
-        app_name = request.data.get('app')
         model_name = request.data.get('model')
-        if not menu_id or not model_name or not app_name:
+        if not menu_id or not model_name:
             return ErrorResponse( msg='参数错误')
-        for model in get_custom_app_models(app_name):
+        for model in get_custom_app_models():
             if model['model'] != model_name:
                 continue
             for field in model['fields']:
                 if MenuField.objects.filter(
-                        menu_id=menu_id, app=app_name, model=model_name, field_name=field['name']
+                        menu_id=menu_id, model=model_name, field_name=field['name']
                 ).exists():
                     continue
                 data = {
                     'menu': menu_id,
-                    'app': app_name,
                     'model': model_name,
                     'field_name': field['name'],
                     'title': str(field['title']),
diff --git a/backend/dvadmin/utils/field_permission.py b/backend/dvadmin/utils/field_permission.py
index 1c969a07e..20b4cb953 100644
--- a/backend/dvadmin/utils/field_permission.py
+++ b/backend/dvadmin/utils/field_permission.py
@@ -15,16 +15,14 @@ class FieldPermissionMixin:
         获取字段权限
         """
         finded = False
-        for app in get_custom_app_models():
-            for model in app:
-                if model['object'] is self.serializer_class.Meta.model:
-                    finded = True
-                    break
+        for model in get_custom_app_models():
+            if model['object'] is self.serializer_class.Meta.model:
+                finded = True
+                break
             if finded:
                 break
         if finded is False:
             return []
-        print(266666,model)
         user = request.user
         if user.is_superuser==1:
             data = MenuField.objects.filter( model=model['model']).values('field_name')
diff --git a/backend/dvadmin/utils/models.py b/backend/dvadmin/utils/models.py
index 8ea800723..e33152808 100644
--- a/backend/dvadmin/utils/models.py
+++ b/backend/dvadmin/utils/models.py
@@ -141,6 +141,7 @@ def get_custom_app_models(app_name=None):
         return get_model_from_app(app_name)
     res = []
     for app in settings.CUSTOM_APPS:
-        # print(222,get_model_from_app(app))
-        res.append(get_model_from_app(app))
+        all_models = get_model_from_app(app)
+        for model in all_models:
+            res.append(model)
     return res
diff --git a/backend/dvadmin/utils/viewset.py b/backend/dvadmin/utils/viewset.py
index 6b47457ea..a20b9be26 100644
--- a/backend/dvadmin/utils/viewset.py
+++ b/backend/dvadmin/utils/viewset.py
@@ -82,12 +82,9 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
     def get_menu_field(self, serializer_class):
         """获取字段权限"""
         finded = False
-        for app in get_custom_app_models():
-            for model in app:
-                if model['object'] is serializer_class.Meta.model:
-                    finded = True
-                    break
-            if finded:
+        for model in get_custom_app_models():
+            if model['object'] is serializer_class.Meta.model:
+                finded = True
                 break
         if finded is False:
             return []
-- 
Gitee


From 645f43c887bc660e9c0457cf8052aaf8381faaec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Mon, 20 Nov 2023 19:03:14 +0800
Subject: [PATCH 15/40] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.更新字段管理
---
 .../menu/components/MenuFieldCom/api.ts       |  65 +++++
 .../menu/components/MenuFieldCom/crud.tsx     | 228 ++++++++++++++++++
 .../menu/components/MenuFieldCom/index.vue    | 110 +++++++++
 3 files changed, 403 insertions(+)
 create mode 100644 web/src/views/system/menu/components/MenuFieldCom/api.ts
 create mode 100644 web/src/views/system/menu/components/MenuFieldCom/crud.tsx
 create mode 100644 web/src/views/system/menu/components/MenuFieldCom/index.vue

diff --git a/web/src/views/system/menu/components/MenuFieldCom/api.ts b/web/src/views/system/menu/components/MenuFieldCom/api.ts
new file mode 100644
index 000000000..eccde5558
--- /dev/null
+++ b/web/src/views/system/menu/components/MenuFieldCom/api.ts
@@ -0,0 +1,65 @@
+import { request } from '/@/utils/service';
+import { UserPageQuery, AddReq, DelReq, EditReq, InfoReq } from '@fast-crud/fast-crud';
+import XEUtils from "xe-utils";
+import {CurrentInfoType} from "/@/views/system/columns/types";
+
+export const apiPrefix = '/api/system/column/';
+export function GetList(query: UserPageQuery) {
+	return request({
+		url: apiPrefix,
+		method: 'get',
+		params: query,
+	});
+}
+export function GetObj(id: InfoReq) {
+	return request({
+		url: apiPrefix + id,
+		method: 'get',
+	});
+}
+
+export function AddObj(obj: AddReq) {
+	return request({
+		url: apiPrefix,
+		method: 'post',
+		data: obj,
+	});
+}
+
+export function UpdateObj(obj: EditReq) {
+	return request({
+		url: apiPrefix + obj.id + '/',
+		method: 'put',
+		data: obj,
+	});
+}
+
+export function DelObj(id: DelReq) {
+	return request({
+		url: apiPrefix + id + '/',
+		method: 'delete',
+		data: { id },
+	});
+}
+
+/**
+ * 获取所有model
+ */
+export function getModelList() {
+	return request({
+		url: '/api/system/column/get_models/',
+		method: 'get',
+	});
+}
+
+/**
+ * 自动匹配field
+ * @param data
+ */
+export function automatchColumnsData(data: CurrentInfoType) {
+	return request({
+		url: '/api/system/column/auto_match_fields/',
+		method: 'post',
+		data,
+	});
+}
diff --git a/web/src/views/system/menu/components/MenuFieldCom/crud.tsx b/web/src/views/system/menu/components/MenuFieldCom/crud.tsx
new file mode 100644
index 000000000..a99a1a40d
--- /dev/null
+++ b/web/src/views/system/menu/components/MenuFieldCom/crud.tsx
@@ -0,0 +1,228 @@
+import * as api from './api';
+import { dict, UserPageQuery, AddReq, DelReq, EditReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet } from '@fast-crud/fast-crud';
+import { request } from '/@/utils/service';
+import { dictionary } from '/@/utils/dictionary';
+
+import { inject } from 'vue';
+
+
+
+export const createCrudOptions = function ({ crudExpose, props,modelDialog,selectOptions,allModelData }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+	const pageRequest = async (query: UserPageQuery) => {
+		// return await api.GetList(query);
+		if (selectOptions.value.id) {
+			return await api.GetList({ menu: selectOptions.value.id } as any);
+		} else {
+			return undefined;
+		}
+	};
+	const editRequest = async ({ form, row }: EditReq) => {
+		form.id = row.id;
+		return await api.UpdateObj(form);
+	};
+	const delRequest = async ({ row }: DelReq) => {
+		return await api.DelObj(row.id);
+	};
+	const addRequest = async ({ form }: AddReq) => {
+		form.menu = selectOptions.value.id;
+		return await api.AddObj(form);
+	};
+
+
+
+	//权限判定
+	const hasPermissions = inject('$hasPermissions');
+
+	return {
+		crudOptions: {
+			request: {
+				pageRequest,
+				addRequest,
+				editRequest,
+				delRequest,
+			},
+			pagination: {
+				show: false,
+			},
+			actionbar: {
+				buttons: {
+					auto: {
+						text: '自动匹配',
+						type: 'success',
+						click: () => {
+							return modelDialog.value=true;
+						},
+					},
+				},
+			},
+			rowHandle: {
+				//固定右侧
+				fixed: 'right',
+			},
+			form: {
+				col: { span: 24 },
+				labelWidth: '110px',
+				wrapper: {
+					is: 'el-dialog',
+					width: '600px',
+				},
+			},
+			columns: {
+				_index: {
+					title: '序号',
+					form: { show: false },
+					column: {
+						//type: 'index',
+						align: 'center',
+						width: '70px',
+						columnSetDisabled: true, //禁止在列设置中选择
+						//@ts-ignore
+						formatter: (context) => {
+							//计算序号,你可以自定义计算规则，此处为翻页累加
+							let index = context.index ?? 1;
+							let pagination: any = crudExpose!.crudBinding.value.pagination;
+							return ((pagination.currentPage ?? 1) - 1) * pagination.pageSize + index + 1;
+						},
+					},
+				},
+				model: {
+					title: 'model',
+					type: 'dict-select',
+					dict:dict({
+						url:'/api/system/column/get_models/',
+						label:'title',
+						value:'key'
+					}),
+					form: {
+						rules: [
+							// 表单校验规则
+							{
+								required: true,
+								message: '必填项',
+							},
+						],
+						component: {
+							span: 12,
+						},
+					},
+				},
+				title: {
+					title: '中文名',
+					sortable: 'custom',
+					search: {
+						show: true,
+					},
+					type: 'text',
+					form: {
+						rules: [
+							// 表单校验规则
+							{
+								required: true,
+								message: '必填项',
+							},
+						],
+						component: {
+							span: 12,
+						},
+					},
+				},
+				field_name: {
+					title: '字段名',
+					type: 'text',
+					search: {
+						show: true,
+					},
+					form: {
+						rules: [
+							// 表单校验规则
+							{
+								required: true,
+								message: '必填项',
+							},
+						],
+						component: {
+							span: 12,
+						},
+					},
+				},
+
+				// is_create: {
+				// 	title: '创建时显示',
+				// 	sortable: 'custom',
+				// 	search: {
+				// 		disabled: true,
+				// 	},
+				// 	type: 'dict-switch',
+				// 	dict: dict({
+				// 		data: [
+				// 			{ value: true, label: '启用' },
+				// 			{ value: false, label: '禁用' },
+				// 		],
+				// 	}),
+				// 	form: {
+				// 		value: true,
+				// 	},
+				// 	column: {
+				// 		valueChange(context){
+				// 			return api.UpdateObj(context.row)
+				// 		},
+				// 		component: {
+				// 			name: 'fs-dict-switch',
+				// 		},
+				// 	},
+				// },
+				// is_update: {
+				// 	title: '编辑时显示',
+				// 	search: {
+				// 		show: true,
+				// 	},
+				// 	type: 'dict-switch',
+				// 	dict: dict({
+				// 		data: [
+				// 			{ value: true, label: '启用' },
+				// 			{ value: false, label: '禁用' },
+				// 		],
+				// 	}),
+				// 	form: {
+				// 		value: true,
+				// 	},
+				// 	column: {
+				// 		component: {
+				// 			name: 'fs-dict-switch',
+				// 			onChange: compute((context) => {
+				// 				//动态onChange方法测试
+				// 				return () => {
+				// 					console.log('onChange', context.row.switch);
+				// 				};
+				// 			}),
+				// 		},
+				// 	},
+				// },
+				// is_query: {
+				// 	title: '列表中显示',
+				// 	type: 'dict-switch',
+				// 	dict: dict({
+				// 		data: [
+				// 			{ value: true, label: '启用' },
+				// 			{ value: false, label: '禁用' },
+				// 		],
+				// 	}),
+				// 	form: {
+				// 		value: true,
+				// 	},
+				// 	column: {
+				// 		component: {
+				// 			name: 'fs-dict-switch',
+				// 			onChange: compute((context) => {
+				// 				//动态onChange方法测试
+				// 				return () => {
+				// 					console.log('onChange', context.row.switch);
+				// 				};
+				// 			}),
+				// 		},
+				// 	},
+				// },
+			},
+		},
+	};
+};
diff --git a/web/src/views/system/menu/components/MenuFieldCom/index.vue b/web/src/views/system/menu/components/MenuFieldCom/index.vue
new file mode 100644
index 000000000..ec3822bb0
--- /dev/null
+++ b/web/src/views/system/menu/components/MenuFieldCom/index.vue
@@ -0,0 +1,110 @@
+<template>
+  <div>
+    <el-dialog ref="modelRef" v-model="modelDialog" title="选择model">
+      <div v-show="props.model">
+        <el-tag>已选择:{{ props.model }}</el-tag>
+      </div>
+      <div class="model-card">
+        <div v-for="(item,index) in allModelData" :value="item.key" :key="index">
+          <el-text :type="modelCheckIndex===index?'primary':''" @click="onModelChecked(item,index)">
+            {{ item.app + '--' + item.title + '(' + item.key + ')' }}
+          </el-text>
+        </div>
+      </div>
+      <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="modelDialog = false">取消</el-button>
+        <el-button type="primary" @click="handleAutomatch">
+          确定
+        </el-button>
+      </span>
+      </template>
+    </el-dialog>
+    <div style="height: 80vh">
+      <fs-crud ref="crudRef" v-bind="crudBinding">
+      </fs-crud>
+
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import {ref, onMounted, reactive} from 'vue';
+import {useFs} from '@fast-crud/fast-crud';
+import {createCrudOptions} from './crud';
+import {getModelList} from './api'
+import {MenuTreeItemType} from "/@/views/system/menu/types";
+import {successMessage, successNotification, warningNotification} from '/@/utils/message';
+import {automatchColumnsData} from '/@/views/system/columns/components/ColumnsTableCom/api';
+// 当前选择的菜单信息
+let selectOptions: any = ref({name: null});
+
+const props = reactive({
+  model: '',
+  app: '',
+  menu: ''
+})
+
+//model弹窗
+const modelDialog = ref(false)
+// 获取所有model
+const allModelData = ref<any[]>([]);
+const modelCheckIndex = ref(null)
+const onModelChecked = (row, index) => {
+  modelCheckIndex.value = index
+  props.model = row.key
+  props.app = row.app
+}
+/**
+ * 菜单选中时,加载表格数据
+ * @param record
+ */
+const handleRefreshTable = (record: MenuTreeItemType) => {
+  if (!record.is_catalog && record.id) {
+    selectOptions.value = record;
+    crudExpose.doRefresh();
+  } else {
+    //清空表格数据
+    crudExpose.setTableData([]);
+  }
+};
+/**
+ * 自动匹配列
+ */
+const handleAutomatch = async () => {
+  props.menu = selectOptions.value.id
+  modelDialog.value = false
+  if (props.menu && props.model) {
+    const res = await automatchColumnsData(props);
+    if (res?.code === 2000) {
+      successNotification('匹配成功');
+    }
+    crudExpose.doSearch({form: {menu: props.menu, model: props.model}});
+  }else {
+    warningNotification('请选择角色和模型表！');
+  }
+
+};
+
+
+const {crudBinding, crudRef, crudExpose} = useFs({createCrudOptions, props, modelDialog, selectOptions,allModelData});
+onMounted(async () => {
+  const res = await getModelList();
+  allModelData.value = res.data;
+});
+
+defineExpose({selectOptions, handleRefreshTable});
+</script>
+
+<style scoped lang="scss">
+.model-card {
+  margin-top: 10px;
+  height: 30vh;
+  overflow-y: scroll;
+
+  div {
+    margin: 15px 0;
+    cursor: pointer;
+  }
+}
+</style>
-- 
Gitee


From 54e4d23cf725efda483302346776ba5f310ff70f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Tue, 21 Nov 2023 14:21:08 +0800
Subject: [PATCH 16/40] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.更新字段管理
---
 web/src/views/system/menu/index.vue | 4 ++--
 web/src/views/system/role/crud.tsx  | 7 +++++++
 web/src/views/system/user/crud.tsx  | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/web/src/views/system/menu/index.vue b/web/src/views/system/menu/index.vue
index aea35292f..0637a3fe7 100644
--- a/web/src/views/system/menu/index.vue
+++ b/web/src/views/system/menu/index.vue
@@ -15,12 +15,12 @@
 
 			<el-col :span="18">
         <el-tabs type="border-card">
-          <el-tab-pane label="按钮配置" >
+          <el-tab-pane label="按钮权限配置" >
             <div style="height: 80vh">
               <MenuButtonCom ref="menuButtonRef" />
             </div>
           </el-tab-pane>
-          <el-tab-pane label="字段配置">
+          <el-tab-pane label="列权限配置">
             <div style="height: 80vh">
               <MenuFieldCom ref="menuFieldRef"></MenuFieldCom>
             </div>
diff --git a/web/src/views/system/role/crud.tsx b/web/src/views/system/role/crud.tsx
index 8c9f56a8c..f8916507b 100644
--- a/web/src/views/system/role/crud.tsx
+++ b/web/src/views/system/role/crud.tsx
@@ -47,6 +47,13 @@ export const createCrudOptions = function ({
 				editRequest,
 				delRequest,
 			},
+			actionbar: {
+				buttons: {
+					add: {
+						show: hasPermissions('role:Create')
+					}
+				}
+			},
 			rowHandle: {
 				//固定右侧
 				fixed: 'right',
diff --git a/web/src/views/system/user/crud.tsx b/web/src/views/system/user/crud.tsx
index d165f696b..2165cf4b6 100644
--- a/web/src/views/system/user/crud.tsx
+++ b/web/src/views/system/user/crud.tsx
@@ -44,7 +44,6 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 				buttons: {
 					add: {
 						show: hasPermissions('user:Create')
-						// show:true
 					},
 					export:{
 						text:"导出",//按钮文字
-- 
Gitee


From 0286ca003fe826f71b71be835ee49a76decbfc6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Tue, 21 Nov 2023 16:01:42 +0800
Subject: [PATCH 17/40] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0.gitignore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/.gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/.gitignore b/backend/.gitignore
index 047099f90..6c50cc968 100644
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -98,5 +98,4 @@ media/
 __pypackages__/
 package-lock.json
 gunicorn.pid
-plugins/*
 !plugins/__init__.py
-- 
Gitee


From c04b33ed316d585ffb40c32b26ae93dbac12d4db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Tue, 21 Nov 2023 17:51:19 +0800
Subject: [PATCH 18/40] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.更新字段管理
---
 backend/dvadmin/system/fixtures/initSerializer.py | 2 +-
 backend/dvadmin/system/fixtures/init_role.json    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/backend/dvadmin/system/fixtures/initSerializer.py b/backend/dvadmin/system/fixtures/initSerializer.py
index fc701bc7c..a2d74f653 100644
--- a/backend/dvadmin/system/fixtures/initSerializer.py
+++ b/backend/dvadmin/system/fixtures/initSerializer.py
@@ -128,7 +128,7 @@ class RoleInitSerializer(CustomModelSerializer):
 
     class Meta:
         model = Role
-        fields = ['name', 'key', 'sort', 'status', 'admin',
+        fields = ['name', 'key', 'sort', 'status',
                   'creator', 'dept_belong_id']
         read_only_fields = ["id"]
         extra_kwargs = {
diff --git a/backend/dvadmin/system/fixtures/init_role.json b/backend/dvadmin/system/fixtures/init_role.json
index 6fb63fe10..f1678e57f 100644
--- a/backend/dvadmin/system/fixtures/init_role.json
+++ b/backend/dvadmin/system/fixtures/init_role.json
@@ -4,7 +4,6 @@
         "key": "admin",
         "sort": 1,
         "status": true,
-        "admin": true,
         "remark": null
     },
     {
@@ -12,7 +11,6 @@
         "key": "public",
         "sort": 2,
         "status": true,
-        "admin": true,
         "remark": null
     }
 ]
-- 
Gitee


From 6045312f7ebcdd96673237208142d9011c998a68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Tue, 21 Nov 2023 19:22:00 +0800
Subject: [PATCH 19/40] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dvadmin/system/fixtures/init_menu.json    | 98 -------------------
 1 file changed, 98 deletions(-)

diff --git a/backend/dvadmin/system/fixtures/init_menu.json b/backend/dvadmin/system/fixtures/init_menu.json
index 9d514fe54..2c26ccc61 100644
--- a/backend/dvadmin/system/fixtures/init_menu.json
+++ b/backend/dvadmin/system/fixtures/init_menu.json
@@ -82,46 +82,6 @@
                     }
                 ]
             },
-            {
-                "name": "菜单按钮",
-                "icon": "dot-circle-o",
-                "sort": 2,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/menuButton",
-                "component": "system/menuButton/index",
-                "component_name": "menuButton",
-                "status": true,
-                "cache": false,
-                "visible": false,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "查询",
-                        "value": "menu_button:Search",
-                        "api": "/api/system/menu_button/",
-                        "method": 0
-                    },
-                    {
-                        "name": "新增",
-                        "value": "menu_button:Create",
-                        "api": "/api/system/menu_button/",
-                        "method": 1
-                    },
-                    {
-                        "name": "编辑",
-                        "value": "menu_button:Update",
-                        "api": "/api/system/menu_button/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "删除",
-                        "value": "menu_button:Delete",
-                        "api": "/api/system/menu_button/{id}/",
-                        "method": 3
-                    }
-                ]
-            },
             {
                 "name": "部门管理",
                 "icon": "ele-OfficeBuilding",
@@ -250,64 +210,6 @@
                     }
                 ]
             },
-            {
-                "name": "列管理",
-                "icon": "iconfont icon-bolangneng",
-                "sort": 5,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/columns",
-                "component": "system/columns/index",
-                "component_name": "columns",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "查询",
-                        "value": "column:Search",
-                        "api": "/api/system/column/",
-                        "method": 0
-                    },
-                    {
-                        "name": "详情",
-                        "value": "column:Retrieve",
-                        "api": "/api/system/column/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "新增",
-                        "value": "column:Create",
-                        "api": "/api/system/column/",
-                        "method": 1
-                    },
-                    {
-                        "name": "编辑",
-                        "value": "column:Update",
-                        "api": "/api/system/column/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "删除",
-                        "value": "column:Delete",
-                        "api": "/api/system/column/{id}/",
-                        "method": 3
-                    },
-                    {
-                        "name": "所有模型表",
-                        "value": "column:AllModel",
-                        "api": "/api/system/column/get_models/",
-                        "method": 0
-                    },
-                    {
-                        "name": "自动匹配所有字段",
-                        "value": "column:AutoMatch",
-                        "api": "/api/system/column/auto_match_fields/",
-                        "method": 1
-                    }
-                ]
-            },
             {
                 "name": "用户管理",
                 "icon": "iconfont icon-icon-",
-- 
Gitee


From fb8b0a5ac6f87e5adf2ac1b6e6cc80357447df15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Tue, 21 Nov 2023 21:21:58 +0800
Subject: [PATCH 20/40] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.更新字段管理
---
 .../views/system/dept/components/DeptFormCom/index.vue   | 2 +-
 .../views/system/dept/components/DeptUserCom/crud.tsx    | 1 -
 .../views/system/dept/components/DeptUserCom/index.vue   | 2 +-
 web/src/views/system/messageCenter/crud.tsx              | 9 +++++++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/web/src/views/system/dept/components/DeptFormCom/index.vue b/web/src/views/system/dept/components/DeptFormCom/index.vue
index f28851f82..445069b14 100644
--- a/web/src/views/system/dept/components/DeptFormCom/index.vue
+++ b/web/src/views/system/dept/components/DeptFormCom/index.vue
@@ -19,7 +19,7 @@
 			<el-input v-model="deptFormData.key" />
 		</el-form-item>
 		<el-form-item label="负责人">
-			<el-input v-model="deptFormData.owner" />
+			<el-input v-model="deptFormData.owner" placeholder="请输入" />
 		</el-form-item>
 		<el-form-item label="备注">
 			<el-input v-model="deptFormData.description" maxlength="200" show-word-limit type="textarea" />
diff --git a/web/src/views/system/dept/components/DeptUserCom/crud.tsx b/web/src/views/system/dept/components/DeptUserCom/crud.tsx
index 0eaa096e7..afeaf9ae1 100644
--- a/web/src/views/system/dept/components/DeptUserCom/crud.tsx
+++ b/web/src/views/system/dept/components/DeptUserCom/crud.tsx
@@ -266,7 +266,6 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 						url: '/api/system/role/',
 						value: 'id',
 						label: 'name',
-						isTree: true,
 						getData: async ({ url }: { url: string }) => {
 							return request({
 								url: url,
diff --git a/web/src/views/system/dept/components/DeptUserCom/index.vue b/web/src/views/system/dept/components/DeptUserCom/index.vue
index 922a8fb23..6538f204b 100644
--- a/web/src/views/system/dept/components/DeptUserCom/index.vue
+++ b/web/src/views/system/dept/components/DeptUserCom/index.vue
@@ -251,10 +251,10 @@ const handleResetPwdSubmit = async () => {
 };
 
 onMounted(() => {
-	crudExpose.doRefresh();
 	deptCountChart = init(deptCountBar.value as HTMLElement);
 	deptSexChart = init(deptSexPie.value as HTMLElement);
 	getDeptInfo();
+  crudExpose.doRefresh();
 });
 
 defineExpose({
diff --git a/web/src/views/system/messageCenter/crud.tsx b/web/src/views/system/messageCenter/crud.tsx
index aebef1e8f..427e69923 100644
--- a/web/src/views/system/messageCenter/crud.tsx
+++ b/web/src/views/system/messageCenter/crud.tsx
@@ -47,6 +47,15 @@ export const createCrudOptions = function ({ crudExpose, tabActivted }: { crudEx
 				editRequest,
 				delRequest,
 			},
+			actionbar:{
+				buttons:{
+					add:{
+						show:computed(() =>{
+							return tabActivted.value !== 'receive'
+						})
+					},
+				}
+			},
 			rowHandle: {
 				fixed:'right',
 				width:150,
-- 
Gitee


From dd2dcd4ad1232d458211d24cfdc51fa031021acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Wed, 22 Nov 2023 17:52:39 +0800
Subject: [PATCH 21/40] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96docker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker_env/web/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker_env/web/Dockerfile b/docker_env/web/Dockerfile
index 7f7fc2b52..9d465d100 100644
--- a/docker_env/web/Dockerfile
+++ b/docker_env/web/Dockerfile
@@ -1,7 +1,7 @@
 FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/dvadmin3-base-web:16.19-alpine
 WORKDIR /web/
 COPY web/. .
-RUN yarn install
+RUN yarn install --registry=https://registry.npm.taobao.org
 RUN yarn build
 
 FROM nginx:alpine
-- 
Gitee


From 0131d31808ba56c05981045133b79a1d3a06e971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Wed, 22 Nov 2023 21:58:10 +0800
Subject: [PATCH 22/40] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96docker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker_env/nginx/my.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker_env/nginx/my.conf b/docker_env/nginx/my.conf
index 30fa2108d..e1db0b7a2 100644
--- a/docker_env/nginx/my.conf
+++ b/docker_env/nginx/my.conf
@@ -28,6 +28,6 @@ server {
         proxy_send_timeout 600s;
         real_ip_header X-Forwarded-For;
         rewrite ^/api/(.*)$ /$1 break;  #重写
-        proxy_pass http://177.8.0.12:8000/; # 设置代理服务器的协议和地址
+        proxy_pass http://177.10.0.12:8000/; # 设置代理服务器的协议和地址
      }
  }
-- 
Gitee


From 2baba8e36f11146a973d2c99d6324fd46769a2dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Thu, 23 Nov 2023 16:19:35 +0800
Subject: [PATCH 23/40] =?UTF-8?q?feat:=20=E7=89=88=E6=9C=AC=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json                  |   2 +-
 web/src/i18n/lang/en.ts           | 248 ++++++++++++++-------------
 web/src/i18n/lang/zh-cn.ts        | 272 ++++++++++++++++--------------
 web/src/i18n/pages/login/zh-cn.ts |   2 +-
 web/src/layout/upgrade/index.vue  |   8 +-
 5 files changed, 275 insertions(+), 257 deletions(-)

diff --git a/web/package.json b/web/package.json
index 807cd61bd..43b7cb8e5 100644
--- a/web/package.json
+++ b/web/package.json
@@ -62,7 +62,7 @@
 		"@typescript-eslint/parser": "^5.46.0",
 		"@vitejs/plugin-vue": "^4.0.0",
 		"@vue/compiler-sfc": "^3.2.45",
-		"eslint": "^8.29.0",
+		"eslint": "^8.54.0",
 		"eslint-plugin-vue": "^9.8.0",
 		"prettier": "^2.8.1",
 		"sass": "^1.56.2",
diff --git a/web/src/i18n/lang/en.ts b/web/src/i18n/lang/en.ts
index 3b6541b60..721897587 100644
--- a/web/src/i18n/lang/en.ts
+++ b/web/src/i18n/lang/en.ts
@@ -1,123 +1,131 @@
 // 定义内容
 export default {
-	router: {
-		home: 'home',
-		system: 'system',
-		systemMenu: 'systemMenu',
-		systemRole: 'systemRole',
-		systemUser: 'systemUser',
-		systemDept: 'systemDept',
-		systemDic: 'systemDic',
-		limits: 'limits',
-		limitsFrontEnd: 'FrontEnd',
-		limitsFrontEndPage: 'FrontEndPage',
-		limitsFrontEndBtn: 'FrontEndBtn',
-		limitsBackEnd: 'BackEnd',
-		limitsBackEndEndPage: 'BackEndEndPage',
-		personal: 'personal',
-	},
-	staticRoutes: {
-		signIn: 'signIn',
-		notFound: 'notFound',
-		noPower: 'noPower',
-	},
-	user: {
-		title0: 'Component size',
-		title1: 'Language switching',
-		title2: 'Menu search',
-		title3: 'Layout configuration',
-		title4: 'news',
-		title5: 'Full screen on',
-		title6: 'Full screen off',
-		dropdownLarge: 'large',
-		dropdownDefault: 'default',
-		dropdownSmall: 'small',
-		dropdown1: 'home page',
-		dropdown2: 'Personal Center',
-		dropdown3: '404',
-		dropdown4: '401',
-		dropdown5: 'Log out',
-		dropdown6: 'Code warehouse',
-		searchPlaceholder: 'Menu search: support Chinese, routing path',
-		newTitle: 'notice',
-		newBtn: 'All read',
-		newGo: 'Go to the notification center',
-		newDesc: 'No notice',
-		logOutTitle: 'Tips',
-		logOutMessage: 'This operation will log out. Do you want to continue?',
-		logOutConfirm: 'determine',
-		logOutCancel: 'cancel',
-		logOutExit: 'Exiting',
-	},
-	tagsView: {
-		refresh: 'refresh',
-		close: 'close',
-		closeOther: 'closeOther',
-		closeAll: 'closeAll',
-		fullscreen: 'fullscreen',
-		closeFullscreen: 'closeFullscreen',
-	},
-	notFound: {
-		foundTitle: 'Wrong address input, please re-enter the address~',
-		foundMsg: 'You can check the web address first, and then re-enter or give us feedback.',
-		foundBtn: 'Back to home page',
-	},
-	noAccess: {
-		accessTitle: 'You are not authorized to operate~',
-		accessMsg: 'Contact information: add QQ group discussion 665452019',
-		accessBtn: 'Reauthorization',
-	},
-	layout: {
-		configTitle: 'Layout configuration',
-		oneTitle: 'Global Themes',
-		twoTopTitle: 'top bar set up',
-		twoMenuTitle: 'Menu set up',
-		twoColumnsTitle: 'Columns set up',
-		twoTopBar: 'Top bar background',
-		twoTopBarColor: 'Top bar default font color',
-		twoIsTopBarColorGradual: 'Top bar gradient',
-		twoMenuBar: 'Menu background',
-		twoMenuBarColor: 'Menu default font color',
-		twoIsMenuBarColorGradual: 'Menu gradient',
-		twoColumnsMenuBar: 'Column menu background',
-		twoColumnsMenuBarColor: 'Default font color bar menu',
-		twoIsColumnsMenuBarColorGradual: 'Column gradient',
-		threeTitle: 'Interface settings',
-		threeIsCollapse: 'Menu horizontal collapse',
-		threeIsUniqueOpened: 'Menu accordion',
-		threeIsFixedHeader: 'Fixed header',
-		threeIsClassicSplitMenu: 'Classic layout split menu',
-		threeIsLockScreen: 'Open the lock screen',
-		threeLockScreenTime: 'screen locking(s/s)',
-		fourTitle: 'Interface display',
-		fourIsShowLogo: 'Sidebar logo',
-		fourIsBreadcrumb: 'Open breadcrumb',
-		fourIsBreadcrumbIcon: 'Open breadcrumb icon',
-		fourIsTagsview: 'Open tagsview',
-		fourIsTagsviewIcon: 'Open tagsview Icon',
-		fourIsCacheTagsView: 'Enable tagsview cache',
-		fourIsSortableTagsView: 'Enable tagsview drag',
-		fourIsShareTagsView: 'Enable tagsview sharing',
-		fourIsFooter: 'Open footer',
-		fourIsGrayscale: 'Grey model',
-		fourIsInvert: 'Color weak mode',
-		fourIsDark: 'Dark Mode',
-		fourIsWartermark: 'Turn on watermark',
-		fourWartermarkText: 'Watermark copy',
-		fiveTitle: 'Other settings',
-		fiveTagsStyle: 'Tagsview style',
-		fiveAnimation: 'page animation',
-		fiveColumnsAsideStyle: 'Column style',
-		fiveColumnsAsideLayout: 'Column layout',
-		sixTitle: 'Layout switch',
-		sixDefaults: 'One',
-		sixClassic: 'Two',
-		sixTransverse: 'Three',
-		sixColumns: 'Four',
-		tipText: 'Click the button below to copy the layout configuration to `/src/stores/themeConfig.ts` It has been modified in.',
-		copyText: 'replication configuration',
-		resetText: 'restore default',
-		copyTextSuccess: 'Copy succeeded!',
-		copyTextError: 'Copy failed!',
-	},
+    router: {
+        home: 'home',
+        system: 'system',
+        systemMenu: 'systemMenu',
+        systemRole: 'systemRole',
+        systemUser: 'systemUser',
+        systemDept: 'systemDept',
+        systemDic: 'systemDic',
+        limits: 'limits',
+        limitsFrontEnd: 'FrontEnd',
+        limitsFrontEndPage: 'FrontEndPage',
+        limitsFrontEndBtn: 'FrontEndBtn',
+        limitsBackEnd: 'BackEnd',
+        limitsBackEndEndPage: 'BackEndEndPage',
+        personal: 'personal',
+    },
+    staticRoutes: {
+        signIn: 'signIn',
+        notFound: 'notFound',
+        noPower: 'noPower',
+    },
+    user: {
+        title0: 'Component size',
+        title1: 'Language switching',
+        title2: 'Menu search',
+        title3: 'Layout configuration',
+        title4: 'news',
+        title5: 'Full screen on',
+        title6: 'Full screen off',
+        dropdownLarge: 'large',
+        dropdownDefault: 'default',
+        dropdownSmall: 'small',
+        dropdown1: 'home page',
+        dropdown2: 'Personal Center',
+        dropdown3: '404',
+        dropdown4: '401',
+        dropdown5: 'Log out',
+        dropdown6: 'Code warehouse',
+        searchPlaceholder: 'Menu search: support Chinese, routing path',
+        newTitle: 'notice',
+        newBtn: 'All read',
+        newGo: 'Go to the notification center',
+        newDesc: 'No notice',
+        logOutTitle: 'Tips',
+        logOutMessage: 'This operation will log out. Do you want to continue?',
+        logOutConfirm: 'determine',
+        logOutCancel: 'cancel',
+        logOutExit: 'Exiting',
+    },
+    tagsView: {
+        refresh: 'refresh',
+        close: 'close',
+        closeOther: 'closeOther',
+        closeAll: 'closeAll',
+        fullscreen: 'fullscreen',
+        closeFullscreen: 'closeFullscreen',
+    },
+    notFound: {
+        foundTitle: 'Wrong address input, please re-enter the address~',
+        foundMsg: 'You can check the web address first, and then re-enter or give us feedback.',
+        foundBtn: 'Back to home page',
+    },
+    noAccess: {
+        accessTitle: 'You are not authorized to operate~',
+        accessMsg: 'Contact information: add QQ group discussion 665452019',
+        accessBtn: 'Reauthorization',
+    },
+    layout: {
+        configTitle: 'Layout configuration',
+        oneTitle: 'Global Themes',
+        twoTopTitle: 'top bar set up',
+        twoMenuTitle: 'Menu set up',
+        twoColumnsTitle: 'Columns set up',
+        twoTopBar: 'Top bar background',
+        twoTopBarColor: 'Top bar default font color',
+        twoIsTopBarColorGradual: 'Top bar gradient',
+        twoMenuBar: 'Menu background',
+        twoMenuBarColor: 'Menu default font color',
+        twoIsMenuBarColorGradual: 'Menu gradient',
+        twoColumnsMenuBar: 'Column menu background',
+        twoColumnsMenuBarColor: 'Default font color bar menu',
+        twoIsColumnsMenuBarColorGradual: 'Column gradient',
+        threeTitle: 'Interface settings',
+        threeIsCollapse: 'Menu horizontal collapse',
+        threeIsUniqueOpened: 'Menu accordion',
+        threeIsFixedHeader: 'Fixed header',
+        threeIsClassicSplitMenu: 'Classic layout split menu',
+        threeIsLockScreen: 'Open the lock screen',
+        threeLockScreenTime: 'screen locking(s/s)',
+        fourTitle: 'Interface display',
+        fourIsShowLogo: 'Sidebar logo',
+        fourIsBreadcrumb: 'Open breadcrumb',
+        fourIsBreadcrumbIcon: 'Open breadcrumb icon',
+        fourIsTagsview: 'Open tagsview',
+        fourIsTagsviewIcon: 'Open tagsview Icon',
+        fourIsCacheTagsView: 'Enable tagsview cache',
+        fourIsSortableTagsView: 'Enable tagsview drag',
+        fourIsShareTagsView: 'Enable tagsview sharing',
+        fourIsFooter: 'Open footer',
+        fourIsGrayscale: 'Grey model',
+        fourIsInvert: 'Color weak mode',
+        fourIsDark: 'Dark Mode',
+        fourIsWartermark: 'Turn on watermark',
+        fourWartermarkText: 'Watermark copy',
+        fiveTitle: 'Other settings',
+        fiveTagsStyle: 'Tagsview style',
+        fiveAnimation: 'page animation',
+        fiveColumnsAsideStyle: 'Column style',
+        fiveColumnsAsideLayout: 'Column layout',
+        sixTitle: 'Layout switch',
+        sixDefaults: 'One',
+        sixClassic: 'Two',
+        sixTransverse: 'Three',
+        sixColumns: 'Four',
+        tipText: 'Click the button below to copy the layout configuration to `/src/stores/themeConfig.ts` It has been modified in.',
+        copyText: 'replication configuration',
+        resetText: 'restore default',
+        copyTextSuccess: 'Copy succeeded!',
+        copyTextError: 'Copy failed!',
+    },
+    upgrade: {
+        title: 'New version upgrade',
+        msg: 'It\'s a new version. Update it now！Don\'t worry, update quickly oh!',
+        desc: 'Tip: The update restores the default configuration',
+        btnOne: 'Cruel refusal',
+        btnTwo: 'Update now',
+        btnTwoLoading: 'updating',
+    },
 };
diff --git a/web/src/i18n/lang/zh-cn.ts b/web/src/i18n/lang/zh-cn.ts
index 567cb9aaf..6fc6ef3dc 100644
--- a/web/src/i18n/lang/zh-cn.ts
+++ b/web/src/i18n/lang/zh-cn.ts
@@ -1,134 +1,144 @@
 // 定义内容
 export default {
-	router: {
-		home: '首页',
-		system: '系统管理',
-		config: '常规配置',
-		log: '日志管理',
-		/* 常规配置 */
-		configSystem: '系统配置',
-		configDict: '字典管理',
-		configArea: '地区管理',
-		configFile: '附件管理',
-		/* 系统管理 */
-		systemMenu: '菜单管理',
-		systemRole: '角色管理',
-		systemUser: '用户管理',
-		systemDept: '部门管理',
-		/* 日志管理 */
-		loginLog: '登录日志',
-		operationLog: '操作日志',
-		systemApiWhiteList: '接口白名单',
-		limits: '权限管理',
-		limitsFrontEnd: '前端控制',
-		limitsFrontEndPage: '页面权限',
-		limitsFrontEndBtn: '按钮权限',
-		limitsBackEnd: '后端控制',
-		limitsBackEndEndPage: '页面权限',
-		personal: '个人中心',
-	},
-	staticRoutes: {
-		signIn: '登录',
-		notFound: '找不到此页面',
-		noPower: '没有权限',
-	},
-	user: {
-		title0: '组件大小',
-		title1: '语言切换',
-		title2: '菜单搜索',
-		title3: '布局配置',
-		title4: '消息',
-		title5: '开全屏',
-		title6: '关全屏',
-		dropdownLarge: '大型',
-		dropdownDefault: '默认',
-		dropdownSmall: '小型',
-		dropdown1: '首页',
-		dropdown2: '个人中心',
-		dropdown3: '404',
-		dropdown4: '401',
-		dropdown5: '退出登录',
-		dropdown6: '代码仓库',
-		searchPlaceholder: '菜单搜索：支持中文、路由路径',
-		newTitle: '通知',
-		newBtn: '全部已读',
-		newGo: '前往通知中心',
-		newDesc: '暂无通知',
-		logOutTitle: '提示',
-		logOutMessage: '此操作将退出登录, 是否继续?',
-		logOutConfirm: '确定',
-		logOutCancel: '取消',
-		logOutExit: '退出中',
-	},
-	tagsView: {
-		refresh: '刷新',
-		close: '关闭',
-		closeOther: '关闭其它',
-		closeAll: '全部关闭',
-		fullscreen: '当前页全屏',
-		closeFullscreen: '关闭全屏',
-	},
-	notFound: {
-		foundTitle: '地址输入错误，请重新输入地址~',
-		foundMsg: '您可以先检查网址，然后重新输入或给我们反馈问题。',
-		foundBtn: '返回首页',
-	},
-	noAccess: {
-		accessTitle: '您未被授权，没有操作权限~',
-		accessMsg: '联系方式：加QQ群探讨 665452019',
-		accessBtn: '重新授权',
-	},
-	layout: {
-		configTitle: '布局配置',
-		oneTitle: '全局主题',
-		twoTopTitle: '顶栏设置',
-		twoMenuTitle: '菜单设置',
-		twoColumnsTitle: '分栏设置',
-		twoTopBar: '顶栏背景',
-		twoTopBarColor: '顶栏默认字体颜色',
-		twoIsTopBarColorGradual: '顶栏背景渐变',
-		twoMenuBar: '菜单背景',
-		twoMenuBarColor: '菜单默认字体颜色',
-		twoIsMenuBarColorGradual: '菜单背景渐变',
-		twoColumnsMenuBar: '分栏菜单背景',
-		twoColumnsMenuBarColor: '分栏菜单默认字体颜色',
-		twoIsColumnsMenuBarColorGradual: '分栏菜单背景渐变',
-		threeTitle: '界面设置',
-		threeIsCollapse: '菜单水平折叠',
-		threeIsUniqueOpened: '菜单手风琴',
-		threeIsFixedHeader: '固定 Header',
-		threeIsClassicSplitMenu: '经典布局分割菜单',
-		threeIsLockScreen: '开启锁屏',
-		threeLockScreenTime: '自动锁屏(s/秒)',
-		fourTitle: '界面显示',
-		fourIsShowLogo: '侧边栏 Logo',
-		fourIsBreadcrumb: '开启 Breadcrumb',
-		fourIsBreadcrumbIcon: '开启 Breadcrumb 图标',
-		fourIsTagsview: '开启 Tagsview',
-		fourIsTagsviewIcon: '开启 Tagsview 图标',
-		fourIsCacheTagsView: '开启 TagsView 缓存',
-		fourIsSortableTagsView: '开启 TagsView 拖拽',
-		fourIsShareTagsView: '开启 TagsView 共用',
-		fourIsFooter: '开启 Footer',
-		fourIsGrayscale: '灰色模式',
-		fourIsInvert: '色弱模式',
-		fourIsDark: '深色模式',
-		fourIsWartermark: '开启水印',
-		fourWartermarkText: '水印文案',
-		fiveTitle: '其它设置',
-		fiveTagsStyle: 'Tagsview 风格',
-		fiveAnimation: '主页面切换动画',
-		fiveColumnsAsideStyle: '分栏高亮风格',
-		fiveColumnsAsideLayout: '分栏布局风格',
-		sixTitle: '布局切换',
-		sixDefaults: '默认',
-		sixClassic: '经典',
-		sixTransverse: '横向',
-		sixColumns: '分栏',
-		tipText: '点击下方按钮，复制布局配置去 `src/stores/themeConfig.ts` 中修改。',
-		copyText: '一键复制配置',
-		resetText: '一键恢复默认',
-		copyTextSuccess: '复制成功！',
-		copyTextError: '复制失败！',
-	},
+    router: {
+        home: '首页',
+        system: '系统管理',
+        config: '常规配置',
+        log: '日志管理',
+        /* 常规配置 */
+        configSystem: '系统配置',
+        configDict: '字典管理',
+        configArea: '地区管理',
+        configFile: '附件管理',
+        /* 系统管理 */
+        systemMenu: '菜单管理',
+        systemRole: '角色管理',
+        systemUser: '用户管理',
+        systemDept: '部门管理',
+        /* 日志管理 */
+        loginLog: '登录日志',
+        operationLog: '操作日志',
+        systemApiWhiteList: '接口白名单',
+        limits: '权限管理',
+        limitsFrontEnd: '前端控制',
+        limitsFrontEndPage: '页面权限',
+        limitsFrontEndBtn: '按钮权限',
+        limitsBackEnd: '后端控制',
+        limitsBackEndEndPage: '页面权限',
+        personal: '个人中心',
+    },
+    staticRoutes: {
+        signIn: '登录',
+        notFound: '找不到此页面',
+        noPower: '没有权限',
+    },
+    user: {
+        title0: '组件大小',
+        title1: '语言切换',
+        title2: '菜单搜索',
+        title3: '布局配置',
+        title4: '消息',
+        title5: '开全屏',
+        title6: '关全屏',
+        dropdownLarge: '大型',
+        dropdownDefault: '默认',
+        dropdownSmall: '小型',
+        dropdown1: '首页',
+        dropdown2: '个人中心',
+        dropdown3: '404',
+        dropdown4: '401',
+        dropdown5: '退出登录',
+        dropdown6: '代码仓库',
+        searchPlaceholder: '菜单搜索：支持中文、路由路径',
+        newTitle: '通知',
+        newBtn: '全部已读',
+        newGo: '前往通知中心',
+        newDesc: '暂无通知',
+        logOutTitle: '提示',
+        logOutMessage: '此操作将退出登录, 是否继续?',
+        logOutConfirm: '确定',
+        logOutCancel: '取消',
+        logOutExit: '退出中',
+    },
+    tagsView: {
+        refresh: '刷新',
+        close: '关闭',
+        closeOther: '关闭其它',
+        closeAll: '全部关闭',
+        fullscreen: '当前页全屏',
+        closeFullscreen: '关闭全屏',
+    },
+    notFound: {
+        foundTitle: '地址输入错误，请重新输入地址~',
+        foundMsg: '您可以先检查网址，然后重新输入或给我们反馈问题。',
+        foundBtn: '返回首页',
+    },
+    noAccess: {
+        accessTitle: '您未被授权，没有操作权限~',
+        accessMsg: '联系方式：加QQ群探讨 665452019',
+        accessBtn: '重新授权',
+    },
+    layout: {
+        configTitle: '布局配置',
+        oneTitle: '全局主题',
+        twoTopTitle: '顶栏设置',
+        twoMenuTitle: '菜单设置',
+        twoColumnsTitle: '分栏设置',
+        twoTopBar: '顶栏背景',
+        twoTopBarColor: '顶栏默认字体颜色',
+        twoIsTopBarColorGradual: '顶栏背景渐变',
+        twoMenuBar: '菜单背景',
+        twoMenuBarColor: '菜单默认字体颜色',
+        twoMenuBarActiveColor: '菜单高亮背景色',
+        twoIsMenuBarColorGradual: '菜单背景渐变',
+        twoColumnsMenuBar: '分栏菜单背景',
+        twoColumnsMenuBarColor: '分栏菜单默认字体颜色',
+        twoIsColumnsMenuBarColorGradual: '分栏菜单背景渐变',
+        twoIsColumnsMenuHoverPreload: '分栏菜单滑鼠悬停预加载',
+        threeTitle: '界面设置',
+        threeIsCollapse: '菜单水平折叠',
+        threeIsUniqueOpened: '菜单手风琴',
+        threeIsFixedHeader: '固定 Header',
+        threeIsClassicSplitMenu: '经典布局分割菜单',
+        threeIsLockScreen: '开启锁屏',
+        threeLockScreenTime: '自动锁屏(s/秒)',
+        fourTitle: '界面显示',
+        fourIsShowLogo: '侧边栏 Logo',
+        fourIsBreadcrumb: '开启 Breadcrumb',
+        fourIsBreadcrumbIcon: '开启 Breadcrumb 图标',
+        fourIsTagsview: '开启 Tagsview',
+        fourIsTagsviewIcon: '开启 Tagsview 图标',
+        fourIsCacheTagsView: '开启 TagsView 缓存',
+        fourIsSortableTagsView: '开启 TagsView 拖拽',
+        fourIsShareTagsView: '开启 TagsView 共用',
+        fourIsFooter: '开启 Footer',
+        fourIsGrayscale: '灰色模式',
+        fourIsInvert: '色弱模式',
+        fourIsDark: '深色模式',
+        fourIsWartermark: '开启水印',
+        fourWartermarkText: '水印文案',
+        fiveTitle: '其它设置',
+        fiveTagsStyle: 'Tagsview 风格',
+        fiveAnimation: '主页面切换动画',
+        fiveColumnsAsideStyle: '分栏高亮风格',
+        fiveColumnsAsideLayout: '分栏布局风格',
+        sixTitle: '布局切换',
+        sixDefaults: '默认',
+        sixClassic: '经典',
+        sixTransverse: '横向',
+        sixColumns: '分栏',
+        tipText: '点击下方按钮，复制布局配置去 `src/stores/themeConfig.ts` 中修改。',
+        copyText: '一键复制配置',
+        resetText: '一键恢复默认',
+        copyTextSuccess: '复制成功！',
+        copyTextError: '复制失败！',
+    },
+    upgrade: {
+        title: '新版本升级',
+        msg: '新版本来啦，马上更新尝鲜吧！不用担心，更新很快的哦！',
+        desc: '提示：更新会还原默认配寘',
+        btnOne: '残忍拒绝',
+        btnTwo: '马上更新',
+        btnTwoLoading: '更新中',
+    },
 };
diff --git a/web/src/i18n/pages/login/zh-cn.ts b/web/src/i18n/pages/login/zh-cn.ts
index 61f994d2d..6ab9813aa 100644
--- a/web/src/i18n/pages/login/zh-cn.ts
+++ b/web/src/i18n/pages/login/zh-cn.ts
@@ -1,7 +1,7 @@
 // 定义内容
 export default {
 	label: {
-		one1: '用户名登录',
+		one1: '账号密码登录',
 		two2: '手机号登录',
 	},
 	link: {
diff --git a/web/src/layout/upgrade/index.vue b/web/src/layout/upgrade/index.vue
index 7fe861a78..e36101265 100644
--- a/web/src/layout/upgrade/index.vue
+++ b/web/src/layout/upgrade/index.vue
@@ -76,10 +76,10 @@ const delayShow = () => {
 };
 // 页面加载时
 onMounted(() => {
-	// delayShow();
-	// setTimeout(() => {
-	// 	state.btnTxt = t('message.upgrade.btnTwo');
-	// }, 200);
+	delayShow();
+	setTimeout(() => {
+		state.btnTxt = t('message.upgrade.btnTwo');
+	}, 200);
 });
 </script>
 
-- 
Gitee


From 6172dea399222bd1a251634dc3670b1913c5d5e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Thu, 23 Nov 2023 16:33:19 +0800
Subject: [PATCH 24/40] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=95=86?=
 =?UTF-8?q?=E4=B8=9A=E6=8E=88=E6=9D=83=E6=A0=87=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/layout/component/main.vue | 2 +-
 web/src/layout/footer/index.vue   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/src/layout/component/main.vue b/web/src/layout/component/main.vue
index fd3f59993..9250d1e6a 100644
--- a/web/src/layout/component/main.vue
+++ b/web/src/layout/component/main.vue
@@ -4,7 +4,7 @@
 		<el-scrollbar ref="layoutMainScrollbarRef" class="layout-main-scroll layout-backtop-header-fixed"
 			wrap-class="layout-main-scroll" view-class="layout-main-scroll">
 			<LayoutParentView />
-			<!-- <LayoutFooter v-if="isFooter" /> -->
+      <LayoutFooter v-if="isFooter" />
 		</el-scrollbar>
 		<el-backtop :target="setBacktopClass" />
 	</el-main>
diff --git a/web/src/layout/footer/index.vue b/web/src/layout/footer/index.vue
index 526cd8fc9..67e6e5c07 100644
--- a/web/src/layout/footer/index.vue
+++ b/web/src/layout/footer/index.vue
@@ -1,8 +1,7 @@
 <template>
-	<div class="layout-footer pb15">
+	<div class="layout-footer pb5 pt2">
 		<div class="layout-footer-warp">
-			<div>❤️ Powered by Django-Vue3-Admin ❤️</div>
-			<div class="mt5">Copyright DVAdmin团队</div>
+			<div>❤️ Powered by Django-Vue3-Admin Copyright © DVAdmin团队 ❤️</div>
 		</div>
 	</div>
 </template>
-- 
Gitee


From 42e6c7b6003501580586423c35e89c446ac5a73a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Thu, 23 Nov 2023 18:55:25 +0800
Subject: [PATCH 25/40] =?UTF-8?q?feat:=20websocket=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/application/websocketConfig.py     |  2 +-
 web/src/App.vue                            | 14 +++--
 web/src/i18n/lang/zh-cn.ts                 |  4 +-
 web/src/i18n/lang/zh-tw.ts                 |  2 +-
 web/src/layout/navBars/breadcrumb/user.vue | 69 +++++++++++++++++++++-
 web/src/layout/upgrade/index.vue           |  2 +-
 web/src/stores/interface/index.ts          |  1 +
 web/src/stores/userInfo.ts                 |  4 ++
 web/src/utils/websocket.ts                 | 20 +++++--
 9 files changed, 100 insertions(+), 18 deletions(-)

diff --git a/backend/application/websocketConfig.py b/backend/application/websocketConfig.py
index c36d97a15..ab2cd64f3 100644
--- a/backend/application/websocketConfig.py
+++ b/backend/application/websocketConfig.py
@@ -73,7 +73,7 @@ class DvadminWebSocket(AsyncJsonWebsocketConsumer):
                 unread_count = await _get_message_unread(self.user_id)
                 if unread_count == 0:
                     # 发送连接成功
-                    await self.send_json(set_message('system', 'SYSTEM', '连接成功'))
+                    await self.send_json(set_message('system', 'SYSTEM', '您已上线'))
                 else:
                     await self.send_json(
                         set_message('system', 'SYSTEM', "请查看您的未读消息~",
diff --git a/web/src/App.vue b/web/src/App.vue
index ec824fa43..caa36ca0c 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -59,12 +59,6 @@ onBeforeMount(() => {
 	setIntroduction.cssCdn();
 	// 设置批量第三方 js
 	setIntroduction.jsCdn();
-	//websockt 模块
-	try {
-		//websocket.init(wsReceive)
-	} catch (e) {
-		console.log('websocket错误');
-	}
 });
 // 页面加载时
 onMounted(() => {
@@ -93,6 +87,14 @@ watch(
 	() => route.path,
 	() => {
 		other.useTitle();
+    if (!websocket.websocket) {
+      //websockt 模块
+      try {
+        websocket.init(wsReceive)
+      } catch (e) {
+        console.log('websocket错误');
+      }
+    }
 	},
 	{
 		deep: true,
diff --git a/web/src/i18n/lang/zh-cn.ts b/web/src/i18n/lang/zh-cn.ts
index 6fc6ef3dc..6289a3919 100644
--- a/web/src/i18n/lang/zh-cn.ts
+++ b/web/src/i18n/lang/zh-cn.ts
@@ -40,6 +40,8 @@ export default {
         title4: '消息',
         title5: '开全屏',
         title6: '关全屏',
+        retry: '重试上线',
+        onlinePrompt: '当前离线状态，是否重试上线？',
         dropdownLarge: '大型',
         dropdownDefault: '默认',
         dropdownSmall: '小型',
@@ -75,7 +77,7 @@ export default {
     },
     noAccess: {
         accessTitle: '您未被授权，没有操作权限~',
-        accessMsg: '联系方式：加QQ群探讨 665452019',
+        accessMsg: '请联系管理员',
         accessBtn: '重新授权',
     },
     layout: {
diff --git a/web/src/i18n/lang/zh-tw.ts b/web/src/i18n/lang/zh-tw.ts
index 35e406fe7..ea0016445 100644
--- a/web/src/i18n/lang/zh-tw.ts
+++ b/web/src/i18n/lang/zh-tw.ts
@@ -123,7 +123,7 @@ export default {
 	},
 	noAccess: {
 		accessTitle: '您未被授權，沒有操作許可權~',
-		accessMsg: '聯繫方式：加QQ群探討665452019',
+		accessMsg: '請聯系管理員',
 		accessBtn: '重新授權',
 	},
 	layout: {
diff --git a/web/src/layout/navBars/breadcrumb/user.vue b/web/src/layout/navBars/breadcrumb/user.vue
index f4cf706d5..620a07690 100644
--- a/web/src/layout/navBars/breadcrumb/user.vue
+++ b/web/src/layout/navBars/breadcrumb/user.vue
@@ -57,9 +57,33 @@
 				:class="!state.isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"
 			></i>
 		</div>
+    <div>
+      <span v-if="!isSocketOpen">
+        <el-popconfirm
+          width="250"
+          ref="onlinePopoverRef"
+          :confirm-button-text="$t('message.user.retry')"
+          :icon="InfoFilled"
+          trigger="hover"
+          icon-color="#626AEF"
+          :title="$t('message.user.onlinePrompt')"
+          @confirm="onlineConfirmEvent"
+        >
+          <template #reference>
+            <el-badge is-dot class="item" :class="{'online-status': isSocketOpen,'online-down':!isSocketOpen}">
+              <img :src="userInfos.avatar || headerImage" class="layout-navbars-breadcrumb-user-link-photo mr5" />
+            </el-badge>
+          </template>
+        </el-popconfirm>
+      </span>
+    </div>
 		<el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
 			<span class="layout-navbars-breadcrumb-user-link">
-				<img :src="userInfos.avatar || headerImage" class="layout-navbars-breadcrumb-user-link-photo mr5" />
+        <span v-if="isSocketOpen">
+          <el-badge is-dot class="item" :class="{'online-status': isSocketOpen,'online-down':!isSocketOpen}">
+            <img :src="userInfos.avatar || headerImage" class="layout-navbars-breadcrumb-user-link-photo mr5" />
+          </el-badge>
+        </span>
 				{{ userInfos.username === '' ? 'common' : userInfos.username }}
 				<el-icon class="el-icon--right">
 					<ele-ArrowDown />
@@ -79,7 +103,7 @@
 </template>
 
 <script setup lang="ts" name="layoutBreadcrumbUser">
-import { defineAsyncComponent, ref, computed, reactive, onMounted } from 'vue';
+import { defineAsyncComponent, ref, computed, reactive, onMounted, unref, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import screenfull from 'screenfull';
@@ -91,6 +115,8 @@ import other from '/@/utils/other';
 import mittBus from '/@/utils/mitt';
 import { Session, Local } from '/@/utils/storage';
 import headerImage from '/@/assets/img/headerImage.png';
+import websocket from '/@/utils/websocket';
+import { InfoFilled } from '@element-plus/icons-vue'
 // 引入组件
 const UserNews = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/userNews.vue'));
 const Search = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/search.vue'));
@@ -118,6 +144,21 @@ const layoutUserFlexNum = computed(() => {
 	else num = '';
 	return num;
 });
+
+// 定义变量内容
+const { isSocketOpen } = storeToRefs(useUserInfo());
+
+// websocket状态
+const onlinePopoverRef = ref()
+const onlineConfirmEvent = () => {
+  if (!isSocketOpen.value) {
+      websocket.is_reonnect = true
+      websocket.reconnect_current = 1
+      websocket.reconnect()
+  }
+  // 手动隐藏弹出
+  unref(onlinePopoverRef).popperRef?.delayHide?.()
+}
 // 全屏点击时
 const onScreenfullClick = () => {
 	if (!screenfull.isEnabled) {
@@ -256,5 +297,29 @@ const messageCenter = messageCenterStore();
 	:deep(.el-badge__content.is-fixed) {
 		top: 12px;
 	}
+  .online-status{
+    cursor: pointer;
+    :deep .el-badge__content.is-fixed {
+      top: 30px;
+      font-size: 14px;
+      left: 5px;
+      height: 12px;
+      width: 12px;
+      padding: 0;
+      background-color: #18bc9c;
+    }
+  }
+  .online-down{
+    cursor: pointer;
+    :deep .el-badge__content.is-fixed {
+      top: 30px;
+      font-size: 14px;
+      left: 5px;
+      height: 12px;
+      width: 12px;
+      padding: 0;
+      background-color: #979b9c;
+    }
+  }
 }
 </style>
diff --git a/web/src/layout/upgrade/index.vue b/web/src/layout/upgrade/index.vue
index e36101265..89654ca95 100644
--- a/web/src/layout/upgrade/index.vue
+++ b/web/src/layout/upgrade/index.vue
@@ -17,7 +17,7 @@
 			<div class="upgrade-content">
 				{{ getThemeConfig.globalTitle }} {{ $t('message.upgrade.msg') }}
 				<div class="mt5">
-					<el-link type="primary" class="font12" href="https://gitee.com/lyt-top/vue-next-admin/blob/master/CHANGELOG.md" target="_black">
+					<el-link type="primary" class="font12" href=https://gitee.com/huge-dream/django-vue3-admin/blob/master/CHANGELOG.md" target="_black">
 						CHANGELOG.md
 					</el-link>
 				</div>
diff --git a/web/src/stores/interface/index.ts b/web/src/stores/interface/index.ts
index 98d016bb4..6d2c775db 100644
--- a/web/src/stores/interface/index.ts
+++ b/web/src/stores/interface/index.ts
@@ -19,6 +19,7 @@ export interface UserInfosState {
 }
 export interface UserInfosStates {
 	userInfos: UserInfosState;
+	isSocketOpen: boolean
 }
 
 // 路由缓存列表
diff --git a/web/src/stores/userInfo.ts b/web/src/stores/userInfo.ts
index 4bef2a90f..9be64a8b4 100644
--- a/web/src/stores/userInfo.ts
+++ b/web/src/stores/userInfo.ts
@@ -26,6 +26,7 @@ export const useUserInfo = defineStore('userInfo', {
 				},
 			],
 		},
+		isSocketOpen: false
 	}),
 	actions: {
 		async updateUserInfos() {
@@ -57,6 +58,9 @@ export const useUserInfo = defineStore('userInfo', {
 				Session.set('userInfo', this.userInfos);
 			}
 		},
+		async setWebSocketState(socketState: boolean) {
+			this.isSocketOpen = socketState;
+		},
 		async getApiUserInfo() {
 			return request({
 				url: '/api/system/user/user_info/',
diff --git a/web/src/utils/websocket.ts b/web/src/utils/websocket.ts
index 987273e88..2fabadbda 100644
--- a/web/src/utils/websocket.ts
+++ b/web/src/utils/websocket.ts
@@ -3,7 +3,7 @@ import {Session} from "/@/utils/storage";
 import {getWsBaseURL} from "/@/utils/baseUrl";
 // @ts-ignore
 import socket from '@/types/api/socket'
-
+import {useUserInfo} from "/@/stores/userInfo";
 const websocket: socket = {
     websocket: null,
     connectURL: getWsBaseURL(),
@@ -42,6 +42,7 @@ const websocket: socket = {
         }
         websocket.websocket.onclose = (e: any) => {
             websocket.socket_open = false
+            useUserInfo().setWebSocketState(websocket.socket_open);
             // 需要重新连接
             if (websocket.is_reonnect) {
                 websocket.reconnect_timer = setTimeout(() => {
@@ -49,6 +50,8 @@ const websocket: socket = {
                     if (websocket.reconnect_current > websocket.reconnect_count) {
                         clearTimeout(websocket.reconnect_timer)
                         websocket.is_reonnect = false
+                        websocket.socket_open = false
+                        useUserInfo().setWebSocketState(websocket.socket_open);
                         return
                     }
                     // 记录重连次数
@@ -60,6 +63,7 @@ const websocket: socket = {
         // 连接成功
         websocket.websocket.onopen = function () {
             websocket.socket_open = true
+            useUserInfo().setWebSocketState(websocket.socket_open);
             websocket.is_reonnect = true
             // 开启心跳
             websocket.heartbeat()
@@ -85,17 +89,21 @@ const websocket: socket = {
             callback && callback()
         } else {
             clearInterval(websocket.hearbeat_timer)
-            message({
-                type: 'warning',
-                message: 'socket链接已断开',
-                duration: 1000,
-            })
+            // message({
+            //     type: 'warning',
+            //     message: 'socket链接已断开',
+            //     duration: 1000,
+            // })
+            websocket.socket_open = false
+            useUserInfo().setWebSocketState(websocket.socket_open);
         }
     },
     close: () => {
         websocket.is_reonnect = false
         websocket.websocket.close()
         websocket.websocket = null;
+        websocket.socket_open = false
+        useUserInfo().setWebSocketState(websocket.socket_open);
     },
     /**
      * 重新连接
-- 
Gitee


From c7633330243d21b1b9f70572b76d42f758c01650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Fri, 24 Nov 2023 15:12:46 +0800
Subject: [PATCH 26/40] =?UTF-8?q?refactor:=20=E6=A3=80=E6=B5=8B=E7=9B=AE?=
 =?UTF-8?q?=E5=89=8D=E6=89=80=E6=9C=89=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/views/menu_button.py   |  16 +-
 web/src/main.ts                               |   3 +-
 web/src/plugin/permission/index.ts            |   6 +-
 web/src/stores/btnPermission.ts               |  26 +
 web/src/utils/authDirective.ts                |  15 +-
 web/src/utils/authFunction.ts                 |  15 +-
 web/src/views/system/areas/crud.tsx           | 457 +++++++++--------
 .../dept/components/DeptUserCom/crud.tsx      |  14 +-
 .../dept/components/DeptUserCom/index.vue     |   2 +-
 web/src/views/system/dictionary/crud.tsx      |  10 +-
 .../views/system/dictionary/subDict/index.vue |   6 +-
 web/src/views/system/fileList/crud.tsx        |   1 +
 .../menu/components/MenuButtonCom/crud.tsx    | 411 +++++++--------
 .../menu/components/MenuFieldCom/crud.tsx     |  22 +-
 .../menu/components/MenuTreeCom/index.vue     |  10 +-
 web/src/views/system/messageCenter/crud.tsx   |  10 +-
 web/src/views/system/role/crud.tsx            |  37 +-
 web/src/views/system/role/index.vue           |  59 ++-
 web/src/views/system/rolePermission/api.ts    | 107 ----
 web/src/views/system/rolePermission/index.vue | 432 ----------------
 web/src/views/system/user/crud.tsx            |  12 +-
 web/src/views/system/whiteList/crud.tsx       | 478 +++++++++---------
 22 files changed, 851 insertions(+), 1298 deletions(-)
 create mode 100644 web/src/stores/btnPermission.ts
 delete mode 100644 web/src/views/system/rolePermission/api.ts
 delete mode 100644 web/src/views/system/rolePermission/index.vue

diff --git a/backend/dvadmin/system/views/menu_button.py b/backend/dvadmin/system/views/menu_button.py
index 245b34735..4473d4737 100644
--- a/backend/dvadmin/system/views/menu_button.py
+++ b/backend/dvadmin/system/views/menu_button.py
@@ -11,7 +11,7 @@ from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
 from dvadmin.system.models import MenuButton, RoleMenuButtonPermission
-from dvadmin.utils.json_response import DetailResponse
+from dvadmin.utils.json_response import DetailResponse, SuccessResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
 
@@ -49,12 +49,24 @@ class MenuButtonViewSet(CustomModelViewSet):
     retrieve:单例
     destroy:删除
     """
-    queryset = MenuButton.objects.all()
+    queryset = MenuButton.objects.order_by('create_datetime')
     serializer_class = MenuButtonSerializer
     create_serializer_class = MenuButtonCreateUpdateSerializer
     update_serializer_class = MenuButtonCreateUpdateSerializer
     extra_filter_class = []
 
+    def list(self, request, *args, **kwargs):
+        """
+        重写list方法
+        :param request:
+        :param args:
+        :param kwargs:
+        :return:
+        """
+        queryset = self.filter_queryset(self.get_queryset())
+        serializer = self.get_serializer(queryset, many=True, request=request)
+        return SuccessResponse(serializer.data,msg="获取成功")
+
     @action(methods=['get'],detail=False,permission_classes=[IsAuthenticated])
     def menu_button_all_permission(self,request):
         """
diff --git a/web/src/main.ts b/web/src/main.ts
index cb435568a..f735d7f7f 100644
--- a/web/src/main.ts
+++ b/web/src/main.ts
@@ -14,7 +14,7 @@ import piniaPersist from 'pinia-plugin-persist';
 // @ts-ignore
 import fastCrud from './settings.ts';
 import pinia from './stores';
-import permission from '/@/plugin/permission/index';
+import {RegisterPermission} from '/@/plugin/permission/index';
 // @ts-ignore
 import eIconPicker, { iconList, analyzingIconForIconfont } from 'e-icon-picker';
 import 'e-icon-picker/icon/default-icon/symbol.js'; //基本彩色图标库
@@ -54,7 +54,6 @@ other.elSvg(app);
 
 
 app.use(VXETable)
-app.use(permission);
 app.use(pinia).use(router).use(ElementPlus, { i18n: i18n.global.t }).use(i18n).use(VueGridLayout).use(fastCrud).mount('#app');
 
 app.config.globalProperties.mittBus = mitt();
diff --git a/web/src/plugin/permission/index.ts b/web/src/plugin/permission/index.ts
index b519bd07e..a40941e41 100644
--- a/web/src/plugin/permission/index.ts
+++ b/web/src/plugin/permission/index.ts
@@ -1,10 +1,6 @@
 import permissionDirective from './directive.permission'
 import permissionFunc from './func.permission'
-const install = function (app:any) {
+export const RegisterPermission = function (app:any) {
   app.directive('permission', permissionDirective)
   app.provide('$hasPermissions',permissionFunc.hasPermissions)
 }
-
-export default {
-  install
-}
diff --git a/web/src/stores/btnPermission.ts b/web/src/stores/btnPermission.ts
new file mode 100644
index 000000000..287962890
--- /dev/null
+++ b/web/src/stores/btnPermission.ts
@@ -0,0 +1,26 @@
+import {defineStore} from "pinia";
+import {DictionaryStates} from "/@/stores/interface";
+import {request} from "/@/utils/service";
+
+export const BtnPermissionStore = defineStore('BtnPermission', {
+    state: (): DictionaryStates => ({
+        data: []
+    }),
+    actions: {
+        async getBtnPermissionStore() {
+            request({
+                url: '/api/system/menu_button/menu_button_all_permission/',
+                method: 'get',
+            }).then((ret: {
+                data: []
+            }) => {
+                // 转换数据格式并保存到pinia
+                let dataList = ret.data
+                this.data=dataList
+            })
+        },
+    },
+    persist: {
+        enabled: true,
+    },
+});
diff --git a/web/src/utils/authDirective.ts b/web/src/utils/authDirective.ts
index 5971e64fa..44a8871f9 100644
--- a/web/src/utils/authDirective.ts
+++ b/web/src/utils/authDirective.ts
@@ -1,7 +1,6 @@
 import type { App } from 'vue';
-import { useUserInfo } from '/@/stores/userInfo';
 import { judementSameArr } from '/@/utils/arrayOperation';
-
+import {BtnPermissionStore} from "/@/stores/btnPermission";
 /**
  * 用户权限指令
  * @directive 单个权限验证（v-auth="xxx"）
@@ -12,16 +11,16 @@ export function authDirective(app: App) {
 	// 单个权限验证（v-auth="xxx"）
 	app.directive('auth', {
 		mounted(el, binding) {
-			const stores = useUserInfo();
-			if (!stores.userInfos.authBtnList.some((v: string) => v === binding.value)) el.parentNode.removeChild(el);
+			const stores = BtnPermissionStore();
+			if (!stores.data.some((v: string) => v === binding.value)) el.parentNode.removeChild(el);
 		},
 	});
 	// 多个权限验证，满足一个则显示（v-auths="[xxx,xxx]"）
 	app.directive('auths', {
 		mounted(el, binding) {
 			let flag = false;
-			const stores = useUserInfo();
-			stores.userInfos.authBtnList.map((val: string) => {
+			const stores = BtnPermissionStore();
+			stores.data.map((val: string) => {
 				binding.value.map((v: string) => {
 					if (val === v) flag = true;
 				});
@@ -32,8 +31,8 @@ export function authDirective(app: App) {
 	// 多个权限验证，全部满足则显示（v-auth-all="[xxx,xxx]"）
 	app.directive('auth-all', {
 		mounted(el, binding) {
-			const stores = useUserInfo();
-			const flag = judementSameArr(binding.value, stores.userInfos.authBtnList);
+			const stores = BtnPermissionStore();
+			const flag = judementSameArr(binding.value, stores.data);
 			if (!flag) el.parentNode.removeChild(el);
 		},
 	});
diff --git a/web/src/utils/authFunction.ts b/web/src/utils/authFunction.ts
index 84c0ab468..c328520fc 100644
--- a/web/src/utils/authFunction.ts
+++ b/web/src/utils/authFunction.ts
@@ -1,14 +1,13 @@
-import { useUserInfo } from '/@/stores/userInfo';
 import { judementSameArr } from '/@/utils/arrayOperation';
-
+import {BtnPermissionStore} from "/@/stores/btnPermission";
 /**
  * 单个权限验证
  * @param value 权限值
  * @returns 有权限，返回 `true`，反之则反
  */
 export function auth(value: string): boolean {
-	const stores = useUserInfo();
-	return stores.userInfos.authBtnList.some((v: string) => v === value);
+	const stores = BtnPermissionStore();
+	return stores.data.some((v: string) => v === value);
 }
 
 /**
@@ -18,8 +17,8 @@ export function auth(value: string): boolean {
  */
 export function auths(value: Array<string>): boolean {
 	let flag = false;
-	const stores = useUserInfo();
-	stores.userInfos.authBtnList.map((val: string) => {
+	const stores = BtnPermissionStore();
+	stores.data.map((val: string) => {
 		value.map((v: string) => {
 			if (val === v) flag = true;
 		});
@@ -33,6 +32,6 @@ export function auths(value: Array<string>): boolean {
  * @returns 有权限，返回 `true`，反之则反
  */
 export function authAll(value: Array<string>): boolean {
-	const stores = useUserInfo();
-	return judementSameArr(value, stores.userInfos.authBtnList);
+	const stores = BtnPermissionStore();
+	return judementSameArr(value, stores.data);
 }
diff --git a/web/src/views/system/areas/crud.tsx b/web/src/views/system/areas/crud.tsx
index edf693536..01d186025 100644
--- a/web/src/views/system/areas/crud.tsx
+++ b/web/src/views/system/areas/crud.tsx
@@ -1,225 +1,244 @@
 import * as api from './api';
-import { dict, UserPageQuery, AddReq, DelReq, EditReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet } from '@fast-crud/fast-crud';
-import { dictionary } from '/@/utils/dictionary';
-import { successMessage } from '/@/utils/message';
+import {
+    dict,
+    UserPageQuery,
+    AddReq,
+    DelReq,
+    EditReq,
+    compute,
+    CreateCrudOptionsProps,
+    CreateCrudOptionsRet
+} from '@fast-crud/fast-crud';
+import {dictionary} from '/@/utils/dictionary';
+import {successMessage} from '/@/utils/message';
+import {auth} from "/@/utils/authFunction";
 
-export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
-	const pageRequest = async (query: UserPageQuery) => {
-		return await api.GetList(query);
-	};
-	const editRequest = async ({ form, row }: EditReq) => {
-		form.id = row.id;
-		return await api.UpdateObj(form);
-	};
-	const delRequest = async ({ row }: DelReq) => {
-		return await api.DelObj(row.id);
-	};
-	const addRequest = async ({ form }: AddReq) => {
-		return await api.AddObj(form);
-	};
+export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps): CreateCrudOptionsRet {
+    const pageRequest = async (query: UserPageQuery) => {
+        return await api.GetList(query);
+    };
+    const editRequest = async ({form, row}: EditReq) => {
+        form.id = row.id;
+        return await api.UpdateObj(form);
+    };
+    const delRequest = async ({row}: DelReq) => {
+        return await api.DelObj(row.id);
+    };
+    const addRequest = async ({form}: AddReq) => {
+        return await api.AddObj(form);
+    };
 
-	/**
-	 * 懒加载
-	 * @param row
-	 * @returns {Promise<unknown>}
-	 */
-	const loadContentMethod = (tree: any, treeNode: any, resolve: Function) => {
-		pageRequest({ pcode: tree.code }).then((res: APIResponseData) => {
-			resolve(res.data);
-		});
-	};
+    /**
+     * 懒加载
+     * @param row
+     * @returns {Promise<unknown>}
+     */
+    const loadContentMethod = (tree: any, treeNode: any, resolve: Function) => {
+        pageRequest({pcode: tree.code}).then((res: APIResponseData) => {
+            resolve(res.data);
+        });
+    };
 
-	return {
-		crudOptions: {
-			request: {
-				pageRequest,
-				addRequest,
-				editRequest,
-				delRequest,
-			},
-			rowHandle: {
-				//固定右侧
-				fixed: 'right',
-				width: 200,
-				buttons: {
-					view: {
-						show: false,
-					},
-					edit: {
-						iconRight: 'Edit',
-						type: 'text',
-					},
-					remove: {
-						iconRight: 'Delete',
-						type: 'text',
-					},
-				},
-			},
-			pagination: {
-				show: false,
-			},
-			table: {
-				rowKey: 'id',
-				lazy: true,
-				load: loadContentMethod,
-				treeProps: { children: 'children', hasChildren: 'hasChild' },
-			},
-			columns: {
-				_index: {
-					title: '序号',
-					form: { show: false },
-					column: {
-						type: 'index',
-						align: 'center',
-						width: '70px',
-						columnSetDisabled: true, //禁止在列设置中选择
-					},
-				},
-				// pcode: {
-				// 	title: '父级地区',
-				// 	show: false,
-				// 	search: {
-				// 		show: true,
-				// 	},
-				// 	type: 'dict-tree',
-				// 	form: {
-				// 		component: {
-				// 			showAllLevels: false, // 仅显示最后一级
-				// 			props: {
-				// 				elProps: {
-				// 					clearable: true,
-				// 					showAllLevels: false, // 仅显示最后一级
-				// 					props: {
-				// 						checkStrictly: true, // 可以不需要选到最后一级
-				// 						emitPath: false,
-				// 						clearable: true,
-				// 					},
-				// 				},
-				// 			},
-				// 		},
-				// 	},
-				// },
-				name: {
-					title: '名称',
-					search: {
-						show: true,
-					},
-					treeNode: true,
-					type: 'input',
-					column:{
-						minWidth: 120,
-					},
-					form: {
-						rules: [
-							// 表单校验规则
-							{ required: true, message: '名称必填项' },
-						],
-						component: {
-							placeholder: '请输入名称',
-						},
-					},
-				},
-				code: {
-					title: '地区编码',
-					search: {
-						show: true,
-					},
-					type: 'input',
-					column:{
-						minWidth: 90,
-					},
-					form: {
-						rules: [
-							// 表单校验规则
-							{ required: true, message: '地区编码必填项' },
-						],
-						component: {
-							placeholder: '请输入地区编码',
-						},
-					},
-				},
-				pinyin: {
-					title: '拼音',
-					search: {
-						disabled: true,
-					},
-					type: 'input',
-					column:{
-						minWidth: 120,
-					},
-					form: {
-						rules: [
-							// 表单校验规则
-							{ required: true, message: '拼音必填项' },
-						],
-						component: {
-							placeholder: '请输入拼音',
-						},
-					},
-				},
-				level: {
-					title: '地区层级',
-					search: {
-						disabled: true,
-					},
-					type: 'input',
-					column:{
-						minWidth: 100,
-					},
-					form: {
-						disabled: false,
-						rules: [
-							// 表单校验规则
-							{ required: true, message: '拼音必填项' },
-						],
-						component: {
-							placeholder: '请输入拼音',
-						},
-					},
-				},
-				initials: {
-					title: '首字母',
-					column:{
-						minWidth: 100,
-					},
-					form: {
-						rules: [
-							// 表单校验规则
-							{ required: true, message: '首字母必填项' },
-						],
+    return {
+        crudOptions: {
+            request: {
+                pageRequest,
+                addRequest,
+                editRequest,
+                delRequest,
+            },
+            actionbar: {
+                buttons: {
+                    add: {
+                        show: auth('area:Create'),
+                    }
+                }
+            },
+            rowHandle: {
+                //固定右侧
+                fixed: 'right',
+                width: 200,
+                buttons: {
+                    view: {
+                        show: false,
+                    },
+                    edit: {
+                        iconRight: 'Edit',
+                        type: 'text',
+						show: auth('area:Update')
+                    },
+                    remove: {
+                        iconRight: 'Delete',
+                        type: 'text',
+						show: auth('area:Delete')
+                    },
+                },
+            },
+            pagination: {
+                show: false,
+            },
+            table: {
+                rowKey: 'id',
+                lazy: true,
+                load: loadContentMethod,
+                treeProps: {children: 'children', hasChildren: 'hasChild'},
+            },
+            columns: {
+                _index: {
+                    title: '序号',
+                    form: {show: false},
+                    column: {
+                        type: 'index',
+                        align: 'center',
+                        width: '70px',
+                        columnSetDisabled: true, //禁止在列设置中选择
+                    },
+                },
+                // pcode: {
+                // 	title: '父级地区',
+                // 	show: false,
+                // 	search: {
+                // 		show: true,
+                // 	},
+                // 	type: 'dict-tree',
+                // 	form: {
+                // 		component: {
+                // 			showAllLevels: false, // 仅显示最后一级
+                // 			props: {
+                // 				elProps: {
+                // 					clearable: true,
+                // 					showAllLevels: false, // 仅显示最后一级
+                // 					props: {
+                // 						checkStrictly: true, // 可以不需要选到最后一级
+                // 						emitPath: false,
+                // 						clearable: true,
+                // 					},
+                // 				},
+                // 			},
+                // 		},
+                // 	},
+                // },
+                name: {
+                    title: '名称',
+                    search: {
+                        show: true,
+                    },
+                    treeNode: true,
+                    type: 'input',
+                    column: {
+                        minWidth: 120,
+                    },
+                    form: {
+                        rules: [
+                            // 表单校验规则
+                            {required: true, message: '名称必填项'},
+                        ],
+                        component: {
+                            placeholder: '请输入名称',
+                        },
+                    },
+                },
+                code: {
+                    title: '地区编码',
+                    search: {
+                        show: true,
+                    },
+                    type: 'input',
+                    column: {
+                        minWidth: 90,
+                    },
+                    form: {
+                        rules: [
+                            // 表单校验规则
+                            {required: true, message: '地区编码必填项'},
+                        ],
+                        component: {
+                            placeholder: '请输入地区编码',
+                        },
+                    },
+                },
+                pinyin: {
+                    title: '拼音',
+                    search: {
+                        disabled: true,
+                    },
+                    type: 'input',
+                    column: {
+                        minWidth: 120,
+                    },
+                    form: {
+                        rules: [
+                            // 表单校验规则
+                            {required: true, message: '拼音必填项'},
+                        ],
+                        component: {
+                            placeholder: '请输入拼音',
+                        },
+                    },
+                },
+                level: {
+                    title: '地区层级',
+                    search: {
+                        disabled: true,
+                    },
+                    type: 'input',
+                    column: {
+                        minWidth: 100,
+                    },
+                    form: {
+                        disabled: false,
+                        rules: [
+                            // 表单校验规则
+                            {required: true, message: '拼音必填项'},
+                        ],
+                        component: {
+                            placeholder: '请输入拼音',
+                        },
+                    },
+                },
+                initials: {
+                    title: '首字母',
+                    column: {
+                        minWidth: 100,
+                    },
+                    form: {
+                        rules: [
+                            // 表单校验规则
+                            {required: true, message: '首字母必填项'},
+                        ],
 
-						component: {
-							placeholder: '请输入首字母',
-						},
-					},
-				},
-				enable: {
-					title: '是否启用',
-					search: {
-						show: true,
-					},
-					type: 'dict-radio',
-					column: {
-						minWidth:90,
-						component: {
-							name: 'fs-dict-switch',
-							activeText: '',
-							inactiveText: '',
-							style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
-							onChange: compute((context) => {
-								return () => {
-									api.UpdateObj(context.row).then((res: APIResponseData) => {
-										successMessage(res.msg as string);
-									});
-								};
-							}),
-						},
-					},
-					dict: dict({
-						data: dictionary('button_status_bool'),
-					}),
-				},
-			},
-		},
-	};
+                        component: {
+                            placeholder: '请输入首字母',
+                        },
+                    },
+                },
+                enable: {
+                    title: '是否启用',
+                    search: {
+                        show: true,
+                    },
+                    type: 'dict-radio',
+                    column: {
+                        minWidth: 90,
+                        component: {
+                            name: 'fs-dict-switch',
+                            activeText: '',
+                            inactiveText: '',
+                            style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
+                            onChange: compute((context) => {
+                                return () => {
+                                    api.UpdateObj(context.row).then((res: APIResponseData) => {
+                                        successMessage(res.msg as string);
+                                    });
+                                };
+                            }),
+                        },
+                    },
+                    dict: dict({
+                        data: dictionary('button_status_bool'),
+                    }),
+                },
+            },
+        },
+    };
 };
diff --git a/web/src/views/system/dept/components/DeptUserCom/crud.tsx b/web/src/views/system/dept/components/DeptUserCom/crud.tsx
index afeaf9ae1..d3fb883ac 100644
--- a/web/src/views/system/dept/components/DeptUserCom/crud.tsx
+++ b/web/src/views/system/dept/components/DeptUserCom/crud.tsx
@@ -4,6 +4,7 @@ import { request } from '/@/utils/service';
 import * as api from './api';
 import { dictionary } from '/@/utils/dictionary';
 import { successMessage } from '/@/utils/message';
+import {auth} from "/@/utils/authFunction";
 
 export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
 	const pageRequest = async (query: UserPageQuery) => {
@@ -39,9 +40,6 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 		return await api.exportData(query);
 	};
 
-	//权限判定
-	const hasPermissions: any = inject('$hasPermissions');
-
 	return {
 		crudOptions: {
 			table: {
@@ -58,12 +56,12 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 			actionbar: {
 				buttons: {
 					add: {
-						show: hasPermissions('user:Create'),
-						// show:true
+						show: auth('user:Create')
 					},
 					export: {
 						text: '导出', //按钮文字
 						title: '导出', //鼠标停留显示的信息
+						show: auth('user:Export'),
 						click() {
 							return exportRequest(crudExpose!.getSearchFormData());
 						},
@@ -89,15 +87,15 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 						show: false,
 					},
 					edit: {
-						show: hasPermissions('user:Update'),
+						show: auth('user:Update'),
 					},
 					remove: {
-						show: hasPermissions('user:Delete'),
+						show: auth('user:Delete'),
 					},
 					custom: {
 						text: '重设密码',
 						type: 'primary',
-						show: hasPermissions('user:ResetPassword'),
+						show: auth('user:ResetPassword'),
 						tooltip: {
 							placement: 'top',
 							content: '重设密码',
diff --git a/web/src/views/system/dept/components/DeptUserCom/index.vue b/web/src/views/system/dept/components/DeptUserCom/index.vue
index 6538f204b..fb50ff90e 100644
--- a/web/src/views/system/dept/components/DeptUserCom/index.vue
+++ b/web/src/views/system/dept/components/DeptUserCom/index.vue
@@ -40,7 +40,7 @@
 			<el-button :icon="!showCount ? 'Hide' : 'View'" circle @click="showCount = !showCount"></el-button>
 		</template>
 		<template #actionbar-right>
-			<importExcel api="api/system/user/">导入 </importExcel>
+			<importExcel api="api/system/user/" v-auth="'user:Import'">导入 </importExcel>
 		</template>
 	</fs-crud>
 
diff --git a/web/src/views/system/dictionary/crud.tsx b/web/src/views/system/dictionary/crud.tsx
index 40a069a3e..ff057e049 100644
--- a/web/src/views/system/dictionary/crud.tsx
+++ b/web/src/views/system/dictionary/crud.tsx
@@ -3,7 +3,7 @@ import { dict, UserPageQuery, AddReq, DelReq, EditReq, compute, CreateCrudOption
 import { dictionary } from '/@/utils/dictionary';
 import { inject, nextTick, ref } from 'vue';
 import { successMessage } from '/@/utils/message';
-
+import {auth} from '/@/utils/authFunction';
 export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
 	const pageRequest = async (query: UserPageQuery) => {
 		return await api.GetList(query);
@@ -19,8 +19,6 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 		return await api.AddObj(form);
 	};
 
-	//权限判定
-	const hasPermissions = inject('$hasPermissions');
 
 	return {
 		crudOptions: {
@@ -40,17 +38,17 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 					edit: {
 						iconRight: 'Edit',
 						type: 'text',
-						show: hasPermissions('dictionary:Update'),
+						show: auth('dictionary:Update'),
 					},
 					remove: {
 						iconRight: 'Delete',
 						type: 'text',
-						show: hasPermissions('dictionary:Delete'),
+						show: auth('dictionary:Delete'),
 					},
 					custom: {
 						text: '字典配置',
 						type: 'text',
-						show: hasPermissions('dictionary:Update'),
+						show: auth('dictionary:Update'),
 						tooltip: {
 							placement: 'top',
 							content: '字典配置',
diff --git a/web/src/views/system/dictionary/subDict/index.vue b/web/src/views/system/dictionary/subDict/index.vue
index 65dd40092..ca4559784 100644
--- a/web/src/views/system/dictionary/subDict/index.vue
+++ b/web/src/views/system/dictionary/subDict/index.vue
@@ -1,8 +1,8 @@
 <template>
 	<el-drawer size="70%" v-model="drawer" direction="rtl" destroy-on-close :before-close="handleClose">
-		<fs-page>
-			<fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
-		</fs-page>
+		<div>
+      <fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
+    </div>
 	</el-drawer>
 </template>
 
diff --git a/web/src/views/system/fileList/crud.tsx b/web/src/views/system/fileList/crud.tsx
index 31a7ec2af..5c6a0d5a6 100644
--- a/web/src/views/system/fileList/crud.tsx
+++ b/web/src/views/system/fileList/crud.tsx
@@ -34,6 +34,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 				//固定右侧
 				fixed: 'right',
 				width: 200,
+				show:false,
 				buttons: {
 					view: {
 						show: false,
diff --git a/web/src/views/system/menu/components/MenuButtonCom/crud.tsx b/web/src/views/system/menu/components/MenuButtonCom/crud.tsx
index 0270ad5fd..c1a7a1f01 100644
--- a/web/src/views/system/menu/components/MenuButtonCom/crud.tsx
+++ b/web/src/views/system/menu/components/MenuButtonCom/crud.tsx
@@ -1,202 +1,215 @@
-import { AddReq, DelReq, EditReq, dict, CreateCrudOptionsRet, CreateCrudOptionsProps } from '@fast-crud/fast-crud';
+import {AddReq, DelReq, EditReq, dict, CreateCrudOptionsRet, CreateCrudOptionsProps} from '@fast-crud/fast-crud';
 import * as api from './api';
-
-import { request } from '/@/utils/service';
+import {auth} from '/@/utils/authFunction'
+import {request} from '/@/utils/service';
 //此处为crudOptions配置
-export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
-	const pageRequest = async () => {
-		if (context!.selectOptions.value.id) {
-			return await api.GetList({ menu: context!.selectOptions.value.id } as any);
-		} else {
-			return undefined;
-		}
-	};
-	const editRequest = async ({ form, row }: EditReq) => {
-		return await api.UpdateObj({ ...form, menu: row.menu });
-	};
-	const delRequest = async ({ row }: DelReq) => {
-		return await api.DelObj(row.id);
-	};
-	const addRequest = async ({ form }: AddReq) => {
-		return await api.AddObj({ ...form, ...{ menu: context!.selectOptions.value.id } });
-	};
-	return {
-		crudOptions: {
-			search: {
-				container: {
-					action: {
-						//按钮栏配置
-						col: {
-							span: 8,
-						},
-					},
-				},
-			},
-			rowHandle: {
-				//固定右侧
-				fixed: 'right',
-				width: 200,
-				buttons: {
-					view: {
-						show: false,
-					},
-					edit: {
-						icon: '',
-						type: 'primary',
-					},
-					remove: {
-						icon: '',
-						type: 'primary',
-					},
-				},
-			},
-			request: {
-				pageRequest,
-				addRequest,
-				editRequest,
-				delRequest,
-			},
-			form: {
-				col: { span: 24 },
-				labelWidth: '100px',
-				wrapper: {
-					is: 'el-dialog',
-					width: '600px',
-				},
-			},
-			columns: {
-				_index: {
-					title: '序号',
-					form: { show: false },
-					column: {
-						type: 'index',
-						align: 'center',
-						width: '70px',
-						columnSetDisabled: true, //禁止在列设置中选择
-					},
-				},
-				search: {
-					title: '关键词',
-					column: { show: false },
-					type: 'text',
-					search: { show: true },
-					form: {
-						show: false,
-						component: {
-							placeholder: '输入关键词搜索',
-						},
-					},
-				},
-				id: {
-					title: 'ID',
-					type: 'text',
-					column: { show: false },
-					search: { show: false },
-					form: { show: false },
-				},
-				name: {
-					title: '权限名称',
-					type: 'text',
-					search: { show: true },
-					column: {
-						minWidth: 120,
-						sortable: true,
-					},
-					form: {
-						rules: [{ required: true, message: '权限名称必填' }],
-						component: {
-							placeholder: '输入权限名称搜索',
-							props: {
-								clearable: true,
-								allowCreate: true,
-								filterable: true,
-							},
-						},
-						helper: {
-							render() {
-								return <el-alert title="手动输入" type="warning" description="页面中按钮的名称或者自定义一个名称" />;
-							},
-						},
-					},
-				},
-				value: {
-					title: '权限值',
-					type: 'text',
-					search: { show: false },
-					column: {
-						width: 200,
-						sortable: true,
-					},
-					form: {
-						rules: [{ required: true, message: '权限标识必填' }],
-						placeholder: '输入权限标识',
-						helper: {
-							render() {
-								return <el-alert title="唯一值" type="warning" description="用于判断前端按钮权限或接口权限" />;
-							},
-						},
-					},
-				},
-				method: {
-					title: '请求方式',
-					search: { show: false },
-					type: 'dict-select',
-					column: {
-						width: 120,
-						sortable: true,
-					},
-					dict: dict({
-						data: [
-							{ label: 'GET', value: 0 },
-							{ label: 'POST', value: 1, color: 'success' },
-							{ label: 'PUT', value: 2, color: 'warning' },
-							{ label: 'DELETE', value: 3, color: 'danger' },
-						],
-					}),
-					form: {
-						rules: [{ required: true, message: '必填项' }],
-					},
-				},
-				api: {
-					title: '接口地址',
-					search: { show: false },
-					type: 'dict-select',
-					dict: dict({
-						getData() {
-							return request({ url: '/swagger.json' }).then((res: any) => {
-								const ret = Object.keys(res.paths);
-								const data = [];
-								for (const item of ret) {
-									const obj: any = {};
-									obj.label = item;
-									obj.value = item;
-									data.push(obj);
-								}
-								return data;
-							});
-						},
-					}),
-					column: {
-						minWidth: 250,
-						sortable: true,
-					},
-					form: {
-						rules: [{ required: true, message: '必填项' }],
-						component: {
-							props: {
-								allowCreate: true,
-								filterable: true,
-								clearable: true,
-							},
-						},
-						helper: {
-							render() {
-								return <el-alert title="请正确填写，以免请求时被拦截。匹配单例使用正则,例如:/api/xx/.*?/" type="warning" />;
-							},
-						},
-					},
-				},
-			},
-		},
-	};
+export const createCrudOptions = function ({crudExpose, context}: CreateCrudOptionsProps): CreateCrudOptionsRet {
+    const pageRequest = async () => {
+        if (context!.selectOptions.value.id) {
+            return await api.GetList({menu: context!.selectOptions.value.id} as any);
+        } else {
+            return undefined;
+        }
+    };
+    const editRequest = async ({form, row}: EditReq) => {
+        return await api.UpdateObj({...form, menu: row.menu});
+    };
+    const delRequest = async ({row}: DelReq) => {
+        return await api.DelObj(row.id);
+    };
+    const addRequest = async ({form}: AddReq) => {
+        return await api.AddObj({...form, ...{menu: context!.selectOptions.value.id}});
+    };
+    return {
+        crudOptions: {
+            pagination:{
+                show:false
+            },
+            search: {
+                container: {
+                    action: {
+                        //按钮栏配置
+                        col: {
+                            span: 8,
+                        },
+                    },
+                },
+            },
+            actionbar: {
+                buttons: {
+                    add: {
+                        show: auth('btn:Create')
+                    },
+                },
+            },
+            rowHandle: {
+                //固定右侧
+                fixed: 'right',
+                width: 200,
+                buttons: {
+                    view: {
+                        show: false,
+                    },
+                    edit: {
+                        icon: '',
+                        type: 'primary',
+                        show: auth('btn:Update')
+                    },
+                    remove: {
+                        show: auth('btn:Delete')
+                    },
+                },
+            },
+            request: {
+                pageRequest,
+                addRequest,
+                editRequest,
+                delRequest,
+            },
+            form: {
+                col: {span: 24},
+                labelWidth: '100px',
+                wrapper: {
+                    is: 'el-dialog',
+                    width: '600px',
+                },
+            },
+            columns: {
+                _index: {
+                    title: '序号',
+                    form: {show: false},
+                    column: {
+                        type: 'index',
+                        align: 'center',
+                        width: '70px',
+                        columnSetDisabled: true, //禁止在列设置中选择
+                    },
+                },
+                search: {
+                    title: '关键词',
+                    column: {show: false},
+                    type: 'text',
+                    search: {show: true},
+                    form: {
+                        show: false,
+                        component: {
+                            placeholder: '输入关键词搜索',
+                        },
+                    },
+                },
+                id: {
+                    title: 'ID',
+                    type: 'text',
+                    column: {show: false},
+                    search: {show: false},
+                    form: {show: false},
+                },
+                name: {
+                    title: '权限名称',
+                    type: 'text',
+                    search: {show: true},
+                    column: {
+                        minWidth: 120,
+                        sortable: true,
+                    },
+                    form: {
+                        rules: [{required: true, message: '权限名称必填'}],
+                        component: {
+                            placeholder: '输入权限名称搜索',
+                            props: {
+                                clearable: true,
+                                allowCreate: true,
+                                filterable: true,
+                            },
+                        },
+                        helper: {
+                            render() {
+                                return <el-alert title="手动输入" type="warning"
+                                                 description="页面中按钮的名称或者自定义一个名称"/>;
+                            },
+                        },
+                    },
+                },
+                value: {
+                    title: '权限值',
+                    type: 'text',
+                    search: {show: false},
+                    column: {
+                        width: 200,
+                        sortable: true,
+                    },
+                    form: {
+                        rules: [{required: true, message: '权限标识必填'}],
+                        placeholder: '输入权限标识',
+                        helper: {
+                            render() {
+                                return <el-alert title="唯一值" type="warning"
+                                                 description="用于判断前端按钮权限或接口权限"/>;
+                            },
+                        },
+                    },
+                },
+                method: {
+                    title: '请求方式',
+                    search: {show: false},
+                    type: 'dict-select',
+                    column: {
+                        width: 120,
+                        sortable: true,
+                    },
+                    dict: dict({
+                        data: [
+                            {label: 'GET', value: 0},
+                            {label: 'POST', value: 1, color: 'success'},
+                            {label: 'PUT', value: 2, color: 'warning'},
+                            {label: 'DELETE', value: 3, color: 'danger'},
+                        ],
+                    }),
+                    form: {
+                        rules: [{required: true, message: '必填项'}],
+                    },
+                },
+                api: {
+                    title: '接口地址',
+                    search: {show: false},
+                    type: 'dict-select',
+                    dict: dict({
+                        getData() {
+                            return request({url: '/swagger.json'}).then((res: any) => {
+                                const ret = Object.keys(res.paths);
+                                const data = [];
+                                for (const item of ret) {
+                                    const obj: any = {};
+                                    obj.label = item;
+                                    obj.value = item;
+                                    data.push(obj);
+                                }
+                                return data;
+                            });
+                        },
+                    }),
+                    column: {
+                        minWidth: 250,
+                        sortable: true,
+                    },
+                    form: {
+                        rules: [{required: true, message: '必填项'}],
+                        component: {
+                            props: {
+                                allowCreate: true,
+                                filterable: true,
+                                clearable: true,
+                            },
+                        },
+                        helper: {
+                            render() {
+                                return <el-alert title="请正确填写，以免请求时被拦截。匹配单例使用正则,例如:/api/xx/.*?/"
+                                                 type="warning"/>;
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    };
 };
diff --git a/web/src/views/system/menu/components/MenuFieldCom/crud.tsx b/web/src/views/system/menu/components/MenuFieldCom/crud.tsx
index a99a1a40d..17d4a8316 100644
--- a/web/src/views/system/menu/components/MenuFieldCom/crud.tsx
+++ b/web/src/views/system/menu/components/MenuFieldCom/crud.tsx
@@ -2,8 +2,8 @@ import * as api from './api';
 import { dict, UserPageQuery, AddReq, DelReq, EditReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet } from '@fast-crud/fast-crud';
 import { request } from '/@/utils/service';
 import { dictionary } from '/@/utils/dictionary';
-
 import { inject } from 'vue';
+import {auth} from "/@/utils/authFunction";
 
 
 
@@ -28,11 +28,6 @@ export const createCrudOptions = function ({ crudExpose, props,modelDialog,selec
 		return await api.AddObj(form);
 	};
 
-
-
-	//权限判定
-	const hasPermissions = inject('$hasPermissions');
-
 	return {
 		crudOptions: {
 			request: {
@@ -46,9 +41,13 @@ export const createCrudOptions = function ({ crudExpose, props,modelDialog,selec
 			},
 			actionbar: {
 				buttons: {
+					add:{
+						show:auth('column:Create')
+					},
 					auto: {
 						text: '自动匹配',
 						type: 'success',
+						show:auth('column:Match'),
 						click: () => {
 							return modelDialog.value=true;
 						},
@@ -58,6 +57,17 @@ export const createCrudOptions = function ({ crudExpose, props,modelDialog,selec
 			rowHandle: {
 				//固定右侧
 				fixed: 'right',
+				buttons: {
+					view: {
+						show: false,
+					},
+					edit: {
+						show: auth('column:Update')
+					},
+					remove: {
+						show: auth('column:Delete')
+					},
+				},
 			},
 			form: {
 				col: { span: 24 },
diff --git a/web/src/views/system/menu/components/MenuTreeCom/index.vue b/web/src/views/system/menu/components/MenuTreeCom/index.vue
index 82363f5f6..91a9988e1 100644
--- a/web/src/views/system/menu/components/MenuTreeCom/index.vue
+++ b/web/src/views/system/menu/components/MenuTreeCom/index.vue
@@ -41,31 +41,31 @@
 
 		<div class="mtc-tags">
 			<el-tooltip effect="dark" content="新增">
-				<el-icon size="16" @click="handleUpdateMenu('create')" class="mtc-tags-icon">
+				<el-icon size="16" v-auth="'menu:Create'" @click="handleUpdateMenu('create')" class="mtc-tags-icon">
 					<Plus />
 				</el-icon>
 			</el-tooltip>
 
 			<el-tooltip effect="dark" content="编辑">
-				<el-icon size="16" @click="handleUpdateMenu('update')" class="mtc-tags-icon">
+				<el-icon size="16" v-auth="'menu:Update'" @click="handleUpdateMenu('update')" class="mtc-tags-icon">
 					<Edit />
 				</el-icon>
 			</el-tooltip>
 
 			<el-tooltip effect="dark" content="上移">
-				<el-icon size="16" @click="handleSort('up')" class="mtc-tags-icon">
+				<el-icon size="16" v-auth="'menu:MoveUp'" @click="handleSort('up')" class="mtc-tags-icon">
 					<Top />
 				</el-icon>
 			</el-tooltip>
 
 			<el-tooltip effect="dark" content="下移">
-				<el-icon size="16" @click="handleSort('down')" class="mtc-tags-icon">
+				<el-icon size="16" v-auth="'menu:MoveDown'" @click="handleSort('down')" class="mtc-tags-icon">
 					<Bottom />
 				</el-icon>
 			</el-tooltip>
 
 			<el-tooltip effect="dark" content="删除">
-				<el-icon size="16" @click="handleDeleteMenu()" class="mtc-tags-icon">
+				<el-icon size="16" v-auth="'menu:Delete'" @click="handleDeleteMenu()" class="mtc-tags-icon">
 					<Delete />
 				</el-icon>
 			</el-tooltip>
diff --git a/web/src/views/system/messageCenter/crud.tsx b/web/src/views/system/messageCenter/crud.tsx
index 427e69923..f77626e9e 100644
--- a/web/src/views/system/messageCenter/crud.tsx
+++ b/web/src/views/system/messageCenter/crud.tsx
@@ -3,7 +3,7 @@ import { dict, useCompute, PageQuery, AddReq, DelReq, EditReq, CrudExpose, CrudO
 import tableSelector from '/@/components/tableSelector/index.vue';
 import {shallowRef, computed, ref, inject} from 'vue';
 import manyToMany from '/@/components/manyToMany/index.vue';
-
+import {auth} from '/@/utils/authFunction'
 const { compute } = useCompute();
 
 interface CreateCrudOptionsTypes {
@@ -36,8 +36,6 @@ export const createCrudOptions = function ({ crudExpose, tabActivted }: { crudEx
 		return tabActivted.value === 'receive';
 	});
 
-	//权限判定
-	const hasPermissions = inject("$hasPermissions")
 
 	return {
 		crudOptions: {
@@ -51,7 +49,7 @@ export const createCrudOptions = function ({ crudExpose, tabActivted }: { crudEx
 				buttons:{
 					add:{
 						show:computed(() =>{
-							return tabActivted.value !== 'receive'
+							return tabActivted.value !== 'receive' && auth('messageCenter:Create');
 						})
 					},
 				}
@@ -67,7 +65,7 @@ export const createCrudOptions = function ({ crudExpose, tabActivted }: { crudEx
 						text:"查看",
 						type:'text',
 						iconRight:'View',
-						show:hasPermissions("messageCenter:Search"),
+						show:auth("messageCenter:Search"),
 						click({ index, row }) {
 							crudExpose.openView({ index, row });
 							if (tabActivted.value === 'receive') {
@@ -79,7 +77,7 @@ export const createCrudOptions = function ({ crudExpose, tabActivted }: { crudEx
 					remove: {
 						iconRight: 'Delete',
 						type: 'text',
-						show:hasPermissions('messageCenter:Delete')
+						show:auth('messageCenter:Delete')
 					},
 				},
 			},
diff --git a/web/src/views/system/role/crud.tsx b/web/src/views/system/role/crud.tsx
index f8916507b..73ec6d3c3 100644
--- a/web/src/views/system/role/crud.tsx
+++ b/web/src/views/system/role/crud.tsx
@@ -3,7 +3,7 @@ import * as api from './api';
 import { dictionary } from '/@/utils/dictionary';
 import { columnPermission } from '../../../utils/columnPermission';
 import { successMessage } from '../../../utils/message';
-
+import {auth} from '/@/utils/authFunction'
 interface CreateCrudOptionsTypes {
 	output: any;
 	crudOptions: CrudOptions;
@@ -14,12 +14,10 @@ export const createCrudOptions = function ({
 	crudExpose,
 	rolePermission,
 	handleDrawerOpen,
-	hasPermissions,
 }: {
 	crudExpose: CrudExpose;
 	rolePermission: any;
 	handleDrawerOpen: Function;
-	hasPermissions: Function;
 }): CreateCrudOptionsTypes {
 	const pageRequest = async (query: any) => {
 		return await api.GetList(query);
@@ -50,7 +48,7 @@ export const createCrudOptions = function ({
 			actionbar: {
 				buttons: {
 					add: {
-						show: hasPermissions('role:Create')
+						show: auth('role:Create')
 					}
 				}
 			},
@@ -63,31 +61,15 @@ export const createCrudOptions = function ({
 						show: true,
 					},
 					edit: {
-						show: hasPermissions('role:Update'),
+						show: auth('role:Update'),
 					},
 					remove: {
-						show: hasPermissions('role:Delete'),
+						show: auth('role:Delete'),
 					},
-					/* custom: {
-						type: 'primary',
-						text: '权限配置',
-						show: hasPermissions('role:Update'),
-						tooltip: {
-							placement: 'top',
-							content: '权限配置',
-						},
-						click: (context: any): void => {
-							const { row } = context;
-							// eslint-disable-next-line no-mixed-spaces-and-tabs
-							rolePermission.value.drawer = true;
-							rolePermission.value.editedRoleInfo = row;
-							rolePermission.value.initGet();
-						},
-					}, */
-					customNew: {
+					permission: {
 						type: 'primary',
 						text: '权限配置',
-						show: hasPermissions('role:Update'),
+						show: auth('role:Permission'),
 						tooltip: {
 							placement: 'top',
 							content: '权限配置',
@@ -134,9 +116,9 @@ export const createCrudOptions = function ({
 						sortable: 'custom',
 						show: columnPermission('name', 'is_query'),
 					},
-					addForm: {
-						show: columnPermission('name', 'is_create'),
-					},
+					// addForm: {
+					// 	show: columnPermission('name', 'is_create'),
+					// },
 					editForm: {
 						show: columnPermission('name', 'is_update'),
 					},
@@ -177,7 +159,6 @@ export const createCrudOptions = function ({
 					column: {
 						minWidth: 90,
 						sortable: 'custom',
-						show: columnPermission('sort', 'is_query'),
 					},
 					addForm: {
 						show: columnPermission('sort', 'is_create'),
diff --git a/web/src/views/system/role/index.vue b/web/src/views/system/role/index.vue
index f5d40115d..658a7b695 100644
--- a/web/src/views/system/role/index.vue
+++ b/web/src/views/system/role/index.vue
@@ -13,13 +13,14 @@
 </template>
 
 <script lang="ts" setup name="role">
-import { ref, onMounted, inject } from 'vue';
+import {ref, onMounted, inject, onBeforeUpdate} from 'vue';
 import { useColumnPermission } from '/@/stores/columnPermission';
 import { GetPermission } from './api';
 import { useExpose, useCrud } from '@fast-crud/fast-crud';
 import { createCrudOptions } from './crud';
 import PermissionComNew from './components/PermissionComNew/index.vue';
-
+import _ from "lodash-es";
+import {columnPermission} from "/@/utils/columnPermission";
 let drawerVisible = ref(false);
 let roleId = ref(null);
 let roleName = ref(null);
@@ -30,11 +31,11 @@ const crudRef = ref();
 // crud 配置的ref
 const crudBinding = ref();
 
-const hasPermissions: any = inject('$hasPermissions');
 
 const fetchColumnPermission = async () => {
 	const res = await GetPermission();
 	useColumnPermission().setPermissionData(res.data);
+  console.log(3333,res)
 };
 
 const handleDrawerOpen = (row: any) => {
@@ -48,21 +49,51 @@ const handleDrawerClose = () => {
 };
 
 const { crudExpose } = useExpose({ crudRef, crudBinding });
+const handlecolumnPermission = async (crudOptions:any)=>{
+  const res = await GetPermission();
+  const columns = crudOptions.columns;
+  for(let col in columns){
+    for(let i in res.data){
+      if(res.data[i].field_name === col){
+        columns[col].column.show = i['is_query']
+        columns[col].addForm = {
+          show:i['is_create']
+        }
+        columns[col].editForm = {
+          show:i['is_update']
+        }
+        break;
+      }
+    }
+  }
+}
 
-// 页面打开后获取列表数据
-onMounted(async () => {
-	await fetchColumnPermission();
+// 你的crud配置
+const { crudOptions } = createCrudOptions({ crudExpose, rolePermission, handleDrawerOpen });
 
-	// 你的crud配置
-	const { crudOptions } = createCrudOptions({ crudExpose, rolePermission, handleDrawerOpen, hasPermissions });
 
-	// 初始化crud配置
-	const { resetCrudOptions } = useCrud({
-		crudExpose,
-		crudOptions,
-		context: {},
-	});
 
+// 页面打开后获取列表数据
+onMounted( async () => {
+
+  await handlecolumnPermission(crudOptions)
+  // //合并新的crudOptions
+  // const newOptions = _.merge(crudOptions, {
+  //   columns: {
+  //     text: {
+  //       title: "追加字段",
+  //       type: "text"
+  //     }
+  //   }
+  // });
+  //重置crudBinding
+  // resetCrudOptions(newOptions);
+// 初始化crud配置
+  const { resetCrudOptions } = useCrud({
+    crudExpose,
+    crudOptions,
+    context: {},
+  });
 	crudExpose.doRefresh();
 });
 
diff --git a/web/src/views/system/rolePermission/api.ts b/web/src/views/system/rolePermission/api.ts
deleted file mode 100644
index f015ab77c..000000000
--- a/web/src/views/system/rolePermission/api.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { request } from "/@/utils/service";
-
-/**
- * 获取角色所拥有的菜单
- * @param params
- */
-export function GetMenu(params:any) {
-    return request({
-        url: '/api/system/role_menu_button_permission/role_get_menu/',
-        method: 'get',
-        params:params
-    });
-}
-
-/***
- * 新增权限
- * @param data
- * @constructor
- */
-export function SaveMenuPermission(data:any) {
-    return request({
-        url: '/api/system/role_menu_permission/save_auth/',
-        method: 'post',
-        data:data
-    });
-}
-
-
-/**
- * 获取菜单下的按钮
- * @param params
- * @constructor
- */
-export function GetMenuButton(params:any) {
-    return request({
-        url: '/api/system/role_menu_button_permission/role_menu_get_button/',
-        method: 'get',
-        params:params
-    });
-}
-
-
-
-
-
-/***
- * 根据角色获取数据权限范围
- * @constructor
- */
-export function GetDataScope (params:any={}) {
-    return request({
-        url: '/api/system/role_menu_button_permission/data_scope/',
-        method: 'get',
-        params: params
-    })
-}
-
-/***
- * 获取权限部门
- * @constructor
- */
-export function GetDataScopeDept (params:any) {
-    return request({
-        url: '/api/system/role_menu_button_permission/role_to_dept_all/',
-        method: 'get',
-        params: params
-    })
-}
-
-/***
- * 新增权限
- * @param data
- * @constructor
- */
-export function CreatePermission(data:any) {
-    return request({
-        url: '/api/system/role_menu_button_permission/',
-        method: 'post',
-        data:data
-    });
-}
-
-/***
- * 根据菜单获取菜单下按钮
- * @param params
- */
-export function getObj(params:any) {
-    return request({
-        url: '/api/system/role_menu_button_permission/menu_to_button/',
-        method: 'get',
-        params:params
-    });
-}
-
-/**
- * 删除按钮权限
- * @param data
- * @constructor
- */
-export function DeletePermission(data:any) {
-    return request({
-        url: `/api/system/role_menu_button_permission/${data.id}/`,
-        method: 'delete',
-        data:{}
-    });
-}
-
diff --git a/web/src/views/system/rolePermission/index.vue b/web/src/views/system/rolePermission/index.vue
deleted file mode 100644
index bf8896f99..000000000
--- a/web/src/views/system/rolePermission/index.vue
+++ /dev/null
@@ -1,432 +0,0 @@
-<template>
-    <el-drawer
-        size="70%"
-        v-model="drawer"
-        direction="rtl"
-        destroy-on-close
-        :before-close="handleClose"
-    >
-        <template #header>
-            <div>
-                <el-tag size="large" type="primary">当前角色:{{ editedRoleInfo.name }}</el-tag>
-            </div>
-        </template>
-        <div style="padding: 1em">
-            <el-row :gutter="10">
-                <el-col :xs="24" :sm="24" :md="8" :lg="6" :xl="6">
-                    <el-card header="菜单页面授权">
-                        <template #header>
-                            <div class="card-header">
-                                <el-tooltip effect="dark" content="点击菜单项,可对菜单下的按钮/接口授权"
-                                            placement="right">
-                                    <div>
-                                        <span>菜单页面</span>
-                                        <el-icon>
-                                            <QuestionFilled/>
-                                        </el-icon>
-                                    </div>
-                                </el-tooltip>
-                                <el-button size="mini" type="primary" @click="onSaveAuth">保存菜单授权</el-button>
-                            </div>
-                        </template>
-                        <el-tree :data="menuData"
-                                 ref="menuTree"
-                                 show-checkbox
-                                 node-key="id"
-                                 highlight-current
-                                 :expand-on-click-node="false"
-                                 :check-on-click-node="true"
-                                 :props="defaultProps"
-                                 @node-click="menuNodeClick"
-                        />
-                    </el-card>
-                </el-col>
-                <el-col :xs="24" :sm="24" :md="16" :lg="18" :xl="18">
-                    <!--          <el-alert title="对页面菜单下按钮授权"  description="新增或删除对菜单下的按钮/接口授权" type="warning" />-->
-                    <el-card v-if="isBtnPermissionShow">
-                        <template #header>
-                            <div class="card-header">
-                                <el-tooltip effect="dark" content="新增或删除对菜单下的按钮/接口授权" placement="right">
-                                    <div>
-                                        <span>按钮/接口授权</span>
-                                        <el-icon>
-                                            <QuestionFilled/>
-                                        </el-icon>
-                                    </div>
-                                </el-tooltip>
-                            </div>
-                        </template>
-                        <div>
-                            <el-divider content-position="left">{{ editedMenuInfo.name }}</el-divider>
-                            <el-button type="primary" size="small" style="margin-bottom: 0.5em"
-                                       @click="createBtnPermission">新增
-                            </el-button>
-                            <el-table size="small" :data="buttonPermissionData" border style="width: 100%">
-                                <el-table-column prop="menu_button" label="权限名称" width="100">
-                                    <template #default="scope">
-                                        <div>{{ formatMenuBtn(scope.row.menu_button) }}</div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column prop="data_range" label="权限范围" width="140">
-                                    <template #default="scope">
-                                        <div>{{ formatDataRange(scope.row.data_range) }}</div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column prop="dept" label="权限涉及部门"/>
-                                <el-table-column fixed="right" label="操作" width="120">
-                                    <template #default="scope">
-                                        <el-button type="danger" size="small" @click="onDeleteBtn(scope)">删除
-                                        </el-button>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-
-
-                        <!--          <el-divider content-position="left">字段授权</el-divider>-->
-                        <!--          <el-table size="small" :data="crudPermissionData" border style="width: 100%">-->
-                        <!--            <el-table-column prop="field" label="字段"></el-table-column>-->
-                        <!--            <el-table-column prop="table" label="列表显示">-->
-                        <!--              <template #default="scope">-->
-                        <!--                <div>-->
-                        <!--                  <el-switch size="mini" v-model="scope.row.table"/>-->
-                        <!--                </div>-->
-                        <!--              </template>-->
-                        <!--            </el-table-column>-->
-                        <!--            <el-table-column prop="view" label="表单查看">-->
-                        <!--              <template #default="scope">-->
-                        <!--                <div>-->
-                        <!--                  <el-switch size="mini" v-model="scope.row.view"/>-->
-                        <!--                </div>-->
-                        <!--              </template>-->
-                        <!--            </el-table-column>-->
-                        <!--            <el-table-column prop="edit" label="表单编辑">-->
-                        <!--              <template #default="scope">-->
-                        <!--                <div>-->
-                        <!--                  <el-switch size="mini" v-model="scope.row.edit"/>-->
-                        <!--                </div>-->
-                        <!--              </template>-->
-                        <!--            </el-table-column>-->
-                        <!--          </el-table>-->
-                    </el-card>
-                </el-col>
-            </el-row>
-            <el-dialog v-model="dialogFormVisible" width="400px" title="配置按钮权限">
-                <el-form ref="buttonFormRef" :model="buttonForm" :rules="buttonRules" label-width="120px">
-                    <el-form-item label="按钮" prop="menu_button">
-                        <el-select v-model="buttonForm.menu_button" placeholder="请选择按钮" @change="onChangeButton">
-                            <el-option v-for="(item,index) in buttonOptions" :key="index" :label="item.name"
-                                       :value="item.id"/>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="权限范围" prop="data_range">
-                        <el-select v-model="buttonForm.data_range" placeholder="请选择按钮">
-                            <el-option v-for="(item,index) in dataScopeOptions" :key="index" :label="item.label"
-                                       :value="item.value"/>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="数据部门" prop="dept" v-show="buttonForm.data_range === 4">
-                        <div class="dept-tree">
-                            <el-tree
-                                :data="deptOptions"
-                                show-checkbox
-                                default-expand-all
-                                :default-checked-keys="deptCheckedKeys"
-                                ref="deptTree"
-                                node-key="id"
-                                :check-strictly="true"
-                                :props="{ label: 'name' }"
-                            ></el-tree>
-                        </div>
-                    </el-form-item>
-                </el-form>
-                <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取消</el-button>
-        <el-button type="primary" @click="onSaveButtonForm">
-          确定
-        </el-button>
-      </span>
-                </template>
-            </el-dialog>
-        </div>
-    </el-drawer>
-</template>
-
-<script lang="ts" setup name="rolePermission">
-import {ref, defineExpose, reactive, toRefs} from 'vue'
-import {ElMessageBox} from 'element-plus'
-import * as api from './api'
-import type {FormRules, FormInstance} from 'element-plus'
-import {ElMessage} from 'element-plus'
-import XEUtils from 'xe-utils'
-//抽屉是否显示
-const drawer = ref(false)
-//当前编辑的角色信息
-const editedRoleInfo = ref({})
-
-//抽屉关闭确认
-const handleClose = (done: () => void) => {
-    ElMessageBox.confirm('您确定要关闭?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-    })
-        .then(() => {
-            done()
-        })
-        .catch(() => {
-            // catch error
-        })
-}
-
-/*****菜单的配置项***/
-const defaultProps = {
-    children: 'children',
-    label: 'name',
-    isLeaf: 'hasChild'
-}
-
-interface Tree {
-    name: string
-    children?: Tree[],
-    id: number
-}
-
-let menuData = ref<Tree>()
-//获取菜单
-const getMenuData = () => {
-    api.GetMenu({}).then((res: any) => {
-        const {data} = res
-        const list = XEUtils.toArrayTree(data, {parentKey: "parent", key:'menu_id',strict: true})
-        menuData.value = list
-    })
-}
-
-let isBtnPermissionShow = ref(false)
-let buttonOptions = ref<[]>()
-let editedMenuInfo = ref()
-//菜单节点点击事件
-const menuNodeClick = (node: any, obj: any) => {
-    isBtnPermissionShow.value = !node.is_catalog
-    if (!node.is_catalog) {
-        buttonOptions.value = []
-        editedMenuInfo.value = node
-        api.GetMenuButton({menu: node.menu_id}).then((res: any) => {
-            const {data} = res
-            buttonOptions.value = data
-        })
-        api.getObj({menu: node.menu_id, role: editedRoleInfo.value.id}).then((res: any) => {
-            const {data} = res
-            buttonPermissionData.value = data
-        })
-    }
-
-}
-const menuTree = ref()
-/*****菜单的配置项***/
-/***按钮授权的弹窗****/
-//是否显示新增表单
-const dialogFormVisible = ref(false)
-//部门树
-const deptTree = ref()
-//自定义部门数据
-const deptOptions = ref()
-//选中的部门数据
-const deptCheckedKeys = []
-//按钮表单
-const buttonForm = reactive({
-    menu_button: null,
-    role: null,
-    menu: null,
-    data_range: null,
-    dept: []
-})
-//按钮表格数据
-let buttonPermissionData = ref([])
-//按钮表单验证
-const buttonRules = reactive<FormRules>({
-    menu_button: [
-        {required: true, message: '必填项'}
-    ],
-    data_range: [
-        {required: true, message: '必填项'}
-    ]
-})
-//新增按钮
-const buttonFormRef = ref<FormInstance>()
-const createBtnPermission = () => {
-    dialogFormVisible.value = true
-    buttonForm.menu_button = null
-    buttonForm.menu = null
-    buttonForm.role = null
-    buttonForm.data_range = null
-    buttonForm.dept = []
-}
-//权限范围数据
-const dataScopeOptions = ref<[]>()
-//按钮值变化事件
-const onChangeButton = (val: any) => {
-    dataScopeOptions.value = []
-    //获取权限值范围
-    api.GetDataScope({menu_button: val}).then((res: any) => {
-        dataScopeOptions.value = res.data
-    })
-    //获取权限部门值
-    api.GetDataScopeDept({menu_button: val}).then((res: any) => {
-        deptOptions.value = XEUtils.toArrayTree(res.data, {parentKey: 'parent', strict: false})
-    })
-
-}
-//过滤按钮名称
-const formatMenuBtn = (val: any) => {
-    let obj: any = buttonOptions.value?.find((item: any) => {
-        return item.id === val
-    })
-    return obj ? obj.name : null
-}
-//过滤权限范围
-const formatDataRange = (val: any) => {
-    let obj: any = [
-        {
-            "value": 0,
-            "label": '仅本人数据权限'
-        },
-        {
-            "value": 1,
-            "label": '本部门及以下数据权限'
-        },
-        {
-            "value": 2,
-            "label": '本部门数据权限'
-        },
-        {
-            "value": 3,
-            "label": '全部数据权限'
-        },
-        {
-            "value": 4,
-            "label": '自定义数据权限'
-        }
-    ].find((item: any) => {
-        return item.value === val
-    })
-    return obj ? obj.label : null
-}
-//保存按钮表单
-
-const onSaveButtonForm = async () => {
-    const {id: roleId} = editedRoleInfo.value
-    const {id: menuId} = editedMenuInfo.value
-    const form: any = Object.assign({}, buttonForm)
-    form.role = roleId
-    form.menu = menuId
-    //选中的部门
-    const checkedList = deptTree.value.getCheckedKeys()
-    form.dept = checkedList
-    if (!buttonFormRef.value) return
-    await buttonFormRef.value.validate((valid, fields) => {
-        if (valid) {
-            api.CreatePermission(form).then((res: any) => {
-                const {data} = res
-                buttonPermissionData.value.push(data)
-                dialogFormVisible.value = false
-                ElMessage({
-                    type: 'success',
-                    message: res.msg,
-                })
-            })
-        } else {
-            ElMessage({
-                type: 'error',
-                title: '提交错误',
-                message: 'F12控制台看详情',
-            })
-            console.log('提交错误', fields)
-        }
-    })
-
-}
-//删除按钮权限
-const onDeleteBtn = (scope: any) => {
-    const {row, $index} = scope
-    ElMessageBox.confirm(
-        '您是否要删除数据?',
-        '温馨提示',
-        {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-        }
-    ).then(() => {
-        api.DeletePermission({id: row.id}).then((res: any) => {
-            buttonPermissionData.value.splice($index, 1)
-            ElMessage({
-                type: 'success',
-                message: res.msg,
-            })
-        })
-    })
-        .catch(() => {
-            ElMessage({
-                type: 'info',
-                message: '取消删除',
-            })
-        })
-
-}
-/***按钮授权的弹窗****/
-//初始化数据
-const initGet = () => {
-    getMenuData()
-}
-
-/**
- * 保存授权
- */
-const onSaveAuth = () => {
-    //选中的菜单
-    const checkedList = menuTree.value.getCheckedKeys()
-    //半选中的菜单
-    const halfCheckedList = menuTree.value.getHalfCheckedKeys()
-    //合并的菜单数据
-    const menuIdList = [...checkedList, ...halfCheckedList]
-    // console.log(menuIdList)
-    const {id: roleId} = editedRoleInfo.value
-    const data = {
-        role: roleId,
-        menu: menuIdList
-    }
-    api.SaveMenuPermission(data).then((res: any) => {
-        ElMessage({
-            message: res.msg,
-            type: 'success',
-        })
-    })
-}
-
-
-defineExpose({drawer, editedRoleInfo, initGet})
-</script>
-
-<style scoped>
-.card-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-
-.dept-tree::-webkit-scrollbar {
-    display: none; /* Chrome Safari */
-}
-
-.dept-tree {
-    height: 160px;
-    overflow-y: scroll;
-    scrollbar-width: none; /* firefox */
-    -ms-overflow-style: none; /* IE 10+ */
-    border: 1px solid #e1e1e1;
-    width: 16em;
-    border-radius: 2px;
-}
-</style>
diff --git a/web/src/views/system/user/crud.tsx b/web/src/views/system/user/crud.tsx
index 2165cf4b6..44b97a5d5 100644
--- a/web/src/views/system/user/crud.tsx
+++ b/web/src/views/system/user/crud.tsx
@@ -3,7 +3,7 @@ import { dict, UserPageQuery, AddReq, DelReq, EditReq, compute, CreateCrudOption
 import { request } from '/@/utils/service';
 import { dictionary } from '/@/utils/dictionary';
 import { successMessage } from '/@/utils/message';
-import { inject } from 'vue';
+import { auth } from '/@/utils/authFunction';
 
 export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
 	const pageRequest = async (query: UserPageQuery) => {
@@ -24,8 +24,6 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 		return await api.exportData(query)
 	}
 
-	//权限判定
-	const hasPermissions:any = inject('$hasPermissions');
 
 	return {
 		crudOptions: {
@@ -43,7 +41,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 			actionbar: {
 				buttons: {
 					add: {
-						show: hasPermissions('user:Create')
+						show: auth('user:Create')
 					},
 					export:{
 						text:"导出",//按钮文字
@@ -65,17 +63,17 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					edit: {
 						iconRight: 'Edit',
 						type: 'text',
-						show: hasPermissions('user:Update'),
+						show: auth('user:Update'),
 					},
 					remove: {
 						iconRight: 'Delete',
 						type: 'text',
-						show: hasPermissions('user:Delete'),
+						show: auth('user:Delete'),
 					},
                     custom: {
 						text: '重设密码',
 						type: 'text',
-						show: hasPermissions('user:ResetPassword'),
+						show: auth('user:ResetPassword'),
 						tooltip: {
 							placement: 'top',
 							content: '重设密码',
diff --git a/web/src/views/system/whiteList/crud.tsx b/web/src/views/system/whiteList/crud.tsx
index e6dade926..7104cdaed 100644
--- a/web/src/views/system/whiteList/crud.tsx
+++ b/web/src/views/system/whiteList/crud.tsx
@@ -1,237 +1,251 @@
 import * as api from './api';
-import { dict, UserPageQuery, AddReq, DelReq, EditReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet } from '@fast-crud/fast-crud';
-import { request } from '/@/utils/service';
-import { dictionary } from '/@/utils/dictionary';
-import { successMessage } from '/@/utils/message';
-import {inject} from "vue";
+import {
+    dict,
+    UserPageQuery,
+    AddReq,
+    DelReq,
+    EditReq,
+    compute,
+    CreateCrudOptionsProps,
+    CreateCrudOptionsRet
+} from '@fast-crud/fast-crud';
+import {request} from '/@/utils/service';
+import {dictionary} from '/@/utils/dictionary';
+import {successMessage} from '/@/utils/message';
+import {auth} from '/@/utils/authFunction'
 
-export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
-	const pageRequest = async (query: UserPageQuery) => {
-		return await api.GetList(query);
-	};
-	const editRequest = async ({ form, row }: EditReq) => {
-		form.id = row.id;
-		return await api.UpdateObj(form);
-	};
-	const delRequest = async ({ row }: DelReq) => {
-		return await api.DelObj(row.id);
-	};
-	const addRequest = async ({ form }: AddReq) => {
-		return await api.AddObj(form);
-	};
+export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps): CreateCrudOptionsRet {
+    const pageRequest = async (query: UserPageQuery) => {
+        return await api.GetList(query);
+    };
+    const editRequest = async ({form, row}: EditReq) => {
+        form.id = row.id;
+        return await api.UpdateObj(form);
+    };
+    const delRequest = async ({row}: DelReq) => {
+        return await api.DelObj(row.id);
+    };
+    const addRequest = async ({form}: AddReq) => {
+        return await api.AddObj(form);
+    };
 
-	//权限判定
-	const hasPermissions = inject("$hasPermissions")
 
-	return {
-		crudOptions: {
-			request: {
-				pageRequest,
-				addRequest,
-				editRequest,
-				delRequest,
-			},
-			rowHandle: {
-				//固定右侧
-				fixed: 'right',
-				width: 150,
-				buttons: {
-					view: {
-						show: false,
-					},
-					edit: {
-						iconRight: 'Edit',
-						type: 'text',
-						show:hasPermissions("api_white_list:Update")
-					},
-					remove: {
-						iconRight: 'Delete',
-						type: 'text',
-						show:hasPermissions("api_white_list:Delete")
-					},
-				},
-			},
-			form: {
-				col: { span: 24 },
-				labelWidth: '110px',
-				wrapper: {
-					is: 'el-dialog',
-					width: '600px',
-				},
-			},
-			columns: {
-				_index: {
-					title: '序号',
-					form: { show: false },
-					column: {
-						//type: 'index',
-						align: 'center',
-						width: '70px',
-						columnSetDisabled: true, //禁止在列设置中选择
-						//@ts-ignore
-						formatter: (context) => {
-							//计算序号,你可以自定义计算规则，此处为翻页累加
-							let index = context.index ?? 1;
-							let pagination: any = crudExpose!.crudBinding.value.pagination;
-							return ((pagination.currentPage ?? 1) - 1) * pagination.pageSize + index + 1;
-						},
-					},
-				},
-				search: {
-					title: '关键词',
-					column: {
-						show: false,
-					},
-					search: {
-						show: true,
-						component: {
-							props: {
-								clearable: true,
-							},
-							placeholder: '请输入关键词',
-						},
-					},
-					form: {
-						show: false,
-						component: {
-							props: {
-								clearable: true,
-							},
-						},
-					},
-				},
-				method: {
-					title: '请求方式',
-					sortable: 'custom',
-					search: {
-						disabled: false,
-					},
-					type: 'dict-select',
-					dict: dict({
-						data: [
-							{
-								label: 'GET',
-								value: 0,
-							},
-							{
-								label: 'POST',
-								value: 1,
-							},
-							{
-								label: 'PUT',
-								value: 2,
-							},
-							{
-								label: 'DELETE',
-								value: 3,
-							},
-							{
-								label: 'PATCH',
-								value: 4,
-							},
-						],
-					}),
-					column:{
-						minWidth: 120,
-					},
-					form: {
-						rules: [
-							// 表单校验规则
-							{
-								required: true,
-								message: '必填项',
-							},
-						],
-						component: {
-							span: 12,
-						},
-						itemProps: {
-							class: { yxtInput: true },
-						},
-					},
-				},
-				url: {
-					title: '接口地址',
-					sortable: 'custom',
-					search: {
-						disabled: true,
-					},
-					type: 'dict-select',
-					dict: dict({
-						async getData(dict: any) {
-							return request('/swagger.json').then((ret: any) => {
-								const res = Object.keys(ret.paths);
-								const data = [];
-								for (const item of res) {
-									const obj = { label: '', value: '' };
-									obj.label = item;
-									obj.value = item;
-									data.push(obj);
-								}
-								return data;
-							});
-						},
-					}),
-					column:{
-						minWidth: 200,
-					},
-					form: {
-						rules: [
-							// 表单校验规则
-							{
-								required: true,
-								message: '必填项',
-							},
-						],
-						component: {
-							span: 24,
-							props: {
-								elProps: {
-									allowCreate: true,
-									filterable: true,
-									clearable: true,
-								},
-							},
-						},
-						itemProps: {
-							class: { yxtInput: true },
-						},
-						helper: {
-							position: 'label',
-							tooltip: {
-								placement: 'top-start',
-							},
-							text: '请正确填写，以免请求时被拦截。匹配单例使用正则,例如:/api/xx/.*?/',
-						},
-					},
-				},
-				enable_datasource: {
-					title: '数据权限认证',
-					search: {
-						disabled: false,
-					},
-					type: 'dict-radio',
-					column: {
-						minWidth:120,
-						component: {
-							name: 'fs-dict-switch',
-							activeText: '',
-							inactiveText: '',
-							style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
-							onChange: compute((context) => {
-								return () => {
-									api.UpdateObj(context.row).then((res: APIResponseData) => {
-										successMessage(res.msg as string);
-									});
-								};
-							}),
-						},
-					},
-					dict: dict({
-						data: dictionary('button_status_bool'),
-					}),
-				},
-			},
-		},
-	};
+    return {
+        crudOptions: {
+            request: {
+                pageRequest,
+                addRequest,
+                editRequest,
+                delRequest,
+            },
+            actionbar: {
+                buttons: {
+                    add: {
+                        show: auth('api_white_list:Create')
+                    }
+                }
+            },
+            rowHandle: {
+                //固定右侧
+                fixed: 'right',
+                width: 150,
+                buttons: {
+                    view: {
+                        show: false,
+                    },
+                    edit: {
+                        iconRight: 'Edit',
+                        type: 'text',
+                        show: auth("api_white_list:Update")
+                    },
+                    remove: {
+                        iconRight: 'Delete',
+                        type: 'text',
+                        show: auth("api_white_list:Delete")
+                    },
+                },
+            },
+            form: {
+                col: {span: 24},
+                labelWidth: '110px',
+                wrapper: {
+                    is: 'el-dialog',
+                    width: '600px',
+                },
+            },
+            columns: {
+                _index: {
+                    title: '序号',
+                    form: {show: false},
+                    column: {
+                        //type: 'index',
+                        align: 'center',
+                        width: '70px',
+                        columnSetDisabled: true, //禁止在列设置中选择
+                        //@ts-ignore
+                        formatter: (context) => {
+                            //计算序号,你可以自定义计算规则，此处为翻页累加
+                            let index = context.index ?? 1;
+                            let pagination: any = crudExpose!.crudBinding.value.pagination;
+                            return ((pagination.currentPage ?? 1) - 1) * pagination.pageSize + index + 1;
+                        },
+                    },
+                },
+                search: {
+                    title: '关键词',
+                    column: {
+                        show: false,
+                    },
+                    search: {
+                        show: true,
+                        component: {
+                            props: {
+                                clearable: true,
+                            },
+                            placeholder: '请输入关键词',
+                        },
+                    },
+                    form: {
+                        show: false,
+                        component: {
+                            props: {
+                                clearable: true,
+                            },
+                        },
+                    },
+                },
+                method: {
+                    title: '请求方式',
+                    sortable: 'custom',
+                    search: {
+                        disabled: false,
+                    },
+                    type: 'dict-select',
+                    dict: dict({
+                        data: [
+                            {
+                                label: 'GET',
+                                value: 0,
+                            },
+                            {
+                                label: 'POST',
+                                value: 1,
+                            },
+                            {
+                                label: 'PUT',
+                                value: 2,
+                            },
+                            {
+                                label: 'DELETE',
+                                value: 3,
+                            },
+                            {
+                                label: 'PATCH',
+                                value: 4,
+                            },
+                        ],
+                    }),
+                    column: {
+                        minWidth: 120,
+                    },
+                    form: {
+                        rules: [
+                            // 表单校验规则
+                            {
+                                required: true,
+                                message: '必填项',
+                            },
+                        ],
+                        component: {
+                            span: 12,
+                        },
+                        itemProps: {
+                            class: {yxtInput: true},
+                        },
+                    },
+                },
+                url: {
+                    title: '接口地址',
+                    sortable: 'custom',
+                    search: {
+                        disabled: true,
+                    },
+                    type: 'dict-select',
+                    dict: dict({
+                        async getData(dict: any) {
+                            return request('/swagger.json').then((ret: any) => {
+                                const res = Object.keys(ret.paths);
+                                const data = [];
+                                for (const item of res) {
+                                    const obj = {label: '', value: ''};
+                                    obj.label = item;
+                                    obj.value = item;
+                                    data.push(obj);
+                                }
+                                return data;
+                            });
+                        },
+                    }),
+                    column: {
+                        minWidth: 200,
+                    },
+                    form: {
+                        rules: [
+                            // 表单校验规则
+                            {
+                                required: true,
+                                message: '必填项',
+                            },
+                        ],
+                        component: {
+                            span: 24,
+                            props: {
+                                elProps: {
+                                    allowCreate: true,
+                                    filterable: true,
+                                    clearable: true,
+                                },
+                            },
+                        },
+                        itemProps: {
+                            class: {yxtInput: true},
+                        },
+                        helper: {
+                            position: 'label',
+                            tooltip: {
+                                placement: 'top-start',
+                            },
+                            text: '请正确填写，以免请求时被拦截。匹配单例使用正则,例如:/api/xx/.*?/',
+                        },
+                    },
+                },
+                enable_datasource: {
+                    title: '数据权限认证',
+                    search: {
+                        disabled: false,
+                    },
+                    type: 'dict-radio',
+                    column: {
+                        minWidth: 120,
+                        component: {
+                            name: 'fs-dict-switch',
+                            activeText: '',
+                            inactiveText: '',
+                            style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
+                            onChange: compute((context) => {
+                                return () => {
+                                    api.UpdateObj(context.row).then((res: APIResponseData) => {
+                                        successMessage(res.msg as string);
+                                    });
+                                };
+                            }),
+                        },
+                    },
+                    dict: dict({
+                        data: dictionary('button_status_bool'),
+                    }),
+                },
+            },
+        },
+    };
 };
-- 
Gitee


From fca82c093a960b948223484347851dfb0140b23a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Fri, 24 Nov 2023 15:25:41 +0800
Subject: [PATCH 27/40] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96deep?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/layout/navBars/breadcrumb/user.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/layout/navBars/breadcrumb/user.vue b/web/src/layout/navBars/breadcrumb/user.vue
index 620a07690..61793c974 100644
--- a/web/src/layout/navBars/breadcrumb/user.vue
+++ b/web/src/layout/navBars/breadcrumb/user.vue
@@ -299,7 +299,7 @@ const messageCenter = messageCenterStore();
 	}
   .online-status{
     cursor: pointer;
-    :deep .el-badge__content.is-fixed {
+    :deep(.el-badge__content.is-fixed) {
       top: 30px;
       font-size: 14px;
       left: 5px;
@@ -311,7 +311,7 @@ const messageCenter = messageCenterStore();
   }
   .online-down{
     cursor: pointer;
-    :deep .el-badge__content.is-fixed {
+    :deep(.el-badge__content.is-fixed) {
       top: 30px;
       font-size: 14px;
       left: 5px;
-- 
Gitee


From 4b77fb903c0970c3a72b6a0716e8e8a4a3535981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Fri, 24 Nov 2023 15:37:47 +0800
Subject: [PATCH 28/40] =?UTF-8?q?refactor:=20=E6=A3=80=E6=B5=8B=E7=9B=AE?=
 =?UTF-8?q?=E5=89=8D=E6=89=80=E6=9C=89=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/layout/upgrade/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/src/layout/upgrade/index.vue b/web/src/layout/upgrade/index.vue
index 89654ca95..a10795434 100644
--- a/web/src/layout/upgrade/index.vue
+++ b/web/src/layout/upgrade/index.vue
@@ -17,15 +17,15 @@
 			<div class="upgrade-content">
 				{{ getThemeConfig.globalTitle }} {{ $t('message.upgrade.msg') }}
 				<div class="mt5">
-					<el-link type="primary" class="font12" href=https://gitee.com/huge-dream/django-vue3-admin/blob/master/CHANGELOG.md" target="_black">
+					<el-link type="primary" class="font12" href="https://gitee.com/huge-dream/django-vue3-admin/blob/master/CHANGELOG.md" target="_black">
 						CHANGELOG.md
 					</el-link>
 				</div>
 				<div class="upgrade-content-desc mt5">{{ $t('message.upgrade.desc') }}</div>
 			</div>
 			<div class="upgrade-btn">
-				<el-button round size="default" type="info" text @click="onCancel">{{ $t('message.upgrade.btnOne') }}</el-button>
-				<el-button type="primary" round size="default" @click="onUpgrade" :loading="state.isLoading">{{ state.btnTxt }}</el-button>
+				<el-button round size="default" type="info" text  @click="onCancel" >{{ $t('message.upgrade.btnOne') }}</el-button>
+				<el-button type="primary" round size="default" @click="onUpgrade"  :loading="state.isLoading" >{{ state.btnTxt }}</el-button>
 			</div>
 		</el-dialog>
 	</div>
-- 
Gitee


From f291885d57ca3a2d2cb48841702054c668e0e89f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Sun, 26 Nov 2023 11:03:26 +0800
Subject: [PATCH 29/40] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=9D=E5=A7=8B=E5=8C=96=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dvadmin/system/fixtures/init_menu.json    | 1314 +++++++++--------
 1 file changed, 687 insertions(+), 627 deletions(-)

diff --git a/backend/dvadmin/system/fixtures/init_menu.json b/backend/dvadmin/system/fixtures/init_menu.json
index 2c26ccc61..a054af292 100644
--- a/backend/dvadmin/system/fixtures/init_menu.json
+++ b/backend/dvadmin/system/fixtures/init_menu.json
@@ -1,644 +1,704 @@
 [
-    {
-        "name": "系统管理",
-        "icon": "iconfont icon-xitongshezhi",
+  {
+    "name": "系统管理",
+    "icon": "iconfont icon-xitongshezhi",
+    "sort": 1,
+    "is_link": false,
+    "is_catalog": true,
+    "web_path": "/system",
+    "component": "",
+    "component_name": "",
+    "status": true,
+    "cache": false,
+    "visible": true,
+    "children": [
+      {
+        "name": "菜单管理",
+        "icon": "iconfont icon-caidan",
         "sort": 1,
         "is_link": false,
-        "is_catalog": true,
-        "web_path": "/system",
-        "component": "",
-        "component_name": "",
+        "is_catalog": false,
+        "web_path": "/menu",
+        "component": "system/menu/index",
+        "component_name": "menu",
         "status": true,
         "cache": false,
         "visible": true,
-        "children": [
-            {
-                "name": "菜单管理",
-                "icon": "iconfont icon-caidan",
-                "sort": 1,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/menu",
-                "component": "system/menu/index",
-                "component_name": "menu",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "查询",
-                        "value": "menu:Search",
-                        "api": "/api/system/menu/",
-                        "method": 0
-                    },
-                    {
-                        "name": "详情",
-                        "value": "menu:Retrieve",
-                        "api": "/api/system/menu/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "新增",
-                        "value": "menu:Create",
-                        "api": "/api/system/menu/",
-                        "method": 1
-                    },
-                    {
-                        "name": "编辑",
-                        "value": "menu:Update",
-                        "api": "/api/system/menu/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "删除",
-                        "value": "menu:Delete",
-                        "api": "/api/system/menu/{id}/",
-                        "method": 3
-                    },
-                    {
-                        "name": "查询所有",
-                        "value": "menu:SearchAll",
-                        "api": "/api/system/menu/get_all_menu/",
-                        "method": 0
-                    },
-                    {
-                        "name": "路由",
-                        "value": "menu:router",
-                        "api": "/api/system/menu/web_router/",
-                        "method": 0
-                    },
-                    {
-                        "name": "上移",
-                        "value": "menu:MoveUp",
-                        "api": "/api/system/menu/mode_up/",
-                        "method": 1
-                    },
-                    {
-                        "name": "下移",
-                        "value": "menu:MoveDown",
-                        "api": "/api/system/menu/mode_down/",
-                        "method": 1
-                    }
-                ]
-            },
-            {
-                "name": "部门管理",
-                "icon": "ele-OfficeBuilding",
-                "sort": 3,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/dept",
-                "component": "system/dept/index",
-                "component_name": "dept",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "查询",
-                        "value": "dept:Search",
-                        "api": "/api/system/dept/",
-                        "method": 0
-                    },
-                    {
-                        "name": "详情",
-                        "value": "dept:Retrieve",
-                        "api": "/api/system/dept/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "新增",
-                        "value": "dept:Create",
-                        "api": "/api/system/dept/",
-                        "method": 1
-                    },
-                    {
-                        "name": "编辑",
-                        "value": "dept:Update",
-                        "api": "/api/system/dept/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "删除",
-                        "value": "dept:Delete",
-                        "api": "/api/system/dept/{id}/",
-                        "method": 3
-                    },
-                    {
-                        "name": "查询所有",
-                        "value": "dept:SearchAll",
-                        "api": "/api/system/dept/all_dept/",
-                        "method": 0
-                    },
-                    {
-                        "name": "懒加载查询所有",
-                        "value": "dept:LazySearchAll",
-                        "api": "/api/system/dept/dept_lazy_tree/",
-                        "method": 0
-                    },
-                    {
-                        "name": "上移",
-                        "value": "dept:MoveUp",
-                        "api": "/api/system/dept/mode_up/",
-                        "method": 1
-                    },
-                    {
-                        "name": "下移",
-                        "value": "dept:MoveDown",
-                        "api": "/api/system/dept/mode_down/",
-                        "method": 1
-                    },
-                    {
-                        "name": "头信息",
-                        "value": "dept:HeaderInfo",
-                        "api": "/api/system/dept/dept_info/",
-                        "method": 0
-                    }
-                ]
-            },
-            {
-                "name": "角色管理",
-                "icon": "ele-ColdDrink",
-                "sort": 4,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/role",
-                "component": "system/role/index",
-                "component_name": "role",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "查询",
-                        "value": "role:Search",
-                        "api": "/api/system/role/",
-                        "method": 0
-                    },
-                    {
-                        "name": "详情",
-                        "value": "role:Retrieve",
-                        "api": "/api/system/role/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "新增",
-                        "value": "role:Create",
-                        "api": "/api/system/role/",
-                        "method": 1
-                    },
-                    {
-                        "name": "编辑",
-                        "value": "role:Update",
-                        "api": "/api/system/role/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "保存",
-                        "value": "role:Save",
-                        "api": "/api/system/role/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "删除",
-                        "value": "role:Delete",
-                        "api": "/api/system/role/{id}/",
-                        "method": 3
-                    }
-                ]
-            },
-            {
-                "name": "用户管理",
-                "icon": "iconfont icon-icon-",
-                "sort": 6,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/user",
-                "component": "system/user/index",
-                "component_name": "user",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "查询",
-                        "value": "user:Search",
-                        "api": "/api/system/user/",
-                        "method": 0
-                    },
-                    {
-                        "name": "详情",
-                        "value": "user:Retrieve",
-                        "api": "/api/system/user/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "新增",
-                        "value": "user:Create",
-                        "api": "/api/system/user/",
-                        "method": 1
-                    },
-                    {
-                        "name": "导出",
-                        "value": "user:Export",
-                        "api": "/api/system/user/export/",
-                        "method": 1
-                    },
-                    {
-                        "name": "导入",
-                        "value": "user:Import",
-                        "api": "/api/system/user/import/",
-                        "method": 1
-                    },
-                    {
-                        "name": "编辑",
-                        "value": "user:Update",
-                        "api": "/api/system/user/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "重设密码",
-                        "value": "user:ResetPassword",
-                        "api": "/api/system/user/{id}/reset_password/",
-                        "method": 2
-                    },
-                    {
-                        "name": "重置密码",
-                        "value": "user:DefaultPassword",
-                        "api": "/api/system/user/{id}/reset_to_default_password/",
-                        "method": 2
-                    },
-                    {
-                        "name": "删除",
-                        "value": "user:Delete",
-                        "api": "/api/system/user/{id}/",
-                        "method": 3
-                    }
-                ]
-            },
-            {
-                "name": "消息中心",
-                "icon": "iconfont icon-xiaoxizhongxin",
-                "sort": 7,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/messageCenter",
-                "component": "system/messageCenter/index",
-                "component_name": "messageCenter",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "查询",
-                        "value": "messageCenter:Search",
-                        "api": "/api/system/message_center/",
-                        "method": 0
-                    },
-                    {
-                        "name": "详情",
-                        "value": "messageCenter:Retrieve",
-                        "api": "/api/system/message_center/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "新增",
-                        "value": "messageCenter:Create",
-                        "api": "/api/system/message_center/",
-                        "method": 1
-                    },
-                    {
-                        "name": "编辑",
-                        "value": "messageCenter:Update",
-                        "api": "/api/system/message_center/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "删除",
-                        "value": "messageCenter:Delete",
-                        "api": "/api/system/menu/{id}/",
-                        "method": 3
-                    }
-                ]
-            },
-            {
-                "name": "接口白名单",
-                "icon": "ele-SetUp",
-                "sort": 8,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/apiWhiteList",
-                "component": "system/whiteList/index",
-                "component_name": "whiteList",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "查询",
-                        "value": "api_white_list:Search",
-                        "api": "/api/system/api_white_list/",
-                        "method": 0
-                    },
-                    {
-                        "name": "详情",
-                        "value": "api_white_list:Retrieve",
-                        "api": "/api/system/api_white_list/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "新增",
-                        "value": "api_white_list:Create",
-                        "api": "/api/system/api_white_list/",
-                        "method": 1
-                    },
-                    {
-                        "name": "编辑",
-                        "value": "api_white_list:Update",
-                        "api": "/api/system/api_white_list/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "删除",
-                        "value": "api_white_list:Delete",
-                        "api": "/api/system/api_white_list/{id}/",
-                        "method": 3
-                    }
-                ]
-            }
-        ],
-        "menu_button": []
-    },
-    {
-        "name": "常规配置",
-        "icon": "iconfont icon-configure",
+        "children": [],
+        "menu_button": [
+          {
+            "name": "查询",
+            "value": "menu:Search",
+            "api": "/api/system/menu/",
+            "method": 0
+          },
+          {
+            "name": "详情",
+            "value": "menu:Retrieve",
+            "api": "/api/system/menu/{id}/",
+            "method": 0
+          },
+          {
+            "name": "新增",
+            "value": "menu:Create",
+            "api": "/api/system/menu/",
+            "method": 1
+          },
+          {
+            "name": "编辑",
+            "value": "menu:Update",
+            "api": "/api/system/menu/{id}/",
+            "method": 2
+          },
+          {
+            "name": "删除",
+            "value": "menu:Delete",
+            "api": "/api/system/menu/{id}/",
+            "method": 3
+          },
+          {
+            "name": "查询所有",
+            "value": "menu:SearchAll",
+            "api": "/api/system/menu/get_all_menu/",
+            "method": 0
+          },
+          {
+            "name": "路由",
+            "value": "menu:router",
+            "api": "/api/system/menu/web_router/",
+            "method": 0
+          },
+          {
+            "name": "上移",
+            "value": "menu:MoveUp",
+            "api": "/api/system/menu/mode_up/",
+            "method": 1
+          },
+          {
+            "name": "下移",
+            "value": "menu:MoveDown",
+            "api": "/api/system/menu/mode_down/",
+            "method": 1
+          },
+          {
+            "name": "新增按钮权限",
+            "value": "btn:Create",
+            "api": "/api/system/menu_button/",
+            "method": 1
+          },
+          {
+            "name": "修改按钮权限",
+            "value": "btn:Update",
+            "api": "/api/system/menu_button/{id}/",
+            "method": 2
+          },
+          {
+            "name": "查询按钮权限",
+            "value": "btn:Search",
+            "api": "/api/system/menu_button/",
+            "method": 0
+          },
+          {
+            "name": "删除按钮权限",
+            "value": "btn:Delete",
+            "api": "/api/system/menu_button/{id}/",
+            "method": 3
+          },
+          {
+            "name": "查询列权限",
+            "value": "column:Search",
+            "api": "/api/system/column/",
+            "method": 0
+          },
+          {
+            "name": "新增列权限",
+            "value": "column:Create",
+            "api": "/api/system/column/",
+            "method": 1
+          },
+          {
+            "name": "编辑列权限",
+            "value": "column:Update",
+            "api": "/api/system/column/{id}/",
+            "method": 2
+          },
+          {
+            "name": "删除列权限",
+            "value": "column:Delete",
+            "api": "/api/system/column/{id}/",
+            "method": 3
+          },
+          {
+            "name": "自动匹配列权限",
+            "value": "column:Match",
+            "api": "/api/system/column/auto_match_fields/",
+            "method": 1
+          }
+        ]
+      },
+      {
+        "name": "部门管理",
+        "icon": "ele-OfficeBuilding",
+        "sort": 3,
+        "is_link": false,
+        "is_catalog": false,
+        "web_path": "/dept",
+        "component": "system/dept/index",
+        "component_name": "dept",
+        "status": true,
+        "cache": false,
+        "visible": true,
+        "children": [],
+        "menu_button": [
+          {
+            "name": "查询",
+            "value": "dept:Search",
+            "api": "/api/system/dept/",
+            "method": 0
+          },
+          {
+            "name": "详情",
+            "value": "dept:Retrieve",
+            "api": "/api/system/dept/{id}/",
+            "method": 0
+          },
+          {
+            "name": "新增",
+            "value": "dept:Create",
+            "api": "/api/system/dept/",
+            "method": 1
+          },
+          {
+            "name": "编辑",
+            "value": "dept:Update",
+            "api": "/api/system/dept/{id}/",
+            "method": 2
+          },
+          {
+            "name": "删除",
+            "value": "dept:Delete",
+            "api": "/api/system/dept/{id}/",
+            "method": 3
+          },
+          {
+            "name": "查询所有",
+            "value": "dept:SearchAll",
+            "api": "/api/system/dept/all_dept/",
+            "method": 0
+          },
+          {
+            "name": "懒加载查询所有",
+            "value": "dept:LazySearchAll",
+            "api": "/api/system/dept/dept_lazy_tree/",
+            "method": 0
+          },
+          {
+            "name": "上移",
+            "value": "dept:MoveUp",
+            "api": "/api/system/dept/mode_up/",
+            "method": 1
+          },
+          {
+            "name": "下移",
+            "value": "dept:MoveDown",
+            "api": "/api/system/dept/mode_down/",
+            "method": 1
+          },
+          {
+            "name": "头信息",
+            "value": "dept:HeaderInfo",
+            "api": "/api/system/dept/dept_info/",
+            "method": 0
+          }
+        ]
+      },
+      {
+        "name": "角色管理",
+        "icon": "ele-ColdDrink",
+        "sort": 4,
+        "is_link": false,
+        "is_catalog": false,
+        "web_path": "/role",
+        "component": "system/role/index",
+        "component_name": "role",
+        "status": true,
+        "cache": false,
+        "visible": true,
+        "children": [],
+        "menu_button": [
+          {
+            "name": "查询",
+            "value": "role:Search",
+            "api": "/api/system/role/",
+            "method": 0
+          },
+          {
+            "name": "详情",
+            "value": "role:Retrieve",
+            "api": "/api/system/role/{id}/",
+            "method": 0
+          },
+          {
+            "name": "新增",
+            "value": "role:Create",
+            "api": "/api/system/role/",
+            "method": 1
+          },
+          {
+            "name": "编辑",
+            "value": "role:Update",
+            "api": "/api/system/role/{id}/",
+            "method": 2
+          },
+          {
+            "name": "保存",
+            "value": "role:Save",
+            "api": "/api/system/role/{id}/",
+            "method": 2
+          },
+          {
+            "name": "删除",
+            "value": "role:Delete",
+            "api": "/api/system/role/{id}/",
+            "method": 3
+          },
+          {
+            "name": "权限配置",
+            "value": "role:Permission",
+            "api": "/api/system/role/{id}/",
+            "method": 0
+          }
+        ]
+      },
+      {
+        "name": "用户管理",
+        "icon": "iconfont icon-icon-",
+        "sort": 6,
+        "is_link": false,
+        "is_catalog": false,
+        "web_path": "/user",
+        "component": "system/user/index",
+        "component_name": "user",
+        "status": true,
+        "cache": false,
+        "visible": true,
+        "children": [],
+        "menu_button": [
+          {
+            "name": "查询",
+            "value": "user:Search",
+            "api": "/api/system/user/",
+            "method": 0
+          },
+          {
+            "name": "详情",
+            "value": "user:Retrieve",
+            "api": "/api/system/user/{id}/",
+            "method": 0
+          },
+          {
+            "name": "新增",
+            "value": "user:Create",
+            "api": "/api/system/user/",
+            "method": 1
+          },
+          {
+            "name": "导出",
+            "value": "user:Export",
+            "api": "/api/system/user/export/",
+            "method": 1
+          },
+          {
+            "name": "导入",
+            "value": "user:Import",
+            "api": "/api/system/user/import/",
+            "method": 1
+          },
+          {
+            "name": "编辑",
+            "value": "user:Update",
+            "api": "/api/system/user/{id}/",
+            "method": 2
+          },
+          {
+            "name": "重设密码",
+            "value": "user:ResetPassword",
+            "api": "/api/system/user/{id}/reset_password/",
+            "method": 2
+          },
+          {
+            "name": "重置密码",
+            "value": "user:DefaultPassword",
+            "api": "/api/system/user/{id}/reset_to_default_password/",
+            "method": 2
+          },
+          {
+            "name": "删除",
+            "value": "user:Delete",
+            "api": "/api/system/user/{id}/",
+            "method": 3
+          }
+        ]
+      },
+      {
+        "name": "消息中心",
+        "icon": "iconfont icon-xiaoxizhongxin",
+        "sort": 7,
+        "is_link": false,
+        "is_catalog": false,
+        "web_path": "/messageCenter",
+        "component": "system/messageCenter/index",
+        "component_name": "messageCenter",
+        "status": true,
+        "cache": false,
+        "visible": true,
+        "children": [],
+        "menu_button": [
+          {
+            "name": "查询",
+            "value": "messageCenter:Search",
+            "api": "/api/system/message_center/",
+            "method": 0
+          },
+          {
+            "name": "详情",
+            "value": "messageCenter:Retrieve",
+            "api": "/api/system/message_center/{id}/",
+            "method": 0
+          },
+          {
+            "name": "新增",
+            "value": "messageCenter:Create",
+            "api": "/api/system/message_center/",
+            "method": 1
+          },
+          {
+            "name": "编辑",
+            "value": "messageCenter:Update",
+            "api": "/api/system/message_center/{id}/",
+            "method": 2
+          },
+          {
+            "name": "删除",
+            "value": "messageCenter:Delete",
+            "api": "/api/system/menu/{id}/",
+            "method": 3
+          }
+        ]
+      },
+      {
+        "name": "接口白名单",
+        "icon": "ele-SetUp",
+        "sort": 8,
+        "is_link": false,
+        "is_catalog": false,
+        "web_path": "/apiWhiteList",
+        "component": "system/whiteList/index",
+        "component_name": "whiteList",
+        "status": true,
+        "cache": false,
+        "visible": true,
+        "children": [],
+        "menu_button": [
+          {
+            "name": "查询",
+            "value": "api_white_list:Search",
+            "api": "/api/system/api_white_list/",
+            "method": 0
+          },
+          {
+            "name": "详情",
+            "value": "api_white_list:Retrieve",
+            "api": "/api/system/api_white_list/{id}/",
+            "method": 0
+          },
+          {
+            "name": "新增",
+            "value": "api_white_list:Create",
+            "api": "/api/system/api_white_list/",
+            "method": 1
+          },
+          {
+            "name": "编辑",
+            "value": "api_white_list:Update",
+            "api": "/api/system/api_white_list/{id}/",
+            "method": 2
+          },
+          {
+            "name": "删除",
+            "value": "api_white_list:Delete",
+            "api": "/api/system/api_white_list/{id}/",
+            "method": 3
+          }
+        ]
+      }
+    ],
+    "menu_button": []
+  },
+  {
+    "name": "常规配置",
+    "icon": "iconfont icon-configure",
+    "sort": 2,
+    "is_link": false,
+    "is_catalog": true,
+    "web_path": "/generalConfig",
+    "component": "",
+    "component_name": "",
+    "status": true,
+    "cache": false,
+    "visible": true,
+    "children": [
+      {
+        "name": "系统配置",
+        "icon": "iconfont icon-system",
+        "sort": 0,
+        "is_link": false,
+        "is_catalog": false,
+        "web_path": "/config",
+        "component": "system/config/index",
+        "component_name": "config",
+        "status": true,
+        "cache": false,
+        "visible": true,
+        "children": [],
+        "menu_button": [
+          {
+            "name": "查询",
+            "value": "system_config:Search",
+            "api": "/api/system/system_config/",
+            "method": 0
+          },
+          {
+            "name": "详情",
+            "value": "system_config:Retrieve",
+            "api": "/api/system/system_config/{id}/",
+            "method": 0
+          },
+          {
+            "name": "新增",
+            "value": "system_config:Create",
+            "api": "/api/system/system_config/",
+            "method": 1
+          },
+          {
+            "name": "编辑",
+            "value": "system_config:Update",
+            "api": "/api/system/system_config/{id}/",
+            "method": 2
+          },
+          {
+            "name": "删除",
+            "value": "system_config:Delete",
+            "api": "/api/system/system_config/{id}/",
+            "method": 3
+          }
+        ]
+      },
+      {
+        "name": "字典管理",
+        "icon": "iconfont icon-dict",
+        "sort": 1,
+        "is_link": false,
+        "is_catalog": false,
+        "web_path": "/dictionary",
+        "component": "system/dictionary/index",
+        "component_name": "dictionary",
+        "status": true,
+        "cache": false,
+        "visible": true,
+        "children": [],
+        "menu_button": [
+          {
+            "name": "查询",
+            "value": "dictionary:Search",
+            "api": "/api/system/dictionary/",
+            "method": 0
+          },
+          {
+            "name": "详情",
+            "value": "dictionary:Retrieve",
+            "api": "/api/system/dictionary/{id}/",
+            "method": 0
+          },
+          {
+            "name": "新增",
+            "value": "dictionary:Create",
+            "api": "/api/system/dictionary/",
+            "method": 1
+          },
+          {
+            "name": "编辑",
+            "value": "dictionary:Update",
+            "api": "/api/system/dictionary/{id}/",
+            "method": 2
+          },
+          {
+            "name": "删除",
+            "value": "dictionary:Delete",
+            "api": "/api/system/dictionary/{id}/",
+            "method": 3
+          }
+        ]
+      },
+      {
+        "name": "地区管理",
+        "icon": "iconfont icon-Area",
         "sort": 2,
         "is_link": false,
-        "is_catalog": true,
-        "web_path": "/generalConfig",
-        "component": "",
-        "component_name": "",
+        "is_catalog": false,
+        "web_path": "/areas",
+        "component": "system/areas/index",
+        "component_name": "areas",
         "status": true,
         "cache": false,
         "visible": true,
-        "children": [
-            {
-                "name": "系统配置",
-                "icon": "iconfont icon-system",
-                "sort": 0,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/config",
-                "component": "system/config/index",
-                "component_name": "config",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "查询",
-                        "value": "system_config:Search",
-                        "api": "/api/system/system_config/",
-                        "method": 0
-                    },
-                    {
-                        "name": "详情",
-                        "value": "system_config:Retrieve",
-                        "api": "/api/system/system_config/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "新增",
-                        "value": "system_config:Create",
-                        "api": "/api/system/system_config/",
-                        "method": 1
-                    },
-                    {
-                        "name": "编辑",
-                        "value": "system_config:Update",
-                        "api": "/api/system/system_config/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "删除",
-                        "value": "system_config:Delete",
-                        "api": "/api/system/system_config/{id}/",
-                        "method": 3
-                    }
-                ]
-            },
-            {
-                "name": "字典管理",
-                "icon": "iconfont icon-dict",
-                "sort": 1,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/dictionary",
-                "component": "system/dictionary/index",
-                "component_name": "dictionary",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "查询",
-                        "value": "dictionary:Search",
-                        "api": "/api/system/dictionary/",
-                        "method": 0
-                    },
-                    {
-                        "name": "详情",
-                        "value": "dictionary:Retrieve",
-                        "api": "/api/system/dictionary/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "新增",
-                        "value": "dictionary:Create",
-                        "api": "/api/system/dictionary/",
-                        "method": 1
-                    },
-                    {
-                        "name": "编辑",
-                        "value": "dictionary:Update",
-                        "api": "/api/system/dictionary/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "删除",
-                        "value": "dictionary:Delete",
-                        "api": "/api/system/dictionary/{id}/",
-                        "method": 3
-                    }
-                ]
-            },
-            {
-                "name": "地区管理",
-                "icon": "iconfont icon-Area",
-                "sort": 2,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/areas",
-                "component": "system/areas/index",
-                "component_name": "areas",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "查询",
-                        "value": "area:Search",
-                        "api": "/api/system/area/",
-                        "method": 0
-                    },
-                    {
-                        "name": "详情",
-                        "value": "area:Retrieve",
-                        "api": "/api/system/area/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "新增",
-                        "value": "area:Create",
-                        "api": "/api/system/area/",
-                        "method": 1
-                    },
-                    {
-                        "name": "编辑",
-                        "value": "area:Update",
-                        "api": "/api/system/area/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "删除",
-                        "value": "area:Delete",
-                        "api": "/api/system/area/{id}/",
-                        "method": 3
-                    }
-                ]
-            },
-            {
-                "name": "附件管理",
-                "icon": "iconfont icon-file",
-                "sort": 3,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/file",
-                "component": "system/fileList/index",
-                "component_name": "file",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "详情",
-                        "value": "file:Retrieve",
-                        "api": "/api/system/file/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "查询",
-                        "value": "file:Search",
-                        "api": "/api/system/file/",
-                        "method": 0
-                    },
-                    {
-                        "name": "编辑",
-                        "value": "file:Update",
-                        "api": "/api/system/file/{id}/",
-                        "method": 1
-                    },
-                    {
-                        "name": "删除",
-                        "value": "file:Delete",
-                        "api": "/api/system/file/{id}/",
-                        "method": 3
-                    }
-                ]
-            }
-        ],
-        "menu_button": []
-    },
-    {
-        "name": "日志管理",
-        "icon": "iconfont icon-rizhi",
+        "children": [],
+        "menu_button": [
+          {
+            "name": "查询",
+            "value": "area:Search",
+            "api": "/api/system/area/",
+            "method": 0
+          },
+          {
+            "name": "详情",
+            "value": "area:Retrieve",
+            "api": "/api/system/area/{id}/",
+            "method": 0
+          },
+          {
+            "name": "新增",
+            "value": "area:Create",
+            "api": "/api/system/area/",
+            "method": 1
+          },
+          {
+            "name": "编辑",
+            "value": "area:Update",
+            "api": "/api/system/area/{id}/",
+            "method": 2
+          },
+          {
+            "name": "删除",
+            "value": "area:Delete",
+            "api": "/api/system/area/{id}/",
+            "method": 3
+          }
+        ]
+      },
+      {
+        "name": "附件管理",
+        "icon": "iconfont icon-file",
         "sort": 3,
         "is_link": false,
-        "is_catalog": true,
-        "web_path": "/log",
-        "component": "",
-        "component_name": "",
+        "is_catalog": false,
+        "web_path": "/file",
+        "component": "system/fileList/index",
+        "component_name": "file",
+        "status": true,
+        "cache": false,
+        "visible": true,
+        "children": [],
+        "menu_button": [
+          {
+            "name": "详情",
+            "value": "file:Retrieve",
+            "api": "/api/system/file/{id}/",
+            "method": 0
+          },
+          {
+            "name": "查询",
+            "value": "file:Search",
+            "api": "/api/system/file/",
+            "method": 0
+          },
+          {
+            "name": "编辑",
+            "value": "file:Update",
+            "api": "/api/system/file/{id}/",
+            "method": 1
+          },
+          {
+            "name": "删除",
+            "value": "file:Delete",
+            "api": "/api/system/file/{id}/",
+            "method": 3
+          }
+        ]
+      }
+    ],
+    "menu_button": []
+  },
+  {
+    "name": "日志管理",
+    "icon": "iconfont icon-rizhi",
+    "sort": 3,
+    "is_link": false,
+    "is_catalog": true,
+    "web_path": "/log",
+    "component": "",
+    "component_name": "",
+    "status": true,
+    "cache": false,
+    "visible": true,
+    "children": [
+      {
+        "name": "登录日志",
+        "icon": "iconfont icon-guanlidenglurizhi",
+        "sort": 1,
+        "is_link": false,
+        "is_catalog": false,
+        "web_path": "/loginLog",
+        "component": "system/log/loginLog/index",
+        "component_name": "loginLog",
+        "status": true,
+        "cache": false,
+        "visible": true,
+        "children": [],
+        "menu_button": [
+          {
+            "name": "查询",
+            "value": "login_log:Search",
+            "api": "/api/system/login_log/",
+            "method": 0
+          },
+          {
+            "name": "详情",
+            "value": "login_log:Retrieve",
+            "api": "/api/system/login_log/{id}/",
+            "method": 0
+          }
+        ]
+      },
+      {
+        "name": "操作日志",
+        "icon": "iconfont icon-caozuorizhi",
+        "sort": 2,
+        "is_link": false,
+        "is_catalog": false,
+        "web_path": "/operationLog",
+        "component": "system/log/operationLog/index",
+        "component_name": "operationLog",
         "status": true,
         "cache": false,
         "visible": true,
-        "children": [
-            {
-                "name": "登录日志",
-                "icon": "iconfont icon-guanlidenglurizhi",
-                "sort": 1,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/loginLog",
-                "component": "system/log/loginLog/index",
-                "component_name": "loginLog",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "查询",
-                        "value": "login_log:Search",
-                        "api": "/api/system/login_log/",
-                        "method": 0
-                    },
-                    {
-                        "name": "详情",
-                        "value": "login_log:Retrieve",
-                        "api": "/api/system/login_log/{id}/",
-                        "method": 0
-                    }
-                ]
-            },
-            {
-                "name": "操作日志",
-                "icon": "iconfont icon-caozuorizhi",
-                "sort": 2,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/operationLog",
-                "component": "system/log/operationLog/index",
-                "component_name": "operationLog",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "详情",
-                        "value": "operation_log:Retrieve",
-                        "api": "/api/system/operation_log/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "查询",
-                        "value": "operation_log:Search",
-                        "api": "/api/system/operation_log/",
-                        "method": 0
-                    }
-                ]
-            }
-        ],
-        "menu_button": []
-    }
+        "children": [],
+        "menu_button": [
+          {
+            "name": "详情",
+            "value": "operation_log:Retrieve",
+            "api": "/api/system/operation_log/{id}/",
+            "method": 0
+          },
+          {
+            "name": "查询",
+            "value": "operation_log:Search",
+            "api": "/api/system/operation_log/",
+            "method": 0
+          }
+        ]
+      }
+    ],
+    "menu_button": []
+  }
 ]
\ No newline at end of file
-- 
Gitee


From 0650c9574526b6d3885c168f92782830d19ee66d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Sun, 26 Nov 2023 11:37:21 +0800
Subject: [PATCH 30/40] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E5=88=97=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=88=9D=E5=A7=8B=E5=8C=96=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dvadmin/system/fixtures/initSerializer.py |   36 +-
 .../dvadmin/system/fixtures/init_menu.json    | 2073 +++++++++++------
 2 files changed, 1419 insertions(+), 690 deletions(-)

diff --git a/backend/dvadmin/system/fixtures/initSerializer.py b/backend/dvadmin/system/fixtures/initSerializer.py
index a2d74f653..0b139c1af 100644
--- a/backend/dvadmin/system/fixtures/initSerializer.py
+++ b/backend/dvadmin/system/fixtures/initSerializer.py
@@ -9,7 +9,7 @@ django.setup()
 from dvadmin.system.models import (
     Role, Dept, Users, Menu, MenuButton,
     ApiWhiteList, Dictionary, SystemConfig,
-    RoleMenuPermission, RoleMenuButtonPermission
+    RoleMenuPermission, RoleMenuButtonPermission, MenuField
 )
 from dvadmin.utils.serializers import CustomModelSerializer
 
@@ -53,6 +53,16 @@ class MenuButtonInitSerializer(CustomModelSerializer):
         read_only_fields = ["id"]
 
 
+class MenuFieldInitSerializer(CustomModelSerializer):
+    """
+    初始化列权限-序列化器
+    """
+
+    class Meta:
+        model = MenuField
+        fields = ['id', 'menu','field_name','title','model']
+        read_only_fields = ["id"]
+
 class MenuInitSerializer(CustomModelSerializer):
     """
     递归深度获取数信息(用于生成初始化json文件)
@@ -60,7 +70,7 @@ class MenuInitSerializer(CustomModelSerializer):
     name = serializers.CharField(required=False)
     children = serializers.SerializerMethodField()
     menu_button = serializers.SerializerMethodField()
-
+    menu_field = serializers.SerializerMethodField()
     def get_children(self, obj: Menu):
         data = []
         instance = Menu.objects.filter(parent_id=obj.id)
@@ -76,10 +86,18 @@ class MenuInitSerializer(CustomModelSerializer):
             data = list(instance.values('name', 'value', 'api', 'method'))
         return data
 
+    def get_menu_field(self, obj: Menu):
+        data = []
+        instance = obj.menufield_set.order_by('field_name')
+        if instance:
+            data = list(instance.values('field_name', 'title','model'))
+        return data
+
     def save(self, **kwargs):
         instance = super().save(**kwargs)
         children = self.initial_data.get('children')
         menu_button = self.initial_data.get('menu_button')
+        menu_field = self.initial_data.get('menu_field')
         # 菜单表
         if children:
             for menu_data in children:
@@ -108,12 +126,24 @@ class MenuInitSerializer(CustomModelSerializer):
                 serializer = MenuButtonInitSerializer(instance_obj, data=menu_button_data, request=self.request)
                 serializer.is_valid(raise_exception=True)
                 serializer.save()
+        # 列权限
+        if menu_field:
+            for field_data in menu_field:
+                field_data['menu'] = instance.id
+                filter_data = {
+                    'menu':field_data['menu'],
+                    'field_name':field_data['field_name']
+                }
+                instance_obj = MenuField.objects.filter(**filter_data).first()
+                serializer = MenuFieldInitSerializer(instance_obj, data=field_data, request=self.request)
+                serializer.is_valid(raise_exception=True)
+                serializer.save()
         return instance
 
     class Meta:
         model = Menu
         fields = ['name', 'icon', 'sort', 'is_link', 'is_catalog', 'web_path', 'component', 'component_name', 'status',
-                  'cache', 'visible', 'parent', 'children', 'menu_button', 'creator', 'dept_belong_id']
+                  'cache', 'visible', 'parent', 'children', 'menu_button','menu_field', 'creator', 'dept_belong_id']
         extra_kwargs = {
             'creator': {'write_only': True},
             'dept_belong_id': {'write_only': True}
diff --git a/backend/dvadmin/system/fixtures/init_menu.json b/backend/dvadmin/system/fixtures/init_menu.json
index a054af292..61a50589b 100644
--- a/backend/dvadmin/system/fixtures/init_menu.json
+++ b/backend/dvadmin/system/fixtures/init_menu.json
@@ -1,704 +1,1403 @@
 [
-  {
-    "name": "系统管理",
-    "icon": "iconfont icon-xitongshezhi",
-    "sort": 1,
-    "is_link": false,
-    "is_catalog": true,
-    "web_path": "/system",
-    "component": "",
-    "component_name": "",
-    "status": true,
-    "cache": false,
-    "visible": true,
-    "children": [
-      {
-        "name": "菜单管理",
-        "icon": "iconfont icon-caidan",
+    {
+        "name": "ϵͳ����",
+        "icon": "iconfont icon-xitongshezhi",
         "sort": 1,
         "is_link": false,
-        "is_catalog": false,
-        "web_path": "/menu",
-        "component": "system/menu/index",
-        "component_name": "menu",
+        "is_catalog": true,
+        "web_path": "/system",
+        "component": "",
+        "component_name": "",
         "status": true,
         "cache": false,
         "visible": true,
-        "children": [],
-        "menu_button": [
-          {
-            "name": "查询",
-            "value": "menu:Search",
-            "api": "/api/system/menu/",
-            "method": 0
-          },
-          {
-            "name": "详情",
-            "value": "menu:Retrieve",
-            "api": "/api/system/menu/{id}/",
-            "method": 0
-          },
-          {
-            "name": "新增",
-            "value": "menu:Create",
-            "api": "/api/system/menu/",
-            "method": 1
-          },
-          {
-            "name": "编辑",
-            "value": "menu:Update",
-            "api": "/api/system/menu/{id}/",
-            "method": 2
-          },
-          {
-            "name": "删除",
-            "value": "menu:Delete",
-            "api": "/api/system/menu/{id}/",
-            "method": 3
-          },
-          {
-            "name": "查询所有",
-            "value": "menu:SearchAll",
-            "api": "/api/system/menu/get_all_menu/",
-            "method": 0
-          },
-          {
-            "name": "路由",
-            "value": "menu:router",
-            "api": "/api/system/menu/web_router/",
-            "method": 0
-          },
-          {
-            "name": "上移",
-            "value": "menu:MoveUp",
-            "api": "/api/system/menu/mode_up/",
-            "method": 1
-          },
-          {
-            "name": "下移",
-            "value": "menu:MoveDown",
-            "api": "/api/system/menu/mode_down/",
-            "method": 1
-          },
-          {
-            "name": "新增按钮权限",
-            "value": "btn:Create",
-            "api": "/api/system/menu_button/",
-            "method": 1
-          },
-          {
-            "name": "修改按钮权限",
-            "value": "btn:Update",
-            "api": "/api/system/menu_button/{id}/",
-            "method": 2
-          },
-          {
-            "name": "查询按钮权限",
-            "value": "btn:Search",
-            "api": "/api/system/menu_button/",
-            "method": 0
-          },
-          {
-            "name": "删除按钮权限",
-            "value": "btn:Delete",
-            "api": "/api/system/menu_button/{id}/",
-            "method": 3
-          },
-          {
-            "name": "查询列权限",
-            "value": "column:Search",
-            "api": "/api/system/column/",
-            "method": 0
-          },
-          {
-            "name": "新增列权限",
-            "value": "column:Create",
-            "api": "/api/system/column/",
-            "method": 1
-          },
-          {
-            "name": "编辑列权限",
-            "value": "column:Update",
-            "api": "/api/system/column/{id}/",
-            "method": 2
-          },
-          {
-            "name": "删除列权限",
-            "value": "column:Delete",
-            "api": "/api/system/column/{id}/",
-            "method": 3
-          },
-          {
-            "name": "自动匹配列权限",
-            "value": "column:Match",
-            "api": "/api/system/column/auto_match_fields/",
-            "method": 1
-          }
-        ]
-      },
-      {
-        "name": "部门管理",
-        "icon": "ele-OfficeBuilding",
-        "sort": 3,
-        "is_link": false,
-        "is_catalog": false,
-        "web_path": "/dept",
-        "component": "system/dept/index",
-        "component_name": "dept",
-        "status": true,
-        "cache": false,
-        "visible": true,
-        "children": [],
-        "menu_button": [
-          {
-            "name": "查询",
-            "value": "dept:Search",
-            "api": "/api/system/dept/",
-            "method": 0
-          },
-          {
-            "name": "详情",
-            "value": "dept:Retrieve",
-            "api": "/api/system/dept/{id}/",
-            "method": 0
-          },
-          {
-            "name": "新增",
-            "value": "dept:Create",
-            "api": "/api/system/dept/",
-            "method": 1
-          },
-          {
-            "name": "编辑",
-            "value": "dept:Update",
-            "api": "/api/system/dept/{id}/",
-            "method": 2
-          },
-          {
-            "name": "删除",
-            "value": "dept:Delete",
-            "api": "/api/system/dept/{id}/",
-            "method": 3
-          },
-          {
-            "name": "查询所有",
-            "value": "dept:SearchAll",
-            "api": "/api/system/dept/all_dept/",
-            "method": 0
-          },
-          {
-            "name": "懒加载查询所有",
-            "value": "dept:LazySearchAll",
-            "api": "/api/system/dept/dept_lazy_tree/",
-            "method": 0
-          },
-          {
-            "name": "上移",
-            "value": "dept:MoveUp",
-            "api": "/api/system/dept/mode_up/",
-            "method": 1
-          },
-          {
-            "name": "下移",
-            "value": "dept:MoveDown",
-            "api": "/api/system/dept/mode_down/",
-            "method": 1
-          },
-          {
-            "name": "头信息",
-            "value": "dept:HeaderInfo",
-            "api": "/api/system/dept/dept_info/",
-            "method": 0
-          }
-        ]
-      },
-      {
-        "name": "角色管理",
-        "icon": "ele-ColdDrink",
-        "sort": 4,
-        "is_link": false,
-        "is_catalog": false,
-        "web_path": "/role",
-        "component": "system/role/index",
-        "component_name": "role",
-        "status": true,
-        "cache": false,
-        "visible": true,
-        "children": [],
-        "menu_button": [
-          {
-            "name": "查询",
-            "value": "role:Search",
-            "api": "/api/system/role/",
-            "method": 0
-          },
-          {
-            "name": "详情",
-            "value": "role:Retrieve",
-            "api": "/api/system/role/{id}/",
-            "method": 0
-          },
-          {
-            "name": "新增",
-            "value": "role:Create",
-            "api": "/api/system/role/",
-            "method": 1
-          },
-          {
-            "name": "编辑",
-            "value": "role:Update",
-            "api": "/api/system/role/{id}/",
-            "method": 2
-          },
-          {
-            "name": "保存",
-            "value": "role:Save",
-            "api": "/api/system/role/{id}/",
-            "method": 2
-          },
-          {
-            "name": "删除",
-            "value": "role:Delete",
-            "api": "/api/system/role/{id}/",
-            "method": 3
-          },
-          {
-            "name": "权限配置",
-            "value": "role:Permission",
-            "api": "/api/system/role/{id}/",
-            "method": 0
-          }
-        ]
-      },
-      {
-        "name": "用户管理",
-        "icon": "iconfont icon-icon-",
-        "sort": 6,
-        "is_link": false,
-        "is_catalog": false,
-        "web_path": "/user",
-        "component": "system/user/index",
-        "component_name": "user",
-        "status": true,
-        "cache": false,
-        "visible": true,
-        "children": [],
-        "menu_button": [
-          {
-            "name": "查询",
-            "value": "user:Search",
-            "api": "/api/system/user/",
-            "method": 0
-          },
-          {
-            "name": "详情",
-            "value": "user:Retrieve",
-            "api": "/api/system/user/{id}/",
-            "method": 0
-          },
-          {
-            "name": "新增",
-            "value": "user:Create",
-            "api": "/api/system/user/",
-            "method": 1
-          },
-          {
-            "name": "导出",
-            "value": "user:Export",
-            "api": "/api/system/user/export/",
-            "method": 1
-          },
-          {
-            "name": "导入",
-            "value": "user:Import",
-            "api": "/api/system/user/import/",
-            "method": 1
-          },
-          {
-            "name": "编辑",
-            "value": "user:Update",
-            "api": "/api/system/user/{id}/",
-            "method": 2
-          },
-          {
-            "name": "重设密码",
-            "value": "user:ResetPassword",
-            "api": "/api/system/user/{id}/reset_password/",
-            "method": 2
-          },
-          {
-            "name": "重置密码",
-            "value": "user:DefaultPassword",
-            "api": "/api/system/user/{id}/reset_to_default_password/",
-            "method": 2
-          },
-          {
-            "name": "删除",
-            "value": "user:Delete",
-            "api": "/api/system/user/{id}/",
-            "method": 3
-          }
-        ]
-      },
-      {
-        "name": "消息中心",
-        "icon": "iconfont icon-xiaoxizhongxin",
-        "sort": 7,
-        "is_link": false,
-        "is_catalog": false,
-        "web_path": "/messageCenter",
-        "component": "system/messageCenter/index",
-        "component_name": "messageCenter",
-        "status": true,
-        "cache": false,
-        "visible": true,
-        "children": [],
-        "menu_button": [
-          {
-            "name": "查询",
-            "value": "messageCenter:Search",
-            "api": "/api/system/message_center/",
-            "method": 0
-          },
-          {
-            "name": "详情",
-            "value": "messageCenter:Retrieve",
-            "api": "/api/system/message_center/{id}/",
-            "method": 0
-          },
-          {
-            "name": "新增",
-            "value": "messageCenter:Create",
-            "api": "/api/system/message_center/",
-            "method": 1
-          },
-          {
-            "name": "编辑",
-            "value": "messageCenter:Update",
-            "api": "/api/system/message_center/{id}/",
-            "method": 2
-          },
-          {
-            "name": "删除",
-            "value": "messageCenter:Delete",
-            "api": "/api/system/menu/{id}/",
-            "method": 3
-          }
-        ]
-      },
-      {
-        "name": "接口白名单",
-        "icon": "ele-SetUp",
-        "sort": 8,
-        "is_link": false,
-        "is_catalog": false,
-        "web_path": "/apiWhiteList",
-        "component": "system/whiteList/index",
-        "component_name": "whiteList",
-        "status": true,
-        "cache": false,
-        "visible": true,
-        "children": [],
-        "menu_button": [
-          {
-            "name": "查询",
-            "value": "api_white_list:Search",
-            "api": "/api/system/api_white_list/",
-            "method": 0
-          },
-          {
-            "name": "详情",
-            "value": "api_white_list:Retrieve",
-            "api": "/api/system/api_white_list/{id}/",
-            "method": 0
-          },
-          {
-            "name": "新增",
-            "value": "api_white_list:Create",
-            "api": "/api/system/api_white_list/",
-            "method": 1
-          },
-          {
-            "name": "编辑",
-            "value": "api_white_list:Update",
-            "api": "/api/system/api_white_list/{id}/",
-            "method": 2
-          },
-          {
-            "name": "删除",
-            "value": "api_white_list:Delete",
-            "api": "/api/system/api_white_list/{id}/",
-            "method": 3
-          }
-        ]
-      }
-    ],
-    "menu_button": []
-  },
-  {
-    "name": "常规配置",
-    "icon": "iconfont icon-configure",
-    "sort": 2,
-    "is_link": false,
-    "is_catalog": true,
-    "web_path": "/generalConfig",
-    "component": "",
-    "component_name": "",
-    "status": true,
-    "cache": false,
-    "visible": true,
-    "children": [
-      {
-        "name": "系统配置",
-        "icon": "iconfont icon-system",
-        "sort": 0,
-        "is_link": false,
-        "is_catalog": false,
-        "web_path": "/config",
-        "component": "system/config/index",
-        "component_name": "config",
-        "status": true,
-        "cache": false,
-        "visible": true,
-        "children": [],
-        "menu_button": [
-          {
-            "name": "查询",
-            "value": "system_config:Search",
-            "api": "/api/system/system_config/",
-            "method": 0
-          },
-          {
-            "name": "详情",
-            "value": "system_config:Retrieve",
-            "api": "/api/system/system_config/{id}/",
-            "method": 0
-          },
-          {
-            "name": "新增",
-            "value": "system_config:Create",
-            "api": "/api/system/system_config/",
-            "method": 1
-          },
-          {
-            "name": "编辑",
-            "value": "system_config:Update",
-            "api": "/api/system/system_config/{id}/",
-            "method": 2
-          },
-          {
-            "name": "删除",
-            "value": "system_config:Delete",
-            "api": "/api/system/system_config/{id}/",
-            "method": 3
-          }
-        ]
-      },
-      {
-        "name": "字典管理",
-        "icon": "iconfont icon-dict",
-        "sort": 1,
-        "is_link": false,
-        "is_catalog": false,
-        "web_path": "/dictionary",
-        "component": "system/dictionary/index",
-        "component_name": "dictionary",
-        "status": true,
-        "cache": false,
-        "visible": true,
-        "children": [],
-        "menu_button": [
-          {
-            "name": "查询",
-            "value": "dictionary:Search",
-            "api": "/api/system/dictionary/",
-            "method": 0
-          },
-          {
-            "name": "详情",
-            "value": "dictionary:Retrieve",
-            "api": "/api/system/dictionary/{id}/",
-            "method": 0
-          },
-          {
-            "name": "新增",
-            "value": "dictionary:Create",
-            "api": "/api/system/dictionary/",
-            "method": 1
-          },
-          {
-            "name": "编辑",
-            "value": "dictionary:Update",
-            "api": "/api/system/dictionary/{id}/",
-            "method": 2
-          },
-          {
-            "name": "删除",
-            "value": "dictionary:Delete",
-            "api": "/api/system/dictionary/{id}/",
-            "method": 3
-          }
-        ]
-      },
-      {
-        "name": "地区管理",
-        "icon": "iconfont icon-Area",
+        "parent": null,
+        "children": [
+            {
+                "name": "�˵�����",
+                "icon": "iconfont icon-caidan",
+                "sort": 1,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/menu",
+                "component": "system/menu/index",
+                "component_name": "menu",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "parent": 1,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "��ѯ",
+                        "value": "menu:Search",
+                        "api": "/api/system/menu/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "menu:Retrieve",
+                        "api": "/api/system/menu/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "��ѯ����",
+                        "value": "menu:SearchAll",
+                        "api": "/api/system/menu/get_all_menu/",
+                        "method": 0
+                    },
+                    {
+                        "name": "·��",
+                        "value": "menu:router",
+                        "api": "/api/system/menu/web_router/",
+                        "method": 0
+                    },
+                    {
+                        "name": "��ѯ��ťȨ��",
+                        "value": "btn:Search",
+                        "api": "/api/system/menu_button/",
+                        "method": 0
+                    },
+                    {
+                        "name": "��ѯ��Ȩ��",
+                        "value": "column:Search",
+                        "api": "/api/system/column/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "menu:Create",
+                        "api": "/api/system/menu/",
+                        "method": 1
+                    },
+                    {
+                        "name": "����",
+                        "value": "menu:MoveUp",
+                        "api": "/api/system/menu/mode_up/",
+                        "method": 1
+                    },
+                    {
+                        "name": "����",
+                        "value": "menu:MoveDown",
+                        "api": "/api/system/menu/mode_down/",
+                        "method": 1
+                    },
+                    {
+                        "name": "������ťȨ��",
+                        "value": "btn:Create",
+                        "api": "/api/system/menu_button/",
+                        "method": 1
+                    },
+                    {
+                        "name": "������Ȩ��",
+                        "value": "column:Create",
+                        "api": "/api/system/column/",
+                        "method": 1
+                    },
+                    {
+                        "name": "�Զ�ƥ����Ȩ��",
+                        "value": "column:Match",
+                        "api": "/api/system/column/auto_match_fields/",
+                        "method": 1
+                    },
+                    {
+                        "name": "�༭",
+                        "value": "menu:Update",
+                        "api": "/api/system/menu/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "�޸İ�ťȨ��",
+                        "value": "btn:Update",
+                        "api": "/api/system/menu_button/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "�༭��Ȩ��",
+                        "value": "column:Update",
+                        "api": "/api/system/column/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "ɾ��",
+                        "value": "menu:Delete",
+                        "api": "/api/system/menu/{id}/",
+                        "method": 3
+                    },
+                    {
+                        "name": "ɾ����ťȨ��",
+                        "value": "btn:Delete",
+                        "api": "/api/system/menu_button/{id}/",
+                        "method": 3
+                    },
+                    {
+                        "name": "ɾ����Ȩ��",
+                        "value": "column:Delete",
+                        "api": "/api/system/column/{id}/",
+                        "method": 3
+                    }
+                ],
+                "menu_field": []
+            },
+            {
+                "name": "���Ź���",
+                "icon": "ele-OfficeBuilding",
+                "sort": 3,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/dept",
+                "component": "system/dept/index",
+                "component_name": "dept",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "parent": 1,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "��ѯ",
+                        "value": "dept:Search",
+                        "api": "/api/system/dept/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "dept:Retrieve",
+                        "api": "/api/system/dept/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "��ѯ����",
+                        "value": "dept:SearchAll",
+                        "api": "/api/system/dept/all_dept/",
+                        "method": 0
+                    },
+                    {
+                        "name": "�����ز�ѯ����",
+                        "value": "dept:LazySearchAll",
+                        "api": "/api/system/dept/dept_lazy_tree/",
+                        "method": 0
+                    },
+                    {
+                        "name": "ͷ��Ϣ",
+                        "value": "dept:HeaderInfo",
+                        "api": "/api/system/dept/dept_info/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "dept:Create",
+                        "api": "/api/system/dept/",
+                        "method": 1
+                    },
+                    {
+                        "name": "����",
+                        "value": "dept:MoveUp",
+                        "api": "/api/system/dept/mode_up/",
+                        "method": 1
+                    },
+                    {
+                        "name": "����",
+                        "value": "dept:MoveDown",
+                        "api": "/api/system/dept/mode_down/",
+                        "method": 1
+                    },
+                    {
+                        "name": "�༭",
+                        "value": "dept:Update",
+                        "api": "/api/system/dept/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "ɾ��",
+                        "value": "dept:Delete",
+                        "api": "/api/system/dept/{id}/",
+                        "method": 3
+                    }
+                ],
+                "menu_field": []
+            },
+            {
+                "name": "��ɫ����",
+                "icon": "ele-ColdDrink",
+                "sort": 4,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/role",
+                "component": "system/role/index",
+                "component_name": "role",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "parent": 1,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "��ѯ",
+                        "value": "role:Search",
+                        "api": "/api/system/role/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "role:Retrieve",
+                        "api": "/api/system/role/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "Ȩ������",
+                        "value": "role:Permission",
+                        "api": "/api/system/role/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "role:Create",
+                        "api": "/api/system/role/",
+                        "method": 1
+                    },
+                    {
+                        "name": "�༭",
+                        "value": "role:Update",
+                        "api": "/api/system/role/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "����",
+                        "value": "role:Save",
+                        "api": "/api/system/role/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "ɾ��",
+                        "value": "role:Delete",
+                        "api": "/api/system/role/{id}/",
+                        "method": 3
+                    }
+                ],
+                "menu_field": [
+                    {
+                        "field_name": "create_datetime",
+                        "title": "����ʱ��",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "creator",
+                        "title": "������",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "dept_belong_id",
+                        "title": "���ݹ�������",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "description",
+                        "title": "����",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "id",
+                        "title": "Id",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "key",
+                        "title": "Ȩ���ַ�",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "modifier",
+                        "title": "�޸���",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "name",
+                        "title": "��ɫ����",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "sort",
+                        "title": "��ɫ˳��",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "status",
+                        "title": "��ɫ״̬",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "update_datetime",
+                        "title": "�޸�ʱ��",
+                        "model": "Role"
+                    }
+                ]
+            },
+            {
+                "name": "�û�����",
+                "icon": "iconfont icon-icon-",
+                "sort": 6,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/user",
+                "component": "system/user/index",
+                "component_name": "user",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "parent": 1,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "��ѯ",
+                        "value": "user:Search",
+                        "api": "/api/system/user/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "user:Retrieve",
+                        "api": "/api/system/user/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "user:Create",
+                        "api": "/api/system/user/",
+                        "method": 1
+                    },
+                    {
+                        "name": "����",
+                        "value": "user:Export",
+                        "api": "/api/system/user/export/",
+                        "method": 1
+                    },
+                    {
+                        "name": "����",
+                        "value": "user:Import",
+                        "api": "/api/system/user/import/",
+                        "method": 1
+                    },
+                    {
+                        "name": "�༭",
+                        "value": "user:Update",
+                        "api": "/api/system/user/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "��������",
+                        "value": "user:ResetPassword",
+                        "api": "/api/system/user/{id}/reset_password/",
+                        "method": 2
+                    },
+                    {
+                        "name": "��������",
+                        "value": "user:DefaultPassword",
+                        "api": "/api/system/user/{id}/reset_to_default_password/",
+                        "method": 2
+                    },
+                    {
+                        "name": "ɾ��",
+                        "value": "user:Delete",
+                        "api": "/api/system/user/{id}/",
+                        "method": 3
+                    }
+                ],
+                "menu_field": [
+                    {
+                        "field_name": "avatar",
+                        "title": "ͷ��",
+                        "model": "Users"
+                    },
+                    {
+                        "field_name": "create_datetime",
+                        "title": "����ʱ��",
+                        "model": "Users"
+                    },
+                    {
+                        "field_name": "creator",
+                        "title": "������",
+                        "model": "Users"
+                    },
+                    {
+                        "field_name": "dept",
+                        "title": "��������",
+                        "model": "Users"
+                    },
+                    {
+                        "field_name": "dept_belong_id",
+                        "title": "���ݹ�������",
+                        "model": "Users"
+                    },
+                    {
+                        "field_name": "description",
+                        "title": "����",
+                        "model": "Users"
+                    },
+                    {
+                        "field_name": "email",
+                        "title": "����",
+                        "model": "Users"
+                    },
+                    {
+                        "field_name": "gender",
+                        "title": "�Ա�",
+                        "model": "Users"
+                    },
+                    {
+                        "field_name": "id",
+                        "title": "Id",
+                        "model": "Users"
+                    },
+                    {
+                        "field_name": "mobile",
+                        "title": "�绰",
+                        "model": "Users"
+                    },
+                    {
+                        "field_name": "modifier",
+                        "title": "�޸���",
+                        "model": "Users"
+                    },
+                    {
+                        "field_name": "name",
+                        "title": "����",
+                        "model": "Users"
+                    },
+                    {
+                        "field_name": "update_datetime",
+                        "title": "�޸�ʱ��",
+                        "model": "Users"
+                    },
+                    {
+                        "field_name": "username",
+                        "title": "�û��˺�",
+                        "model": "Users"
+                    },
+                    {
+                        "field_name": "user_type",
+                        "title": "�û�����",
+                        "model": "Users"
+                    }
+                ]
+            },
+            {
+                "name": "��Ϣ����",
+                "icon": "iconfont icon-xiaoxizhongxin",
+                "sort": 7,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/messageCenter",
+                "component": "system/messageCenter/index",
+                "component_name": "messageCenter",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "parent": 1,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "��ѯ",
+                        "value": "messageCenter:Search",
+                        "api": "/api/system/message_center/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "messageCenter:Retrieve",
+                        "api": "/api/system/message_center/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "messageCenter:Create",
+                        "api": "/api/system/message_center/",
+                        "method": 1
+                    },
+                    {
+                        "name": "�༭",
+                        "value": "messageCenter:Update",
+                        "api": "/api/system/message_center/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "ɾ��",
+                        "value": "messageCenter:Delete",
+                        "api": "/api/system/menu/{id}/",
+                        "method": 3
+                    }
+                ],
+                "menu_field": [
+                    {
+                        "field_name": "content",
+                        "title": "����",
+                        "model": "MessageCenter"
+                    },
+                    {
+                        "field_name": "create_datetime",
+                        "title": "����ʱ��",
+                        "model": "MessageCenter"
+                    },
+                    {
+                        "field_name": "creator",
+                        "title": "������",
+                        "model": "MessageCenter"
+                    },
+                    {
+                        "field_name": "dept_belong_id",
+                        "title": "���ݹ�������",
+                        "model": "MessageCenter"
+                    },
+                    {
+                        "field_name": "description",
+                        "title": "����",
+                        "model": "MessageCenter"
+                    },
+                    {
+                        "field_name": "id",
+                        "title": "Id",
+                        "model": "MessageCenter"
+                    },
+                    {
+                        "field_name": "modifier",
+                        "title": "�޸���",
+                        "model": "MessageCenter"
+                    },
+                    {
+                        "field_name": "target_type",
+                        "title": "Ŀ������",
+                        "model": "MessageCenter"
+                    },
+                    {
+                        "field_name": "title",
+                        "title": "����",
+                        "model": "MessageCenter"
+                    },
+                    {
+                        "field_name": "update_datetime",
+                        "title": "�޸�ʱ��",
+                        "model": "MessageCenter"
+                    }
+                ]
+            },
+            {
+                "name": "�ӿڰ�����",
+                "icon": "ele-SetUp",
+                "sort": 8,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/apiWhiteList",
+                "component": "system/whiteList/index",
+                "component_name": "whiteList",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "parent": 1,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "��ѯ",
+                        "value": "api_white_list:Search",
+                        "api": "/api/system/api_white_list/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "api_white_list:Retrieve",
+                        "api": "/api/system/api_white_list/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "api_white_list:Create",
+                        "api": "/api/system/api_white_list/",
+                        "method": 1
+                    },
+                    {
+                        "name": "�༭",
+                        "value": "api_white_list:Update",
+                        "api": "/api/system/api_white_list/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "ɾ��",
+                        "value": "api_white_list:Delete",
+                        "api": "/api/system/api_white_list/{id}/",
+                        "method": 3
+                    }
+                ],
+                "menu_field": [
+                    {
+                        "field_name": "create_datetime",
+                        "title": "����ʱ��",
+                        "model": "ApiWhiteList"
+                    },
+                    {
+                        "field_name": "creator",
+                        "title": "������",
+                        "model": "ApiWhiteList"
+                    },
+                    {
+                        "field_name": "dept_belong_id",
+                        "title": "���ݹ�������",
+                        "model": "ApiWhiteList"
+                    },
+                    {
+                        "field_name": "description",
+                        "title": "����",
+                        "model": "ApiWhiteList"
+                    },
+                    {
+                        "field_name": "enable_datasource",
+                        "title": "��������Ȩ��",
+                        "model": "ApiWhiteList"
+                    },
+                    {
+                        "field_name": "id",
+                        "title": "Id",
+                        "model": "ApiWhiteList"
+                    },
+                    {
+                        "field_name": "method",
+                        "title": "�ӿ����󷽷�",
+                        "model": "ApiWhiteList"
+                    },
+                    {
+                        "field_name": "modifier",
+                        "title": "�޸���",
+                        "model": "ApiWhiteList"
+                    },
+                    {
+                        "field_name": "update_datetime",
+                        "title": "�޸�ʱ��",
+                        "model": "ApiWhiteList"
+                    },
+                    {
+                        "field_name": "url",
+                        "title": "url",
+                        "model": "ApiWhiteList"
+                    }
+                ]
+            }
+        ],
+        "menu_button": [],
+        "menu_field": []
+    },
+    {
+        "name": "��������",
+        "icon": "iconfont icon-configure",
         "sort": 2,
         "is_link": false,
-        "is_catalog": false,
-        "web_path": "/areas",
-        "component": "system/areas/index",
-        "component_name": "areas",
+        "is_catalog": true,
+        "web_path": "/generalConfig",
+        "component": "",
+        "component_name": "",
         "status": true,
         "cache": false,
         "visible": true,
-        "children": [],
-        "menu_button": [
-          {
-            "name": "查询",
-            "value": "area:Search",
-            "api": "/api/system/area/",
-            "method": 0
-          },
-          {
-            "name": "详情",
-            "value": "area:Retrieve",
-            "api": "/api/system/area/{id}/",
-            "method": 0
-          },
-          {
-            "name": "新增",
-            "value": "area:Create",
-            "api": "/api/system/area/",
-            "method": 1
-          },
-          {
-            "name": "编辑",
-            "value": "area:Update",
-            "api": "/api/system/area/{id}/",
-            "method": 2
-          },
-          {
-            "name": "删除",
-            "value": "area:Delete",
-            "api": "/api/system/area/{id}/",
-            "method": 3
-          }
-        ]
-      },
-      {
-        "name": "附件管理",
-        "icon": "iconfont icon-file",
+        "parent": null,
+        "children": [
+            {
+                "name": "ϵͳ����",
+                "icon": "iconfont icon-system",
+                "sort": 0,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/config",
+                "component": "system/config/index",
+                "component_name": "config",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "parent": 10,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "��ѯ",
+                        "value": "system_config:Search",
+                        "api": "/api/system/system_config/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "system_config:Retrieve",
+                        "api": "/api/system/system_config/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "system_config:Create",
+                        "api": "/api/system/system_config/",
+                        "method": 1
+                    },
+                    {
+                        "name": "�༭",
+                        "value": "system_config:Update",
+                        "api": "/api/system/system_config/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "ɾ��",
+                        "value": "system_config:Delete",
+                        "api": "/api/system/system_config/{id}/",
+                        "method": 3
+                    }
+                ],
+                "menu_field": []
+            },
+            {
+                "name": "�ֵ����",
+                "icon": "iconfont icon-dict",
+                "sort": 1,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/dictionary",
+                "component": "system/dictionary/index",
+                "component_name": "dictionary",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "parent": 10,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "��ѯ",
+                        "value": "dictionary:Search",
+                        "api": "/api/system/dictionary/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "dictionary:Retrieve",
+                        "api": "/api/system/dictionary/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "dictionary:Create",
+                        "api": "/api/system/dictionary/",
+                        "method": 1
+                    },
+                    {
+                        "name": "�༭",
+                        "value": "dictionary:Update",
+                        "api": "/api/system/dictionary/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "ɾ��",
+                        "value": "dictionary:Delete",
+                        "api": "/api/system/dictionary/{id}/",
+                        "method": 3
+                    }
+                ],
+                "menu_field": [
+                    {
+                        "field_name": "color",
+                        "title": "��ɫ",
+                        "model": "Dictionary"
+                    },
+                    {
+                        "field_name": "create_datetime",
+                        "title": "����ʱ��",
+                        "model": "Dictionary"
+                    },
+                    {
+                        "field_name": "creator",
+                        "title": "������",
+                        "model": "Dictionary"
+                    },
+                    {
+                        "field_name": "dept_belong_id",
+                        "title": "���ݹ�������",
+                        "model": "Dictionary"
+                    },
+                    {
+                        "field_name": "description",
+                        "title": "����",
+                        "model": "Dictionary"
+                    },
+                    {
+                        "field_name": "id",
+                        "title": "Id",
+                        "model": "Dictionary"
+                    },
+                    {
+                        "field_name": "is_value",
+                        "title": "�Ƿ�Ϊvalueֵ",
+                        "model": "Dictionary"
+                    },
+                    {
+                        "field_name": "label",
+                        "title": "�ֵ�����",
+                        "model": "Dictionary"
+                    },
+                    {
+                        "field_name": "modifier",
+                        "title": "�޸���",
+                        "model": "Dictionary"
+                    },
+                    {
+                        "field_name": "parent",
+                        "title": "����",
+                        "model": "Dictionary"
+                    },
+                    {
+                        "field_name": "remark",
+                        "title": "��ע",
+                        "model": "Dictionary"
+                    },
+                    {
+                        "field_name": "sort",
+                        "title": "��ʾ����",
+                        "model": "Dictionary"
+                    },
+                    {
+                        "field_name": "status",
+                        "title": "״̬",
+                        "model": "Dictionary"
+                    },
+                    {
+                        "field_name": "type",
+                        "title": "����ֵ����",
+                        "model": "Dictionary"
+                    },
+                    {
+                        "field_name": "update_datetime",
+                        "title": "�޸�ʱ��",
+                        "model": "Dictionary"
+                    },
+                    {
+                        "field_name": "value",
+                        "title": "�ֵ���",
+                        "model": "Dictionary"
+                    }
+                ]
+            },
+            {
+                "name": "��������",
+                "icon": "iconfont icon-Area",
+                "sort": 2,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/areas",
+                "component": "system/areas/index",
+                "component_name": "areas",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "parent": 10,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "��ѯ",
+                        "value": "area:Search",
+                        "api": "/api/system/area/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "area:Retrieve",
+                        "api": "/api/system/area/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "area:Create",
+                        "api": "/api/system/area/",
+                        "method": 1
+                    },
+                    {
+                        "name": "�༭",
+                        "value": "area:Update",
+                        "api": "/api/system/area/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "ɾ��",
+                        "value": "area:Delete",
+                        "api": "/api/system/area/{id}/",
+                        "method": 3
+                    }
+                ],
+                "menu_field": [
+                    {
+                        "field_name": "code",
+                        "title": "��������",
+                        "model": "Area"
+                    },
+                    {
+                        "field_name": "create_datetime",
+                        "title": "����ʱ��",
+                        "model": "Area"
+                    },
+                    {
+                        "field_name": "creator",
+                        "title": "������",
+                        "model": "Area"
+                    },
+                    {
+                        "field_name": "dept_belong_id",
+                        "title": "���ݹ�������",
+                        "model": "Area"
+                    },
+                    {
+                        "field_name": "description",
+                        "title": "����",
+                        "model": "Area"
+                    },
+                    {
+                        "field_name": "enable",
+                        "title": "�Ƿ�����",
+                        "model": "Area"
+                    },
+                    {
+                        "field_name": "id",
+                        "title": "Id",
+                        "model": "Area"
+                    },
+                    {
+                        "field_name": "initials",
+                        "title": "����ĸ",
+                        "model": "Area"
+                    },
+                    {
+                        "field_name": "level",
+                        "title": "�����㼶(1ʡ�� 2���� 3���� 4�缶)",
+                        "model": "Area"
+                    },
+                    {
+                        "field_name": "modifier",
+                        "title": "�޸���",
+                        "model": "Area"
+                    },
+                    {
+                        "field_name": "name",
+                        "title": "����",
+                        "model": "Area"
+                    },
+                    {
+                        "field_name": "pcode",
+                        "title": "����������",
+                        "model": "Area"
+                    },
+                    {
+                        "field_name": "pinyin",
+                        "title": "ƴ��",
+                        "model": "Area"
+                    },
+                    {
+                        "field_name": "update_datetime",
+                        "title": "�޸�ʱ��",
+                        "model": "Area"
+                    }
+                ]
+            },
+            {
+                "name": "��������",
+                "icon": "iconfont icon-file",
+                "sort": 3,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/file",
+                "component": "system/fileList/index",
+                "component_name": "file",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "parent": 10,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "����",
+                        "value": "file:Retrieve",
+                        "api": "/api/system/file/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "��ѯ",
+                        "value": "file:Search",
+                        "api": "/api/system/file/",
+                        "method": 0
+                    },
+                    {
+                        "name": "�༭",
+                        "value": "file:Update",
+                        "api": "/api/system/file/{id}/",
+                        "method": 1
+                    },
+                    {
+                        "name": "ɾ��",
+                        "value": "file:Delete",
+                        "api": "/api/system/file/{id}/",
+                        "method": 3
+                    }
+                ],
+                "menu_field": [
+                    {
+                        "field_name": "create_datetime",
+                        "title": "����ʱ��",
+                        "model": "FileList"
+                    },
+                    {
+                        "field_name": "creator",
+                        "title": "������",
+                        "model": "FileList"
+                    },
+                    {
+                        "field_name": "dept_belong_id",
+                        "title": "���ݹ�������",
+                        "model": "FileList"
+                    },
+                    {
+                        "field_name": "description",
+                        "title": "����",
+                        "model": "FileList"
+                    },
+                    {
+                        "field_name": "engine",
+                        "title": "����",
+                        "model": "FileList"
+                    },
+                    {
+                        "field_name": "file_url",
+                        "title": "�ļ���ַ",
+                        "model": "FileList"
+                    },
+                    {
+                        "field_name": "id",
+                        "title": "Id",
+                        "model": "FileList"
+                    },
+                    {
+                        "field_name": "md5sum",
+                        "title": "�ļ�md5",
+                        "model": "FileList"
+                    },
+                    {
+                        "field_name": "mime_type",
+                        "title": "Mime����",
+                        "model": "FileList"
+                    },
+                    {
+                        "field_name": "modifier",
+                        "title": "�޸���",
+                        "model": "FileList"
+                    },
+                    {
+                        "field_name": "name",
+                        "title": "����",
+                        "model": "FileList"
+                    },
+                    {
+                        "field_name": "size",
+                        "title": "�ļ���С",
+                        "model": "FileList"
+                    },
+                    {
+                        "field_name": "update_datetime",
+                        "title": "�޸�ʱ��",
+                        "model": "FileList"
+                    },
+                    {
+                        "field_name": "url",
+                        "title": "url",
+                        "model": "FileList"
+                    }
+                ]
+            }
+        ],
+        "menu_button": [],
+        "menu_field": []
+    },
+    {
+        "name": "��־����",
+        "icon": "iconfont icon-rizhi",
         "sort": 3,
         "is_link": false,
-        "is_catalog": false,
-        "web_path": "/file",
-        "component": "system/fileList/index",
-        "component_name": "file",
-        "status": true,
-        "cache": false,
-        "visible": true,
-        "children": [],
-        "menu_button": [
-          {
-            "name": "详情",
-            "value": "file:Retrieve",
-            "api": "/api/system/file/{id}/",
-            "method": 0
-          },
-          {
-            "name": "查询",
-            "value": "file:Search",
-            "api": "/api/system/file/",
-            "method": 0
-          },
-          {
-            "name": "编辑",
-            "value": "file:Update",
-            "api": "/api/system/file/{id}/",
-            "method": 1
-          },
-          {
-            "name": "删除",
-            "value": "file:Delete",
-            "api": "/api/system/file/{id}/",
-            "method": 3
-          }
-        ]
-      }
-    ],
-    "menu_button": []
-  },
-  {
-    "name": "日志管理",
-    "icon": "iconfont icon-rizhi",
-    "sort": 3,
-    "is_link": false,
-    "is_catalog": true,
-    "web_path": "/log",
-    "component": "",
-    "component_name": "",
-    "status": true,
-    "cache": false,
-    "visible": true,
-    "children": [
-      {
-        "name": "登录日志",
-        "icon": "iconfont icon-guanlidenglurizhi",
-        "sort": 1,
-        "is_link": false,
-        "is_catalog": false,
-        "web_path": "/loginLog",
-        "component": "system/log/loginLog/index",
-        "component_name": "loginLog",
-        "status": true,
-        "cache": false,
-        "visible": true,
-        "children": [],
-        "menu_button": [
-          {
-            "name": "查询",
-            "value": "login_log:Search",
-            "api": "/api/system/login_log/",
-            "method": 0
-          },
-          {
-            "name": "详情",
-            "value": "login_log:Retrieve",
-            "api": "/api/system/login_log/{id}/",
-            "method": 0
-          }
-        ]
-      },
-      {
-        "name": "操作日志",
-        "icon": "iconfont icon-caozuorizhi",
-        "sort": 2,
-        "is_link": false,
-        "is_catalog": false,
-        "web_path": "/operationLog",
-        "component": "system/log/operationLog/index",
-        "component_name": "operationLog",
+        "is_catalog": true,
+        "web_path": "/log",
+        "component": "",
+        "component_name": "",
         "status": true,
         "cache": false,
         "visible": true,
-        "children": [],
-        "menu_button": [
-          {
-            "name": "详情",
-            "value": "operation_log:Retrieve",
-            "api": "/api/system/operation_log/{id}/",
-            "method": 0
-          },
-          {
-            "name": "查询",
-            "value": "operation_log:Search",
-            "api": "/api/system/operation_log/",
-            "method": 0
-          }
-        ]
-      }
-    ],
-    "menu_button": []
-  }
+        "parent": null,
+        "children": [
+            {
+                "name": "��¼��־",
+                "icon": "iconfont icon-guanlidenglurizhi",
+                "sort": 1,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/loginLog",
+                "component": "system/log/loginLog/index",
+                "component_name": "loginLog",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "parent": 15,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "��ѯ",
+                        "value": "login_log:Search",
+                        "api": "/api/system/login_log/",
+                        "method": 0
+                    },
+                    {
+                        "name": "����",
+                        "value": "login_log:Retrieve",
+                        "api": "/api/system/login_log/{id}/",
+                        "method": 0
+                    }
+                ],
+                "menu_field": [
+                    {
+                        "field_name": "agent",
+                        "title": "agent��Ϣ",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "area_code",
+                        "title": "�������",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "browser",
+                        "title": "�������",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "city",
+                        "title": "����",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "continent",
+                        "title": "��",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "country",
+                        "title": "����",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "country_code",
+                        "title": "���",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "country_english",
+                        "title": "Ӣ��ȫ��",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "create_datetime",
+                        "title": "����ʱ��",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "creator",
+                        "title": "������",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "dept_belong_id",
+                        "title": "���ݹ�������",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "description",
+                        "title": "����",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "district",
+                        "title": "����",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "id",
+                        "title": "Id",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "ip",
+                        "title": "��¼ip",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "isp",
+                        "title": "��Ӫ��",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "latitude",
+                        "title": "�",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "login_type",
+                        "title": "��¼����",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "longitude",
+                        "title": "����",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "modifier",
+                        "title": "�޸���",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "os",
+                        "title": "����ϵͳ",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "province",
+                        "title": "ʡ��",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "update_datetime",
+                        "title": "�޸�ʱ��",
+                        "model": "LoginLog"
+                    },
+                    {
+                        "field_name": "username",
+                        "title": "��¼�û���",
+                        "model": "LoginLog"
+                    }
+                ]
+            },
+            {
+                "name": "������־",
+                "icon": "iconfont icon-caozuorizhi",
+                "sort": 2,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/operationLog",
+                "component": "system/log/operationLog/index",
+                "component_name": "operationLog",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "parent": 15,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "����",
+                        "value": "operation_log:Retrieve",
+                        "api": "/api/system/operation_log/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "��ѯ",
+                        "value": "operation_log:Search",
+                        "api": "/api/system/operation_log/",
+                        "method": 0
+                    }
+                ],
+                "menu_field": [
+                    {
+                        "field_name": "create_datetime",
+                        "title": "����ʱ��",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "creator",
+                        "title": "������",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "dept_belong_id",
+                        "title": "���ݹ�������",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "description",
+                        "title": "����",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "id",
+                        "title": "Id",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "json_result",
+                        "title": "������Ϣ",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "modifier",
+                        "title": "�޸���",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "request_body",
+                        "title": "�������",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "request_browser",
+                        "title": "���������",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "request_ip",
+                        "title": "����ip��ַ",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "request_method",
+                        "title": "����ʽ",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "request_modular",
+                        "title": "����ģ��",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "request_msg",
+                        "title": "����˵��",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "request_os",
+                        "title": "����ϵͳ",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "request_path",
+                        "title": "�����ַ",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "response_code",
+                        "title": "��Ӧ״̬��",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "status",
+                        "title": "��Ӧ״̬",
+                        "model": "OperationLog"
+                    },
+                    {
+                        "field_name": "update_datetime",
+                        "title": "�޸�ʱ��",
+                        "model": "OperationLog"
+                    }
+                ]
+            }
+        ],
+        "menu_button": [],
+        "menu_field": []
+    }
 ]
\ No newline at end of file
-- 
Gitee


From d721405ee4d34ca07e64051fb69c1c8e1c1c6322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Sun, 26 Nov 2023 11:43:43 +0800
Subject: [PATCH 31/40] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E5=88=97=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=88=9D=E5=A7=8B=E5=8C=96=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/system/menu/components/MenuFieldCom/crud.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/src/views/system/menu/components/MenuFieldCom/crud.tsx b/web/src/views/system/menu/components/MenuFieldCom/crud.tsx
index 17d4a8316..e60ba47ce 100644
--- a/web/src/views/system/menu/components/MenuFieldCom/crud.tsx
+++ b/web/src/views/system/menu/components/MenuFieldCom/crud.tsx
@@ -133,6 +133,7 @@ export const createCrudOptions = function ({ crudExpose, props,modelDialog,selec
 						],
 						component: {
 							span: 12,
+							placeholder: '请输入中文名',
 						},
 					},
 				},
@@ -152,6 +153,7 @@ export const createCrudOptions = function ({ crudExpose, props,modelDialog,selec
 						],
 						component: {
 							span: 12,
+							placeholder: '请输入字段名',
 						},
 					},
 				},
-- 
Gitee


From a2d4d6e07e5748800e8d4bba65a4ed14488a1513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Tue, 28 Nov 2023 10:29:05 +0800
Subject: [PATCH 32/40] =?UTF-8?q?feat:=20=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dvadmin/system/fixtures/init_menu.json    | 426 +++++++++---------
 1 file changed, 213 insertions(+), 213 deletions(-)

diff --git a/backend/dvadmin/system/fixtures/init_menu.json b/backend/dvadmin/system/fixtures/init_menu.json
index 61a50589b..425887234 100644
--- a/backend/dvadmin/system/fixtures/init_menu.json
+++ b/backend/dvadmin/system/fixtures/init_menu.json
@@ -1,6 +1,6 @@
 [
     {
-        "name": "ϵͳ����",
+        "name": "系统管理",
         "icon": "iconfont icon-xitongshezhi",
         "sort": 1,
         "is_link": false,
@@ -14,7 +14,7 @@
         "parent": null,
         "children": [
             {
-                "name": "�˵�����",
+                "name": "菜单管理",
                 "icon": "iconfont icon-caidan",
                 "sort": 1,
                 "is_link": false,
@@ -29,109 +29,109 @@
                 "children": [],
                 "menu_button": [
                     {
-                        "name": "��ѯ",
+                        "name": "查询",
                         "value": "menu:Search",
                         "api": "/api/system/menu/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "详情",
                         "value": "menu:Retrieve",
                         "api": "/api/system/menu/{id}/",
                         "method": 0
                     },
                     {
-                        "name": "��ѯ����",
+                        "name": "查询所有",
                         "value": "menu:SearchAll",
                         "api": "/api/system/menu/get_all_menu/",
                         "method": 0
                     },
                     {
-                        "name": "·��",
+                        "name": "路由",
                         "value": "menu:router",
                         "api": "/api/system/menu/web_router/",
                         "method": 0
                     },
                     {
-                        "name": "��ѯ��ťȨ��",
+                        "name": "查询按钮权限",
                         "value": "btn:Search",
                         "api": "/api/system/menu_button/",
                         "method": 0
                     },
                     {
-                        "name": "��ѯ��Ȩ��",
+                        "name": "查询列权限",
                         "value": "column:Search",
                         "api": "/api/system/column/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "新增",
                         "value": "menu:Create",
                         "api": "/api/system/menu/",
                         "method": 1
                     },
                     {
-                        "name": "����",
+                        "name": "上移",
                         "value": "menu:MoveUp",
                         "api": "/api/system/menu/mode_up/",
                         "method": 1
                     },
                     {
-                        "name": "����",
+                        "name": "下移",
                         "value": "menu:MoveDown",
                         "api": "/api/system/menu/mode_down/",
                         "method": 1
                     },
                     {
-                        "name": "������ťȨ��",
+                        "name": "新增按钮权限",
                         "value": "btn:Create",
                         "api": "/api/system/menu_button/",
                         "method": 1
                     },
                     {
-                        "name": "������Ȩ��",
+                        "name": "新增列权限",
                         "value": "column:Create",
                         "api": "/api/system/column/",
                         "method": 1
                     },
                     {
-                        "name": "�Զ�ƥ����Ȩ��",
+                        "name": "自动匹配列权限",
                         "value": "column:Match",
                         "api": "/api/system/column/auto_match_fields/",
                         "method": 1
                     },
                     {
-                        "name": "�༭",
+                        "name": "编辑",
                         "value": "menu:Update",
                         "api": "/api/system/menu/{id}/",
                         "method": 2
                     },
                     {
-                        "name": "�޸İ�ťȨ��",
+                        "name": "修改按钮权限",
                         "value": "btn:Update",
                         "api": "/api/system/menu_button/{id}/",
                         "method": 2
                     },
                     {
-                        "name": "�༭��Ȩ��",
+                        "name": "编辑列权限",
                         "value": "column:Update",
                         "api": "/api/system/column/{id}/",
                         "method": 2
                     },
                     {
-                        "name": "ɾ��",
+                        "name": "删除",
                         "value": "menu:Delete",
                         "api": "/api/system/menu/{id}/",
                         "method": 3
                     },
                     {
-                        "name": "ɾ����ťȨ��",
+                        "name": "删除按钮权限",
                         "value": "btn:Delete",
                         "api": "/api/system/menu_button/{id}/",
                         "method": 3
                     },
                     {
-                        "name": "ɾ����Ȩ��",
+                        "name": "删除列权限",
                         "value": "column:Delete",
                         "api": "/api/system/column/{id}/",
                         "method": 3
@@ -140,7 +140,7 @@
                 "menu_field": []
             },
             {
-                "name": "���Ź���",
+                "name": "部门管理",
                 "icon": "ele-OfficeBuilding",
                 "sort": 3,
                 "is_link": false,
@@ -155,61 +155,61 @@
                 "children": [],
                 "menu_button": [
                     {
-                        "name": "��ѯ",
+                        "name": "查询",
                         "value": "dept:Search",
                         "api": "/api/system/dept/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "详情",
                         "value": "dept:Retrieve",
                         "api": "/api/system/dept/{id}/",
                         "method": 0
                     },
                     {
-                        "name": "��ѯ����",
+                        "name": "查询所有",
                         "value": "dept:SearchAll",
                         "api": "/api/system/dept/all_dept/",
                         "method": 0
                     },
                     {
-                        "name": "�����ز�ѯ����",
+                        "name": "懒加载查询所有",
                         "value": "dept:LazySearchAll",
                         "api": "/api/system/dept/dept_lazy_tree/",
                         "method": 0
                     },
                     {
-                        "name": "ͷ��Ϣ",
+                        "name": "头信息",
                         "value": "dept:HeaderInfo",
                         "api": "/api/system/dept/dept_info/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "新增",
                         "value": "dept:Create",
                         "api": "/api/system/dept/",
                         "method": 1
                     },
                     {
-                        "name": "����",
+                        "name": "上移",
                         "value": "dept:MoveUp",
                         "api": "/api/system/dept/mode_up/",
                         "method": 1
                     },
                     {
-                        "name": "����",
+                        "name": "下移",
                         "value": "dept:MoveDown",
                         "api": "/api/system/dept/mode_down/",
                         "method": 1
                     },
                     {
-                        "name": "�༭",
+                        "name": "编辑",
                         "value": "dept:Update",
                         "api": "/api/system/dept/{id}/",
                         "method": 2
                     },
                     {
-                        "name": "ɾ��",
+                        "name": "删除",
                         "value": "dept:Delete",
                         "api": "/api/system/dept/{id}/",
                         "method": 3
@@ -218,7 +218,7 @@
                 "menu_field": []
             },
             {
-                "name": "��ɫ����",
+                "name": "角色管理",
                 "icon": "ele-ColdDrink",
                 "sort": 4,
                 "is_link": false,
@@ -233,43 +233,43 @@
                 "children": [],
                 "menu_button": [
                     {
-                        "name": "��ѯ",
+                        "name": "查询",
                         "value": "role:Search",
                         "api": "/api/system/role/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "详情",
                         "value": "role:Retrieve",
                         "api": "/api/system/role/{id}/",
                         "method": 0
                     },
                     {
-                        "name": "Ȩ������",
+                        "name": "权限配置",
                         "value": "role:Permission",
                         "api": "/api/system/role/{id}/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "新增",
                         "value": "role:Create",
                         "api": "/api/system/role/",
                         "method": 1
                     },
                     {
-                        "name": "�༭",
+                        "name": "编辑",
                         "value": "role:Update",
                         "api": "/api/system/role/{id}/",
                         "method": 2
                     },
                     {
-                        "name": "����",
+                        "name": "保存",
                         "value": "role:Save",
                         "api": "/api/system/role/{id}/",
                         "method": 2
                     },
                     {
-                        "name": "ɾ��",
+                        "name": "删除",
                         "value": "role:Delete",
                         "api": "/api/system/role/{id}/",
                         "method": 3
@@ -278,22 +278,22 @@
                 "menu_field": [
                     {
                         "field_name": "create_datetime",
-                        "title": "����ʱ��",
+                        "title": "创建时间",
                         "model": "Role"
                     },
                     {
                         "field_name": "creator",
-                        "title": "������",
+                        "title": "创建人",
                         "model": "Role"
                     },
                     {
                         "field_name": "dept_belong_id",
-                        "title": "���ݹ�������",
+                        "title": "数据归属部门",
                         "model": "Role"
                     },
                     {
                         "field_name": "description",
-                        "title": "����",
+                        "title": "描述",
                         "model": "Role"
                     },
                     {
@@ -303,38 +303,38 @@
                     },
                     {
                         "field_name": "key",
-                        "title": "Ȩ���ַ�",
+                        "title": "权限字符",
                         "model": "Role"
                     },
                     {
                         "field_name": "modifier",
-                        "title": "�޸���",
+                        "title": "修改人",
                         "model": "Role"
                     },
                     {
                         "field_name": "name",
-                        "title": "��ɫ����",
+                        "title": "角色名称",
                         "model": "Role"
                     },
                     {
                         "field_name": "sort",
-                        "title": "��ɫ˳��",
+                        "title": "角色顺序",
                         "model": "Role"
                     },
                     {
                         "field_name": "status",
-                        "title": "��ɫ״̬",
+                        "title": "角色状态",
                         "model": "Role"
                     },
                     {
                         "field_name": "update_datetime",
-                        "title": "�޸�ʱ��",
+                        "title": "修改时间",
                         "model": "Role"
                     }
                 ]
             },
             {
-                "name": "�û�����",
+                "name": "用户管理",
                 "icon": "iconfont icon-icon-",
                 "sort": 6,
                 "is_link": false,
@@ -349,55 +349,55 @@
                 "children": [],
                 "menu_button": [
                     {
-                        "name": "��ѯ",
+                        "name": "查询",
                         "value": "user:Search",
                         "api": "/api/system/user/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "详情",
                         "value": "user:Retrieve",
                         "api": "/api/system/user/{id}/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "新增",
                         "value": "user:Create",
                         "api": "/api/system/user/",
                         "method": 1
                     },
                     {
-                        "name": "����",
+                        "name": "导出",
                         "value": "user:Export",
                         "api": "/api/system/user/export/",
                         "method": 1
                     },
                     {
-                        "name": "����",
+                        "name": "导入",
                         "value": "user:Import",
                         "api": "/api/system/user/import/",
                         "method": 1
                     },
                     {
-                        "name": "�༭",
+                        "name": "编辑",
                         "value": "user:Update",
                         "api": "/api/system/user/{id}/",
                         "method": 2
                     },
                     {
-                        "name": "��������",
+                        "name": "重设密码",
                         "value": "user:ResetPassword",
                         "api": "/api/system/user/{id}/reset_password/",
                         "method": 2
                     },
                     {
-                        "name": "��������",
+                        "name": "重置密码",
                         "value": "user:DefaultPassword",
                         "api": "/api/system/user/{id}/reset_to_default_password/",
                         "method": 2
                     },
                     {
-                        "name": "ɾ��",
+                        "name": "删除",
                         "value": "user:Delete",
                         "api": "/api/system/user/{id}/",
                         "method": 3
@@ -406,42 +406,42 @@
                 "menu_field": [
                     {
                         "field_name": "avatar",
-                        "title": "ͷ��",
+                        "title": "头像",
                         "model": "Users"
                     },
                     {
                         "field_name": "create_datetime",
-                        "title": "����ʱ��",
+                        "title": "创建时间",
                         "model": "Users"
                     },
                     {
                         "field_name": "creator",
-                        "title": "������",
+                        "title": "创建人",
                         "model": "Users"
                     },
                     {
                         "field_name": "dept",
-                        "title": "��������",
+                        "title": "所属部门",
                         "model": "Users"
                     },
                     {
                         "field_name": "dept_belong_id",
-                        "title": "���ݹ�������",
+                        "title": "数据归属部门",
                         "model": "Users"
                     },
                     {
                         "field_name": "description",
-                        "title": "����",
+                        "title": "描述",
                         "model": "Users"
                     },
                     {
                         "field_name": "email",
-                        "title": "����",
+                        "title": "邮箱",
                         "model": "Users"
                     },
                     {
                         "field_name": "gender",
-                        "title": "�Ա�",
+                        "title": "性别",
                         "model": "Users"
                     },
                     {
@@ -451,38 +451,38 @@
                     },
                     {
                         "field_name": "mobile",
-                        "title": "�绰",
+                        "title": "电话",
                         "model": "Users"
                     },
                     {
                         "field_name": "modifier",
-                        "title": "�޸���",
+                        "title": "修改人",
                         "model": "Users"
                     },
                     {
                         "field_name": "name",
-                        "title": "����",
+                        "title": "姓名",
                         "model": "Users"
                     },
                     {
                         "field_name": "update_datetime",
-                        "title": "�޸�ʱ��",
+                        "title": "修改时间",
                         "model": "Users"
                     },
                     {
                         "field_name": "username",
-                        "title": "�û��˺�",
+                        "title": "用户账号",
                         "model": "Users"
                     },
                     {
                         "field_name": "user_type",
-                        "title": "�û�����",
+                        "title": "用户类型",
                         "model": "Users"
                     }
                 ]
             },
             {
-                "name": "��Ϣ����",
+                "name": "消息中心",
                 "icon": "iconfont icon-xiaoxizhongxin",
                 "sort": 7,
                 "is_link": false,
@@ -497,31 +497,31 @@
                 "children": [],
                 "menu_button": [
                     {
-                        "name": "��ѯ",
+                        "name": "查询",
                         "value": "messageCenter:Search",
                         "api": "/api/system/message_center/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "详情",
                         "value": "messageCenter:Retrieve",
                         "api": "/api/system/message_center/{id}/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "新增",
                         "value": "messageCenter:Create",
                         "api": "/api/system/message_center/",
                         "method": 1
                     },
                     {
-                        "name": "�༭",
+                        "name": "编辑",
                         "value": "messageCenter:Update",
                         "api": "/api/system/message_center/{id}/",
                         "method": 2
                     },
                     {
-                        "name": "ɾ��",
+                        "name": "删除",
                         "value": "messageCenter:Delete",
                         "api": "/api/system/menu/{id}/",
                         "method": 3
@@ -530,27 +530,27 @@
                 "menu_field": [
                     {
                         "field_name": "content",
-                        "title": "����",
+                        "title": "内容",
                         "model": "MessageCenter"
                     },
                     {
                         "field_name": "create_datetime",
-                        "title": "����ʱ��",
+                        "title": "创建时间",
                         "model": "MessageCenter"
                     },
                     {
                         "field_name": "creator",
-                        "title": "������",
+                        "title": "创建人",
                         "model": "MessageCenter"
                     },
                     {
                         "field_name": "dept_belong_id",
-                        "title": "���ݹ�������",
+                        "title": "数据归属部门",
                         "model": "MessageCenter"
                     },
                     {
                         "field_name": "description",
-                        "title": "����",
+                        "title": "描述",
                         "model": "MessageCenter"
                     },
                     {
@@ -560,28 +560,28 @@
                     },
                     {
                         "field_name": "modifier",
-                        "title": "�޸���",
+                        "title": "修改人",
                         "model": "MessageCenter"
                     },
                     {
                         "field_name": "target_type",
-                        "title": "Ŀ������",
+                        "title": "目标类型",
                         "model": "MessageCenter"
                     },
                     {
                         "field_name": "title",
-                        "title": "����",
+                        "title": "标题",
                         "model": "MessageCenter"
                     },
                     {
                         "field_name": "update_datetime",
-                        "title": "�޸�ʱ��",
+                        "title": "修改时间",
                         "model": "MessageCenter"
                     }
                 ]
             },
             {
-                "name": "�ӿڰ�����",
+                "name": "接口白名单",
                 "icon": "ele-SetUp",
                 "sort": 8,
                 "is_link": false,
@@ -596,31 +596,31 @@
                 "children": [],
                 "menu_button": [
                     {
-                        "name": "��ѯ",
+                        "name": "查询",
                         "value": "api_white_list:Search",
                         "api": "/api/system/api_white_list/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "详情",
                         "value": "api_white_list:Retrieve",
                         "api": "/api/system/api_white_list/{id}/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "新增",
                         "value": "api_white_list:Create",
                         "api": "/api/system/api_white_list/",
                         "method": 1
                     },
                     {
-                        "name": "�༭",
+                        "name": "编辑",
                         "value": "api_white_list:Update",
                         "api": "/api/system/api_white_list/{id}/",
                         "method": 2
                     },
                     {
-                        "name": "ɾ��",
+                        "name": "删除",
                         "value": "api_white_list:Delete",
                         "api": "/api/system/api_white_list/{id}/",
                         "method": 3
@@ -629,27 +629,27 @@
                 "menu_field": [
                     {
                         "field_name": "create_datetime",
-                        "title": "����ʱ��",
+                        "title": "创建时间",
                         "model": "ApiWhiteList"
                     },
                     {
                         "field_name": "creator",
-                        "title": "������",
+                        "title": "创建人",
                         "model": "ApiWhiteList"
                     },
                     {
                         "field_name": "dept_belong_id",
-                        "title": "���ݹ�������",
+                        "title": "数据归属部门",
                         "model": "ApiWhiteList"
                     },
                     {
                         "field_name": "description",
-                        "title": "����",
+                        "title": "描述",
                         "model": "ApiWhiteList"
                     },
                     {
                         "field_name": "enable_datasource",
-                        "title": "��������Ȩ��",
+                        "title": "激活数据权限",
                         "model": "ApiWhiteList"
                     },
                     {
@@ -659,17 +659,17 @@
                     },
                     {
                         "field_name": "method",
-                        "title": "�ӿ����󷽷�",
+                        "title": "接口请求方法",
                         "model": "ApiWhiteList"
                     },
                     {
                         "field_name": "modifier",
-                        "title": "�޸���",
+                        "title": "修改人",
                         "model": "ApiWhiteList"
                     },
                     {
                         "field_name": "update_datetime",
-                        "title": "�޸�ʱ��",
+                        "title": "修改时间",
                         "model": "ApiWhiteList"
                     },
                     {
@@ -684,7 +684,7 @@
         "menu_field": []
     },
     {
-        "name": "��������",
+        "name": "常规配置",
         "icon": "iconfont icon-configure",
         "sort": 2,
         "is_link": false,
@@ -698,7 +698,7 @@
         "parent": null,
         "children": [
             {
-                "name": "ϵͳ����",
+                "name": "系统配置",
                 "icon": "iconfont icon-system",
                 "sort": 0,
                 "is_link": false,
@@ -713,31 +713,31 @@
                 "children": [],
                 "menu_button": [
                     {
-                        "name": "��ѯ",
+                        "name": "查询",
                         "value": "system_config:Search",
                         "api": "/api/system/system_config/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "详情",
                         "value": "system_config:Retrieve",
                         "api": "/api/system/system_config/{id}/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "新增",
                         "value": "system_config:Create",
                         "api": "/api/system/system_config/",
                         "method": 1
                     },
                     {
-                        "name": "�༭",
+                        "name": "编辑",
                         "value": "system_config:Update",
                         "api": "/api/system/system_config/{id}/",
                         "method": 2
                     },
                     {
-                        "name": "ɾ��",
+                        "name": "删除",
                         "value": "system_config:Delete",
                         "api": "/api/system/system_config/{id}/",
                         "method": 3
@@ -746,7 +746,7 @@
                 "menu_field": []
             },
             {
-                "name": "�ֵ����",
+                "name": "字典管理",
                 "icon": "iconfont icon-dict",
                 "sort": 1,
                 "is_link": false,
@@ -761,31 +761,31 @@
                 "children": [],
                 "menu_button": [
                     {
-                        "name": "��ѯ",
+                        "name": "查询",
                         "value": "dictionary:Search",
                         "api": "/api/system/dictionary/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "详情",
                         "value": "dictionary:Retrieve",
                         "api": "/api/system/dictionary/{id}/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "新增",
                         "value": "dictionary:Create",
                         "api": "/api/system/dictionary/",
                         "method": 1
                     },
                     {
-                        "name": "�༭",
+                        "name": "编辑",
                         "value": "dictionary:Update",
                         "api": "/api/system/dictionary/{id}/",
                         "method": 2
                     },
                     {
-                        "name": "ɾ��",
+                        "name": "删除",
                         "value": "dictionary:Delete",
                         "api": "/api/system/dictionary/{id}/",
                         "method": 3
@@ -794,27 +794,27 @@
                 "menu_field": [
                     {
                         "field_name": "color",
-                        "title": "��ɫ",
+                        "title": "颜色",
                         "model": "Dictionary"
                     },
                     {
                         "field_name": "create_datetime",
-                        "title": "����ʱ��",
+                        "title": "创建时间",
                         "model": "Dictionary"
                     },
                     {
                         "field_name": "creator",
-                        "title": "������",
+                        "title": "创建人",
                         "model": "Dictionary"
                     },
                     {
                         "field_name": "dept_belong_id",
-                        "title": "���ݹ�������",
+                        "title": "数据归属部门",
                         "model": "Dictionary"
                     },
                     {
                         "field_name": "description",
-                        "title": "����",
+                        "title": "描述",
                         "model": "Dictionary"
                     },
                     {
@@ -824,58 +824,58 @@
                     },
                     {
                         "field_name": "is_value",
-                        "title": "�Ƿ�Ϊvalueֵ",
+                        "title": "是否为value值",
                         "model": "Dictionary"
                     },
                     {
                         "field_name": "label",
-                        "title": "�ֵ�����",
+                        "title": "字典名称",
                         "model": "Dictionary"
                     },
                     {
                         "field_name": "modifier",
-                        "title": "�޸���",
+                        "title": "修改人",
                         "model": "Dictionary"
                     },
                     {
                         "field_name": "parent",
-                        "title": "����",
+                        "title": "父级",
                         "model": "Dictionary"
                     },
                     {
                         "field_name": "remark",
-                        "title": "��ע",
+                        "title": "备注",
                         "model": "Dictionary"
                     },
                     {
                         "field_name": "sort",
-                        "title": "��ʾ����",
+                        "title": "显示排序",
                         "model": "Dictionary"
                     },
                     {
                         "field_name": "status",
-                        "title": "״̬",
+                        "title": "状态",
                         "model": "Dictionary"
                     },
                     {
                         "field_name": "type",
-                        "title": "����ֵ����",
+                        "title": "数据值类型",
                         "model": "Dictionary"
                     },
                     {
                         "field_name": "update_datetime",
-                        "title": "�޸�ʱ��",
+                        "title": "修改时间",
                         "model": "Dictionary"
                     },
                     {
                         "field_name": "value",
-                        "title": "�ֵ���",
+                        "title": "字典编号",
                         "model": "Dictionary"
                     }
                 ]
             },
             {
-                "name": "��������",
+                "name": "地区管理",
                 "icon": "iconfont icon-Area",
                 "sort": 2,
                 "is_link": false,
@@ -890,31 +890,31 @@
                 "children": [],
                 "menu_button": [
                     {
-                        "name": "��ѯ",
+                        "name": "查询",
                         "value": "area:Search",
                         "api": "/api/system/area/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "详情",
                         "value": "area:Retrieve",
                         "api": "/api/system/area/{id}/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "新增",
                         "value": "area:Create",
                         "api": "/api/system/area/",
                         "method": 1
                     },
                     {
-                        "name": "�༭",
+                        "name": "编辑",
                         "value": "area:Update",
                         "api": "/api/system/area/{id}/",
                         "method": 2
                     },
                     {
-                        "name": "ɾ��",
+                        "name": "删除",
                         "value": "area:Delete",
                         "api": "/api/system/area/{id}/",
                         "method": 3
@@ -923,32 +923,32 @@
                 "menu_field": [
                     {
                         "field_name": "code",
-                        "title": "��������",
+                        "title": "地区编码",
                         "model": "Area"
                     },
                     {
                         "field_name": "create_datetime",
-                        "title": "����ʱ��",
+                        "title": "创建时间",
                         "model": "Area"
                     },
                     {
                         "field_name": "creator",
-                        "title": "������",
+                        "title": "创建人",
                         "model": "Area"
                     },
                     {
                         "field_name": "dept_belong_id",
-                        "title": "���ݹ�������",
+                        "title": "数据归属部门",
                         "model": "Area"
                     },
                     {
                         "field_name": "description",
-                        "title": "����",
+                        "title": "描述",
                         "model": "Area"
                     },
                     {
                         "field_name": "enable",
-                        "title": "�Ƿ�����",
+                        "title": "是否启用",
                         "model": "Area"
                     },
                     {
@@ -958,43 +958,43 @@
                     },
                     {
                         "field_name": "initials",
-                        "title": "����ĸ",
+                        "title": "首字母",
                         "model": "Area"
                     },
                     {
                         "field_name": "level",
-                        "title": "�����㼶(1ʡ�� 2���� 3���� 4�缶)",
+                        "title": "地区层级(1省份 2城市 3区县 4乡级)",
                         "model": "Area"
                     },
                     {
                         "field_name": "modifier",
-                        "title": "�޸���",
+                        "title": "修改人",
                         "model": "Area"
                     },
                     {
                         "field_name": "name",
-                        "title": "����",
+                        "title": "名称",
                         "model": "Area"
                     },
                     {
                         "field_name": "pcode",
-                        "title": "����������",
+                        "title": "父地区编码",
                         "model": "Area"
                     },
                     {
                         "field_name": "pinyin",
-                        "title": "ƴ��",
+                        "title": "拼音",
                         "model": "Area"
                     },
                     {
                         "field_name": "update_datetime",
-                        "title": "�޸�ʱ��",
+                        "title": "修改时间",
                         "model": "Area"
                     }
                 ]
             },
             {
-                "name": "��������",
+                "name": "附件管理",
                 "icon": "iconfont icon-file",
                 "sort": 3,
                 "is_link": false,
@@ -1009,25 +1009,25 @@
                 "children": [],
                 "menu_button": [
                     {
-                        "name": "����",
+                        "name": "详情",
                         "value": "file:Retrieve",
                         "api": "/api/system/file/{id}/",
                         "method": 0
                     },
                     {
-                        "name": "��ѯ",
+                        "name": "查询",
                         "value": "file:Search",
                         "api": "/api/system/file/",
                         "method": 0
                     },
                     {
-                        "name": "�༭",
+                        "name": "编辑",
                         "value": "file:Update",
                         "api": "/api/system/file/{id}/",
                         "method": 1
                     },
                     {
-                        "name": "ɾ��",
+                        "name": "删除",
                         "value": "file:Delete",
                         "api": "/api/system/file/{id}/",
                         "method": 3
@@ -1036,32 +1036,32 @@
                 "menu_field": [
                     {
                         "field_name": "create_datetime",
-                        "title": "����ʱ��",
+                        "title": "创建时间",
                         "model": "FileList"
                     },
                     {
                         "field_name": "creator",
-                        "title": "������",
+                        "title": "创建人",
                         "model": "FileList"
                     },
                     {
                         "field_name": "dept_belong_id",
-                        "title": "���ݹ�������",
+                        "title": "数据归属部门",
                         "model": "FileList"
                     },
                     {
                         "field_name": "description",
-                        "title": "����",
+                        "title": "描述",
                         "model": "FileList"
                     },
                     {
                         "field_name": "engine",
-                        "title": "����",
+                        "title": "引擎",
                         "model": "FileList"
                     },
                     {
                         "field_name": "file_url",
-                        "title": "�ļ���ַ",
+                        "title": "文件地址",
                         "model": "FileList"
                     },
                     {
@@ -1071,32 +1071,32 @@
                     },
                     {
                         "field_name": "md5sum",
-                        "title": "�ļ�md5",
+                        "title": "文件md5",
                         "model": "FileList"
                     },
                     {
                         "field_name": "mime_type",
-                        "title": "Mime����",
+                        "title": "Mime类型",
                         "model": "FileList"
                     },
                     {
                         "field_name": "modifier",
-                        "title": "�޸���",
+                        "title": "修改人",
                         "model": "FileList"
                     },
                     {
                         "field_name": "name",
-                        "title": "����",
+                        "title": "名称",
                         "model": "FileList"
                     },
                     {
                         "field_name": "size",
-                        "title": "�ļ���С",
+                        "title": "文件大小",
                         "model": "FileList"
                     },
                     {
                         "field_name": "update_datetime",
-                        "title": "�޸�ʱ��",
+                        "title": "修改时间",
                         "model": "FileList"
                     },
                     {
@@ -1111,7 +1111,7 @@
         "menu_field": []
     },
     {
-        "name": "��־����",
+        "name": "日志管理",
         "icon": "iconfont icon-rizhi",
         "sort": 3,
         "is_link": false,
@@ -1125,7 +1125,7 @@
         "parent": null,
         "children": [
             {
-                "name": "��¼��־",
+                "name": "登录日志",
                 "icon": "iconfont icon-guanlidenglurizhi",
                 "sort": 1,
                 "is_link": false,
@@ -1140,13 +1140,13 @@
                 "children": [],
                 "menu_button": [
                     {
-                        "name": "��ѯ",
+                        "name": "查询",
                         "value": "login_log:Search",
                         "api": "/api/system/login_log/",
                         "method": 0
                     },
                     {
-                        "name": "����",
+                        "name": "详情",
                         "value": "login_log:Retrieve",
                         "api": "/api/system/login_log/{id}/",
                         "method": 0
@@ -1155,67 +1155,67 @@
                 "menu_field": [
                     {
                         "field_name": "agent",
-                        "title": "agent��Ϣ",
+                        "title": "agent信息",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "area_code",
-                        "title": "�������",
+                        "title": "区域代码",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "browser",
-                        "title": "�������",
+                        "title": "浏览器名",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "city",
-                        "title": "����",
+                        "title": "城市",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "continent",
-                        "title": "��",
+                        "title": "州",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "country",
-                        "title": "����",
+                        "title": "国家",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "country_code",
-                        "title": "���",
+                        "title": "简称",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "country_english",
-                        "title": "Ӣ��ȫ��",
+                        "title": "英文全称",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "create_datetime",
-                        "title": "����ʱ��",
+                        "title": "创建时间",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "creator",
-                        "title": "������",
+                        "title": "创建人",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "dept_belong_id",
-                        "title": "���ݹ�������",
+                        "title": "数据归属部门",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "description",
-                        "title": "����",
+                        "title": "描述",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "district",
-                        "title": "����",
+                        "title": "县区",
                         "model": "LoginLog"
                     },
                     {
@@ -1225,58 +1225,58 @@
                     },
                     {
                         "field_name": "ip",
-                        "title": "��¼ip",
+                        "title": "登录ip",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "isp",
-                        "title": "��Ӫ��",
+                        "title": "运营商",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "latitude",
-                        "title": "�",
+                        "title": "纬度",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "login_type",
-                        "title": "��¼����",
+                        "title": "登录类型",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "longitude",
-                        "title": "����",
+                        "title": "经度",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "modifier",
-                        "title": "�޸���",
+                        "title": "修改人",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "os",
-                        "title": "����ϵͳ",
+                        "title": "操作系统",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "province",
-                        "title": "ʡ��",
+                        "title": "省份",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "update_datetime",
-                        "title": "�޸�ʱ��",
+                        "title": "修改时间",
                         "model": "LoginLog"
                     },
                     {
                         "field_name": "username",
-                        "title": "��¼�û���",
+                        "title": "登录用户名",
                         "model": "LoginLog"
                     }
                 ]
             },
             {
-                "name": "������־",
+                "name": "操作日志",
                 "icon": "iconfont icon-caozuorizhi",
                 "sort": 2,
                 "is_link": false,
@@ -1291,13 +1291,13 @@
                 "children": [],
                 "menu_button": [
                     {
-                        "name": "����",
+                        "name": "详情",
                         "value": "operation_log:Retrieve",
                         "api": "/api/system/operation_log/{id}/",
                         "method": 0
                     },
                     {
-                        "name": "��ѯ",
+                        "name": "查询",
                         "value": "operation_log:Search",
                         "api": "/api/system/operation_log/",
                         "method": 0
@@ -1306,22 +1306,22 @@
                 "menu_field": [
                     {
                         "field_name": "create_datetime",
-                        "title": "����ʱ��",
+                        "title": "创建时间",
                         "model": "OperationLog"
                     },
                     {
                         "field_name": "creator",
-                        "title": "������",
+                        "title": "创建人",
                         "model": "OperationLog"
                     },
                     {
                         "field_name": "dept_belong_id",
-                        "title": "���ݹ�������",
+                        "title": "数据归属部门",
                         "model": "OperationLog"
                     },
                     {
                         "field_name": "description",
-                        "title": "����",
+                        "title": "描述",
                         "model": "OperationLog"
                     },
                     {
@@ -1331,67 +1331,67 @@
                     },
                     {
                         "field_name": "json_result",
-                        "title": "������Ϣ",
+                        "title": "返回信息",
                         "model": "OperationLog"
                     },
                     {
                         "field_name": "modifier",
-                        "title": "�޸���",
+                        "title": "修改人",
                         "model": "OperationLog"
                     },
                     {
                         "field_name": "request_body",
-                        "title": "�������",
+                        "title": "请求参数",
                         "model": "OperationLog"
                     },
                     {
                         "field_name": "request_browser",
-                        "title": "���������",
+                        "title": "请求浏览器",
                         "model": "OperationLog"
                     },
                     {
                         "field_name": "request_ip",
-                        "title": "����ip��ַ",
+                        "title": "请求ip地址",
                         "model": "OperationLog"
                     },
                     {
                         "field_name": "request_method",
-                        "title": "����ʽ",
+                        "title": "请求方式",
                         "model": "OperationLog"
                     },
                     {
                         "field_name": "request_modular",
-                        "title": "����ģ��",
+                        "title": "请求模块",
                         "model": "OperationLog"
                     },
                     {
                         "field_name": "request_msg",
-                        "title": "����˵��",
+                        "title": "操作说明",
                         "model": "OperationLog"
                     },
                     {
                         "field_name": "request_os",
-                        "title": "����ϵͳ",
+                        "title": "操作系统",
                         "model": "OperationLog"
                     },
                     {
                         "field_name": "request_path",
-                        "title": "�����ַ",
+                        "title": "请求地址",
                         "model": "OperationLog"
                     },
                     {
                         "field_name": "response_code",
-                        "title": "��Ӧ״̬��",
+                        "title": "响应状态码",
                         "model": "OperationLog"
                     },
                     {
                         "field_name": "status",
-                        "title": "��Ӧ״̬",
+                        "title": "响应状态",
                         "model": "OperationLog"
                     },
                     {
                         "field_name": "update_datetime",
-                        "title": "�޸�ʱ��",
+                        "title": "修改时间",
                         "model": "OperationLog"
                     }
                 ]
-- 
Gitee


From 064cbee8a273b4ed3b092c65eb44dac786c974a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Tue, 28 Nov 2023 10:29:29 +0800
Subject: [PATCH 33/40] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=9D=E5=A7=8B=E5=8C=96=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/fixtures/init_systemconfig.json    | 14 +++++++++++
 web/src/views/system/login/index.vue          | 24 ++++++++++++-------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/backend/dvadmin/system/fixtures/init_systemconfig.json b/backend/dvadmin/system/fixtures/init_systemconfig.json
index ed4c967b3..c32606e02 100644
--- a/backend/dvadmin/system/fixtures/init_systemconfig.json
+++ b/backend/dvadmin/system/fixtures/init_systemconfig.json
@@ -65,6 +65,20 @@
         "placeholder": null,
         "setting": null,
         "children": [
+            {
+                "parent": 1,
+                "title": "网站标题",
+                "key": "site_title",
+                "value": "Dvadmin",
+                "sort": 1,
+                "status": true,
+                "data_options": null,
+                "form_item_type": 0,
+                "rule": [],
+                "placeholder": "请输入网站标题",
+                "setting": null,
+                "children": []
+            },
             {
                 "parent": 1,
                 "title": "网站名称",
diff --git a/web/src/views/system/login/index.vue b/web/src/views/system/login/index.vue
index 28d3a1757..1b0904dcc 100644
--- a/web/src/views/system/login/index.vue
+++ b/web/src/views/system/login/index.vue
@@ -4,8 +4,8 @@
 			<div class="login-left-logo">
 				<img :src="logoMini" />
 				<div class="login-left-logo-text">
-					<span>{{ getThemeConfig.globalViceTitle }}</span>
-					<span class="login-left-logo-text-msg">{{ getThemeConfig.globalViceTitleMsg }}</span>
+					<span>{{ getSystemConfig['login.site_title']||getThemeConfig.globalViceTitle }}</span>
+					<span class="login-left-logo-text-msg">{{ getSystemConfig['login.site_name']||getThemeConfig.globalViceTitleMsg }}</span>
 				</div>
 			</div>
 			<div class="login-left-img">
@@ -42,15 +42,15 @@
 		</div>
 
 		<div class="login-authorization">
-			<p>Copyright © 2021-2022 django-vue-admin.com 版权所有</p>
+			<p>Copyright © {{getSystemConfig['login.copyright'] || '2021-2022 django-vue-admin.com'}} 版权所有</p>
 			<p class="la-other">
-				<a href="https://beian.miit.gov.cn" target="_blank">晋ICP备18005113号-3</a>
+				<a href="https://beian.miit.gov.cn" target="_blank">{{getSystemConfig['login.keep_record'] || '晋ICP备18005113号-3'}}</a>
 				|
-				<a href="https://django-vue-admin.com" target="_blank">帮助</a>
+				<a :href="getSystemConfig['login.help_url']?getSystemConfig['login.help_url']:'https://django-vue-admin.com'" target="_blank">帮助</a>
 				|
-				<a href="#">隐私</a>
+				<a :href="getSystemConfig['login.privacy_url']?getSystemConfig['login.privacy_url']:'#'">隐私</a>
 				|
-				<a href="#">条款</a>
+				<a :href="getSystemConfig['login.clause_url']?getSystemConfig['login.clause_url']:'#'">条款</a>
 			</p>
 		</div>
 	</div>
@@ -64,7 +64,7 @@ import { NextLoading } from '/@/utils/loading';
 import logoMini from '/@/assets/logo-mini.svg';
 import loginMain from '/@/assets/login-main.svg';
 import loginBg from '/@/assets/login-bg.svg';
-
+import {SystemConfigStore} from '/@/stores/systemConfig'
 // 引入组件
 const Account = defineAsyncComponent(() => import('/@/views/system/login/component/account.vue'));
 const Mobile = defineAsyncComponent(() => import('/@/views/system/login/component/mobile.vue'));
@@ -82,6 +82,14 @@ const state = reactive({
 const getThemeConfig = computed(() => {
 	return themeConfig.value;
 });
+
+const systemConfigStore = SystemConfigStore()
+const {systemConfig} = storeToRefs(systemConfigStore)
+const getSystemConfig = computed(()=>{
+  return systemConfig.value
+})
+
+
 // 页面加载时
 onMounted(() => {
 	NextLoading.done();
-- 
Gitee


From 205cfcca2eff8befc86229860f099c4f3361c140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Thu, 30 Nov 2023 15:57:42 +0800
Subject: [PATCH 34/40] =?UTF-8?q?refactor:=20=E4=B8=8A=E4=BC=A0=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84README?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/README.md | 202 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 189 insertions(+), 13 deletions(-)

diff --git a/web/README.md b/web/README.md
index 99cc0ce3f..e70cc71da 100644
--- a/web/README.md
+++ b/web/README.md
@@ -1,8 +1,32 @@
-<div align="center">django-vue3-admin:web </div>
+# Django-Vue3-Admin
 
-#### 🌈 介绍
+[![img](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitee.com/liqianglog/django-vue-admin/blob/master/LICENSE)  [![img](https://img.shields.io/badge/python-%3E=3.7.x-green.svg)](https://python.org/)  [![PyPI - Django Version badge](https://img.shields.io/badge/django%20versions-3.2-blue)](https://docs.djangoproject.com/zh-hans/3.2/) [![img](https://img.shields.io/badge/node-%3E%3D%2012.0.0-brightgreen)](https://nodejs.org/zh-cn/) [![img](https://gitee.com/liqianglog/django-vue-admin/badge/star.svg?theme=dark)](https://gitee.com/liqianglog/django-vue-admin)
 
-django-vue3-admin，基于 vue3 + CompositionAPI + typescript + vite + element plus, 是一款全栈，快速，开源的后台管理系统！
+[预 览](https://demo.dvadmin.com) | [官网文档](https://www.django-vue-admin.com) | [群聊](https://qm.qq.com/cgi-bin/qm/qr?k=fOdnHhC8DJlRHGYSnyhoB8P5rgogA6Vs&jump_from=webapi) | [社区](https://bbs.django-vue-admin.com) | [插件市场](https://bbs.django-vue-admin.com/plugMarket.html) | [Github](https://github.com/liqianglog/django-vue-admin)
+
+
+
+💡 **「关于」**
+
+我们是一群热爱代码的青年，在这个炙热的时代下，我们希望静下心来通过Code带来一点我们的色彩和颜色。
+
+因为热爱，所以拥抱未来!
+
+
+## 平台简介
+
+💡 [django-vue3-admin](https://gitee.com/huge-dream/django-vue3-admin.git) 是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
+    django-vue3-admin 基于 vue3 + CompositionAPI + typescript + vite + element plus, 是一款全栈，快速，开源的后台管理系统！
+
+
+
+
+* 🧑‍🤝‍🧑前端采用 Vue3+TS+pinia+fastcrud(感谢[vue-next-admin](https://lyt-top.gitee.io/vue-next-admin-doc-preview/))
+* 👭后端采用 Python 语言 Django 框架以及强大的 [Django REST Framework](https://pypi.org/project/djangorestframework)。
+* 👫权限认证使用[Django REST Framework SimpleJWT](https://pypi.org/project/djangorestframework-simplejwt)，支持多终端认证系统。
+* 👬支持加载动态权限菜单，多方式轻松权限控制。
+* 💏特别鸣谢：[vue-next-admin](https://lyt-top.gitee.io/vue-next-admin-doc-preview/)。
+* 💡 特别感谢[jetbrains](https://www.jetbrains.com/) 为本开源项目提供免费的 IntelliJ IDEA 授权。
 
 #### 🏭 环境支持
 
@@ -12,21 +36,173 @@ django-vue3-admin，基于 vue3 + CompositionAPI + typescript + vite + element p
 
 > 由于 Vue3 不再支持 IE11，故而 ElementPlus 也不支持 IE11 及之前版本。
 
-#### ⚡ 使用说明
 
-建议使用 yarn，yarn 是一个类似于npm的包管理器 <a href="http://nodejs.cn/" target="_blank">node 版本 > 16</a>
+
+## 在线体验
+
+👩‍👧‍👦演示地址：[https://demo.dvadmin.com](https://demo.dvadmin.com)
+
+- 账号：superadmin
+
+- 密码：admin123456
+
+👩‍👦‍👦文档地址：[coding](https://dvadmin-private.coding.net/share/km/cec69f3d-30fe-47d5-bd97-e9e851f0b776/K-2)
+
+
+
+## 交流
+
+- 交流社区：[戳我](https://bbs.django-vue-admin.com)👩‍👦‍👦
+
+- 插件市场：[戳我](https://bbs.django-vue-admin.com/plugMarket.html)👩‍👦‍👦
+
+-  django-vue-admin交流01群(已满)：812482043 [点击链接加入群聊](https://qm.qq.com/cgi-bin/qm/qr?k=aJVwjDvH-Es4MPJQuoO32N0SucK22TE5&jump_from=webapi)
+-  django-vue-admin交流02群(已满)：687252418  [点击链接加入群聊](https://qm.qq.com/cgi-bin/qm/qr?k=4jJN4IjWGfxJ8YJXbb_gTsuWjR34WLdc&jump_from=webapi)
+-  django-vue-admin交流03群：442108213  [点击链接加入群聊](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=wsm5oSz3K8dElBYUDtLTcQSEPhINFkl8&authKey=M6sbER0z59ZakgBr5erFeZyFZU15CI52bErNZa%2FxSvvGIuVAbY0N5866v89hm%2FK4&noverify=0&group_code=442108213)
+
+- 二维码
+
+  <img src='https://images.gitee.com/uploads/images/2022/0530/233203_5fb11883_5074988.jpeg' width='200'>
+
+## 源码地址
+
+gitee地址(主推)：[https://gitee.com/huge-dream/django-vue3-admin](https://gitee.com/huge-dream/django-vue3-admin)👩‍👦‍👦
+
+github地址：暂无
+
+
+## 内置功能
+
+1.  👨‍⚕️菜单管理：配置系统菜单，操作权限，按钮权限标识、后端接口权限等。
+2.  🧑‍⚕️部门管理：配置系统组织机构（公司、部门、角色）。
+3.  👩‍⚕️角色管理：角色菜单权限分配、数据权限分配、设置角色按部门进行数据范围权限划分。
+4.  🧑‍🎓按钮权限权限：授权角色的按钮权限和接口权限,可做到每一个接口都能授权数据范围。
+5.  🧑‍🎓字段权限权限：授权页面的字段显示权限。
+5.  👨‍🎓用户管理：用户是系统操作者，该功能主要完成系统用户配置。
+6.  👬接口白名单：配置不需要进行权限校验的接口。
+7.  🧑‍🔧字典管理：对系统中经常使用的一些较为固定的数据进行维护。
+8.  🧑‍🔧地区管理：对省市县区域进行管理。
+9.  📁附件管理：对平台上所有文件、图片等进行统一管理。
+10.  🗓️操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。
+11.  🔌[插件市场 ](https://bbs.django-vue-admin.com/plugMarket.html)：基于Django-Vue-Admin框架开发的应用和插件。
+
+##  插件市场 🔌
+
+- Celery异步任务：[dvadmin-celery](https://gitee.com/huge-dream/dvadmin-celery)
+- 升级中心后端：[dvadmin-upgrade-center](https://gitee.com/huge-dream/dvadmin-upgrade-center)
+- 升级中心前端：[dvadmin-upgrade-center-web](https://gitee.com/huge-dream/dvadmin-upgrade-center-web)
+
+## 准备工作
+~~~
+Python >= 3.8.0 (推荐3.8+版本)
+nodejs >= 14.0 (推荐最新)
+Mysql >= 5.7.0 (可选，默认数据库sqlite3，推荐8.0版本)
+Redis(可选，最新版)
+~~~
+
+## 前端♝
 
 ```bash
+# 克隆项目
+git clone https://gitee.com/huge-dream/django-vue3-admin.git
 
-# 进入项目
-cd django-vue-admin/web
+# 进入项目目录
+cd web
 
 # 安装依赖
-yarn install
+npm install --registry=https://registry.npm.taobao.org
+
+# 启动服务
+npm run dev
+# 浏览器访问 http://localhost:8080
+# .env.development 文件中可配置启动端口等参数
+# 构建生产环境
+# npm run build
+```
+
+
+
+## 后端💈
+
+~~~bash
+1. 进入项目目录 cd backend
+2. 在项目根目录中，复制 ./conf/env.example.py 文件为一份新的到 ./conf 文件夹下，并重命名为 env.py
+3. 在 env.py 中配置数据库信息
+	mysql数据库版本建议：8.0
+	mysql数据库字符集：utf8mb4
+4. 安装依赖环境
+	pip3 install -r requirements.txt
+5. 执行迁移命令：
+	python3 manage.py makemigrations
+	python3 manage.py migrate
+6. 初始化数据
+	python3 manage.py init
+7. 初始化省市县数据:
+	python3 manage.py init_area
+8. 启动项目
+	python3 manage.py runserver 0.0.0.0:8000
+或使用 daphne :
+  daphne -b 0.0.0.0 -p 8000 application.asgi:application
+~~~
+
+### 访问项目
+
+- 访问地址：[http://localhost:8080](http://localhost:8080) (默认为此地址，如有修改请按照配置文件)
+- 账号：`superadmin` 密码：`admin123456`
+
+
+
+
+
+### docker-compose 运行
+
+~~~shell
+# 先安装docker-compose (自行百度安装),执行此命令等待安装，如有使用celery插件请打开docker-compose.yml中celery 部分注释
+docker-compose up -d
+# 初始化后端数据(第一次执行即可)
+docker exec -ti dvadmin-django bash
+python manage.py makemigrations 
+python manage.py migrate
+python manage.py init_area
+python manage.py init
+exit
+
+前端地址：http://127.0.0.1:8080
+后端地址：http://127.0.0.1:8080/api
+# 在服务器上请把127.0.0.1 换成自己公网ip
+账号：superadmin 密码：admin123456
+
+# docker-compose 停止
+docker-compose down
+#  docker-compose 重启
+docker-compose restart
+#  docker-compose 启动时重新进行 build
+docker-compose up -d --build
+~~~
+
+
+
+## 演示图✅
+
+![image-01](https://images.gitee.com/uploads/images/2022/0530/234137_b58c8f98_5074988.png)
+
+![image-02](https://images.gitee.com/uploads/images/2022/0530/234240_39834603_5074988.png)
+
+![image-03](https://images.gitee.com/uploads/images/2022/0530/234339_35e728a0_5074988.png)
+
+![image-04](https://images.gitee.com/uploads/images/2022/0530/234426_957036b0_5074988.png)
+
+![image-05](https://images.gitee.com/uploads/images/2022/0530/234458_898be492_5074988.png)
+
+![image-06](https://images.gitee.com/uploads/images/2022/0530/234521_35b40076_5074988.png)
+
+![image-07](https://images.gitee.com/uploads/images/2022/0530/234615_c2325639_5074988.png)
+
+![image-08](https://images.gitee.com/uploads/images/2022/0530/234639_1ed6cc93_5074988.png)
+
+![image-09](https://images.gitee.com/uploads/images/2022/0530/234815_cea2c53f_5074988.png)
+
+![image-10](https://images.gitee.com/uploads/images/2022/0530/234840_5f3e5f53_5074988.png)
+
 
-# 运行项目
-yarn dev
 
-# 打包发布
-yarn build
-```
\ No newline at end of file
-- 
Gitee


From 5729aeb521d1f9e4d93b925c77b06c26542ea1bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Thu, 30 Nov 2023 16:13:49 +0800
Subject: [PATCH 35/40] =?UTF-8?q?refactor:=20=E4=B8=8A=E4=BC=A0=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E8=8B=B1=E6=96=87README?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/README.en.md | 168 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 168 insertions(+)
 create mode 100644 web/README.en.md

diff --git a/web/README.en.md b/web/README.en.md
new file mode 100644
index 000000000..d8ca1721c
--- /dev/null
+++ b/web/README.en.md
@@ -0,0 +1,168 @@
+# Django-Vue3-Admin
+
+[![img](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitee.com/huge-dream/django-vue3-admin/blob/master/LICENSE)  [![img](https://img.shields.io/badge/python-%3E=3.7.x-green.svg)](https://python.org/)  [![PyPI - Django Version badge](https://img.shields.io/badge/django%20versions-3.2-blue)](https://docs.djangoproject.com/zh-hans/3.2/) [![img](https://img.shields.io/badge/node-%3E%3D%2012.0.0-brightgreen)](https://nodejs.org/zh-cn/) [![img](https://gitee.com/huge-dream/django-vue3-admin/badge/star.svg?theme=dark)](https://gitee.com/huge-dream/django-vue3-admin)
+
+[preview](https://demo.dvadmin.com) | [Official website document](https://www.django-vue-admin.com) | [qq group](https://qm.qq.com/cgi-bin/qm/qr?k=fOdnHhC8DJlRHGYSnyhoB8P5rgogA6Vs&jump_from=webapi) | [community](https://bbs.django-vue-admin.com) | [plugins market](https://bbs.django-vue-admin.com/plugMarket.html) | [Github](https://github.com/liqianglog/django-vue-admin)
+
+💡 **「About」**
+
+We are a group of young people who love Code. In this hot era, we hope to calm down and bring some of our colors and colors through code.
+
+Because of love, so embrace the future
+
+## framework introduction
+
+💡 [django-vue3-admin](https://gitee.com/huge-dream/django-vue3-admin.git) Is a set of all open source rapid development platform, no reservation for individuals and enterprises free use.
+
+* 🧑‍🤝‍🧑Front-end adoption Vue3+TS+pinia+fastcrud。
+* 👭The backend uses the Python language Django framework as well as the powerful[Django REST Framework](https://pypi.org/project/djangorestframework)。
+* 👫Permission authentication use[Django REST Framework SimpleJWT](https://pypi.org/project/djangorestframework-simplejwt)，Supports the multi-terminal authentication system.
+* 👬Support loading dynamic permission menu, multi - way easy permission control.
+* 💏 Special thanks: [vue-next-admin](https://lyt-top.gitee.io/vue-next-admin-doc-preview/).
+* 💡 💏 Special thanks:[jetbrains](https://www.jetbrains.com/) To provide a free IntelliJ IDEA license for this open source project.
+
+## Online experience
+
+👩‍👧‍👦👩‍👧‍👦 demo address:[https://demo.dvadmin.com](https://demo.dvadmin.com)
+
+* demo account：superadmin
+
+* demo password：admin123456
+
+👩‍👦‍👦docs:[https://django-vue-admin.com](https://django-vue-admin.com)
+
+## communication
+
+* Communication community:[click here](https://bbs.django-vue-admin.com)👩‍👦‍👦
+
+* plugins market:[click here](https://bbs.django-vue-admin.com/plugMarket.html)👩‍👦‍👦
+
+## source code url:
+
+gitee(Main push)：[https://gitee.com/huge-dream/django-vue3-admin](https://gitee.com/huge-dream/django-vue3-admin)👩‍👦‍👦
+
+github：no data
+
+## core function
+
+1. 👨‍⚕️ Menu management: Configure the system menu, operation permissions, button permissions, back-end interface permissions, etc.
+2. 🧑‍⚕️ Department management: Configure the system organization (company, department, role).
+3. 👩‍⚕️ Role management: role menu permission allocation, data permission allocation, set roles according to the department for data range permission division.
+4. 🧑‍🎓 Rights Specifies the rights of the authorization role.
+5. 👨‍🎓 User management: The user is the system operator, this function mainly completes the system user configuration.
+6. 👬 Interface whitelist: specifies the interface that does not need permission verification.
+7. 🧑‍🔧 Dictionary management: Maintenance of some fixed data frequently used in the system.
+8. 🧑‍🔧 Regional management: to manage provinces, cities, counties and regions.
+9. 📁 Attachment management: Unified management of all files and pictures on the platform.
+10. 🗓 ️operation logs: log and query the system normal operation; Log and query system exception information.
+    11.🔌 [plugins market] (<https://bbs.django-vue-admin.com/plugMarket.html>) : based on the Django framework - Vue - Admin application and plug-in development.
+
+## plugins market 🔌
+
+* Celery Asynchronous task：[dvadmin-celery](https://gitee.com/huge-dream/dvadmin-celery)
+* Upgrade center backend：[dvadmin-upgrade-center](https://gitee.com/huge-dream/dvadmin-upgrade-center)
+* Upgrade center front：[dvadmin-upgrade-center-web](https://gitee.com/huge-dream/dvadmin-upgrade-center-web)
+
+## before start project you need:
+
+~~~
+Python >= 3.8.0 
+nodejs >= 14.0
+Mysql >= 5.7.0 (Optional. The default database is sqlite3. 8.0 is recommended)
+Redis(Optional, the latest edition)
+~~~
+
+## frontend♝
+
+```bash
+# clone code
+git clone https://gitee.com/huge-dream/django-vue3-admin.git
+
+# enter code dir
+cd web
+
+# install dependence
+npm install --registry=https://registry.npm.taobao.org
+
+# Start service
+npm run dev
+# Visit http://localhost:8080 in your browser
+# Parameters such as boot port can be configured in the #.env.development file
+# Build the production environment
+# npm run build
+```
+
+## backend💈
+
+~~~bash
+1. enter code dir cd backend
+2. copy ./conf/env.example.py to ./conf dir，rename as env.py
+3. in env.py configure database information
+ mysql database recommended version: 8.0
+ mysql database character set: utf8mb4
+4. install pip dependence
+ pip3 install -r requirements.txt
+5. Execute the migration command:
+ python3 manage.py makemigrations
+ python3 manage.py migrate
+6. Initialization data
+ python3 manage.py init
+7. Initialize provincial, municipal and county data:
+ python3 manage.py init_area
+8. start backend
+ python3 manage.py runserver 0.0.0.0:8000
+or daphne :
+  daphne -b 0.0.0.0 -p 8000 application.asgi:application
+~~~
+
+### visit backend swagger
+
+* visit url：[http://localhost:8080](http://localhost:8080) (The default address is this one. If you want to change it, follow the configuration file)
+* account：`superadmin` password：`admin123456`
+
+### docker-compose
+
+~~~shell
+docker-compose up -d
+# Initialize backend data (first execution only)
+docker exec -ti dvadmin-django bash
+python manage.py makemigrations 
+python manage.py migrate
+python manage.py init_area
+python manage.py init
+exit
+
+frontend url：http://127.0.0.1:8080
+backend url：http://127.0.0.1:8080/api
+# Change 127.0.0.1 to your own public ip address on the server
+account：`superadmin` password：`admin123456`
+
+# docker-compose stop
+docker-compose down
+#  docker-compose restart
+docker-compose restart
+#  docker-compose on start build
+docker-compose up -d --build
+~~~
+
+## Demo screenshot✅
+
+![image-01](https://images.gitee.com/uploads/images/2022/0530/234137_b58c8f98_5074988.png)
+
+![image-02](https://images.gitee.com/uploads/images/2022/0530/234240_39834603_5074988.png)
+
+![image-03](https://images.gitee.com/uploads/images/2022/0530/234339_35e728a0_5074988.png)
+
+![image-04](https://images.gitee.com/uploads/images/2022/0530/234426_957036b0_5074988.png)
+
+![image-05](https://images.gitee.com/uploads/images/2022/0530/234458_898be492_5074988.png)
+
+![image-06](https://images.gitee.com/uploads/images/2022/0530/234521_35b40076_5074988.png)
+
+![image-07](https://images.gitee.com/uploads/images/2022/0530/234615_c2325639_5074988.png)
+
+![image-08](https://images.gitee.com/uploads/images/2022/0530/234639_1ed6cc93_5074988.png)
+
+![image-09](https://images.gitee.com/uploads/images/2022/0530/234815_cea2c53f_5074988.png)
+
+![image-10](https://images.gitee.com/uploads/images/2022/0530/234840_5f3e5f53_5074988.png)
-- 
Gitee


From 120c737de7e11bb8cfab733d499d3e6720bb6034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Thu, 30 Nov 2023 20:23:52 +0800
Subject: [PATCH 36/40] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AE=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?app=E9=87=8C=E7=9A=84models=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/application/settings.py | 10 ++++------
 backend/conf/env.example.py     |  3 ++-
 backend/dvadmin/utils/models.py | 31 +++++++++++++++++++++++--------
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/backend/application/settings.py b/backend/application/settings.py
index 699b77ad2..590c14442 100644
--- a/backend/application/settings.py
+++ b/backend/application/settings.py
@@ -43,10 +43,8 @@ sys.path.insert(0, os.path.join(PLUGINS_PATH))
 DEBUG = locals().get("DEBUG", True)
 ALLOWED_HOSTS = locals().get("ALLOWED_HOSTS", ["*"])
 
-# Application definition
-CUSTOM_APPS = [
-    "dvadmin.system",
-]
+# 列权限需要排除的App应用
+COLUMN_EXCLUDE_APPS = ['channels', 'captcha'] + locals().get("COLUMN_EXCLUDE_APPS", [])
 
 INSTALLED_APPS = [
     "django.contrib.auth",
@@ -60,8 +58,8 @@ INSTALLED_APPS = [
     "corsheaders",  # 注册跨域app
     "drf_yasg",
     "captcha",
-    'channels',
-    *CUSTOM_APPS,
+    "channels",
+    "dvadmin.system",
 ]
 
 MIDDLEWARE = [
diff --git a/backend/conf/env.example.py b/backend/conf/env.example.py
index ffc6afa09..03e8c1b4c 100644
--- a/backend/conf/env.example.py
+++ b/backend/conf/env.example.py
@@ -44,4 +44,5 @@ LOGIN_NO_CAPTCHA_AUTH = True
 # ================================================= #
 
 ALLOWED_HOSTS = ["*"]
-CUSTOM_APPS = []
+# 列权限中排除App应用
+COLUMN_EXCLUDE_APPS = []
diff --git a/backend/dvadmin/utils/models.py b/backend/dvadmin/utils/models.py
index e33152808..fb0c2ba70 100644
--- a/backend/dvadmin/utils/models.py
+++ b/backend/dvadmin/utils/models.py
@@ -13,6 +13,7 @@ from django.db import models
 from django.conf import settings
 
 from application import settings
+
 table_prefix = settings.TABLE_PREFIX  # 数据库表名前缀
 
 
@@ -71,10 +72,13 @@ class CoreModel(models.Model):
     id = models.BigAutoField(primary_key=True, help_text="Id", verbose_name="Id")
     description = models.CharField(max_length=255, verbose_name="描述", null=True, blank=True, help_text="描述")
     creator = models.ForeignKey(to=settings.AUTH_USER_MODEL, related_query_name='creator_query', null=True,
-                                verbose_name='创建人', help_text="创建人", on_delete=models.SET_NULL, db_constraint=False)
+                                verbose_name='创建人', help_text="创建人", on_delete=models.SET_NULL,
+                                db_constraint=False)
     modifier = models.CharField(max_length=255, null=True, blank=True, help_text="修改人", verbose_name="修改人")
-    dept_belong_id = models.CharField(max_length=255, help_text="数据归属部门", null=True, blank=True, verbose_name="数据归属部门")
-    update_datetime = models.DateTimeField(auto_now=True, null=True, blank=True, help_text="修改时间", verbose_name="修改时间")
+    dept_belong_id = models.CharField(max_length=255, help_text="数据归属部门", null=True, blank=True,
+                                      verbose_name="数据归属部门")
+    update_datetime = models.DateTimeField(auto_now=True, null=True, blank=True, help_text="修改时间",
+                                           verbose_name="修改时间")
     create_datetime = models.DateTimeField(auto_now_add=True, null=True, blank=True, help_text="创建时间",
                                            verbose_name="创建时间")
 
@@ -136,12 +140,23 @@ def get_model_from_app(app_name):
 
 
 def get_custom_app_models(app_name=None):
-    """获取所有项目下的app里的models"""
+    """
+    获取所有项目下的app里的models
+    """
     if app_name:
         return get_model_from_app(app_name)
+    all_apps = apps.get_app_configs()
     res = []
-    for app in settings.CUSTOM_APPS:
-        all_models = get_model_from_app(app)
-        for model in all_models:
-            res.append(model)
+    for app in all_apps:
+        if app.name.startswith('django'):
+            continue
+        if app.name in settings.COLUMN_EXCLUDE_APPS:
+            continue
+        try:
+            all_models = get_model_from_app(app.name)
+            if all_models:
+                for model in all_models:
+                    res.append(model)
+        except Exception as e:
+            pass
     return res
-- 
Gitee


From 76914810067b93abc987308147222ed4aa9787fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Thu, 30 Nov 2023 21:31:55 +0800
Subject: [PATCH 37/40] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/fixtures/init_systemconfig.json    |  2 +-
 web/index.html                                | 27 ++++++------
 web/src/views/system/login/index.vue          |  2 +-
 .../components/PermissionComNew/index.vue     | 42 ++++++++++++-------
 4 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/backend/dvadmin/system/fixtures/init_systemconfig.json b/backend/dvadmin/system/fixtures/init_systemconfig.json
index c32606e02..c2326aae4 100644
--- a/backend/dvadmin/system/fixtures/init_systemconfig.json
+++ b/backend/dvadmin/system/fixtures/init_systemconfig.json
@@ -130,7 +130,7 @@
                 "parent": 1,
                 "title": "版权信息",
                 "key": "copyright",
-                "value": "2021-2022 django-vue-admin.com 版权所有",
+                "value": "2021-2024 django-vue-admin.com 版权所有",
                 "sort": 4,
                 "status": true,
                 "data_options": null,
diff --git a/web/index.html b/web/index.html
index 2fcf37bc4..9515e84b7 100644
--- a/web/index.html
+++ b/web/index.html
@@ -10,23 +10,22 @@
 		/>
 		<meta
 			name="description"
-			content="django-vue3-admin，基于 vue3 + CompositionAPI + typescript + vite + element plus, 是一款全栈，快速，开源的后台管理系统！"
+			content="django-vue-admin 基于RBAC模型的权限控制的一整套基础开发平台，权限粒度达到列级别，前后端分离，后端采用django + django-rest-framework，前端采用基于 vue3 + CompositionAPI + typescript + vite + element plus"
 		/>
 		<link rel="icon" href="/favicon.ico" />
-		<title>django-vue3-admin</title>
+		<title>django-vue-admin</title>
 	</head>
 	<body>
-		<div id="app"></div>
-		<script type="text/javascript">
-			// let _hmt = _hmt || [];
-			(function () {
-                let hm = document.createElement('script');
-				hm.src = 'https://hm.baidu.com/hm.js?d9c8b87d10717013641458b300c552e4';
-                let s = document.getElementsByTagName('script')[0];
-				s.parentNode.insertBefore(hm, s);
-			})();
-		</script>
-		<script type="module" src="/src/main.ts"></script>
-		<script type="text/javascript" src="https://api.map.baidu.com/api?v=3.0&ak=wsijQt8sLXrCW71YesmispvYHitfG9gv&s=1"></script>
+    <div id="app"></div>
+    <script>
+        var _hmt = _hmt || [];
+        (function() {
+          var hm = document.createElement("script");
+          hm.src = "https://hm.baidu.com/hm.js?9ba8fc809b5584167a2fb9b31bb3970c";
+          var s = document.getElementsByTagName("script")[0];
+          s.parentNode.insertBefore(hm, s);
+        })();
+    </script>
+    <script type="module" src="/src/main.ts"></script>
 	</body>
 </html>
diff --git a/web/src/views/system/login/index.vue b/web/src/views/system/login/index.vue
index 1b0904dcc..69b2926b3 100644
--- a/web/src/views/system/login/index.vue
+++ b/web/src/views/system/login/index.vue
@@ -42,7 +42,7 @@
 		</div>
 
 		<div class="login-authorization">
-			<p>Copyright © {{getSystemConfig['login.copyright'] || '2021-2022 django-vue-admin.com'}} 版权所有</p>
+			<p>Copyright © {{getSystemConfig['login.copyright'] || '2021-2024 django-vue-admin.com'}} 版权所有</p>
 			<p class="la-other">
 				<a href="https://beian.miit.gov.cn" target="_blank">{{getSystemConfig['login.keep_record'] || '晋ICP备18005113号-3'}}</a>
 				|
diff --git a/web/src/views/system/role/components/PermissionComNew/index.vue b/web/src/views/system/role/components/PermissionComNew/index.vue
index db6f332f9..1d7a80fde 100644
--- a/web/src/views/system/role/components/PermissionComNew/index.vue
+++ b/web/src/views/system/role/components/PermissionComNew/index.vue
@@ -10,7 +10,7 @@
             <el-tag>{{ props.roleName }}</el-tag>
           </div>
         </el-col>
-        <el-col :span="6" :offset="8">
+        <el-col :span="6">
           <div>
             <el-button size="small" type="primary" class="pc-save-btn" @click="handleSavePermission">保存菜单授权
             </el-button>
@@ -20,15 +20,16 @@
     </template>
     <div class="permission-com">
       <el-collapse v-model="collapseCurrent" @change="handleCollapseChange" accordion>
-        <el-collapse-item v-for="(item,mIndex) in menuData" :key="mIndex" :name="mIndex">
+        <el-collapse-item v-for="(item,mIndex) in menuData" :key="mIndex" :name="mIndex"
+                          style="    background-color: #fafafa;">
           <template #title>
-            <div @click.stop="null">
-              <p class="pc-collapse-title">
-                <el-checkbox v-model="item.isCheck">
+            <div>
+              <div class="pc-collapse-title">
+                <el-checkbox v-model="item.isCheck" @click.stop="null">
                   <span>{{ item.name }}</span>
                 </el-checkbox>
-              </p>
-              <div v-show="!collapseCurrent.includes(mIndex)">
+              </div>
+              <div v-show="!collapseCurrent.includes(mIndex)" @click.stop="null" style="text-align: left;">
                 <el-checkbox v-for="btn in item.btns" :key="btn.value" :label="btn.value" v-model="btn.isCheck">
                   {{ btn.name }}
                 </el-checkbox>
@@ -40,7 +41,7 @@
               <p>允许对这些数据有以下操作</p>
               <el-checkbox v-for="(btn,bIndex) in item.btns" :key="bIndex" v-model="btn.isCheck" :label="btn.value">
                 <div class="btn-item">
-                  {{ btn.data_range!==null ? `${btn.name}(${formatDataRange(btn.data_range)})` : btn.name }}
+                  {{ btn.data_range !== null ? `${btn.name}(${formatDataRange(btn.data_range)})` : btn.name }}
                   <span v-show="btn.isCheck" @click.stop.prevent="handleSettingClick(item, btn.id)">
                     <el-icon><Setting/></el-icon>
                   </span>
@@ -51,7 +52,7 @@
             <div class="pccm-item">
               <p>对这些数据有以下字段权限</p>
 
-              <ul  class="columns-list">
+              <ul class="columns-list">
                 <li class="columns-head">
                   <div class="width-txt">
                     <span>字段</span>
@@ -59,7 +60,7 @@
 
                   <div v-for="(head,hIndex) in column.header" :key="hIndex" class="width-check">
                     <el-checkbox :label="head.value" @change="handleColumnChange($event, item, head.value)">
-                      <span>{{head.label}}</span>
+                      <span>{{ head.label }}</span>
                     </el-checkbox>
                   </div>
                 </li>
@@ -111,7 +112,13 @@
 import {ref, onMounted, defineProps, watch, computed, reactive} from 'vue';
 import XEUtils from 'xe-utils';
 import {errorNotification} from '/@/utils/message';
-import {getDataPermissionRange, getDataPermissionDept, getRolePremission, setRolePremission,setBtnDatarange} from './api';
+import {
+  getDataPermissionRange,
+  getDataPermissionDept,
+  getRolePremission,
+  setRolePremission,
+  setBtnDatarange
+} from './api';
 import {MenuDataType, DataPermissionRangeType, CustomDataPermissionDeptType} from './types';
 import {ElMessage} from 'element-plus'
 
@@ -158,9 +165,9 @@ let menuBtnCurrent = ref<number>(-1);
 let dialogVisible = ref(false);
 let dataPermissionRange = ref<DataPermissionRangeType[]>([]);
 const formatDataRange = computed(() => {
-  return function(datarange:number){
+  return function (datarange: number) {
     const findItem = dataPermissionRange.value.find((i) => i.value === datarange);
-    return  findItem?.label || ''
+    return findItem?.label || ''
   }
 })
 let deptData = ref<CustomDataPermissionDeptType[]>([]);
@@ -228,7 +235,7 @@ const handleDialogConfirm = () => {
         if (btn.id === menuBtnCurrent.value) {
           const findItem = dataPermissionRange.value.find((i) => i.value === dataPermission.value);
           btn.data_range = findItem?.value || 0;
-          if(btn.data_range===4){
+          if (btn.data_range === 4) {
             btn.dept = customDataPermission.value
           }
         }
@@ -254,7 +261,10 @@ const handleSavePermission = () => {
 }
 
 const column = reactive({
-  header:[{value:'is_create',label:'新增可见'},{value:'is_update',label:'编辑可见'},{value:'is_query',label:'列表可见'}]
+  header: [{value: 'is_create', label: '新增可见'}, {value: 'is_update', label: '编辑可见'}, {
+    value: 'is_query',
+    label: '列表可见'
+  }]
 })
 
 onMounted(() => {
@@ -272,6 +282,7 @@ onMounted(() => {
 
   .pc-collapse-title {
     line-height: 32px;
+    text-align: left;
 
     span {
       font-size: 16px;
@@ -365,6 +376,7 @@ onMounted(() => {
     border-left: 1px solid #ebeef5;
     border-right: 1px solid #ebeef5;
     box-sizing: border-box;
+    background-color: #fafafa;
   }
 
   .el-collapse-item__header.is-active {
-- 
Gitee


From e0d46871c4cc1fcf763fdca7b151d3af47be8a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Thu, 30 Nov 2023 21:33:32 +0800
Subject: [PATCH 38/40] update README.md

---
 README.en.md |  95 ++++++++++++++++++++++++----------------------
 README.md    | 104 ++++++++++++++++++++++++++++++---------------------
 2 files changed, 112 insertions(+), 87 deletions(-)

diff --git a/README.en.md b/README.en.md
index c1c742bfc..684b078eb 100644
--- a/README.en.md
+++ b/README.en.md
@@ -1,14 +1,14 @@
 # Django-Vue3-Admin
 
-[![img](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitee.com/liqianglog/django-vue-admin/blob/master/LICENSE)  [![img](https://img.shields.io/badge/python-%3E=3.7.x-green.svg)](https://python.org/)  [![PyPI - Django Version badge](https://img.shields.io/badge/django%20versions-3.2-blue)](https://docs.djangoproject.com/zh-hans/3.2/) [![img](https://img.shields.io/badge/node-%3E%3D%2012.0.0-brightgreen)](https://nodejs.org/zh-cn/) [![img](https://gitee.com/liqianglog/django-vue-admin/badge/star.svg?theme=dark)](https://gitee.com/liqianglog/django-vue-admin)
+[![img](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitee.com/huge-dream/django-vue3-admin/blob/master/LICENSE)  [![img](https://img.shields.io/badge/python-%3E=3.7.x-green.svg)](https://python.org/)  [![PyPI - Django Version badge](https://img.shields.io/badge/django%20versions-3.2-blue)](https://docs.djangoproject.com/zh-hans/3.2/) [![img](https://img.shields.io/badge/node-%3E%3D%2012.0.0-brightgreen)](https://nodejs.org/zh-cn/) [![img](https://gitee.com/huge-dream/django-vue3-admin/badge/star.svg?theme=dark)](https://gitee.com/huge-dream/django-vue3-admin)
 
 [preview](https://demo.dvadmin.com) | [Official website document](https://www.django-vue-admin.com) | [qq group](https://qm.qq.com/cgi-bin/qm/qr?k=fOdnHhC8DJlRHGYSnyhoB8P5rgogA6Vs&jump_from=webapi) | [community](https://bbs.django-vue-admin.com) | [plugins market](https://bbs.django-vue-admin.com/plugMarket.html) | [Github](https://github.com/liqianglog/django-vue-admin)
 
 💡 **「About」**
 
-We are a group of young people who love Code. In this hot era, we hope to calm down and bring some of our colors and colors through code.
+It is a completely open-source rapid development platform, provided free for personal use and authorized for group use.
+Django-Vue3-Admin is a comprehensive basic development platform based on the RBAC (Role-Based Access Control) model for permission control, with column-level granularity. It follows a frontend-backend separation architecture, with Django and Django Rest Framework used for the backend, and Vue3, Composition API, TypeScript, Vite, and Element Plus used for the frontend.
 
-Because of love, so embrace the future
 
 ## framework introduction
 
@@ -18,12 +18,13 @@ Because of love, so embrace the future
 * 👭The backend uses the Python language Django framework as well as the powerful[Django REST Framework](https://pypi.org/project/djangorestframework)。
 * 👫Permission authentication use[Django REST Framework SimpleJWT](https://pypi.org/project/djangorestframework-simplejwt)，Supports the multi-terminal authentication system.
 * 👬Support loading dynamic permission menu, multi - way easy permission control.
-* 💏 Special thanks: [vue-next-admin](https://lyt-top.gitee.io/vue-next-admin-doc-preview/).
-* 💡 💏 Special thanks:[jetbrains](https://www.jetbrains.com/) To provide a free IntelliJ IDEA license for this open source project.
+* 👬Enhanced Column Permission Control, with granularity down to each column.
+* 💏Special thanks: [vue-next-admin](https://lyt-top.gitee.io/vue-next-admin-doc-preview/).
+* 💡Special thanks:[jetbrains](https://www.jetbrains.com/) To provide a free IntelliJ IDEA license for this open source project.
 
 ## Online experience
 
-👩‍👧‍👦👩‍👧‍👦 demo address:[http://demo.django-vue-admin.com](http://demo.django-vue-admin.com)
+👩‍👧‍👦👩‍👧‍👦 demo address:[https://demo.dvadmin.com](https://demo.dvadmin.com)
 
 * demo account：superadmin
 
@@ -39,57 +40,61 @@ Because of love, so embrace the future
 
 ## source code url:
 
-gitee(Main push)：[https://gitee.com/liqianglog/django-vue-admin](https://gitee.com/liqianglog/django-vue-admin)👩‍👦‍👦
+gitee(Main push)：[https://gitee.com/huge-dream/django-vue3-admin](https://gitee.com/huge-dream/django-vue3-admin)👩‍👦‍👦
 
-github：[https://github.com/liqianglog/django-vue-admin](https://github.com/liqianglog/django-vue-admin)👩‍👦‍👦
+github：[https://github.com/huge-dream/django-vue3-admin](https://github.com/huge-dream/django-vue3-admin)👩‍👦‍👦
 
 ## core function
 
-1. 👨‍⚕️ Menu management: Configure the system menu, operation permissions, button permissions, back-end interface permissions, etc.
-2. 🧑‍⚕️ Department management: Configure the system organization (company, department, role).
-3. 👩‍⚕️ Role management: role menu permission allocation, data permission allocation, set roles according to the department for data range permission division.
-4. 🧑‍🎓 Rights Specifies the rights of the authorization role.
-5. 👨‍🎓 User management: The user is the system operator, this function mainly completes the system user configuration.
-6. 👬 Interface whitelist: specifies the interface that does not need permission verification.
-7. 🧑‍🔧 Dictionary management: Maintenance of some fixed data frequently used in the system.
-8. 🧑‍🔧 Regional management: to manage provinces, cities, counties and regions.
-9. 📁 Attachment management: Unified management of all files and pictures on the platform.
-10. 🗓 ️operation logs: log and query the system normal operation; Log and query system exception information.
-11.🔌 [plugins market] (<https://bbs.django-vue-admin.com/plugMarket.html>) : based on the Django framework - Vue - Admin application and plug-in development.
+1. 👨‍⚕️Menu Management: Configure system menus, operation permissions, button permission flags, backend interface permissions, etc.
+2. 🧑‍⚕️Department Management: Configure system organizational structure (company, department, role).
+3. 👩‍⚕️Role Management: Role menu permission assignment, data permission assignment, set role-based data scope permissions by department.
+4. 🧑‍🎓Button Permission Control: Authorize role-specific button permissions and interface permissions, enabling authorization of data scope for each interface.
+5. 🧑‍🎓Field Column Permission Control: Authorize page field display permissions, specifically for the display permissions of a certain column.
+6. 👨‍🎓User Management: Users are system operators, and this function is mainly used for system user configuration.
+7. 👬API Whitelist: Configure interfaces that do not require permission verification.
+8. 🧑‍🔧Dictionary Management: Maintain frequently used and relatively fixed data in the system.
+9. 🧑‍🔧Region Management: Manage provinces, cities, counties, and districts.
+10. 📁File Management: Unified management of all files, images, etc., on the platform.
+11. 🗓️Operation Logs: Record and query logs for normal system operations and exceptional system information.
+12. 🔌[Plugin Market](https://bbs.django-vue-admin.com/plugMarket.html): Applications and plugins developed based on the Django-Vue-Admin framework.
 
 ## plugins market 🔌
 
-* Celery Asynchronous task：[dvadmin-celery](https://gitee.com/huge-dream/dvadmin-celery)
-* Upgrade center backend：[dvadmin-upgrade-center](https://gitee.com/huge-dream/dvadmin-upgrade-center)
-* Upgrade center front：[dvadmin-upgrade-center-web](https://gitee.com/huge-dream/dvadmin-upgrade-center-web)
+Updating...
+
+## Repository Branch Explanation 💈
+Main Branch: master (stable version)
+Development Branch: develop
 
 ## before start project you need:
 
 ~~~
-Python >= 3.8.0 
-nodejs >= 14.0
-Mysql >= 5.7.0 (Optional. The default database is sqlite3. 8.0 is recommended)
-Redis(Optional, the latest edition)
+Python >= 3.11.0 (Minimum version 3.9+)
+Node.js >= 16.0
+Mysql >= 8.0 (Optional, default database: SQLite3, supports 5.7+, recommended version: 8.0)
+Redis (Optional, latest version)
 ~~~
 
 ## frontend♝
 
 ```bash
 # clone code
-git clone https://gitee.com/liqianglog/django-vue-admin.git
+git clone https://gitee.com/huge-dream/django-vue3-admin.git
 
 # enter code dir
 cd web
 
 # install dependence
-npm install --registry=https://registry.npm.taobao.org
+npm install yarn
+yarn install --registry=https://registry.npm.taobao.org
 
 # Start service
-npm run dev
+yarn run dev
 # Visit http://localhost:8080 in your browser
 # Parameters such as boot port can be configured in the #.env.development file
 # Build the production environment
-# npm run build
+# yarn run build
 ```
 
 ## backend💈
@@ -111,8 +116,8 @@ npm run dev
  python3 manage.py init_area
 8. start backend
  python3 manage.py runserver 0.0.0.0:8000
-or daphne :
-  daphne -b 0.0.0.0 -p 8000 application.asgi:application
+or uvicorn :
+  uvicorn application.asgi:application --port 8000 --host 0.0.0.0 --workers 8
 ~~~
 
 ### visit backend swagger
@@ -120,12 +125,12 @@ or daphne :
 * visit url：[http://localhost:8080](http://localhost:8080) (The default address is this one. If you want to change it, follow the configuration file)
 * account：`superadmin` password：`admin123456`
 
-### docker-compose 
+### docker-compose
 
 ~~~shell
 docker-compose up -d
 # Initialize backend data (first execution only)
-docker exec -ti dvadmin-django bash
+docker exec -ti dvadmin3-django bash
 python manage.py makemigrations 
 python manage.py migrate
 python manage.py init_area
@@ -147,22 +152,24 @@ docker-compose up -d --build
 
 ## Demo screenshot✅
 
-![image-01](https://images.gitee.com/uploads/images/2022/0530/234137_b58c8f98_5074988.png)
+![image-01](https://foruda.gitee.com/images/1701348994587355489/1bc749e7_5074988.png)
+
+![image-02](https://foruda.gitee.com/images/1701349037811908960/80d361db_5074988.png)
+
+![image-03](https://foruda.gitee.com/images/1701349224478845203/954f0a7b_5074988.png)
 
-![image-02](https://images.gitee.com/uploads/images/2022/0530/234240_39834603_5074988.png)
+![image-04](https://foruda.gitee.com/images/1701349248928658877/64926724_5074988.png)
 
-![image-03](https://images.gitee.com/uploads/images/2022/0530/234339_35e728a0_5074988.png)
+![image-05](https://foruda.gitee.com/images/1701349259068943299/1306ba40_5074988.png)
 
-![image-04](https://images.gitee.com/uploads/images/2022/0530/234426_957036b0_5074988.png)
+![image-06](https://foruda.gitee.com/images/1701349294894429495/e3b3a8cf_5074988.png)
 
-![image-05](https://images.gitee.com/uploads/images/2022/0530/234458_898be492_5074988.png)
+![image-07](https://foruda.gitee.com/images/1701350432536247561/3b26685e_5074988.png)
 
-![image-06](https://images.gitee.com/uploads/images/2022/0530/234521_35b40076_5074988.png)
+![image-08](https://foruda.gitee.com/images/1701350455264771992/b364c57f_5074988.png)
 
-![image-07](https://images.gitee.com/uploads/images/2022/0530/234615_c2325639_5074988.png)
+![image-09](https://foruda.gitee.com/images/1701350479266000753/e4e4f7c5_5074988.png)
 
-![image-08](https://images.gitee.com/uploads/images/2022/0530/234639_1ed6cc93_5074988.png)
+![image-10](https://foruda.gitee.com/images/1701350501421625746/f8dd215e_5074988.png)
 
-![image-09](https://images.gitee.com/uploads/images/2022/0530/234815_cea2c53f_5074988.png)
 
-![image-10](https://images.gitee.com/uploads/images/2022/0530/234840_5f3e5f53_5074988.png)
diff --git a/README.md b/README.md
index 08f6d4183..511caf92b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![img](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitee.com/liqianglog/django-vue-admin/blob/master/LICENSE)  [![img](https://img.shields.io/badge/python-%3E=3.7.x-green.svg)](https://python.org/)  [![PyPI - Django Version badge](https://img.shields.io/badge/django%20versions-3.2-blue)](https://docs.djangoproject.com/zh-hans/3.2/) [![img](https://img.shields.io/badge/node-%3E%3D%2012.0.0-brightgreen)](https://nodejs.org/zh-cn/) [![img](https://gitee.com/liqianglog/django-vue-admin/badge/star.svg?theme=dark)](https://gitee.com/liqianglog/django-vue-admin)
 
-[预 览](https://demo.dvadmin.com) | [官网文档](https://www.django-vue-admin.com) | [群聊](https://qm.qq.com/cgi-bin/qm/qr?k=fOdnHhC8DJlRHGYSnyhoB8P5rgogA6Vs&jump_from=webapi) | [社区](https://bbs.django-vue-admin.com) | [插件市场](https://bbs.django-vue-admin.com/plugMarket.html) | [Github](https://github.com/liqianglog/django-vue-admin) 
+[预 览](https://demo.dvadmin.com) | [官网文档](https://www.django-vue-admin.com) | [群聊](https://qm.qq.com/cgi-bin/qm/qr?k=fOdnHhC8DJlRHGYSnyhoB8P5rgogA6Vs&jump_from=webapi) | [社区](https://bbs.django-vue-admin.com) | [插件市场](https://bbs.django-vue-admin.com/plugMarket.html) | [Github](https://github.com/liqianglog/django-vue-admin)
 
 
 
@@ -10,11 +10,14 @@
 
 我们是一群热爱代码的青年，在这个炙热的时代下，我们希望静下心来通过Code带来一点我们的色彩和颜色。
 
-因为热爱，所以拥抱未来
+因为热爱，所以拥抱未来!
+
 
 ## 平台简介
 
-💡 [django-vue3-admin](https://gitee.com/huge-dream/django-vue3-admin.git) 是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
+💡 [django-vue3-admin](https://gitee.com/huge-dream/django-vue3-admin.git) 是一套全部开源的快速开发平台，毫无保留给个人免费使用、团体授权使用。
+    django-vue3-admin 基于RBAC模型的权限控制的一整套基础开发平台，权限粒度达到列级别，前后端分离，后端采用django + django-rest-framework，前端采用基于 vue3 + CompositionAPI + typescript + vite + element plus
+
 
 
 
@@ -22,20 +25,29 @@
 * 👭后端采用 Python 语言 Django 框架以及强大的 [Django REST Framework](https://pypi.org/project/djangorestframework)。
 * 👫权限认证使用[Django REST Framework SimpleJWT](https://pypi.org/project/djangorestframework-simplejwt)，支持多终端认证系统。
 * 👬支持加载动态权限菜单，多方式轻松权限控制。
+* 👬全新的列权限管控，粒度细化到每一列。
 * 💏特别鸣谢：[vue-next-admin](https://lyt-top.gitee.io/vue-next-admin-doc-preview/)。
-* 💡 特别感谢[jetbrains](https://www.jetbrains.com/) 为本开源项目提供免费的 IntelliJ IDEA 授权。
+* 💡特别感谢[jetbrains](https://www.jetbrains.com/) 为本开源项目提供免费的 IntelliJ IDEA 授权。
+
+#### 🏭 环境支持
+
+| Edge      | Firefox      | Chrome      | Safari      |
+| --------- | ------------ | ----------- | ----------- |
+| Edge ≥ 79 | Firefox ≥ 78 | Chrome ≥ 64 | Safari ≥ 12 |
+
+> 由于 Vue3 不再支持 IE11，故而 ElementPlus 也不支持 IE11 及之前版本。
 
 
 
 ## 在线体验
 
-👩‍👧‍👦演示地址：[http://demo.django-vue-admin.com](http://demo.django-vue-admin.com) 
+👩‍👧‍👦演示地址：[https://demo.dvadmin.com](https://demo.dvadmin.com)
 
-- 账号：superadmin 
+- 账号：superadmin
 
 - 密码：admin123456
 
-👩‍👦‍👦文档地址：[https://django-vue-admin.com](https://django-vue-admin.com)
+👩‍👦‍👦文档地址：[coding](https://dvadmin-private.coding.net/share/km/cec69f3d-30fe-47d5-bd97-e9e851f0b776/K-2)
 
 
 
@@ -46,7 +58,8 @@
 - 插件市场：[戳我](https://bbs.django-vue-admin.com/plugMarket.html)👩‍👦‍👦
 
 -  django-vue-admin交流01群(已满)：812482043 [点击链接加入群聊](https://qm.qq.com/cgi-bin/qm/qr?k=aJVwjDvH-Es4MPJQuoO32N0SucK22TE5&jump_from=webapi)
--  django-vue-admin交流02群：687252418  [点击链接加入群聊](https://qm.qq.com/cgi-bin/qm/qr?k=4jJN4IjWGfxJ8YJXbb_gTsuWjR34WLdc&jump_from=webapi)
+-  django-vue-admin交流02群(已满)：687252418  [点击链接加入群聊](https://qm.qq.com/cgi-bin/qm/qr?k=4jJN4IjWGfxJ8YJXbb_gTsuWjR34WLdc&jump_from=webapi)
+-  django-vue-admin交流03群：442108213  [点击链接加入群聊](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=wsm5oSz3K8dElBYUDtLTcQSEPhINFkl8&authKey=M6sbER0z59ZakgBr5erFeZyFZU15CI52bErNZa%2FxSvvGIuVAbY0N5866v89hm%2FK4&noverify=0&group_code=442108213)
 
 - 二维码
 
@@ -54,10 +67,9 @@
 
 ## 源码地址
 
-gitee地址(主推)：[https://gitee.com/liqianglog/django-vue-admin](https://gitee.com/liqianglog/django-vue-admin)👩‍👦‍👦
-
-github地址：[https://github.com/liqianglog/django-vue-admin](https://github.com/liqianglog/django-vue-admin)👩‍👦‍👦
+gitee地址(主推)：[https://gitee.com/huge-dream/django-vue3-admin](https://gitee.com/huge-dream/django-vue3-admin)👩‍👦‍👦
 
+github地址：[https://github.com/huge-dream/django-vue3-admin](https://github.com/huge-dream/django-vue3-admin)👩‍👦‍👦
 
 
 ## 内置功能
@@ -65,47 +77,51 @@ github地址：[https://github.com/liqianglog/django-vue-admin](https://github.c
 1.  👨‍⚕️菜单管理：配置系统菜单，操作权限，按钮权限标识、后端接口权限等。
 2.  🧑‍⚕️部门管理：配置系统组织机构（公司、部门、角色）。
 3.  👩‍⚕️角色管理：角色菜单权限分配、数据权限分配、设置角色按部门进行数据范围权限划分。
-4.  🧑‍🎓权限权限：授权角色的权限范围。
-5.  👨‍🎓用户管理：用户是系统操作者，该功能主要完成系统用户配置。
-6.  👬接口白名单：配置不需要进行权限校验的接口。
-7.  🧑‍🔧字典管理：对系统中经常使用的一些较为固定的数据进行维护。
-8.  🧑‍🔧地区管理：对省市县区域进行管理。
-9.  📁附件管理：对平台上所有文件、图片等进行统一管理。
-10.  🗓️操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。
-11.  🔌[插件市场 ](https://bbs.django-vue-admin.com/plugMarket.html)：基于Django-Vue-Admin框架开发的应用和插件。
+4.  🧑‍🎓按钮权限控制：授权角色的按钮权限和接口权限,可做到每一个接口都能授权数据范围。
+5.  🧑‍🎓字段列权限控制：授权页面的字段显示权限，具体到某一列的显示权限。
+7.  👨‍🎓用户管理：用户是系统操作者，该功能主要完成系统用户配置。
+8.  👬接口白名单：配置不需要进行权限校验的接口。
+9.  🧑‍🔧字典管理：对系统中经常使用的一些较为固定的数据进行维护。
+10.  🧑‍🔧地区管理：对省市县区域进行管理。
+11.  📁附件管理：对平台上所有文件、图片等进行统一管理。
+12.  🗓️操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。
+13.  🔌[插件市场 ](https://bbs.django-vue-admin.com/plugMarket.html)：基于Django-Vue-Admin框架开发的应用和插件。
 
 ##  插件市场 🔌
+更新中...
+
+##  仓库分支说明 💈
+主分支：master（稳定版本）
+开发分支：develop
 
-- Celery异步任务：[dvadmin-celery](https://gitee.com/huge-dream/dvadmin-celery)
-- 升级中心后端：[dvadmin-upgrade-center](https://gitee.com/huge-dream/dvadmin-upgrade-center)
-- 升级中心前端：[dvadmin-upgrade-center-web](https://gitee.com/huge-dream/dvadmin-upgrade-center-web)
 
 ## 准备工作
 ~~~
-Python >= 3.8.0 (推荐3.8+版本)
-nodejs >= 14.0 (推荐最新)
-Mysql >= 5.7.0 (可选，默认数据库sqlite3，推荐8.0版本)
-Redis(可选，最新版)
+Python >= 3.11.0 (最低3.9+版本)
+nodejs >= 16.0
+Mysql >= 8.0 (可选，默认数据库sqlite3，支持5.7+，推荐8.0版本)
+Redis (可选，最新版)
 ~~~
 
 ## 前端♝
 
 ```bash
 # 克隆项目
-git clone https://gitee.com/liqianglog/django-vue-admin.git
+git clone https://gitee.com/huge-dream/django-vue3-admin.git
 
 # 进入项目目录
 cd web
 
 # 安装依赖
-npm install --registry=https://registry.npm.taobao.org
+npm install yarn
+yarn install --registry=https://registry.npm.taobao.org
 
 # 启动服务
-npm run dev
+yarn build
 # 浏览器访问 http://localhost:8080
 # .env.development 文件中可配置启动端口等参数
 # 构建生产环境
-# npm run build
+# yarn run build
 ```
 
 
@@ -129,9 +145,11 @@ npm run dev
 	python3 manage.py init_area
 8. 启动项目
 	python3 manage.py runserver 0.0.0.0:8000
-或使用 daphne :
-  daphne -b 0.0.0.0 -p 8000 application.asgi:application
+或使用 uvicorn :
+  uvicorn application.asgi:application --port 8000 --host 0.0.0.0 --workers 8
 ~~~
+## 开发建议
+前后端backend与web各自单独一个窗口打开进行开发
 
 ### 访问项目
 
@@ -148,7 +166,7 @@ npm run dev
 # 先安装docker-compose (自行百度安装),执行此命令等待安装，如有使用celery插件请打开docker-compose.yml中celery 部分注释
 docker-compose up -d
 # 初始化后端数据(第一次执行即可)
-docker exec -ti dvadmin-django bash
+docker exec -ti dvadmin3-django bash
 python manage.py makemigrations 
 python manage.py migrate
 python manage.py init_area
@@ -172,25 +190,25 @@ docker-compose up -d --build
 
 ## 演示图✅
 
-![image-01](https://images.gitee.com/uploads/images/2022/0530/234137_b58c8f98_5074988.png)
+![image-01](https://foruda.gitee.com/images/1701348994587355489/1bc749e7_5074988.png)
 
-![image-02](https://images.gitee.com/uploads/images/2022/0530/234240_39834603_5074988.png)
+![image-02](https://foruda.gitee.com/images/1701349037811908960/80d361db_5074988.png)
 
-![image-03](https://images.gitee.com/uploads/images/2022/0530/234339_35e728a0_5074988.png)
+![image-03](https://foruda.gitee.com/images/1701349224478845203/954f0a7b_5074988.png)
 
-![image-04](https://images.gitee.com/uploads/images/2022/0530/234426_957036b0_5074988.png)
+![image-04](https://foruda.gitee.com/images/1701349248928658877/64926724_5074988.png)
 
-![image-05](https://images.gitee.com/uploads/images/2022/0530/234458_898be492_5074988.png)
+![image-05](https://foruda.gitee.com/images/1701349259068943299/1306ba40_5074988.png)
 
-![image-06](https://images.gitee.com/uploads/images/2022/0530/234521_35b40076_5074988.png)
+![image-06](https://foruda.gitee.com/images/1701349294894429495/e3b3a8cf_5074988.png)
 
-![image-07](https://images.gitee.com/uploads/images/2022/0530/234615_c2325639_5074988.png)
+![image-07](https://foruda.gitee.com/images/1701350432536247561/3b26685e_5074988.png)
 
-![image-08](https://images.gitee.com/uploads/images/2022/0530/234639_1ed6cc93_5074988.png)
+![image-08](https://foruda.gitee.com/images/1701350455264771992/b364c57f_5074988.png)
 
-![image-09](https://images.gitee.com/uploads/images/2022/0530/234815_cea2c53f_5074988.png)
+![image-09](https://foruda.gitee.com/images/1701350479266000753/e4e4f7c5_5074988.png)
 
-![image-10](https://images.gitee.com/uploads/images/2022/0530/234840_5f3e5f53_5074988.png)
+![image-10](https://foruda.gitee.com/images/1701350501421625746/f8dd215e_5074988.png)
 
 
 
-- 
Gitee


From fb4bba9000274b26565c81fa8388bfe6fdf73acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Thu, 30 Nov 2023 21:37:43 +0800
Subject: [PATCH 39/40] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/system/config/components/formContent.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/web/src/views/system/config/components/formContent.vue b/web/src/views/system/config/components/formContent.vue
index 845e90f5b..b4a21413b 100644
--- a/web/src/views/system/config/components/formContent.vue
+++ b/web/src/views/system/config/components/formContent.vue
@@ -118,7 +118,7 @@
                 list-type="picture-card"
             >
               <i class="el-icon-plus"></i>
-              <div slot="tip" class="el-upload__tip">选取图片后,需手动上传到服务器,并且只能上传jpg/png文件</div>
+              <div slot="tip" class="el-upload__tip">请选取图片,并且只能上传jpg/png文件</div>
             </el-upload>
             <el-dialog :visible.sync="dialogImgVisible">
               <img width="100%" :src="dialogImageUrl" alt="" />
@@ -150,7 +150,7 @@
                 list-type="picture-card"
             >
               <i class="el-icon-plus"></i>
-              <div slot="tip" class="el-upload__tip">选取图片后,需手动上传到服务器,并且只能上传jpg/png文件</div>
+              <div slot="tip" class="el-upload__tip">请选取图片,并且只能上传jpg/png文件</div>
             </el-upload>
             <el-dialog :visible.sync="dialogImgVisible">
               <img width="100%" :src="dialogImageUrl" alt="" />
@@ -506,4 +506,8 @@ watch(
 );
 </script>
 
-<style></style>
+<style scoped>
+:deep(.el-upload-list--picture-card){
+  text-align: center;
+}
+</style>
-- 
Gitee


From 349986f14f20e943b5645ae49d47c16f3117663f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Thu, 30 Nov 2023 22:02:49 +0800
Subject: [PATCH 40/40] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E5=8F=91=E5=B8=83v3.0.?=
 =?UTF-8?q?0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md             | 10 ++++++++++
 backend/requirements.txt |  2 +-
 web/package.json         | 12 ++++++------
 3 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..23f5a4774
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,10 @@
+# Django-Vue3-Admin 更新日志
+
+## 正式发布v3.0.0版本
+### 1.新增：列权限管理与授权;
+### 2.新增：代码新版本发布后，进行升级提醒;
+### 3.优化：角色管理中按钮权限的操作;
+### 4.优化：websocket 连接状态显示;
+### 5.优化：初始化获取系统配置与字典配置，进行动态渲染登录页面;
+### 6.修复：登录页面中系统配置不生效问题;
+### 7.其他优化
\ No newline at end of file
diff --git a/backend/requirements.txt b/backend/requirements.txt
index d4b0ded5f..d433efbd1 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -1,4 +1,4 @@
-Django==4.2.6
+Django==4.2.7
 django-comment-migrate==0.1.7
 django-cors-headers==4.3.0
 django-filter==23.3
diff --git a/web/package.json b/web/package.json
index 43b7cb8e5..28b837f96 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "django-vue3-admin",
-	"version": "1.0.0",
-	"description": "django-vue3-admin，基于 vue3 + CompositionAPI + typescript + vite + element plus, 是一款全栈，快速，开源的后台管理系统！",
+	"version": "3.0.0",
+	"description": "是一套全部开源的快速开发平台，毫无保留给个人免费使用、团体授权使用。\n    django-vue3-admin 基于RBAC模型的权限控制的一整套基础开发平台，权限粒度达到列级别，前后端分离，后端采用django + django-rest-framework，前端采用基于 vue3 + CompositionAPI + typescript + vite + element plus",
 	"license": "MIT",
 	"scripts": {
 		"dev": "vite --force",
@@ -10,10 +10,10 @@
 	},
 	"dependencies": {
 		"@element-plus/icons-vue": "^2.0.10",
-		"@fast-crud/fast-crud": "^1.18.3",
-		"@fast-crud/fast-extends": "^1.18.3",
-		"@fast-crud/ui-element": "^1.18.3",
-		"@fast-crud/ui-interface": "^1.18.3",
+		"@fast-crud/fast-crud": "^1.19.2",
+		"@fast-crud/fast-extends": "^1.19.2",
+		"@fast-crud/ui-element": "^1.19.2",
+		"@fast-crud/ui-interface": "^1.19.2",
 		"@vitejs/plugin-vue-jsx": "^3.0.0",
 		"@wangeditor/editor": "^5.1.23",
 		"@wangeditor/editor-for-vue": "^5.1.12",
-- 
Gitee