From 08285e7fae70c4f8d23d94dc4be63c5e3d74198c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Sat, 7 Oct 2023 22:07:00 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=20=E5=AD=97=E5=85=B8=E5=AD=90?=
 =?UTF-8?q?=E9=9B=86=E7=82=B9=E5=87=BBX=E6=97=A0=E6=B3=95=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=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                   | 6 ++++--
 web/src/views/system/dictionary/subDict/index.vue | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/application/settings.py b/backend/application/settings.py
index b311baef0..a26d2835a 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",
@@ -58,7 +61,7 @@ INSTALLED_APPS = [
     "drf_yasg",
     "captcha",
     'channels',
-    *locals().get("CUSTOM_APPS", []),  # 所有项目里写的app需要在env.py文件里的CUSTOM_APPS中
+    *locals().get("CUSTOM_APPS", []),  # 自定义且需要字段权限控制的app写在上方的CUSTOM_APPS中
 ]
 
 MIDDLEWARE = [
@@ -96,7 +99,6 @@ WSGI_APPLICATION = "application.wsgi.application"
 
 # Database
 # https://docs.djangoproject.com/en/3.2/ref/settings/#databases
-
 DATABASES = {
     "default": {
         "ENGINE": DATABASE_ENGINE,
diff --git a/web/src/views/system/dictionary/subDict/index.vue b/web/src/views/system/dictionary/subDict/index.vue
index 65dd40092..ab7fdbb5a 100644
--- a/web/src/views/system/dictionary/subDict/index.vue
+++ b/web/src/views/system/dictionary/subDict/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-drawer size="70%" v-model="drawer" direction="rtl" destroy-on-close :before-close="handleClose">
+	<el-drawer size="70%" v-model="drawer" direction="rtl" append-to-body destroy-on-close :before-close="handleClose">
 		<fs-page>
 			<fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
 		</fs-page>
-- 
Gitee


From f88cc13f4475001efa48851494dceced6a1ba79d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Sat, 7 Oct 2023 22:31:06 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=20=E5=A4=84=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=87=AA=E5=8A=A8=E5=8C=B9=E9=85=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/views/column.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/dvadmin/system/views/column.py b/backend/dvadmin/system/views/column.py
index a23d27cdb..8cfd35efa 100644
--- a/backend/dvadmin/system/views/column.py
+++ b/backend/dvadmin/system/views/column.py
@@ -75,6 +75,7 @@ class ColumnViewSet(CustomModelViewSet):
         role_id = request.data.get('role')
         app_name = request.data.get('app')
         model_name = request.data.get('model')
+        menu = request.data.get('menu')
         if not role_id or not model_name or not app_name:
             return DetailResponse([], msg='无操作')
         for model in get_custom_app_models(app_name):
@@ -82,7 +83,7 @@ class ColumnViewSet(CustomModelViewSet):
                 continue
             for field in model['fields']:
                 if Columns.objects.filter(
-                        role_id=role_id, app=app_name, model=model_name, field_name=field['name']
+                        role_id=role_id, menu=menu,app=app_name, model=model_name, field_name=field['name']
                 ).exists():
                     continue
                 data = {
@@ -91,6 +92,7 @@ class ColumnViewSet(CustomModelViewSet):
                     'model': model_name,
                     'field_name': field['name'],
                     'title': str(field['title']),
+                    'menu':menu
                 }
                 serializer = self.get_serializer(data=data, request=request)
                 serializer.is_valid(raise_exception=True)
-- 
Gitee


From 4288677f9bb2b51e2dd30d1d2f13a5cef405d4b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Sat, 7 Oct 2023 22:31:48 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=20=E5=88=A0=E9=99=A4role=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=98=AF=E5=90=A6=E7=AE=A1=E7=90=86=E5=91=98=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/models.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/dvadmin/system/models.py b/backend/dvadmin/system/models.py
index ed728ea7b..939d536a5 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"
-- 
Gitee


From 82e3f81ff853ee2619669f29194b55cef4867ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Sat, 7 Oct 2023 22:35:16 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=20=E5=88=A0=E9=99=A4role=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=98=AF=E5=90=A6=E7=AE=A1=E7=90=86=E5=91=98=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/utils/filters.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/backend/dvadmin/utils/filters.py b/backend/dvadmin/utils/filters.py
index dbd921fa3..307de1665 100644
--- a/backend/dvadmin/utils/filters.py
+++ b/backend/dvadmin/utils/filters.py
@@ -86,12 +86,11 @@ class DataLevelPermissionsFilter(BaseFilterBackend):
         如果不是超级管理员,则进入下一步权限判断
         """
         if request.user.is_superuser == 0:
-            return self._extracted_from_filter_queryset_33(request, queryset, api, method)
+            return self.filter_dept_queryset(request, queryset, api, method)
         else:
             return queryset
 
-    # TODO Rename this here and in `filter_queryset`
-    def _extracted_from_filter_queryset_33(self, request, queryset, api, method):
+    def filter_dept_queryset(self, request, queryset, api, method):
         # 0. 获取用户的部门id，没有部门则返回空
         user_dept_id = getattr(request.user, "dept_id", None)
         if not user_dept_id:
@@ -121,13 +120,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))
-- 
Gitee


From be274d8c7f4d072bb79250d49c2f4ff08f456338 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, 8 Oct 2023 16:26:40 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=20=E5=88=A0=E9=99=A4role=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=98=AF=E5=90=A6=E7=AE=A1=E7=90=86=E5=91=98=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/fixtures/initSerializer.py | 2 +-
 backend/dvadmin/system/fixtures/init_role.json    | 2 --
 backend/dvadmin/system/views/menu.py              | 3 +--
 backend/dvadmin/system/views/menu_button.py       | 3 +--
 backend/dvadmin/utils/pagination.py               | 1 -
 5 files changed, 3 insertions(+), 8 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
     }
 ]
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/utils/pagination.py b/backend/dvadmin/utils/pagination.py
index 52bf143dc..689f7fcae 100644
--- a/backend/dvadmin/utils/pagination.py
+++ b/backend/dvadmin/utils/pagination.py
@@ -80,5 +80,4 @@ class CustomPagination(PageNumberPagination):
             ('is_next', is_next),
             ('is_previous', is_previous),
             ('data', data),
-            ('permission', self.request.permission_fields)
         ]))
-- 
Gitee


From 5be1eece7237d1315c4897d9a1f122fe0719c5b7 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, 8 Oct 2023 16:45:19 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=20=E5=88=97=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=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/dvadmin/system/models.py       |   1 -
 backend/dvadmin/system/views/column.py |   9 +-
 web/src/views/system/columns/index.vue | 149 ++++++++++---------------
 web/src/views/system/columns/types.ts  |   2 -
 4 files changed, 65 insertions(+), 96 deletions(-)

diff --git a/backend/dvadmin/system/models.py b/backend/dvadmin/system/models.py
index 939d536a5..6d4f44761 100644
--- a/backend/dvadmin/system/models.py
+++ b/backend/dvadmin/system/models.py
@@ -183,7 +183,6 @@ 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='表名')
-    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='字段显示名')
     is_query = models.BooleanField(default=1, verbose_name='是否可查询')
diff --git a/backend/dvadmin/system/views/column.py b/backend/dvadmin/system/views/column.py
index 8cfd35efa..5b9024c56 100644
--- a/backend/dvadmin/system/views/column.py
+++ b/backend/dvadmin/system/views/column.py
@@ -32,10 +32,9 @@ class ColumnViewSet(CustomModelViewSet):
         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 role_id or not model_name or not app_name:
             return SuccessResponse([])
-        queryset = self.filter_queryset(self.get_queryset().filter(role_id=role_id, model=model_name, app=app_name,menu_id=menu))
+        queryset = self.filter_queryset(self.get_queryset().filter(role_id=role_id, model=model_name, app=app_name))
         page = self.paginate_queryset(queryset)
         if page is not None:
             serializer = self.get_serializer(page, many=True, request=request)
@@ -75,7 +74,6 @@ class ColumnViewSet(CustomModelViewSet):
         role_id = request.data.get('role')
         app_name = request.data.get('app')
         model_name = request.data.get('model')
-        menu = request.data.get('menu')
         if not role_id or not model_name or not app_name:
             return DetailResponse([], msg='无操作')
         for model in get_custom_app_models(app_name):
@@ -83,7 +81,7 @@ class ColumnViewSet(CustomModelViewSet):
                 continue
             for field in model['fields']:
                 if Columns.objects.filter(
-                        role_id=role_id, menu=menu,app=app_name, model=model_name, field_name=field['name']
+                        role_id=role_id, app=app_name, model=model_name, field_name=field['name']
                 ).exists():
                     continue
                 data = {
@@ -92,7 +90,6 @@ class ColumnViewSet(CustomModelViewSet):
                     'model': model_name,
                     'field_name': field['name'],
                     'title': str(field['title']),
-                    'menu':menu
                 }
                 serializer = self.get_serializer(data=data, request=request)
                 serializer.is_valid(raise_exception=True)
diff --git a/web/src/views/system/columns/index.vue b/web/src/views/system/columns/index.vue
index cd7722e12..08d13f295 100644
--- a/web/src/views/system/columns/index.vue
+++ b/web/src/views/system/columns/index.vue
@@ -1,124 +1,99 @@
 <template>
-	<fs-page class="columns">
-		<el-row class="columns-el-row" :gutter="10">
-			<el-col :span="4">
-				<div class="columns-box columns-left">
-					<ItemCom title="角色" type="role" showPagination @fetchData="fetchRoleData" @itemClick="handleClick" />
-				</div>
-			</el-col>
+  <fs-page class="columns">
+    <el-row class="columns-el-row">
       <el-col :span="4">
         <div class="columns-box columns-left">
-          <ItemCom title="菜单" type="menu" showPagination @fetchData="fetchMenuData" @itemClick="handleClick" />
+          <ItemCom title="角色" type="role" showPagination @fetchData="fetchRoleData" @itemClick="handleClick" />
         </div>
       </el-col>
-			<el-col :span="6">
-				<div class="columns-box columns-center">
-					<ItemCom title="模型表" type="model" label="showText" value="key" @fetchData="fetchModelData" @itemClick="handleClick" />
-				</div>
-			</el-col>
-			<el-col :span="10">
-				<div class="columns-box columns-right">
-					<ColumnsTableCom ref="columnsTableRef" :currentInfo="currentInfo" />
-				</div>
-			</el-col>
-		</el-row>
-	</fs-page>
+      <el-col :span="6">
+        <div class="columns-box columns-center">
+          <ItemCom title="模型表" type="model" label="showText" value="key" @fetchData="fetchModelData" @itemClick="handleClick" />
+        </div>
+      </el-col>
+      <el-col :span="14">
+        <div class="columns-box columns-right">
+          <ColumnsTableCom ref="columnsTableRef" :currentInfo="currentInfo" />
+        </div>
+      </el-col>
+    </el-row>
+  </fs-page>
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive } from 'vue';
 import ItemCom from './components/ItemCom/index.vue';
 import ColumnsTableCom from './components/ColumnsTableCom/index.vue';
-import { getRoleList, getModelList,getMenuList } from './api';
+import { getRoleList, getModelList } from './api';
 import { PageQuery, CurrentInfoType, ModelItemType } from './types';
 
 const columnsTableRef = ref<InstanceType<typeof ColumnsTableCom> | null>(null);
 let currentInfo = reactive<CurrentInfoType>({
-	role: '',
-	model: '',
-	app: '',
-  menu:''
+  role: '',
+  model: '',
+  app: '',
 });
 
-/**
- * 获取角色
- * @param query
- * @param callback
- */
 const fetchRoleData = async (query: PageQuery, callback: Function) => {
-	const res = await getRoleList(query);
-	callback(res);
-};
-
-/**
- * 获取菜单
- * @param query
- * @param callback
- */
-const fetchMenuData= async (query: PageQuery, callback: Function) => {
-  const res = await getMenuList(query);
+  const res = await getRoleList(query);
   callback(res);
 };
 
 const fetchModelData = async (query: PageQuery, callback: Function) => {
-	const res = await getModelList();
-	res.data.forEach((item: ModelItemType) => {
-		item.showText = `${item.app}-${item.title}(${item.key})`;
-	});
-	callback(res);
+  const res = await getModelList();
+  res.data.forEach((item: ModelItemType) => {
+    item.showText = `${item.app}-${item.title}(${item.key})`;
+  });
+  callback(res);
 };
 
 const fetchTableData = () => {
-	if (currentInfo.role && currentInfo.model && currentInfo.app) {
-		columnsTableRef.value?.fetchData(currentInfo);
-		return;
-	}
+  if (currentInfo.role && currentInfo.model && currentInfo.app) {
+    columnsTableRef.value?.fetchData(currentInfo);
+    return;
+  }
 };
 
 const handleClick = (type: string, record: any) => {
-	if (type === 'role') {
-		currentInfo.role = record.id;
-	}
-
-  if(type === 'menu'){
-    currentInfo.menu = record.id;
+  if (type === 'role') {
+    currentInfo.role = record.id;
   }
-
-	if (type === 'model') {
-		currentInfo.model = record.key;
-		currentInfo.app = record.app;
-	}
-	fetchTableData();
+  if (type === 'model') {
+    currentInfo.model = record.key;
+    currentInfo.app = record.app;
+  }
+  fetchTableData();
 };
 </script>
 
 <style lang="scss" scoped>
 .columns {
-	.columns-el-row {
-		height: 100%;
-		overflow: hidden;
+  .columns-el-row {
+    height: 100%;
+    overflow: hidden;
 
-		.el-col {
-			height: 100%;
-			padding: 10px 0;
-			box-sizing: border-box;
-		}
-	}
-	.columns-box {
-		height: 100%;
-		padding: 10px;
-		background-color: #fff;
-		box-sizing: border-box;
-	}
-	.columns-left {
-		border-radius: 0 8px 8px 0;
-	}
-	.columns-center {
-		border-radius: 8px;
-	}
-	.columns-right {
-		position: relative;
-		border-radius: 8px 0 0 8px;
-	}
+    .el-col {
+      height: 100%;
+      padding: 10px 0;
+      box-sizing: border-box;
+    }
+  }
+  .columns-box {
+    height: 100%;
+    padding: 10px;
+    background-color: #fff;
+    box-sizing: border-box;
+  }
+  .columns-left {
+    border-radius: 0 8px 8px 0;
+  }
+  .columns-center {
+    margin: 0 10px;
+    border-radius: 8px;
+  }
+  .columns-right {
+    position: relative;
+    border-radius: 8px 0 0 8px;
+  }
 }
 </style>
diff --git a/web/src/views/system/columns/types.ts b/web/src/views/system/columns/types.ts
index b41cca87c..e36eab73f 100644
--- a/web/src/views/system/columns/types.ts
+++ b/web/src/views/system/columns/types.ts
@@ -13,8 +13,6 @@ export interface CurrentInfoType {
   role: string;
   model: string;
   app: string;
-
-  menu: string;
 }
 
 export interface ModelItemType {
-- 
Gitee