From 69d23c6f69dd416351b8e143297a80000333ed74 Mon Sep 17 00:00:00 2001
From: zhulj <1643600218@qq.com>
Date: Wed, 18 Sep 2024 15:48:49 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=9B=B4=E6=96=B0i?=
 =?UTF-8?q?mport=5Fexport.py=E4=BB=A5=E8=BF=87=E6=BB=A4=E7=A9=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/utils/import_export.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/dvadmin/utils/import_export.py b/backend/dvadmin/utils/import_export.py
index 2bd6e1e8..a3bccd95 100644
--- a/backend/dvadmin/utils/import_export.py
+++ b/backend/dvadmin/utils/import_export.py
@@ -86,4 +86,5 @@ def import_to_data(file_url, field_data, m2m_fields=None):
             else:
                 array[key] = cell_value
         tables.append(array)
-    return tables
+    data = [i for i in tables if len(i) != 0]
+    return data
-- 
Gitee


From ba5c2ab490138906a9501b0d85b9630f837bce2a Mon Sep 17 00:00:00 2001
From: lxy <46486798@qq.com>
Date: Fri, 6 Dec 2024 07:26:22 +0000
Subject: [PATCH 02/14] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4=E6=96=87=E4=BB=B6=E5=AD=97=E6=AE=B5=20update?=
 =?UTF-8?q?=20backend/dvadmin/utils/filters.py.=20url=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=B0=86=E5=AF=BC=E8=87=B4=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lxy <46486798@qq.com>
---
 backend/dvadmin/utils/filters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/dvadmin/utils/filters.py b/backend/dvadmin/utils/filters.py
index d09a8a15..da808ace 100644
--- a/backend/dvadmin/utils/filters.py
+++ b/backend/dvadmin/utils/filters.py
@@ -340,7 +340,7 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
                         from timezone_field import TimeZoneField
 
                         # 不进行 过滤的model 类
-                        if isinstance(field, (models.JSONField, TimeZoneField)):
+                        if isinstance(field, (models.JSONField, TimeZoneField, models.FileField)):
                             continue
                         # warn if the field doesn't exist.
                         if field is None:
-- 
Gitee


From a36dcfa1e50bbc049e314e630cc0b07393c30cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E8=BE=89?= <a@a.com>
Date: Mon, 16 Dec 2024 15:39:13 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/views/download_center.py |  3 +++
 backend/dvadmin/system/views/file_list.py       |  4 ----
 backend/dvadmin/utils/import_export_mixin.py    |  3 +--
 web/src/components/fileSelector/index.vue       | 12 +++++++-----
 web/src/views/system/fileList/index.vue         |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/backend/dvadmin/system/views/download_center.py b/backend/dvadmin/system/views/download_center.py
index 2587d744..4fa88bb9 100644
--- a/backend/dvadmin/system/views/download_center.py
+++ b/backend/dvadmin/system/views/download_center.py
@@ -41,6 +41,9 @@ class DownloadCenterViewSet(CustomModelViewSet):
     serializer_class = DownloadCenterSerializer
     filter_class = DownloadCenterFilterSet
     permission_classes = []
+    extra_filter_class = []
 
     def get_queryset(self):
+        if self.request.user.is_superuser:
+            return super().get_queryset()
         return super().get_queryset().filter(creator=self.request.user)
diff --git a/backend/dvadmin/system/views/file_list.py b/backend/dvadmin/system/views/file_list.py
index eb972709..c0fed8d2 100644
--- a/backend/dvadmin/system/views/file_list.py
+++ b/backend/dvadmin/system/views/file_list.py
@@ -34,10 +34,6 @@ class FileSerializer(CustomModelSerializer):
         model = FileList
         fields = "__all__"
 
-    class Meta:
-        model = FileList
-        fields = "__all__"
-
     def create(self, validated_data):
         file_engine = dispatch.get_system_config_values("fileStorageConfig.file_engine") or 'local'
         file_backup = dispatch.get_system_config_values("fileStorageConfig.file_backup")
diff --git a/backend/dvadmin/utils/import_export_mixin.py b/backend/dvadmin/utils/import_export_mixin.py
index 74e85fd7..4f673f10 100644
--- a/backend/dvadmin/utils/import_export_mixin.py
+++ b/backend/dvadmin/utils/import_export_mixin.py
@@ -305,11 +305,10 @@ class ExportSerializerMixin:
         assert self.export_serializer_class, "'%s' 请配置对应的导出序列化器。" % self.__class__.__name__
         data = self.export_serializer_class(queryset, many=True, request=request).data
         try:
-            from dvadmin3_celery import settings
             async_export_data.delay(
                 data,
                 str(f"导出{get_verbose_name(queryset)}-{datetime.datetime.now().strftime('%Y%m%d%H%M%S')}.xlsx"),
-                DownloadCenter.objects.create(creator=request.user, task_name=f'{get_verbose_name(queryset)}数据导出任务').pk,
+                DownloadCenter.objects.create(creator=request.user, task_name=f'{get_verbose_name(queryset)}数据导出任务', dept_belong_id=request.user.dept).pk,
                 self.export_field_label
             )
             return SuccessResponse(msg="导入任务已创建，请前往‘下载中心’等待下载")
diff --git a/web/src/components/fileSelector/index.vue b/web/src/components/fileSelector/index.vue
index 55b1fa2f..1e1862c3 100644
--- a/web/src/components/fileSelector/index.vue
+++ b/web/src/components/fileSelector/index.vue
@@ -66,7 +66,7 @@
         </div>
       </div>
     </slot>
-    <el-dialog v-model="selectVisiable" :draggable="false" width="50%" :align-center="false" :append-to-body="true"
+    <el-dialog v-model="selectVisiable" :draggable="true" width="50%" :align-center="false" :append-to-body="true"
       @open="if (listData.length === 0) listRequest();" @close="onClose" @closed="onClosed" modal-class="_overlay">
       <template #header>
         <span class="el-dialog__title">文件选择</span>
@@ -248,7 +248,7 @@ const listRequest = async () => {
   });
   listData.value = [];
   await nextTick();
-  listData.value = res.data;
+  listData.value = (res.data as any[]).map((item: any) => ({ ...item, url: getBaseURL(item.url) }));
   pageForm.total = res.total;
   pageForm.page = res.page;
   pageForm.limit = res.limit;
@@ -277,8 +277,10 @@ const onItemClick = async (e: MouseEvent) => {
     if (target.classList.contains('active')) { target.classList.remove('active'); flat = -1; }
     else { target.classList.add('active'); flat = 1; }
     if (data.value.length) {
-      if (flat === 1) data.value.push(fileId);
-      else data.value.splice(data.value.indexOf(fileId), 1);
+      let _l = JSON.parse(JSON.stringify(data.value));
+      if (flat === 1) _l.push(fileId);
+      else _l.splice(_l.indexOf(fileId), 1);
+      data.value = _l;
     } else data.value = [fileId];
     // 去重排序，<降序，>升序
     data.value = Array.from(new Set(data.value)).sort();
@@ -378,7 +380,7 @@ const data = ref<any>(null);
 const emit = defineEmits(['update:modelValue', 'onSave', 'onClose', 'onClosed']);
 watch(
   () => props.modelValue,
-  (val) => data.value = val,
+  (val) => data.value = props.multiple ? JSON.parse(JSON.stringify(val)) : val,
   { immediate: true }
 );
 const { ui } = useUi();
diff --git a/web/src/views/system/fileList/index.vue b/web/src/views/system/fileList/index.vue
index 71418090..92bf005a 100644
--- a/web/src/views/system/fileList/index.vue
+++ b/web/src/views/system/fileList/index.vue
@@ -1,7 +1,7 @@
 <template>
   <fs-page>
     <FileSelector v-model="selected" :showInput="false" ref="fileSelectorRef" :tabsShow="SHOW.ALL" :itemSize="120"
-      :multiple="true" :selectable="false">
+      :multiple="false" :selectable="true" valueKey="url" inputType="image">
       <!-- <template #input="scope">
         input：{{ scope }}
       </template> -->
-- 
Gitee


From 15c87ddd261e4e6ec7fd8f70218955d2b40eed72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E8=BE=89?= <a@a.com>
Date: Tue, 17 Dec 2024 10:58:13 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E5=80=BC=E6=97=B6is=5Fvalu?=
 =?UTF-8?q?e=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/utils/import_export_mixin.py  |   2 +-
 web/src/utils/dictionary.ts                   |   2 +-
 .../views/system/dictionary/subDict/crud.tsx  | 602 +++++++++---------
 3 files changed, 308 insertions(+), 298 deletions(-)

diff --git a/backend/dvadmin/utils/import_export_mixin.py b/backend/dvadmin/utils/import_export_mixin.py
index 4f673f10..e188ff5f 100644
--- a/backend/dvadmin/utils/import_export_mixin.py
+++ b/backend/dvadmin/utils/import_export_mixin.py
@@ -308,7 +308,7 @@ class ExportSerializerMixin:
             async_export_data.delay(
                 data,
                 str(f"导出{get_verbose_name(queryset)}-{datetime.datetime.now().strftime('%Y%m%d%H%M%S')}.xlsx"),
-                DownloadCenter.objects.create(creator=request.user, task_name=f'{get_verbose_name(queryset)}数据导出任务', dept_belong_id=request.user.dept).pk,
+                DownloadCenter.objects.create(creator=request.user, task_name=f'{get_verbose_name(queryset)}数据导出任务', dept_belong_id=request.user.dept_id).pk,
                 self.export_field_label
             )
             return SuccessResponse(msg="导入任务已创建，请前往‘下载中心’等待下载")
diff --git a/web/src/utils/dictionary.ts b/web/src/utils/dictionary.ts
index bdf98269..47383b3f 100644
--- a/web/src/utils/dictionary.ts
+++ b/web/src/utils/dictionary.ts
@@ -4,7 +4,7 @@ import { DictionaryStore } from '/@/stores/dictionary';
 /**
   * @method 获取指定name字典
   */
-export const dictionary = (name: string,key:string|number|undefined) => {
+export const dictionary = (name: string,key?:string|number|undefined) => {
   const dict = DictionaryStore()
   const dictionary = toRaw(dict.data)
   if(key!=undefined){
diff --git a/web/src/views/system/dictionary/subDict/crud.tsx b/web/src/views/system/dictionary/subDict/crud.tsx
index 342d989f..31701737 100644
--- a/web/src/views/system/dictionary/subDict/crud.tsx
+++ b/web/src/views/system/dictionary/subDict/crud.tsx
@@ -1,309 +1,319 @@
 import * as api from './api';
 import {
-    dict,
-    UserPageQuery,
-    AddReq,
-    DelReq,
-    EditReq,
-    CrudOptions,
-    CreateCrudOptionsProps,
-    CreateCrudOptionsRet
+  dict,
+  UserPageQuery,
+  AddReq,
+  DelReq,
+  EditReq,
+  CrudOptions,
+  CreateCrudOptionsProps,
+  CreateCrudOptionsRet
 } from '@fast-crud/fast-crud';
-import {dictionary} from '/@/utils/dictionary';
+import { dictionary } from '/@/utils/dictionary';
 
-export const createCrudOptions = function ({crudExpose, context}: 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) => {
-        const data = crudExpose!.getSearchFormData()
-        const parent = data.parent
-        form.parent = parent
-        if (parent) {
-            return await api.AddObj(form);
-        } else {
-            return undefined
-        }
+export const createCrudOptions = function ({ crudExpose, context }: 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) => {
+    const data = crudExpose!.getSearchFormData()
+    const parent = data.parent
+    form.parent = parent
+    if (parent) {
+      return await api.AddObj(form);
+    } else {
+      return undefined
+    }
 
-    };
+  };
 
-    return {
-        crudOptions: {
-            request: {
-                pageRequest,
-                addRequest,
-                editRequest,
-                delRequest,
+  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',
+          },
+        },
+      },
+      columns: {
+        _index: {
+          title: '序号',
+          form: { show: false },
+          column: {
+            //type: 'index',
+            align: 'center',
+            width: '70px',
+            columnSetDisabled: true, //禁止在列设置中选择
+            formatter: (context) => {
+              //计算序号,你可以自定义计算规则，此处为翻页累加
+              let index = context.index ?? 1;
+              let pagination = crudExpose!.crudBinding.value.pagination;
+              // @ts-ignore
+              return ((pagination.currentPage ?? 1) - 1) * pagination.pageSize + index + 1;
             },
-            rowHandle: {
-                //固定右侧
-                fixed: 'right',
-                width: 200,
-                buttons: {
-                    view: {
-                        show: false,
-                    },
-                    edit: {
-                        iconRight: 'Edit',
-                        type: 'text',
-                    },
-                    remove: {
-                        iconRight: 'Delete',
-                        type: 'text',
-                    },
-                },
+          },
+        },
+        label: {
+          title: '名称',
+          search: {
+            show: true,
+            component: {
+              props: {
+                clearable: true,
+              },
             },
-            columns: {
-                _index: {
-                    title: '序号',
-                    form: {show: false},
-                    column: {
-                        //type: 'index',
-                        align: 'center',
-                        width: '70px',
-                        columnSetDisabled: true, //禁止在列设置中选择
-                        formatter: (context) => {
-                            //计算序号,你可以自定义计算规则，此处为翻页累加
-                            let index = context.index ?? 1;
-                            let pagination = crudExpose!.crudBinding.value.pagination;
-                            // @ts-ignore
-                            return ((pagination.currentPage ?? 1) - 1) * pagination.pageSize + index + 1;
-                        },
-                    },
-                },
-                label: {
-                    title: '名称',
-                    search: {
-                        show: true,
-                        component: {
-                            props: {
-                                clearable: true,
-                            },
-                        },
-                    },
-                    type: 'input',
-                    form: {
-                        rules: [
-                            // 表单校验规则
-                            {required: true, message: '名称必填项'},
-                        ],
-                        component: {
-                            props: {
-                                clearable: true,
-                            },
-                            placeholder: '请输入名称',
-                        },
-                    },
-                },
-                type: {
-                    title: '数据值类型',
-                    type: 'dict-select',
-                    search: {
-                        disabled: true,
-                        component: {
-                            props: {
-                                clearable: true,
-                            },
-                        },
-                    },
-                    show: false,
-                    dict: dict({
-                        data: [
-                            {label: 'text', value: 0},
-                            {label: 'number', value: 1},
-                            {label: 'date', value: 2},
-                            {label: 'datetime', value: 3},
-                            {label: 'time', value: 4},
-                            {label: 'file', value: 5},
-                            {label: 'boolean', value: 6},
-                            {label: 'images', value: 7},
-                        ],
-                    }),
-                    form: {
-                        rules: [
-                            // 表单校验规则
-                            {required: true, message: '数据值类型必填项'},
-                        ],
-                        value: 0,
-                        component: {
-                            props: {
-                                clearable: true,
-                            },
-                            placeholder: '请选择数据值类型',
-                        },
-                        /* valueChange(key, value, form, { getColumn, mode, component, immediate, getComponent }) {
-                            const template = vm.getEditFormTemplate('value')
-                            // 选择框重新选择后，情况value值
-                            if (!immediate) {
-                                form.value = undefined
-                            }
-                            if (value === 0) {
-                                template.component.name = 'el-input'
-                            } else if (value === 1) {
-                                template.component.name = 'el-input-number'
-                            } else if (value === 2) {
-                                template.component.name = 'el-date-picker'
-                                template.component.props = {
-                                    type: 'date',
-                                    valueFormat: 'yyyy-MM-dd'
-                                }
-                            } else if (value === 3) {
-                                template.component.name = 'el-date-picker'
-                                template.component.props = {
-                                    type: 'datetime',
-                                    valueFormat: 'yyyy-MM-dd HH:mm:ss'
-                                }
-                            } else if (value === 4) {
-                                template.component.name = 'el-time-picker'
-                                template.component.props = {
-                                    pickerOptions: {
-                                        arrowControl: true
-                                    },
-                                    valueFormat: 'HH:mm:ss'
-                                }
-                            } else if (value === 5) {
-                                template.component.name = 'd2p-file-uploader'
-                                template.component.props = { elProps: { listType: 'text' } }
-                            } else if (value === 6) {
-                                template.component.name = 'dict-switch'
-                                template.component.value = true
-                                template.component.props = {
-                                    dict: {
-                                        data: [
-                                            { label: '是', value: 'true' },
-                                            { label: '否', value: 'false' }
-                                        ]
-                                    }
-                                }
-                            } else if (value === 7) {
-                                template.component.name = 'd2p-cropper-uploader'
-                                template.component.props = { accept: '.png,.jpeg,.jpg,.ico,.bmp,.gif', cropper: { viewMode: 1 } }
-                            }
-                        }, */
-                    },
-                },
-                value: {
-                    title: '数据值',
-                    search: {
-                        show: true,
-                        component: {
-                            props: {
-                                clearable: true,
-                            },
+          },
+          type: 'input',
+          form: {
+            rules: [
+              // 表单校验规则
+              { required: true, message: '名称必填项' },
+            ],
+            component: {
+              props: {
+                clearable: true,
+              },
+              placeholder: '请输入名称',
+            },
+          },
+        },
+        type: {
+          title: '数据值类型',
+          type: 'dict-select',
+          search: {
+            disabled: true,
+            component: {
+              props: {
+                clearable: true,
+              },
+            },
+          },
+          show: false,
+          dict: dict({
+            data: [
+              { label: 'text', value: 0 },
+              { label: 'number', value: 1 },
+              { label: 'date', value: 2 },
+              { label: 'datetime', value: 3 },
+              { label: 'time', value: 4 },
+              { label: 'file', value: 5 },
+              { label: 'boolean', value: 6 },
+              { label: 'images', value: 7 },
+            ],
+          }),
+          form: {
+            rules: [
+              // 表单校验规则
+              { required: true, message: '数据值类型必填项' },
+            ],
+            value: 0,
+            component: {
+              props: {
+                clearable: true,
+              },
+              placeholder: '请选择数据值类型',
+            },
+            /* valueChange(key, value, form, { getColumn, mode, component, immediate, getComponent }) {
+                const template = vm.getEditFormTemplate('value')
+                // 选择框重新选择后，情况value值
+                if (!immediate) {
+                    form.value = undefined
+                }
+                if (value === 0) {
+                    template.component.name = 'el-input'
+                } else if (value === 1) {
+                    template.component.name = 'el-input-number'
+                } else if (value === 2) {
+                    template.component.name = 'el-date-picker'
+                    template.component.props = {
+                        type: 'date',
+                        valueFormat: 'yyyy-MM-dd'
+                    }
+                } else if (value === 3) {
+                    template.component.name = 'el-date-picker'
+                    template.component.props = {
+                        type: 'datetime',
+                        valueFormat: 'yyyy-MM-dd HH:mm:ss'
+                    }
+                } else if (value === 4) {
+                    template.component.name = 'el-time-picker'
+                    template.component.props = {
+                        pickerOptions: {
+                            arrowControl: true
                         },
-                    },
-                    view: {
-                        component: {props: {height: 100, width: 100}},
-                    },
-                    /* // 提交时,处理数据
-                    valueResolve(row: any, col: any) {
-                        const value = row[col.key]
-                        const type = row.type
-                        if (type === 5 || type === 7) {
-                            if (value != null) {
-                                if (value.length >= 0) {
-                                    if (value instanceof Array) {
-                                        row[col.key] = value.toString()
-                                    } else {
-                                        row[col.key] = value
-                                    }
-                                } else {
-                                    row[col.key] = null
-                                }
-                            }
-                        } else {
-                            row[col.key] = value
-                        }
-                    },
-                    // 接收时,处理数据
-                    valueBuilder(row: any, col: any) {
-                        const value = row[col.key]
-                        const type = row.type
-                        if (type === 5 || type === 7) {
-                            if (value != null && value) {
-                                row[col.key] = value.split(',')
-                            }
-                        } else {
-                            row[col.key] = value
+                        valueFormat: 'HH:mm:ss'
+                    }
+                } else if (value === 5) {
+                    template.component.name = 'd2p-file-uploader'
+                    template.component.props = { elProps: { listType: 'text' } }
+                } else if (value === 6) {
+                    template.component.name = 'dict-switch'
+                    template.component.value = true
+                    template.component.props = {
+                        dict: {
+                            data: [
+                                { label: '是', value: 'true' },
+                                { label: '否', value: 'false' }
+                            ]
                         }
-                    }, */
-                    type: 'input',
-                    form: {
-                        rules: [
-                            // 表单校验规则
-                            {required: true, message: '数据值必填项'},
-                        ],
-                        component: {
-                            props: {
-                                clearable: true,
-                            },
-                            placeholder: '请输入数据值',
-                        },
-                    },
-                },
-                status: {
-                    title: '状态',
-                    width: 80,
-                    search: {
-                        show: true
-                    },
-                    type: 'dict-radio',
-                    dict: dict({
-                        data: dictionary('button_status_bool'),
-                    }),
-                    form: {
-                        value: true,
-                        rules: [
-                            // 表单校验规则
-                            {required: true, message: '状态必填项'},
-                        ],
-                    },
-                },
-                sort: {
-                    title: '排序',
-                    width: 70,
-                    type: 'number',
-                    form: {
-                        value: 1,
-                        component: {},
-                        rules: [
-                            // 表单校验规则
-                            {required: true, message: '排序必填项'},
-                        ],
-                    },
-                },
-                color: {
-                    title: '标签颜色',
-                    width: 90,
-                    search: {
-                        disabled: true,
-                    },
-                    type: 'dict-select',
-                    dict: dict({
-                        data: [
-                            {label: 'success', value: 'success', color: 'success'},
-                            {label: 'primary', value: 'primary', color: 'primary'},
-                            {label: 'info', value: 'info', color: 'info'},
-                            {label: 'danger', value: 'danger', color: 'danger'},
-                            {label: 'warning', value: 'warning', color: 'warning'},
-                        ],
-                    }),
-                    form: {
-                        component: {
-                            props: {
-                                clearable: true,
-                            },
-                        },
-                    },
-                },
+                    }
+                } else if (value === 7) {
+                    template.component.name = 'd2p-cropper-uploader'
+                    template.component.props = { accept: '.png,.jpeg,.jpg,.ico,.bmp,.gif', cropper: { viewMode: 1 } }
+                }
+            }, */
+          },
+        },
+        value: {
+          title: '数据值',
+          search: {
+            show: true,
+            component: {
+              props: {
+                clearable: true,
+              },
+            },
+          },
+          view: {
+            component: { props: { height: 100, width: 100 } },
+          },
+          /* // 提交时,处理数据
+          valueResolve(row: any, col: any) {
+              const value = row[col.key]
+              const type = row.type
+              if (type === 5 || type === 7) {
+                  if (value != null) {
+                      if (value.length >= 0) {
+                          if (value instanceof Array) {
+                              row[col.key] = value.toString()
+                          } else {
+                              row[col.key] = value
+                          }
+                      } else {
+                          row[col.key] = null
+                      }
+                  }
+              } else {
+                  row[col.key] = value
+              }
+          },
+          // 接收时,处理数据
+          valueBuilder(row: any, col: any) {
+              const value = row[col.key]
+              const type = row.type
+              if (type === 5 || type === 7) {
+                  if (value != null && value) {
+                      row[col.key] = value.split(',')
+                  }
+              } else {
+                  row[col.key] = value
+              }
+          }, */
+          type: 'input',
+          form: {
+            rules: [
+              // 表单校验规则
+              { required: true, message: '数据值必填项' },
+            ],
+            component: {
+              props: {
+                clearable: true,
+              },
+              placeholder: '请输入数据值',
             },
+          },
         },
-    };
+        status: {
+          title: '状态',
+          width: 80,
+          search: {
+            show: true
+          },
+          type: 'dict-radio',
+          dict: dict({
+            data: dictionary('button_status_bool'),
+          }),
+          form: {
+            value: true,
+            rules: [
+              // 表单校验规则
+              { required: true, message: '状态必填项' },
+            ],
+          },
+        },
+        sort: {
+          title: '排序',
+          width: 70,
+          type: 'number',
+          form: {
+            value: 1,
+            component: {},
+            rules: [
+              // 表单校验规则
+              { required: true, message: '排序必填项' },
+            ],
+          },
+        },
+        color: {
+          title: '标签颜色',
+          width: 90,
+          search: {
+            disabled: true,
+          },
+          type: 'dict-select',
+          dict: dict({
+            data: [
+              { label: 'success', value: 'success', color: 'success' },
+              { label: 'primary', value: 'primary', color: 'primary' },
+              { label: 'info', value: 'info', color: 'info' },
+              { label: 'danger', value: 'danger', color: 'danger' },
+              { label: 'warning', value: 'warning', color: 'warning' },
+            ],
+          }),
+          form: {
+            component: {
+              props: {
+                clearable: true,
+              },
+            },
+          },
+        },
+        is_value: {
+          title: '是否值',
+          column: {
+            show: false
+          },
+          form: {
+            show: false,
+            value: true
+          }
+        }
+      },
+    },
+  };
 };
-- 
Gitee


From 282ab9a6a1aa8d2d63cf20f0308977b77948b870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=B6=9B?= <1537080775@qq.com>
Date: Wed, 25 Dec 2024 08:59:25 +0800
Subject: [PATCH 05/14] =?UTF-8?q?refactor(20241225-role):=20=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=9D=83=E9=99=90=E5=88=86=E9=85=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、优化角色权限分配逻辑
2、采用实时保存，提高速度
---
 backend/application/settings.py               |   2 +-
 .../views/role_menu_button_permission.py      | 445 ++++++-----------
 .../role/components/PermissionComNew/api.ts   |  70 ---
 .../components/PermissionComNew/index.vue     | 451 ------------------
 .../role/components/PermissionComNew/types.ts |  29 --
 web/src/views/system/role/crud.tsx            | 352 +++++++-------
 web/src/views/system/role/index.vue           |  74 +--
 web/src/views/system/role/types.ts            | 105 +++-
 8 files changed, 408 insertions(+), 1120 deletions(-)
 delete mode 100644 web/src/views/system/role/components/PermissionComNew/api.ts
 delete mode 100644 web/src/views/system/role/components/PermissionComNew/index.vue
 delete mode 100644 web/src/views/system/role/components/PermissionComNew/types.ts

diff --git a/backend/application/settings.py b/backend/application/settings.py
index 1d0adf79..e6bdec5e 100644
--- a/backend/application/settings.py
+++ b/backend/application/settings.py
@@ -404,7 +404,7 @@ PLUGINS_URL_PATTERNS = []
 # ********** 一键导入插件配置开始 **********
 # 例如:
 # from dvadmin_upgrade_center.settings import *    # 升级中心
-from dvadmin3_celery.settings import *            # celery 异步任务
+# from dvadmin3_celery.settings import *            # celery 异步任务
 # from dvadmin_third.settings import *            # 第三方用户管理
 # from dvadmin_ak_sk.settings import *            # 秘钥管理管理
 # from dvadmin_tenants.settings import *            # 租户管理
diff --git a/backend/dvadmin/system/views/role_menu_button_permission.py b/backend/dvadmin/system/views/role_menu_button_permission.py
index 3ee596df..723cd2a6 100644
--- a/backend/dvadmin/system/views/role_menu_button_permission.py
+++ b/backend/dvadmin/system/views/role_menu_button_permission.py
@@ -6,24 +6,20 @@
 @Created on: 2021/6/3 003 0:30
 @Remark: 菜单按钮管理
 """
-from django.db.models import F, Subquery, OuterRef, Exists, BooleanField, Q, Case, Value, When
-from django.db.models.functions import Coalesce
 from rest_framework import serializers
 from rest_framework.decorators import action
-from rest_framework.fields import ListField
 from rest_framework.permissions import IsAuthenticated
 
-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.system.models import RoleMenuButtonPermission, Menu, Dept, MenuButton, RoleMenuPermission, \
+    MenuField, FieldPermission
+from dvadmin.utils.json_response import DetailResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
 
 
 class RoleMenuButtonPermissionSerializer(CustomModelSerializer):
     """
-    菜单按钮-序列化器
+    角色-菜单-按钮-权限 查询序列化
     """
 
     class Meta:
@@ -34,7 +30,7 @@ class RoleMenuButtonPermissionSerializer(CustomModelSerializer):
 
 class RoleMenuButtonPermissionCreateUpdateSerializer(CustomModelSerializer):
     """
-    初始化菜单按钮-序列化器
+    角色-菜单-按钮-权限 创建/修改序列化
     """
     menu_button__name = serializers.CharField(source='menu_button.name', read_only=True)
     menu_button__value = serializers.CharField(source='menu_button.value', read_only=True)
@@ -45,63 +41,99 @@ class RoleMenuButtonPermissionCreateUpdateSerializer(CustomModelSerializer):
         read_only_fields = ["id"]
 
 
-class RoleButtonPermissionSerializer(CustomModelSerializer):
+class RoleMenuSerializer(CustomModelSerializer):
+    """
+    角色-菜单 序列化
+    """
+    isCheck = serializers.SerializerMethodField()
+
+    def get_isCheck(self, instance):
+        params = self.request.query_params
+        data = self.request.data
+        return RoleMenuPermission.objects.filter(
+            menu_id=instance.id,
+            role_id=params.get('roleId', data.get('roleId')),
+        ).exists()
+
+    class Meta:
+        model = Menu
+        fields = ["id", "name", "parent", "is_catalog", "isCheck"]
+
+
+class RoleMenuButtonSerializer(CustomModelSerializer):
     """
-    角色按钮权限
+    角色-菜单-按钮 序列化
     """
     isCheck = serializers.SerializerMethodField()
     data_range = serializers.SerializerMethodField()
+    role_menu_btn_perm_id = serializers.SerializerMethodField()
+    dept = serializers.SerializerMethodField()
 
     def get_isCheck(self, instance):
         params = self.request.query_params
+        data = self.request.data
         return RoleMenuButtonPermission.objects.filter(
-            menu_button__id=instance['id'],
-            role__id=params.get('role'),
+            menu_button_id=instance.id,
+            role_id=params.get('roleId', data.get('roleId')),
         ).exists()
 
     def get_data_range(self, instance):
-        params = self.request.query_params
-        obj = RoleMenuButtonPermission.objects.filter(
-            menu_button__id=instance['id'],
-            role__id=params.get('role'),
-        ).first()
+        obj = self.get_role_menu_btn_prem(instance)
         if obj is None:
             return None
         return obj.data_range
 
-    class Meta:
-        model = MenuButton
-        fields = ['id', 'name', 'value', 'isCheck', 'data_range']
+    def get_role_menu_btn_perm_id(self, instance):
+        obj = self.get_role_menu_btn_prem(instance)
+        if obj is None:
+            return None
+        return obj.id
 
+    def get_dept(self, instance):
+        obj = self.get_role_menu_btn_prem(instance)
+        if obj is None:
+            return None
+        return obj.dept.all().values_list('id', flat=True)
+
+    def get_role_menu_btn_prem(self, instance):
+        params = self.request.query_params
+        data = self.request.data
+        obj = RoleMenuButtonPermission.objects.filter(
+            menu_button_id=instance.id,
+            role_id=params.get('roleId', data.get('roleId')),
+        ).first()
+        return obj
 
-class RoleFieldPermissionSerializer(CustomModelSerializer):
     class Meta:
-        model = FieldPermission
-        fields = "__all__"
+        model = MenuButton
+        fields = ['id', 'menu', 'name', 'isCheck', 'data_range', 'role_menu_btn_perm_id', 'dept']
 
 
 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()
+        queryset = instance.menu_field.filter(role=params.get('roleId')).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()
+        queryset = instance.menu_field.filter(role=params.get('roleId')).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()
+        queryset = instance.menu_field.filter(role=params.get('roleId')).first()
         if queryset:
             return queryset.is_update
         return False
@@ -111,54 +143,6 @@ class RoleMenuFieldSerializer(CustomModelSerializer):
         fields = ['id', 'field_name', 'title', 'is_query', 'is_create', 'is_update']
 
 
-class RoleMenuSerializer(CustomModelSerializer):
-    menus = serializers.SerializerMethodField()
-
-    def get_menus(self, instance):
-        menu_list = Menu.objects.filter(parent=instance['id']).values('id', 'name')
-        serializer = RoleMenuPermissionSerializer(menu_list, many=True, request=self.request)
-        return serializer.data
-
-    class Meta:
-        model = Menu
-        fields = ['id', 'name', 'menus']
-
-
-class RoleMenuPermissionSerializer(CustomModelSerializer):
-    """
-    菜单和按钮权限
-    """
-    # name = serializers.SerializerMethodField()
-    isCheck = serializers.SerializerMethodField()
-    btns = serializers.SerializerMethodField()
-    columns = serializers.SerializerMethodField()
-
-    # def get_name(self, instance):
-    #     parent_list = Menu.get_all_parent(instance['id'])
-    #     names = [d["name"] for d in parent_list]
-    #     return "/".join(names)
-    def get_isCheck(self, instance):
-        params = self.request.query_params
-        return RoleMenuPermission.objects.filter(
-            menu__id=instance['id'],
-            role__id=params.get('role'),
-        ).exists()
-
-    def get_btns(self, instance):
-        btn_list = MenuButton.objects.filter(menu__id=instance['id']).values('id', 'name', 'value')
-        serializer = RoleButtonPermissionSerializer(btn_list, many=True, request=self.request)
-        return serializer.data
-
-    def get_columns(self, instance):
-        col_list = MenuField.objects.filter(menu=instance['id'])
-        serializer = RoleMenuFieldSerializer(col_list, many=True, request=self.request)
-        return serializer.data
-
-    class Meta:
-        model = Menu
-        fields = ['id', 'name', 'isCheck', 'btns', 'columns']
-
-
 class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
     """
     菜单按钮接口
@@ -174,202 +158,103 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
     update_serializer_class = RoleMenuButtonPermissionCreateUpdateSerializer
     extra_filter_class = []
 
-    # @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
-    # def get_role_premission(self, request):
-    #     """
-    #     角色授权获取:
-    #     :param request: role
-    #     :return: menu,btns,columns
-    #     """
-    #     params = request.query_params
-    #     is_superuser = request.user.is_superuser
-    #     if is_superuser:
-    #         queryset = Menu.objects.filter(status=1, is_catalog=True).values('name', 'id').all()
-    #     else:
-    #         role_id = request.user.role.values_list('id', flat=True)
-    #         menu_list = RoleMenuPermission.objects.filter(role__in=role_id).values_list('menu__id', flat=True)
-    #         queryset = Menu.objects.filter(status=1, is_catalog=True, id__in=menu_list).values('name', 'id').all()
-    #     serializer = RoleMenuSerializer(queryset, many=True, request=request)
-    #     data = serializer.data
-    #     return DetailResponse(data=data)
-
     @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
-    def get_role_permission(self, request):
-        params = request.query_params
-        # 需要授权的角色信息
-        current_role = params.get('role', None)
-        # 当前登录用户的角色
-        role_list = request.user.role.values_list('id', flat=True)
-        if current_role is None:
-            return ErrorResponse(msg='参数错误')
-        is_superuser = request.user.is_superuser
-        if is_superuser:
-            menu_queryset = Menu.objects.prefetch_related('menuPermission').prefetch_related(
-                'menufield_set')
-        else:
-            role_id_list = request.user.role.values_list('id', flat=True)
-            menu_list = RoleMenuPermission.objects.filter(role__in=role_id_list).values_list('menu__id', flat=True)
-
-            # 当前角色已授权的菜单
-            menu_queryset = Menu.objects.filter(id__in=menu_list).prefetch_related('menuPermission').prefetch_related(
-                'menufield_set')
-        result = []
-        for menu_item in menu_queryset:
-            isCheck = RoleMenuPermission.objects.filter(
-                menu_id=menu_item.id,
-                role_id=current_role
-            ).exists()
-            dicts = {
-                'name': menu_item.name,
-                'id': menu_item.id,
-                'parent': menu_item.parent.id if menu_item.parent else None,
-                'isCheck': isCheck,
-                'btns': [],
-                'columns': []
-            }
-            for mb_item in menu_item.menuPermission.all():
-                rolemenubuttonpermission_queryset = RoleMenuButtonPermission.objects.filter(
-                    menu_button_id=mb_item.id,
-                    role_id=current_role
-                ).first()
-                dicts['btns'].append(
-                    {
-                        'id': mb_item.id,
-                        'name': mb_item.name,
-                        'value': mb_item.value,
-                        'data_range': rolemenubuttonpermission_queryset.data_range
-                        if rolemenubuttonpermission_queryset
-                        else None,
-                        'isCheck': bool(rolemenubuttonpermission_queryset),
-                        'dept': rolemenubuttonpermission_queryset.dept.all().values_list('id', flat=True)
-                        if rolemenubuttonpermission_queryset
-                        else [],
-                    }
-                )
-            for column_item in menu_item.menufield_set.all():
-                # 需要授权角色已拥有的列权限
-                fieldpermission_queryset = column_item.menu_field.filter(role_id=current_role).first()
-                is_query = fieldpermission_queryset.is_query if fieldpermission_queryset else False
-                is_create = fieldpermission_queryset.is_create if fieldpermission_queryset else False
-                is_update = fieldpermission_queryset.is_update if fieldpermission_queryset else False
-                # 当前登录用户角色可分配的列权限
-                fieldpermission_queryset_disabled = column_item.menu_field.filter(role_id__in=role_list).first()
-                disabled_query = fieldpermission_queryset_disabled.is_query if fieldpermission_queryset_disabled else True
-                disabled_create = fieldpermission_queryset_disabled.is_create if fieldpermission_queryset_disabled else True
-                disabled_update = fieldpermission_queryset_disabled.is_update if fieldpermission_queryset_disabled else True
-
-                dicts['columns'].append({
-                    'id': column_item.id,
-                    'field_name': column_item.field_name,
-                    'title': column_item.title,
-                    'is_query': is_query,
-                    'is_create': is_create,
-                    'is_update': is_update,
-                    'disabled_query': False if is_superuser else not disabled_query,
-                    'disabled_create': False if is_superuser else not disabled_create,
-                    'disabled_update': False if is_superuser else not disabled_update,
-                })
-            result.append(dicts)
-        return DetailResponse(data=result)
-
-    @action(methods=['PUT'], detail=True, permission_classes=[IsAuthenticated])
-    def set_role_premission(self, request, pk):
+    def get_role_menu(self, request):
         """
-        对角色的菜单和按钮及按钮范围授权:
+        获取 角色-菜单
         :param request:
-        :param pk: role
         :return:
         """
-        body = request.data
-        RoleMenuPermission.objects.filter(role=pk).delete()
-        RoleMenuButtonPermission.objects.filter(role=pk).delete()
-        for item in body:
-            if item.get('isCheck'):
-                RoleMenuPermission.objects.create(role_id=pk, menu_id=item["id"])
-            for btn in item.get('btns'):
-                if btn.get('isCheck'):
-                    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 item.get('columns'):
-                FieldPermission.objects.update_or_create(role_id=pk, field_id=col.get('id'),
-                                                         defaults={
-                                                             'is_query': col.get('is_query'),
-                                                             'is_create': col.get('is_create'),
-                                                             'is_update': col.get('is_update')
-                                                         })
-        return DetailResponse(msg="授权成功")
+        menu_queryset = Menu.objects.all()
+        serializer = RoleMenuSerializer(menu_queryset, many=True, request=request)
+        return DetailResponse(data=serializer.data)
 
-    @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
-    def role_menu_get_button(self, request):
+    @action(methods=['PUT'], detail=False, permission_classes=[IsAuthenticated])
+    def set_role_menu(self, request):
         """
-        当前用户角色和菜单获取可下拉选项的按钮:角色授权页面使用
+        设置 角色-菜单
         :param request:
         :return:
         """
-        if params := request.query_params:
-            if menu_id := params.get('menu', None):
-                is_superuser = request.user.is_superuser
-                if is_superuser:
-                    queryset = MenuButton.objects.filter(menu=menu_id).values('id', 'name')
-                else:
-                    role_list = request.user.role.values_list('id', flat=True)
-                    queryset = RoleMenuButtonPermission.objects.filter(
-                        role__in=role_list, menu_button__menu=menu_id
-                    ).values(btn_id=F('menu_button__id'), name=F('menu_button__name'))
-                return DetailResponse(data=queryset)
-        return ErrorResponse(msg="参数错误")
+        data = request.data
+        roleId = data.get('roleId')
+        menuId = data.get('menuId')
+        isCheck = data.get('isCheck')
+        if isCheck:
+            # 添加权限：创建关联记录
+            instance = RoleMenuPermission.objects.create(role_id=roleId, menu_id=menuId)
+        else:
+            # 删除权限：移除关联记录
+            RoleMenuPermission.objects.filter(role_id=roleId, menu_id=menuId).delete()
+        menu_instance = Menu.objects.get(id=menuId)
+        serializer = RoleMenuSerializer(menu_instance, request=request)
+        return DetailResponse(data=serializer.data, msg="更新成功")
 
     @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
-    def data_scope(self, request):
+    def get_role_menu_btn_field(self, request):
         """
-        获取数据权限范围:角色授权页面使用
+        获取 角色-菜单-按钮-列字段
         :param request:
         :return:
         """
-        is_superuser = request.user.is_superuser
-        if is_superuser:
-            data = [
-                {"value": 0, "label": '仅本人数据权限'},
-                {"value": 1, "label": '本部门及以下数据权限'},
-                {"value": 2, "label": '本部门数据权限'},
-                {"value": 3, "label": '全部数据权限'},
-                {"value": 4, "label": '自定义数据权限'}
-            ]
-            return DetailResponse(data=data)
+        params = request.query_params
+        menuId = params.get('menuId', None)
+        menu_btn_queryset = MenuButton.objects.filter(menu_id=menuId)
+        menu_btn_serializer = RoleMenuButtonSerializer(menu_btn_queryset, many=True, request=request)
+        menu_field_queryset = MenuField.objects.filter(menu_id=menuId)
+        menu_field_serializer = RoleMenuFieldSerializer(menu_field_queryset, many=True, request=request)
+        return DetailResponse(data={'menu_btn': menu_btn_serializer.data, 'menu_field': menu_field_serializer.data})
+
+    @action(methods=['PUT'], detail=True, permission_classes=[IsAuthenticated])
+    def set_role_menu_field(self, request, pk):
+        """
+        设置 角色-菜单-列字段
+        """
+        data = request.data
+        for col in data:
+            FieldPermission.objects.update_or_create(
+                role_id=pk, field_id=col.get('id'),
+                defaults={
+                    'is_create': col.get('is_create'),
+                    'is_update': col.get('is_update'),
+                    'is_query': col.get('is_query'),
+                })
+
+        return DetailResponse(data=[], msg="更新成功")
+
+    @action(methods=['PUT'], detail=False, permission_classes=[IsAuthenticated])
+    def set_role_menu_btn(self, request):
+        """
+        设置 角色-菜单-按钮
+        """
+        data = request.data
+        isCheck = data.get('isCheck', None)
+        roleId = data.get('roleId', None)
+        btnId = data.get('btnId', None)
+        if isCheck:
+            # 添加权限：创建关联记录
+            RoleMenuButtonPermission.objects.create(role_id=roleId, menu_button_id=btnId)
         else:
-            params = request.query_params
-            data = [{"value": 0, "label": '仅本人数据权限'}]
-            role_list = request.user.role.values_list('id', flat=True)
-            # 权限页面进入初始化获取所有的数据权限范围
-            role_queryset = RoleMenuButtonPermission.objects.filter(
-                role__in=role_list
-            ).values_list('data_range', flat=True)
-            # 通过按钮小齿轮获取指定按钮的权限
-            if menu_button_id := params.get('menu_button', None):
-                role_queryset = RoleMenuButtonPermission.objects.filter(
-                    role__in=role_list, menu_button__id=menu_button_id
-                ).values_list('data_range', flat=True)
-
-            data_range_list = list(set(role_queryset))
-            for item in data_range_list:
-                if item == 0:
-                    data = data
-                elif item == 1:
-                    data.extend([
-                        {"value": 1, "label": '本部门及以下数据权限'},
-                        {"value": 2, "label": '本部门数据权限'}
-                    ])
-                elif item == 2:
-                    data.extend([{"value": 2, "label": '本部门数据权限'}])
-                elif item == 3:
-                    data.extend([{"value": 3, "label": '全部数据权限'}])
-                elif item == 4:
-                    data.extend([{"value": 4, "label": '自定义数据权限'}])
-                else:
-                    data = []
-            return DetailResponse(data=data)
+            # 删除权限：移除关联记录
+            RoleMenuButtonPermission.objects.filter(role_id=roleId, menu_button_id=btnId).delete()
+        menu_btn_instance = MenuButton.objects.get(id=btnId)
+        serializer = RoleMenuButtonSerializer(menu_btn_instance, request=request)
+        return DetailResponse(data=serializer.data, msg="更新成功")
+
+    @action(methods=['PUT'], detail=False, permission_classes=[IsAuthenticated])
+    def set_role_menu_btn_data_range(self, request):
+        """
+        设置 角色-菜单-按钮-权限
+        """
+        data = request.data
+        instance = RoleMenuButtonPermission.objects.get(id=data.get('role_menu_btn_perm_id'))
+        instance.data_range = data.get('data_range')
+        instance.dept.add(*data.get('dept'))
+        if not data.get('dept'):
+            instance.dept.clear()
+        instance.save()
+        serializer = RoleMenuButtonPermissionSerializer(instance, request=request)
+        return DetailResponse(data=serializer.data, msg="更新成功")
 
     @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
     def role_to_dept_all(self, request):
@@ -395,55 +280,3 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
             dept["disabled"] = False if is_superuser else dept["id"] not in dept_checked_disabled
             data.append(dept)
         return DetailResponse(data=data)
-
-    @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
-    def menu_to_button(self, request):
-        """
-        根据所选择菜单获取已配置的按钮/接口权限:角色授权页面使用
-        :param request:
-        :return:
-        """
-        params = request.query_params
-        menu_id = params.get('menu', None)
-        if menu_id is None:
-            return ErrorResponse(msg="未获取到参数")
-        is_superuser = request.user.is_superuser
-        if is_superuser:
-            queryset = RoleMenuButtonPermission.objects.filter(menu_button__menu=menu_id).values(
-                'id',
-                'data_range',
-                'menu_button',
-                'menu_button__name',
-                'menu_button__value'
-            )
-            return DetailResponse(data=queryset)
-        else:
-            if params:
-
-                role_id = params.get('role', None)
-                if role_id is None:
-                    return ErrorResponse(msg="未获取到参数")
-                queryset = RoleMenuButtonPermission.objects.filter(role=role_id, menu_button__menu=menu_id).values(
-                    'id',
-                    'data_range',
-                    'menu_button',
-                    'menu_button__name',
-                    'menu_button__value'
-                )
-                return DetailResponse(data=queryset)
-        return ErrorResponse(msg="未获取到参数")
-
-    @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
-    def role_to_menu(self, request):
-        """
-        获取角色对应的按钮权限
-        :param request:
-        :return:
-        """
-        params = request.query_params
-        role_id = params.get('role', None)
-        if role_id is None:
-            return ErrorResponse(msg="未获取到参数")
-        queryset = RoleMenuPermission.objects.filter(role_id=role_id).values_list('menu_id', flat=True).distinct()
-
-        return DetailResponse(data=queryset)
diff --git a/web/src/views/system/role/components/PermissionComNew/api.ts b/web/src/views/system/role/components/PermissionComNew/api.ts
deleted file mode 100644
index 0243ab69..00000000
--- a/web/src/views/system/role/components/PermissionComNew/api.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { request } from "/@/utils/service";
-import XEUtils from "xe-utils";
-/**
- * 获取角色的授权列表
- * @param roleId
- * @param query
- */
-export function getRolePermission(query:object) {
-  return request({
-    url: '/api/system/role_menu_button_permission/get_role_permission/',
-    method: 'get',
-    params:query
-  }).then((res:any)=>{
-    return XEUtils.toArrayTree(res.data, {key: 'id', parentKey: 'parent',children: 'children',strict: false})
-  })
-}
-
-/***
- * 设置角色的权限
- * @param roleId
- * @param data
- */
-export function setRolePremission(roleId:any,data:object) {
-  return request({
-    url: `/api/system/role_menu_button_permission/${roleId}/set_role_premission/`,
-    method: 'put',
-    data
-  })
-}
-
-export function getDataPermissionRange(query:object) {
-  return request({
-    url: '/api/system/role_menu_button_permission/data_scope/',
-    method: 'get',
-    params:query
-  })
-}
-
-export function getDataPermissionRangeAll() {
-  return request({
-    url: '/api/system/role_menu_button_permission/data_scope/',
-    method: 'get',
-  })
-}
-export function getDataPermissionDept(query:object) {
-  return request({
-    url: '/api/system/role_menu_button_permission/role_to_dept_all/',
-    method: 'get',
-    params:query
-  })
-}
-
-export function getDataPermissionMenu() {
-  return request({
-    url: '/api/system/role_menu_button_permission/get_role_permissions/',
-    method: 'get'
-  })
-}
-
-/**
- * 设置按钮的数据范围
- */
-export function setBtnDatarange(roleId:number,data:object) {
-  return request({
-    url: `/api/system/role_menu_button_permission/${roleId}/set_btn_datarange/`,
-    method: 'put',
-    data
-  })
-}
-
diff --git a/web/src/views/system/role/components/PermissionComNew/index.vue b/web/src/views/system/role/components/PermissionComNew/index.vue
deleted file mode 100644
index b1da73fd..00000000
--- a/web/src/views/system/role/components/PermissionComNew/index.vue
+++ /dev/null
@@ -1,451 +0,0 @@
-<template>
-	<el-drawer
-		v-model="drawerVisibleNew"
-		title="权限配置"
-		direction="rtl"
-		size="60%"
-		:close-on-click-modal="false"
-		:before-close="handleDrawerClose"
-		:destroy-on-close="true"
-	>
-		<template #header>
-			<el-row>
-				<el-col :span="4">
-					<div>
-						当前授权角色：
-						<el-tag>{{ props.roleName }}</el-tag>
-					</div>
-				</el-col>
-				<el-col :span="6">
-					<div>
-						<el-button size="small" type="primary" class="pc-save-btn" @click="handleSavePermission">保存菜单授权 </el-button>
-					</div>
-				</el-col>
-			</el-row>
-		</template>
-		<div class="permission-com">
-			<el-row class="menu-el-row" :gutter="20">
-				<el-col :span="6">
-					<div class="menu-box menu-left-box">
-						<el-tree
-							ref="treeRef"
-							:data="menuData"
-							:props="defaultTreeProps"
-							:default-checked-keys="menuDefaultCheckedKeys"
-							@check="handleMenuCheck"
-							@node-click="handleMenuClick"
-							node-key="id"
-							check-strictly
-							highlight-current
-							show-checkbox
-							default-expand-all
-						>
-						</el-tree>
-					</div>
-				</el-col>
-
-				<el-col :span="18">
-					<div class="pc-collapse-main" v-if="menuCurrent.btns && menuCurrent.btns.length > 0">
-						<div class="pccm-item">
-							<div class="menu-form-alert">配置操作功能接口权限,配置数据权限点击小齿轮</div>
-							<el-checkbox v-for="(btn, bIndex) in menuCurrent.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 }}
-									<span v-show="btn.isCheck" @click.stop.prevent="handleSettingClick(menuCurrent, btn)">
-										<el-icon>
-											<Setting />
-										</el-icon>
-									</span>
-								</div>
-							</el-checkbox>
-						</div>
-
-						<div class="pccm-item" v-if="menuCurrent.columns && menuCurrent.columns.length > 0">
-							<div class="menu-form-alert">配置数据列字段权限</div>
-							<ul class="columns-list">
-								<li class="columns-head">
-									<div class="width-txt">
-										<span>字段</span>
-									</div>
-									<div v-for="(head, hIndex) in column.header" :key="hIndex" class="width-check">
-										<el-checkbox :label="head.value" @change="handleColumnChange($event, menuCurrent, head.value, head.disabled)">
-											<span>{{ head.label }}</span>
-										</el-checkbox>
-									</div>
-								</li>
-
-								<li v-for="(c_item, c_index) in menuCurrent.columns" :key="c_index" class="columns-item">
-									<div class="width-txt">{{ c_item.title }}</div>
-									<div v-for="(col, cIndex) in column.header" :key="cIndex" class="width-check">
-										<el-checkbox v-model="c_item[col.value]" class="ci-checkout" :disabled="c_item[col.disabled]"></el-checkbox>
-									</div>
-								</li>
-							</ul>
-						</div>
-					</div>
-				</el-col>
-			</el-row>
-
-			<el-dialog v-model="dialogVisible" title="数据权限配置" width="400px" :close-on-click-modal="false" :before-close="handleDialogClose">
-				<div class="pc-dialog">
-					<el-select v-model="dataPermission" @change="handlePermissionRangeChange" class="dialog-select" placeholder="请选择">
-						<el-option v-for="item in dataPermissionRange" :key="item.value" :label="item.label" :value="item.value" />
-					</el-select>
-					<el-tree-select
-						v-show="dataPermission === 4"
-						node-key="id"
-						v-model="customDataPermission"
-						:props="defaultTreeProps"
-						:data="deptData"
-						multiple
-						check-strictly
-						:render-after-expand="false"
-						show-checkbox
-						class="dialog-tree"
-					/>
-				</div>
-				<template #footer>
-					<div>
-						<el-button type="primary" @click="handleDialogConfirm"> 确定</el-button>
-						<el-button @click="handleDialogClose"> 取消</el-button>
-					</div>
-				</template>
-			</el-dialog>
-		</div>
-	</el-drawer>
-</template>
-
-<script setup lang="ts">
-import { ref, onMounted, defineProps, watch, computed, reactive } from 'vue';
-import XEUtils from 'xe-utils';
-import { errorNotification } from '/@/utils/message';
-import { getDataPermissionRange, getDataPermissionDept, getRolePermission, setRolePremission, setBtnDatarange } from './api';
-import { MenuDataType, DataPermissionRangeType, CustomDataPermissionDeptType } from './types';
-import { ElMessage, ElTree } from 'element-plus';
-
-
-const props = defineProps({
-	roleId: {
-		type: Number,
-		default: -1,
-	},
-	roleName: {
-		type: String,
-		default: '',
-	},
-	drawerVisible: {
-		type: Boolean,
-		default: false,
-	},
-});
-const emit = defineEmits(['update:drawerVisible']);
-
-const drawerVisibleNew  = ref(false);
-watch(
-	() => props.drawerVisible,
-	(val) => {
-		drawerVisibleNew .value = val;
-		getMenuBtnPermission();
-		getDataPermissionRangeLable();
-		menuCurrent.value = {};
-	}
-);
-const handleDrawerClose = () => {
-	emit('update:drawerVisible', false);
-};
-
-const defaultTreeProps = {
-	children: 'children',
-	label: 'name',
-	value: 'id',
-};
-
-let menuData = ref<MenuDataType[]>([]); // 菜单列表数据
-let menuDefaultCheckedKeys = ref<number[]>([]); // 默认选中的菜单列表
-let menuCurrent = ref<Partial<MenuDataType>>({}); // 当前选中的菜单
-
-let menuBtnCurrent = ref<number>(-1);
-let dialogVisible = ref(false);
-let dataPermissionRange = ref<DataPermissionRangeType[]>([]);
-let dataPermissionRangeLabel = ref<DataPermissionRangeType[]>([]);
-
-const formatDataRange = computed(() => {
-	return function (datarange: number) {
-		const findItem = dataPermissionRangeLabel.value.find((i) => i.value === datarange);
-		return findItem?.label || '';
-	};
-});
-let deptData = ref<CustomDataPermissionDeptType[]>([]);
-let dataPermission = ref();
-let customDataPermission = ref([]);
-
-/**
- * 菜单复选框选中
- * @param node
- * @param data
- */
-const handleMenuCheck = (node: any, data: any) => {
-	XEUtils.eachTree(menuData.value, (item) => {
-		item.isCheck = data.checkedKeys.includes(item.id);
-	});
-};
-/**
- * 菜单点击
- * @param node
- * @param data
- */
-const handleMenuClick = (selectNode: MenuDataType) => {
-	menuCurrent.value = selectNode;
-};
-//获取菜单,按钮,权限
-const getMenuBtnPermission = async () => {
-	const resMenu = await getRolePermission({ role: props.roleId });
-	menuData.value = resMenu;
-	menuDefaultCheckedKeys.value = XEUtils.toTreeArray(resMenu)
-		.filter((i) => i.isCheck)
-		.map((i) => i.id);
-};
-// 获取按钮的数据权限下拉选项
-const getDataPermissionRangeLable = async () => {
-	const resRange = await getDataPermissionRange({ role: props.roleId });
-	dataPermissionRangeLabel.value = resRange.data;
-};
-
-/**
- * 获取按钮数据权限下拉选项
- * @param btnId  按钮id
- */
-const fetchData = async (btnId: number) => {
-	try {
-		const resRange = await getDataPermissionRange({ menu_button: btnId });
-		if (resRange?.code === 2000) {
-			dataPermissionRange.value = resRange.data;
-		}
-	} catch {
-		return;
-	}
-};
-
-
-/**
- * 设置按钮数据权限
- * @param record 当前菜单
- * @param btnType  按钮类型
- */
-const handleSettingClick = (record: any, btn: MenuDataType['btns'][number]) => {
-	menuCurrent.value = record;
-	menuBtnCurrent.value = btn.id;
-	dialogVisible.value = true;
-	dataPermission.value = btn.data_range;
-	handlePermissionRangeChange(btn.data_range);
-	fetchData(btn.id);
-};
-
-/**
- * 设置列权限
- * @param val  是否选中
- * @param record  当前菜单
- * @param btnType  按钮类型
- * @param disabledType  禁用类型
- */
-const handleColumnChange = (val: boolean, record: any, btnType: string, disabledType: string) => {
-	for (const iterator of record.columns) {
-		iterator[btnType] = iterator[disabledType] ? iterator[btnType] : val;
-	}
-};
-
-/**
- * 数据权限设置
- */
-const handlePermissionRangeChange = async (val: number) => {
-	if (val === 4) {
-		const res = await getDataPermissionDept({ role: props.roleId, menu_button: menuBtnCurrent.value });
-		const depts = XEUtils.toArrayTree(res.data, { parentKey: 'parent', strict: false });
-		deptData.value = depts;
-		const btnObj = XEUtils.find(menuCurrent.value.btns, (item) => item.id === menuBtnCurrent.value);
-		customDataPermission.value = btnObj.dept;
-	}
-};
-
-/**
- * 数据权限设置确认
- */
-const handleDialogConfirm = () => {
-	if (dataPermission.value !== 0 && !dataPermission.value) {
-		errorNotification('请选择');
-		return;
-	}
-	for (const btn of menuCurrent.value?.btns || []) {
-		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) {
-				btn.dept = customDataPermission.value;
-			}
-		}
-	}
-	handleDialogClose();
-};
-const handleDialogClose = () => {
-	dialogVisible.value = false;
-	customDataPermission.value = [];
-	dataPermission.value = null;
-};
-
-//保存菜单授权
-const handleSavePermission = () => {
-	setRolePremission(props.roleId, XEUtils.toTreeArray(menuData.value)).then((res: any) => {
-		ElMessage({
-			message: res.msg,
-			type: 'success',
-		});
-	});
-};
-
-const column = reactive({
-	header: [
-		{ value: 'is_create', label: '新增可见', disabled: 'disabled_create' },
-		{ value: 'is_update', label: '编辑可见', disabled: 'disabled_update' },
-		{ value: 'is_query', label: '列表可见', disabled: 'disabled_query' },
-	],
-});
-
-onMounted(() => {});
-</script>
-
-<style lang="scss" scoped>
-.permission-com {
-	margin: 15px;
-	box-sizing: border-box;
-
-	.pc-save-btn {
-		margin-bottom: 15px;
-	}
-
-	.pc-collapse-title {
-		line-height: 32px;
-		text-align: left;
-
-		span {
-			font-size: 16px;
-		}
-	}
-
-	.pc-collapse-main {
-		box-sizing: border-box;
-
-		.pccm-item {
-			margin-bottom: 10px;
-
-			.menu-form-alert {
-				color: #fff;
-				line-height: 24px;
-				padding: 8px 16px;
-				margin-bottom: 20px;
-				border-radius: 4px;
-				background-color: var(--el-color-primary);
-			}
-
-			.btn-item {
-				display: flex;
-				align-items: center;
-
-				span {
-					margin-left: 5px;
-				}
-			}
-
-			.columns-list {
-				.width-txt {
-					width: 200px;
-				}
-
-				.width-check {
-					width: 100px;
-				}
-
-				.width-icon {
-					cursor: pointer;
-				}
-
-				.columns-head {
-					display: flex;
-					align-items: center;
-					padding: 6px 0;
-					border-bottom: 1px solid #ebeef5;
-					box-sizing: border-box;
-
-					span {
-						font-weight: 900;
-					}
-				}
-
-				.columns-item {
-					display: flex;
-					align-items: center;
-					padding: 6px 0;
-					box-sizing: border-box;
-
-					.ci-checkout {
-						height: auto !important;
-					}
-				}
-			}
-		}
-	}
-
-	.pc-dialog {
-		.dialog-select {
-			width: 100%;
-		}
-
-		.dialog-tree {
-			width: 100%;
-			margin-top: 20px;
-		}
-	}
-}
-</style>
-
-<style lang="scss">
-.permission-com {
-	.el-collapse {
-		border-top: none;
-		border-bottom: none;
-	}
-
-	.el-collapse-item {
-		margin-bottom: 15px;
-	}
-
-	.el-collapse-item__header {
-		height: auto;
-		padding: 15px;
-		border-radius: 8px;
-		border-top: 1px solid #ebeef5;
-		border-left: 1px solid #ebeef5;
-		border-right: 1px solid #ebeef5;
-		box-sizing: border-box;
-		background-color: #fafafa;
-	}
-
-	.el-collapse-item__header.is-active {
-		border-radius: 8px 8px 0 0;
-		background-color: #fafafa;
-	}
-
-	.el-collapse-item__wrap {
-		padding: 15px;
-		border-left: 1px solid #ebeef5;
-		border-right: 1px solid #ebeef5;
-		border-top: 1px solid #ebeef5;
-		border-radius: 0 0 8px 8px;
-		background-color: #fafafa;
-		box-sizing: border-box;
-
-		.el-collapse-item__content {
-			padding-bottom: 0;
-		}
-	}
-}
-</style>
diff --git a/web/src/views/system/role/components/PermissionComNew/types.ts b/web/src/views/system/role/components/PermissionComNew/types.ts
deleted file mode 100644
index 5afc5c0d..00000000
--- a/web/src/views/system/role/components/PermissionComNew/types.ts
+++ /dev/null
@@ -1,29 +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[];
-}
-
-export interface MenuDataType {
-	id: string;
-	name: string;
-	isCheck: boolean;
-	btns: { id: number; name: string; value: string; isCheck: boolean; data_range: number; dept: object }[];
-	columns: { [key: string]: boolean | string; }[];
-	children: MenuDataType[];
-}
diff --git a/web/src/views/system/role/crud.tsx b/web/src/views/system/role/crud.tsx
index 22ad8fd4..1f5c6104 100644
--- a/web/src/views/system/role/crud.tsx
+++ b/web/src/views/system/role/crud.tsx
@@ -1,189 +1,171 @@
-import {CrudOptions, AddReq, DelReq, EditReq, dict, CrudExpose, compute} from '@fast-crud/fast-crud';
+import { CreateCrudOptionsProps, CreateCrudOptionsRet, AddReq, DelReq, EditReq, dict, compute } from '@fast-crud/fast-crud';
 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'
+import { dictionary } from '/@/utils/dictionary';
+import { successMessage } from '../../../utils/message';
+import { auth } from '/@/utils/authFunction';
 
-interface CreateCrudOptionsTypes {
-    output: any;
-    crudOptions: CrudOptions;
-}
+/**
+ *
+ * @param crudExpose：index传递过来的示例
+ * @param context：index传递过来的自定义参数
+ * @returns
+ */
+export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+	const pageRequest = async (query: any) => {
+		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);
+	};
 
-//此处为crudOptions配置
-export const createCrudOptions = function ({
-                                               crudExpose,
-                                               rolePermission,
-                                               handleDrawerOpen,
-                                           }: {
-    crudExpose: CrudExpose;
-    rolePermission: any;
-    handleDrawerOpen: Function;
-}): CreateCrudOptionsTypes {
-    const pageRequest = async (query: any) => {
-        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);
-    };
-
-    //权限判定
-
-    // @ts-ignore
-    // @ts-ignore
-    return {
-        crudOptions: {
-            request: {
-                pageRequest,
-                addRequest,
-                editRequest,
-                delRequest,
-            },
-            pagination: {
-                show: true
-            },
-            actionbar: {
-                buttons: {
-                    add: {
-                        show: auth('role:Create')
-                    }
-                }
-            },
-            rowHandle: {
-                //固定右侧
-                fixed: 'right',
-                width: 320,
-                buttons: {
-                    view: {
-                        show: true,
-                    },
-                    edit: {
-                        show: auth('role:Update'),
-                    },
-                    remove: {
-                        show: auth('role:Delete'),
-                    },
-                    permission: {
-                        type: 'primary',
-                        text: '权限配置',
-                        show: auth('role:Permission'),
-                        tooltip: {
-                            placement: 'top',
-                            content: '权限配置',
-                        },
-                        click: (context: any): void => {
-                            const {row} = context;
-                            handleDrawerOpen(row);
-                        },
-                    },
-                },
-            },
-            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, //禁止在列设置中选择
-                    },
-                },
-                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: 'custom',
-                    },
-                    form: {
-                        rules: [{required: true, message: '角色名称必填'}],
-                        component: {
-                            placeholder: '请输入角色名称',
-                        },
-                    },
-                },
-                key: {
-                    title: '权限标识',
-                    type: 'text',
-                    search: {show: false},
-                    column: {
-                        minWidth: 120,
-                        sortable: 'custom',
-                        columnSetDisabled: true,
-                    },
-                    form: {
-                        rules: [{required: true, message: '权限标识必填'}],
-                        component: {
-                            placeholder: '输入权限标识',
-                        },
-                    },
-                    valueBuilder(context) {
-                        const {row, key} = context
-                        return row[key]
-                    }
-                },
-                sort: {
-                    title: '排序',
-                    search: {show: false},
-                    type: 'number',
-                    column: {
-                        minWidth: 90,
-                        sortable: 'custom',
-                    },
-                    form: {
-                        rules: [{required: true, message: '排序必填'}],
-                        value: 1,
-                    },
-                },
-                status: {
-                    title: '状态',
-                    search: {show: true},
-                    type: 'dict-radio',
-                    column: {
-                        width: 100,
-                        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,
+			},
+			pagination: {
+				show: true,
+			},
+			actionbar: {
+				buttons: {
+					add: {
+						show: auth('role:Create'),
+					},
+				},
+			},
+			rowHandle: {
+				//固定右侧
+				fixed: 'right',
+				width: 320,
+				buttons: {
+					view: {
+						show: true,
+					},
+					edit: {
+						show: auth('role:Update'),
+					},
+					remove: {
+						show: auth('role:Delete'),
+					},
+					permission: {
+						type: 'primary',
+						text: '权限配置',
+						show: auth('role:Permission'),
+						click: (clickContext: any): void => {
+							const { row } = clickContext;
+							context.RoleDrawer.handleDrawerOpen(row);
+							context.RoleMenuBtn.setState([]);
+							context.RoleMenuField.setState([]);
+						},
+					},
+				},
+			},
+			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, //禁止在列设置中选择
+					},
+				},
+				id: {
+					title: 'ID',
+					column: { show: false },
+					search: { show: false },
+					form: { show: false },
+				},
+				name: {
+					title: '角色名称',
+					search: { show: true },
+					column: {
+						minWidth: 120,
+						sortable: 'custom',
+					},
+					form: {
+						rules: [{ required: true, message: '角色名称必填' }],
+						component: {
+							placeholder: '请输入角色名称',
+						},
+					},
+				},
+				key: {
+					title: '权限标识',
+					search: { show: false },
+					column: {
+						minWidth: 120,
+						sortable: 'custom',
+						columnSetDisabled: true,
+					},
+					form: {
+						rules: [{ required: true, message: '权限标识必填' }],
+						component: {
+							placeholder: '输入权限标识',
+						},
+					},
+					valueBuilder(context) {
+						const { row, key } = context;
+						return row[key];
+					},
+				},
+				sort: {
+					title: '排序',
+					search: { show: false },
+					type: 'number',
+					column: {
+						minWidth: 90,
+						sortable: 'custom',
+					},
+					form: {
+						rules: [{ required: true, message: '排序必填' }],
+						value: 1,
+					},
+				},
+				status: {
+					title: '状态',
+					search: { show: true },
+					type: 'dict-radio',
+					column: {
+						width: 100,
+						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({
+						value: dictionary('button_status_bool'),
+					}),
+				},
+			},
+		},
+	};
 };
diff --git a/web/src/views/system/role/index.vue b/web/src/views/system/role/index.vue
index 4b12a38d..19e81242 100644
--- a/web/src/views/system/role/index.vue
+++ b/web/src/views/system/role/index.vue
@@ -1,69 +1,31 @@
 <template>
 	<fs-page>
-		<fs-crud ref="crudRef" v-bind="crudBinding">
-			<template #cell_url="scope">
-				<el-tag size="small">{{ scope.row.url }}</el-tag>
-			</template>
-		</fs-crud>
-
-		<permission ref="rolePermission"></permission>
-
-		<PermissionComNew v-model:drawerVisible="drawerVisible" :roleId="roleId" :roleName="roleName" @drawerClose="handleDrawerClose" />
+		<fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
+		<PermissionDrawerCom ref="PermissionDrawerCom" />
 	</fs-page>
 </template>
 
 <script lang="ts" setup name="role">
-import {ref, onMounted, inject, onBeforeUpdate} from 'vue';
-
-import { GetPermission } from './api';
-import { useExpose, useCrud } from '@fast-crud/fast-crud';
+import { defineAsyncComponent, onMounted } from 'vue';
+import { useFs } from '@fast-crud/fast-crud';
 import { createCrudOptions } from './crud';
-import PermissionComNew from './components/PermissionComNew/index.vue';
-import _ from "lodash-es";
-import {handleColumnPermission} from "/@/utils/columnPermission";
-let drawerVisible = ref(false);
-let roleId = ref(null);
-let roleName = ref(null);
-
-const rolePermission = ref();
-// crud组件的ref
-const crudRef = ref();
-// crud 配置的ref
-const crudBinding = ref();
-
-
-const handleDrawerOpen = (row: any) => {
-	roleId.value = row.id;
-	roleName.value = row.name;
-	drawerVisible.value = true;
-};
-
-const handleDrawerClose = () => {
-	drawerVisible.value = false;
-};
-
-const { crudExpose } = useExpose({ crudRef, crudBinding });
-
-// 你的crud配置
-const { crudOptions } = createCrudOptions({ crudExpose, rolePermission, handleDrawerOpen });
-
-// 初始化crud配置
-const { resetCrudOptions } = useCrud({
-  crudExpose,
-  crudOptions,
-  context: {},
+import { RoleDrawerStores } from './stores/RoleDrawerStores';
+import { RoleMenuBtnStores } from './stores/RoleMenuBtnStores';
+import { RoleMenuFieldStores } from './stores/RoleMenuFieldStores';
+
+const PermissionDrawerCom = defineAsyncComponent(() => import('./components/RoleDrawer.vue'));
+
+const RoleDrawer = RoleDrawerStores(); // 权限配置抽屉参数
+const RoleMenuBtn = RoleMenuBtnStores(); // 角色-菜单
+const RoleMenuField = RoleMenuFieldStores();
+const { crudBinding, crudRef, crudExpose } = useFs({
+	createCrudOptions,
+	context: { RoleDrawer, RoleMenuBtn,RoleMenuField },
 });
 
 // 页面打开后获取列表数据
-onMounted( async () => {
-
-  const newOptions = await handleColumnPermission(GetPermission,crudOptions)
-
-
-  //重置crudBinding
-  //resetCrudOptions(newOptions);
+onMounted(async () => {
+	// 刷新
 	crudExpose.doRefresh();
 });
-
-defineExpose(rolePermission);
 </script>
diff --git a/web/src/views/system/role/types.ts b/web/src/views/system/role/types.ts
index 6b0027c5..e38b56f7 100644
--- a/web/src/views/system/role/types.ts
+++ b/web/src/views/system/role/types.ts
@@ -1,27 +1,88 @@
-import { CrudOptions, CrudExpose } from '@fast-crud/fast-crud';
+/**角色列表数据类型 */
+export interface RoleItemType {
+	id: string | number;
+	modifier_name: string;
+	creator_name: string;
+	create_datetime: string;
+	update_datetime: string;
+	description: string;
+	modifier: string;
+	dept_belong_id: string;
+	name: string;
+	key: string;
+	sort: number;
+	status: boolean;
+	admin: boolean;
+	creator: string;
+}
 
-export interface CreateCrudReturnTypes {
-  crudOptions: CrudOptions;
+/**
+ * 权限配置 抽屉组件参数数据类型
+ */
+export interface RoleDrawerType {
+	/** 是否显示抽屉*/
+	drawerVisible: boolean;
+	/** 角色id*/
+	roleId: string | number | undefined;
+	/** 角色名称*/
+	roleName: string | undefined;
 }
 
-export interface CreateCrudOptionsTypes {
-  crudExpose: CrudExpose;
-  configPermission: Function;
+/**
+ * 菜单数据类型
+ */
+export interface RoleMenuTreeType {
+	id: number | string | undefined;
+	/** 父级id */
+	parent: number | string | undefined;
+	name: string;
+	/** 是否选中 */
+	isCheck: boolean;
+	/** 是否是目录 */
+	is_catalog: boolean;
+}
+/**
+ * 菜单-按钮数据类型
+ */
+export interface RoleMenuBtnType {
+	id: string | number;
+	menu_btn_pre_id: string | number;
+	/** 是否选中 */
+	isCheck: boolean;
+	/** 按钮名称 */
+	name: string;
+	/** 数据权限范围 */
+	data_range: number | null;
+	/** 自定义部门 */
+	dept: number[];
 }
 
-export interface RoleItemType {
-  id: string | number;
-  modifier_name: string;
-  creator_name: string;
-  create_datetime: string;
-  update_datetime: string;
-  description: string;
-  modifier: string;
-  dept_belong_id: string;
-  name: string;
-  key: string;
-  sort: number;
-  status: boolean;
-  admin: boolean;
-  creator: string;
-}
\ No newline at end of file
+/**
+ * 菜单-列字段数据类型
+ */
+export interface RoleMenuFieldType {
+	id: string | number | boolean;
+	/** 模型表字段名 */
+	field_name: string;
+	/** 字段显示名	*/
+	title: string;
+	/** 是否可查询 */
+	is_query: boolean;
+	/** 是否可创建 */
+	is_create: boolean;
+	/** 是否可更新 */
+	is_update: boolean;
+	[key: string]: string | number | boolean;
+}
+/**
+ * 菜单-列字段-标题数据类型
+ */
+export interface RoleMenuFieldHeaderType {
+	value: string;
+	/** 模型表字段名 */
+	label: string;
+	/** 字段显示名	*/
+	disabled: string ;
+	/** 是否可查询 */
+	checked: boolean;
+}
-- 
Gitee


From db27235f611b19a40ea72c8313b66966d138e42c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=B6=9B?= <1537080775@qq.com>
Date: Wed, 25 Dec 2024 08:59:54 +0800
Subject: [PATCH 06/14] =?UTF-8?q?refactor(20241225-role):=20=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=9D=83=E9=99=90=E5=88=86=E9=85=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、优化角色权限分配逻辑
2、采用实时保存，提高速度
---
 .../system/role/components/RoleDrawer.vue     |  58 ++++++
 .../system/role/components/RoleMenuBtn.vue    | 186 ++++++++++++++++++
 .../system/role/components/RoleMenuField.vue  | 118 +++++++++++
 .../system/role/components/RoleMenuTree.vue   |  81 ++++++++
 web/src/views/system/role/components/api.ts   |  88 +++++++++
 .../system/role/stores/RoleDrawerStores.ts    |  32 +++
 .../system/role/stores/RoleMenuBtnStores.ts   |  24 +++
 .../system/role/stores/RoleMenuFieldStores.ts |  24 +++
 .../system/role/stores/RoleMenuTreeStores.ts  |  21 ++
 9 files changed, 632 insertions(+)
 create mode 100644 web/src/views/system/role/components/RoleDrawer.vue
 create mode 100644 web/src/views/system/role/components/RoleMenuBtn.vue
 create mode 100644 web/src/views/system/role/components/RoleMenuField.vue
 create mode 100644 web/src/views/system/role/components/RoleMenuTree.vue
 create mode 100644 web/src/views/system/role/components/api.ts
 create mode 100644 web/src/views/system/role/stores/RoleDrawerStores.ts
 create mode 100644 web/src/views/system/role/stores/RoleMenuBtnStores.ts
 create mode 100644 web/src/views/system/role/stores/RoleMenuFieldStores.ts
 create mode 100644 web/src/views/system/role/stores/RoleMenuTreeStores.ts

diff --git a/web/src/views/system/role/components/RoleDrawer.vue b/web/src/views/system/role/components/RoleDrawer.vue
new file mode 100644
index 00000000..c147b665
--- /dev/null
+++ b/web/src/views/system/role/components/RoleDrawer.vue
@@ -0,0 +1,58 @@
+<template>
+	<el-drawer
+		v-model="RoleDrawer.drawerVisible"
+		title="权限配置"
+		direction="rtl"
+		size="80%"
+		:close-on-click-modal="false"
+		:before-close="RoleDrawer.handleDrawerClose"
+		:destroy-on-close="true"
+	>
+		<template #header>
+			<div>
+				当前授权角色：
+				<el-tag>{{ RoleDrawer.roleName }}</el-tag>
+			</div>
+		</template>
+		<splitpanes class="default-theme" style="height: 100%">
+			<pane min-size="20" size="22">
+				<div class="pane-box">
+					<MenuTree />
+				</div>
+			</pane>
+			<pane min-size="20">
+				<div class="pane-box">
+					<el-tabs v-model="activeName" class="demo-tabs">
+						<el-tab-pane label="接口权限" name="first"><MenuBtn /></el-tab-pane>
+						<el-tab-pane label="列字段权限" name="second"><MenuField /></el-tab-pane>
+					</el-tabs>
+				</div>
+			</pane>
+		</splitpanes>
+	</el-drawer>
+</template>
+
+<script setup lang="ts">
+import { Splitpanes, Pane } from 'splitpanes';
+import 'splitpanes/dist/splitpanes.css';
+import { RoleDrawerStores } from '../stores/RoleDrawerStores';
+import { defineAsyncComponent, ref } from 'vue';
+
+const MenuTree = defineAsyncComponent(() => import('./RoleMenuTree.vue'));
+const MenuBtn = defineAsyncComponent(() => import('./RoleMenuBtn.vue'));
+const MenuField = defineAsyncComponent(() => import('./RoleMenuField.vue'));
+const RoleDrawer = RoleDrawerStores(); // 抽屉参数
+const activeName = ref('first');
+</script>
+
+<style lang="scss" scoped>
+.pane-box {
+	width: 100vw; /* 视口宽度 */
+	height: 100vh; /* 视口高度 */
+	max-width: 100%; /* 确保不超过父元素的宽度 */
+	max-height: 100%; /* 确保不超过父元素的高度 */
+	overflow: auto; /* 当内容超出容器尺寸时显示滚动条 */
+	padding: 10px;
+	background-color: #fff;
+}
+</style>
diff --git a/web/src/views/system/role/components/RoleMenuBtn.vue b/web/src/views/system/role/components/RoleMenuBtn.vue
new file mode 100644
index 00000000..8d0f1b41
--- /dev/null
+++ b/web/src/views/system/role/components/RoleMenuBtn.vue
@@ -0,0 +1,186 @@
+<template>
+	<div class="pccm-item" v-if="RoleMenuBtn.$state.length > 0">
+		<div class="menu-form-alert">配置操作功能接口权限，配置数据权限点击小齿轮</div>
+		<el-checkbox v-for="btn in RoleMenuBtn.$state" :key="btn.id" v-model="btn.isCheck" @change="handleCheckChange(btn)">
+			<div class="btn-item">
+				{{ btn.data_range !== null ? `${btn.name}(${formatDataRange(btn.data_range)})` : btn.name }}
+				<span v-show="btn.isCheck" @click.stop.prevent="handleSettingClick(btn)">
+					<el-icon>
+						<Setting />
+					</el-icon>
+				</span>
+			</div>
+		</el-checkbox>
+	</div>
+	<el-dialog v-model="dialogVisible" title="数据权限配置" width="400px" :close-on-click-modal="false" :before-close="handleDialogClose">
+		<div class="pc-dialog">
+			<el-select v-model="selectBtn.data_range" @change="handlePermissionRangeChange" placeholder="请选择">
+				<el-option v-for="item in dataPermissionRange" :key="item.value" :label="item.label" :value="item.value" />
+			</el-select>
+			<el-tree-select
+				v-show="selectBtn.data_range === 4"
+				node-key="id"
+				v-model="selectBtn.dept"
+				:props="defaultTreeProps"
+				:data="deptData"
+				multiple
+				check-strictly
+				:render-after-expand="false"
+				show-checkbox
+				class="dialog-tree"
+			/>
+		</div>
+		<template #footer>
+			<div>
+				<el-button type="primary" @click="handleDialogConfirm"> 确定</el-button>
+				<el-button @click="handleDialogClose"> 取消</el-button>
+			</div>
+		</template>
+	</el-dialog>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue';
+import { RoleDrawerStores } from '../stores/RoleDrawerStores';
+import { RoleMenuBtnStores } from '../stores/RoleMenuBtnStores';
+import { RoleMenuTreeStores } from '../stores/RoleMenuTreeStores';
+import { RoleMenuBtnType } from '../types';
+import { getRoleToDeptAll, setRoleMenuBtn, setRoleMenuBtnDataRange } from './api';
+import XEUtils from 'xe-utils';
+import { ElMessage } from 'element-plus';
+const RoleDrawer = RoleDrawerStores(); // 角色-菜单
+const RoleMenuTree = RoleMenuTreeStores(); // 角色-菜单
+const RoleMenuBtn = RoleMenuBtnStores(); // 角色-菜单-按钮
+const dialogVisible = ref(false);
+// 选中的按钮
+const selectBtn = ref<RoleMenuBtnType>({
+	id: 0,
+	menu_btn_pre_id: 0,
+	/** 是否选中 */
+	isCheck: false,
+	/** 按钮名称 */
+	name: '',
+	/** 数据权限范围 */
+	data_range: 0,
+	dept: [],
+});
+/**
+ * 数据权限范围
+ */
+const dataPermissionRange = ref([
+	{ label: '仅本人数据权限', value: 0 },
+	{ label: '本部门及以下数据权限', value: 1 },
+	{ label: '本部门数据权限', value: 2 },
+	{ label: '全部数据权限', value: 3 },
+	{ label: '自定数据权限', value: 4 },
+]);
+/**
+ * 自定义数据权限的部门树配置
+ */
+const defaultTreeProps = {
+	children: 'children',
+	label: 'name',
+	value: 'id',
+};
+
+/**
+ * 自定数据权限下拉选择事件
+ */
+const handlePermissionRangeChange = async (val: number) => {
+	if (val < 4) {
+		selectBtn.value.dept = [];
+	}
+};
+/**
+ * 格式化按钮数据范围
+ */
+const formatDataRange = computed(() => {
+	return function (datarange: number) {
+		const datarangeitem = XEUtils.find(dataPermissionRange.value, (item: any) => {
+			if (item.value === datarange) {
+				return item.label;
+			}
+		});
+		return datarangeitem.label;
+	};
+});
+/**
+ * 勾选按钮
+ */
+const handleCheckChange = async (btn: RoleMenuBtnType) => {
+	const put_data = {
+		isCheck: btn.isCheck,
+		roleId: RoleDrawer.roleId,
+		menuId: RoleMenuTree.id,
+		btnId: btn.id,
+	};
+	const { data, msg } = await setRoleMenuBtn(put_data);
+	RoleMenuBtn.updateState(data);
+	ElMessage({ message: msg, type: 'success' });
+};
+
+/**
+ * 按钮-数据范围确定
+ */
+const handleDialogConfirm = async () => {
+	const { data, msg } = await setRoleMenuBtnDataRange(selectBtn.value);
+	selectBtn.value = data;
+	dialogVisible.value = false;
+	ElMessage({ message: msg, type: 'success' });
+};
+/**
+ * 数据范围关闭
+ */
+const handleDialogClose = () => {
+	dialogVisible.value = false;
+};
+
+/**
+ * 齿轮点击
+ */
+const handleSettingClick = async (btn: RoleMenuBtnType) => {
+	selectBtn.value = btn;
+	dialogVisible.value = true;
+};
+
+/**
+ * 部门数据
+ *
+ */
+const deptData = ref<number[]>([]);
+// 页面打开后获取列表数据
+onMounted(async () => {
+	const res = await getRoleToDeptAll({ role: RoleDrawer.roleId, menu_button: selectBtn.value.id });
+	const depts = XEUtils.toArrayTree(res.data, { parentKey: 'parent', strict: false });
+	deptData.value = depts;
+});
+</script>
+
+<style lang="scss" scoped>
+.pccm-item {
+	margin-bottom: 10px;
+	.menu-form-alert {
+		color: #fff;
+		line-height: 24px;
+		padding: 8px 16px;
+		margin-bottom: 20px;
+		border-radius: 4px;
+		background-color: var(--el-color-primary);
+	}
+}
+// .el-checkbox {
+// 	width: 200px;
+// }
+.btn-item {
+	display: flex;
+	align-items: center;
+	justify-content: center; /* 水平居中 */
+	.el-icon {
+		margin-left: 5px;
+	}
+}
+.dialog-tree {
+	width: 100%;
+	margin-top: 20px;
+}
+</style>
diff --git a/web/src/views/system/role/components/RoleMenuField.vue b/web/src/views/system/role/components/RoleMenuField.vue
new file mode 100644
index 00000000..e3676776
--- /dev/null
+++ b/web/src/views/system/role/components/RoleMenuField.vue
@@ -0,0 +1,118 @@
+<template>
+	<div class="pccm-item" v-if="RoleMenuField.$state.length > 0">
+		<div class="menu-form-alert">
+			<el-button size="small" @click="handleSaveField">保存 </el-button>
+			配置数据列字段权限
+		</div>
+
+		<ul class="columns-list">
+			<li class="columns-head">
+				<div class="width-txt">
+					<span>字段</span>
+				</div>
+				<div v-for="(head, hIndex) in RoleMenuFieldHeader.$state" :key="hIndex" class="width-check">
+					<el-checkbox v-model="head.checked" @change="handleColumnChange($event, head.value, head.disabled)">
+						<span>{{ head.label }}</span>
+					</el-checkbox>
+				</div>
+			</li>
+			<div class="columns-content">
+				<li v-for="(c_item, c_index) in RoleMenuField.$state" :key="c_index" class="columns-item">
+					<div class="width-txt">{{ c_item.title }}</div>
+					<div v-for="(col, cIndex) in RoleMenuFieldHeader.$state" :key="cIndex" class="width-check">
+						<el-checkbox v-model="c_item[col.value]" class="ci-checkout" :disabled="c_item[col.disabled]"></el-checkbox>
+					</div>
+				</li>
+			</div>
+		</ul>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { ElMessage } from 'element-plus';
+import { RoleDrawerStores } from '../stores/RoleDrawerStores';
+import { RoleMenuFieldStores, RoleMenuFieldHeaderStores } from '../stores/RoleMenuFieldStores';
+import { setRoleMenuField } from './api';
+const RoleMenuField = RoleMenuFieldStores();
+const RoleMenuFieldHeader = RoleMenuFieldHeaderStores();
+const RoleDrawer = RoleDrawerStores(); // 角色-抽屉
+/** 全选 */
+const handleColumnChange = (val: boolean, btnType: string, disabledType: string) => {
+	for (const iterator of RoleMenuField.$state) {
+		iterator[btnType] = iterator[disabledType] ? iterator[btnType] : val;
+	}
+};
+const handleSaveField = async () => {
+	const res = await setRoleMenuField(RoleDrawer.$state.roleId, RoleMenuField.$state);
+	ElMessage({ message: res.msg, type: 'success' });
+};
+</script>
+
+<style lang="scss" scoped>
+.pccm-item {
+	margin-bottom: 10px;
+	.menu-form-alert {
+		color: #fff;
+		line-height: 24px;
+		padding: 8px 16px;
+		margin-bottom: 20px;
+		border-radius: 4px;
+		background-color: var(--el-color-primary);
+	}
+	.menu-form-btn {
+		margin-left: 10px;
+		height: 40px;
+		padding: 8px 16px;
+		margin-bottom: 20px;
+	}
+
+	.btn-item {
+		display: flex;
+		align-items: center;
+
+		span {
+			margin-left: 5px;
+		}
+	}
+
+	.columns-list {
+		.width-txt {
+			width: 200px;
+		}
+
+		.width-check {
+			width: 100px;
+		}
+
+		.width-icon {
+			cursor: pointer;
+		}
+
+		.columns-head {
+			display: flex;
+			align-items: center;
+			padding: 6px 0;
+			border-bottom: 1px solid #ebeef5;
+			box-sizing: border-box;
+
+			span {
+				font-weight: 900;
+			}
+		}
+		.columns-content {
+			max-height: calc(100vh - 240px); /* 视口高度 */
+			overflow-y: auto; /* 当内容超出高度时显示垂直滚动条 */
+			.columns-item {
+				display: flex;
+				align-items: center;
+				padding: 6px 0;
+				box-sizing: border-box;
+
+				.ci-checkout {
+					height: auto !important;
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/web/src/views/system/role/components/RoleMenuTree.vue b/web/src/views/system/role/components/RoleMenuTree.vue
new file mode 100644
index 00000000..c296e9a9
--- /dev/null
+++ b/web/src/views/system/role/components/RoleMenuTree.vue
@@ -0,0 +1,81 @@
+<template>
+	<el-tree
+		ref="treeRef"
+		:data="menuData"
+		:props="defaultTreeProps"
+		:default-checked-keys="menuDefaultCheckedKeys"
+		@check-change="handleMenuChange"
+		@node-click="handleMenuClick"
+		node-key="id"
+		check-strictly
+		highlight-current
+		show-checkbox
+		default-expand-all
+	>
+	</el-tree>
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref } from 'vue';
+import { RoleDrawerStores } from '../stores/RoleDrawerStores';
+import { RoleMenuTreeStores } from '../stores/RoleMenuTreeStores';
+import { RoleMenuBtnStores } from '../stores/RoleMenuBtnStores';
+import { RoleMenuFieldStores } from '../stores/RoleMenuFieldStores';
+import { RoleMenuFieldHeaderStores } from '../stores/RoleMenuFieldStores';
+import { getRoleMenu, getRoleMenuBtnField, setRoleMenu } from './api';
+import { ElMessage } from 'element-plus';
+import XEUtils from 'xe-utils';
+import { RoleMenuTreeType } from '../types';
+
+const RoleDrawer = RoleDrawerStores(); // 角色-抽屉
+const RoleMenuTree = RoleMenuTreeStores(); // 角色-菜单
+const RoleMenuBtn = RoleMenuBtnStores(); // 角色-菜单-按钮
+const RoleMenuField = RoleMenuFieldStores(); // 角色-菜单-列字段
+const RoleMenuFieldHeader = RoleMenuFieldHeaderStores();// 角色-菜单-列字段
+const menuData = ref<RoleMenuTreeType[]>([]); // 菜单列表数据
+const menuDefaultCheckedKeys = ref<(number | string | undefined)[]>([]); // 默认选中的菜单列表
+// 菜单配置
+const defaultTreeProps = {
+	children: 'children',
+	label: 'name',
+	value: 'id',
+};
+
+/**
+ * 菜单复选框选中
+ * @param node：当前节点的 Node 对象
+ * @param checked：布尔值，表示当前节点是否被选中
+ */
+const handleMenuChange = (node: any, checked: boolean) => {
+	setRoleMenu({ roleId: RoleDrawer.roleId, menuId: node.id, isCheck: checked }).then((res: any) => {
+		ElMessage({ message: res.msg, type: 'success' });
+	});
+};
+/**
+ * 菜单点击事件
+ */
+const handleMenuClick = async (selectNode: RoleMenuTreeType) => {
+	if (!selectNode.is_catalog) {
+		RoleMenuTree.setRoleMenuTree(selectNode); // 更新当前选中的菜单
+		// 获取当前菜单的按钮列表
+		const { data } = await getRoleMenuBtnField({
+			roleId: RoleDrawer.roleId,
+			menuId: selectNode.id,
+		});
+		RoleMenuBtn.setState(data.menu_btn); // 更新按钮列表
+		RoleMenuField.setState(data.menu_field); // 更新列字段列表
+	} else {
+		RoleMenuBtn.setState([]); // 更新按钮列表
+		RoleMenuField.setState([]); // 更新列字段列表
+	}
+	RoleMenuFieldHeader.$reset()
+};
+
+// 页面打开后获取列表数据
+onMounted(async () => {
+	menuData.value = await getRoleMenu({ roleId: RoleDrawer.roleId });
+	menuDefaultCheckedKeys.value = XEUtils.toTreeArray(menuData.value)
+		.filter((i) => i.isCheck)
+		.map((i) => i.id);
+});
+</script>
diff --git a/web/src/views/system/role/components/api.ts b/web/src/views/system/role/components/api.ts
new file mode 100644
index 00000000..dc3a5dc1
--- /dev/null
+++ b/web/src/views/system/role/components/api.ts
@@ -0,0 +1,88 @@
+import { request } from '/@/utils/service';
+import XEUtils from 'xe-utils';
+/**
+ * 获取 角色-菜单
+ * @param query
+ */
+export function getRoleMenu(query: object) {
+	return request({
+		url: '/api/system/role_menu_button_permission/get_role_menu/',
+		method: 'get',
+		params: query,
+	}).then((res: any) => {
+		return XEUtils.toArrayTree(res.data, { key: 'id', parentKey: 'parent', children: 'children', strict: false });
+	});
+}
+/**
+ * 设置 角色-菜单
+ * @param data
+ * @returns
+ */
+export function setRoleMenu(data: object) {
+	return request({
+		url: '/api/system/role_menu_button_permission/set_role_menu/',
+		method: 'put',
+		data,
+	});
+}
+/**
+ * 获取 角色-菜单-按钮-列字段
+ * @param query
+ */
+export function getRoleMenuBtnField(query: object) {
+	return request({
+		url: '/api/system/role_menu_button_permission/get_role_menu_btn_field/',
+		method: 'get',
+		params: query,
+	});
+}
+
+/**
+ * 设置 角色-菜单-按钮
+ * @param data
+ */
+export function setRoleMenuBtn(data: object) {
+	return request({
+		url: '/api/system/role_menu_button_permission/set_role_menu_btn/',
+		method: 'put',
+		data,
+	});
+}
+
+/**
+ * 设置 角色-菜单-列字段
+ * @param data
+ */
+export function setRoleMenuField(roleId: string | number | undefined, data: object) {
+	return request({
+		url: `/api/system/role_menu_button_permission/${roleId}/set_role_menu_field/`,
+		method: 'put',
+		data,
+	});
+}
+
+/**
+ * 设置 角色-菜单-按钮-数据权限
+ * @param query
+ * @returns
+ */
+export function setRoleMenuBtnDataRange(data: object) {
+	return request({
+		url: '/api/system/role_menu_button_permission/set_role_menu_btn_data_range/',
+		method: 'put',
+		data,
+	});
+}
+
+/**
+ * 获取当前用户角色下所能授权的部门
+ * @param query
+ * @returns
+ */
+export function getRoleToDeptAll(query: object) {
+	return request({
+		url: '/api/system/role_menu_button_permission/role_to_dept_all/',
+		method: 'get',
+		params: query,
+	});
+}
diff --git a/web/src/views/system/role/stores/RoleDrawerStores.ts b/web/src/views/system/role/stores/RoleDrawerStores.ts
new file mode 100644
index 00000000..7121c371
--- /dev/null
+++ b/web/src/views/system/role/stores/RoleDrawerStores.ts
@@ -0,0 +1,32 @@
+import { defineStore } from 'pinia';
+import { RoleDrawerType } from '../types';
+/**
+ * 权限配置：抽屉
+ */
+const initialState: RoleDrawerType = {
+	drawerVisible: false,
+	roleId: undefined,
+	roleName: undefined,
+};
+
+export const RoleDrawerStores = defineStore('RoleDrawerStores', {
+	state: (): RoleDrawerType => ({
+		...initialState,
+	}),
+	actions: {
+		/**
+		 * 打开权限修改抽屉
+		 */
+		handleDrawerOpen(row: any) {
+			this.drawerVisible = true;
+			this.roleName = row.name;
+			this.roleId = row.id;
+		},
+		/**
+		 * 关闭权限修改抽屉
+		 */
+		handleDrawerClose() {
+			Object.assign(this.$state, initialState);
+		},
+	},
+});
diff --git a/web/src/views/system/role/stores/RoleMenuBtnStores.ts b/web/src/views/system/role/stores/RoleMenuBtnStores.ts
new file mode 100644
index 00000000..8ef46109
--- /dev/null
+++ b/web/src/views/system/role/stores/RoleMenuBtnStores.ts
@@ -0,0 +1,24 @@
+import { defineStore } from 'pinia';
+import { RoleMenuBtnType } from '../types';
+/**
+ * 权限配置：角色-菜单-按钮
+ */
+
+export const RoleMenuBtnStores = defineStore('RoleMenuBtnStores', {
+	state: (): RoleMenuBtnType[] => [],
+	actions: {
+		/**
+		 * 初始化
+		 */
+		setState(data: RoleMenuBtnType[]) {
+			this.$state = data;
+			this.$state.length = data.length;
+		},
+		updateState(data: RoleMenuBtnType) {
+			const index = this.$state.findIndex((item) => item.id === data.id);
+			if (index !== -1) {
+				this.$state[index] = data;
+			}
+		},
+	},
+});
diff --git a/web/src/views/system/role/stores/RoleMenuFieldStores.ts b/web/src/views/system/role/stores/RoleMenuFieldStores.ts
new file mode 100644
index 00000000..c01c0809
--- /dev/null
+++ b/web/src/views/system/role/stores/RoleMenuFieldStores.ts
@@ -0,0 +1,24 @@
+import { defineStore } from 'pinia';
+import { RoleMenuFieldType, RoleMenuFieldHeaderType } from '../types';
+/**
+ * 权限配置：角色-菜单-列字段
+ */
+
+export const RoleMenuFieldStores = defineStore('RoleMenuFieldStores', {
+	state: (): RoleMenuFieldType[] => [],
+	actions: {
+		/** 重置 */
+		setState(data: RoleMenuFieldType[]) {
+			this.$state = data;
+			this.$state.length = data.length;
+		},
+	},
+});
+
+export const RoleMenuFieldHeaderStores = defineStore('RoleMenuFieldHeaderStores', {
+	state: (): RoleMenuFieldHeaderType[] => [
+		{ value: 'is_create', label: '新增可见', disabled: 'disabled_create', checked: false },
+		{ value: 'is_update', label: '编辑可见', disabled: 'disabled_update', checked: false },
+		{ value: 'is_query', label: '列表可见', disabled: 'disabled_query', checked: false },
+	],
+});
diff --git a/web/src/views/system/role/stores/RoleMenuTreeStores.ts b/web/src/views/system/role/stores/RoleMenuTreeStores.ts
new file mode 100644
index 00000000..14f28c65
--- /dev/null
+++ b/web/src/views/system/role/stores/RoleMenuTreeStores.ts
@@ -0,0 +1,21 @@
+import { defineStore } from 'pinia';
+import { RoleMenuTreeType } from '../types';
+/**
+ * 权限抽屉：角色-菜单
+ */
+
+export const RoleMenuTreeStores = defineStore('RoleMenuTreeStores', {
+	state: (): RoleMenuTreeType => ({
+		id: 0,
+		parent: 0,
+		name: '',
+		isCheck: false,
+		is_catalog: false,
+	}),
+	actions: {
+		/** 赋值 */
+		setRoleMenuTree(data: RoleMenuTreeType) {
+			this.$state = data;
+		},
+	},
+});
-- 
Gitee


From dddafa4826ed9ff9730096e86e8cf38b40da68c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=B6=9B?= <1537080775@qq.com>
Date: Thu, 26 Dec 2024 08:56:19 +0800
Subject: [PATCH 07/14] =?UTF-8?q?feat(20241226-fieldpermission):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=97=E6=9D=83=E9=99=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、后端优化，当多个角色的时候，合并列权限配置
2、前端优化，有多级表头时，列权限设置无效的bug
---
 backend/application/settings.py           |  2 +-
 backend/dvadmin/utils/field_permission.py | 67 +++++++++--------------
 web/src/utils/columnPermission.ts         | 29 ++++------
 3 files changed, 38 insertions(+), 60 deletions(-)

diff --git a/backend/application/settings.py b/backend/application/settings.py
index 1d0adf79..e6bdec5e 100644
--- a/backend/application/settings.py
+++ b/backend/application/settings.py
@@ -404,7 +404,7 @@ PLUGINS_URL_PATTERNS = []
 # ********** 一键导入插件配置开始 **********
 # 例如:
 # from dvadmin_upgrade_center.settings import *    # 升级中心
-from dvadmin3_celery.settings import *            # celery 异步任务
+# from dvadmin3_celery.settings import *            # celery 异步任务
 # from dvadmin_third.settings import *            # 第三方用户管理
 # from dvadmin_ak_sk.settings import *            # 秘钥管理管理
 # from dvadmin_tenants.settings import *            # 租户管理
diff --git a/backend/dvadmin/utils/field_permission.py b/backend/dvadmin/utils/field_permission.py
index 7c259f68..97bb953e 100644
--- a/backend/dvadmin/utils/field_permission.py
+++ b/backend/dvadmin/utils/field_permission.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from itertools import groupby
-
 from django.db.models import F
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
@@ -12,7 +10,7 @@ from dvadmin.utils.models import get_custom_app_models
 
 
 class FieldPermissionMixin:
-    @action(methods=['get'], detail=False,permission_classes=[IsAuthenticated])
+    @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
     def field_permission(self, request):
         """
         获取字段权限
@@ -27,45 +25,32 @@ class FieldPermissionMixin:
         if finded is False:
             return []
         user = request.user
-        if user.is_superuser==1:
-            data = MenuField.objects.filter( model=model['model']).values('field_name')
+        # 创建一个默认字典来存储最终的结果
+        result = {}
+        if user.is_superuser == 1:
+            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:
-            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'))
-            
+                field_name = item.pop('field_name')
+                result[field_name] = {}
+                result[field_name]['is_create'] = True
+                result[field_name]['is_query'] = True
+                result[field_name]['is_update'] = True
+            else:
+                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'))
             """
             合并权限
-
-            这段代码首先根据 field_name 对列表进行排序，
-            然后使用 groupby 按 field_name 进行分组。
-            对于每个组，它创建一个新的字典 merged，
-            并遍历组中的每个字典，将布尔值字段使用逻辑或（or）操作符进行合并（如果 merged 中还没有该字段，则默认为 False），
-            其他字段（如 field_name）则直接取组的关键字（即 key）
             """
-
-            # 使用field_name对列表进行分组, # groupby 需要先对列表进行排序，因为它只能对连续相同的元素进行分组。
-            grouped = groupby(sorted(list(data), key=lambda x: x['field_name']), key=lambda x: x['field_name'])
-
-            data = []
-
-            # 遍历分组，合并权限
-            for key, group in grouped:
-
-                # 初始化一个空字典来存储合并后的结果
-                merged = {}
-                for item in group:
-                    # 合并权限， True值优先
-                    merged['is_create'] = merged.get('is_create', False) or item['is_create']
-                    merged['is_query'] = merged.get('is_query', False) or item['is_query']
-                    merged['is_update'] = merged.get('is_update', False) or item['is_update']
-                    merged['field_name'] = key
-
-                data.append(merged)
-
-        return DetailResponse(data=data)
\ No newline at end of file
+            # 遍历原始数据并填充结果字典
+            for item in data:
+                field_name = item.pop('field_name')
+                for key, value in item.items():
+                    if field_name in result:
+                        if value:
+                            result[field_name][key] = True
+                    else:
+                        result[field_name] = {}
+                        result[field_name][key] = value
+        return DetailResponse(data=result)
diff --git a/web/src/utils/columnPermission.ts b/web/src/utils/columnPermission.ts
index adff4e1f..e58c9347 100644
--- a/web/src/utils/columnPermission.ts
+++ b/web/src/utils/columnPermission.ts
@@ -1,3 +1,4 @@
+import XEUtils from 'xe-utils';
 import {useColumnPermission} from '/@/stores/columnPermission';
 
 type permissionType = 'is_create' | 'is_query' | 'is_update';
@@ -23,25 +24,17 @@ export const handleColumnPermission = async (func: Function, crudOptions: any,ex
 	}
 	const columns = crudOptions.columns;
 	const excludeColumns = ['checked','_index','id', 'create_datetime', 'update_datetime'].concat(excludeColumn)
-	for (let col in columns) {
-		for (let item of res.data) {
-			if (excludeColumns.includes(item.field_name)) {
-				continue
-			} else if(item.field_name === col) {
-				// 如果列表不可见，则禁止在列设置中选择
-                // 只有列表不可见，才修改列配置，这样才不影响默认的配置
-				if(!item['is_query']){
-                    columns[col].column.show = false
-                    columns[col].column.columnSetDisabled = true
-                }
-				columns[col].addForm = {
-					show: item['is_create']
-				}
-				columns[col].editForm = {
-					show: item['is_update']
-				}
+	XEUtils.eachTree(columns, (item, key) => {
+		if (!excludeColumns.includes(String(key)) && key in res.data) {
+			// 如果列表不可见，则禁止在列设置中选择
+			// 只有列表不可见，才修改列配置，这样才不影响默认的配置
+			if (!res.data[key]['is_query']) {
+				item.column.show = false;
+				item.column.columnSetDisabled = true;
 			}
+			item.addForm = { show: res.data[key]['is_create'] };
+			item.editForm = { show: res.data[key]['is_update'] };
 		}
-	}
+	});
 	return crudOptions
 }
-- 
Gitee


From 6726d0167eab0fa910d409beb92df2d9e93e416b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=B6=9B?= <1537080775@qq.com>
Date: Thu, 26 Dec 2024 10:26:27 +0800
Subject: [PATCH 08/14] =?UTF-8?q?feat(20241226-fieldpermission):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=97=E6=9D=83=E9=99=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、优化后端合并权限代码
---
 backend/dvadmin/utils/field_permission.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/backend/dvadmin/utils/field_permission.py b/backend/dvadmin/utils/field_permission.py
index 97bb953e..b20cb4b6 100644
--- a/backend/dvadmin/utils/field_permission.py
+++ b/backend/dvadmin/utils/field_permission.py
@@ -46,11 +46,9 @@ class FieldPermissionMixin:
             # 遍历原始数据并填充结果字典
             for item in data:
                 field_name = item.pop('field_name')
-                for key, value in item.items():
-                    if field_name in result:
-                        if value:
-                            result[field_name][key] = True
-                    else:
-                        result[field_name] = {}
-                        result[field_name][key] = value
+                if field_name not in result:
+                    result[field_name] = item
+                else:
+                    for key, value in item.items():
+                        result[field_name][key] = result[field_name][key] or value
         return DetailResponse(data=result)
-- 
Gitee


From 792a22e606043d3ba1c57576e986ad8bc1afae33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=B6=9B?= <1537080775@qq.com>
Date: Thu, 26 Dec 2024 17:37:08 +0800
Subject: [PATCH 09/14] =?UTF-8?q?feat(20241226-fieldpermission):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=97=E6=9D=83=E9=99=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、优化后端合并权限代码
---
 backend/dvadmin/utils/field_permission.py | 59 +++++++++--------------
 1 file changed, 24 insertions(+), 35 deletions(-)

diff --git a/backend/dvadmin/utils/field_permission.py b/backend/dvadmin/utils/field_permission.py
index b20cb4b6..87026845 100644
--- a/backend/dvadmin/utils/field_permission.py
+++ b/backend/dvadmin/utils/field_permission.py
@@ -1,12 +1,25 @@
 # -*- 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 FieldPermission, MenuField
 from dvadmin.utils.json_response import DetailResponse
-from dvadmin.utils.models import get_custom_app_models
+
+
+def merge_permission(data):
+    """
+    合并权限
+    """
+    result = {}
+    for item in data:
+        field_name = item.pop('field_name')
+        if field_name not in result:
+            result[field_name] = item
+        else:
+            for key, value in item.items():
+                result[field_name][key] = result[field_name][key] or value
+    return result
 
 
 class FieldPermissionMixin:
@@ -15,40 +28,16 @@ class FieldPermissionMixin:
         """
         获取字段权限
         """
-        finded = False
-        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 []
+        model = self.serializer_class.Meta.model.__name__
         user = request.user
         # 创建一个默认字典来存储最终的结果
-        result = {}
         if user.is_superuser == 1:
-            data = MenuField.objects.filter(model=model['model']).values('field_name')
-            for item in data:
-                field_name = item.pop('field_name')
-                result[field_name] = {}
-                result[field_name]['is_create'] = True
-                result[field_name]['is_query'] = True
-                result[field_name]['is_update'] = True
-            else:
-                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'))
-            """
-            合并权限
-            """
-            # 遍历原始数据并填充结果字典
-            for item in data:
-                field_name = item.pop('field_name')
-                if field_name not in result:
-                    result[field_name] = item
-                else:
-                    for key, value in item.items():
-                        result[field_name][key] = result[field_name][key] or value
+            data = MenuField.objects.filter(model=model).values('field_name')
+            result = {item['field_name']: {"is_create": True, "is_query": True, "is_update": True} for item in data}
+        else:
+            roles = request.user.role.values_list('id', flat=True)
+            data = FieldPermission.objects.filter(
+                field__model=model, role__in=roles
+            ).values('is_create', 'is_query', 'is_update', field_name=F('field__field_name'))
+            result = merge_permission(data)
         return DetailResponse(data=result)
-- 
Gitee


From b5c583ba7dcc8db7f81d9f1faedfd7ad582d23cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=B6=9B?= <1537080775@qq.com>
Date: Fri, 3 Jan 2025 14:41:30 +0800
Subject: [PATCH 10/14] =?UTF-8?q?feat(20250103-role):=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=89=B9=E9=87=8F=E6=8E=88=E6=9D=83=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/views/role.py          | 26 ++++++++++++++
 .../system/role/components/RoleDrawer.vue     | 32 +++++++++++++----
 .../system/role/components/RoleUsers.vue      | 35 +++++++++++++++++++
 web/src/views/system/role/components/api.ts   | 33 +++++++++++++++++
 web/src/views/system/role/index.vue           | 13 ++++---
 .../system/role/stores/RoleDrawerStores.ts    |  5 +++
 .../system/role/stores/RoleUsersStores.ts     | 24 +++++++++++++
 web/src/views/system/role/types.ts            | 13 ++++++-
 8 files changed, 169 insertions(+), 12 deletions(-)
 create mode 100644 web/src/views/system/role/components/RoleUsers.vue
 create mode 100644 web/src/views/system/role/stores/RoleUsersStores.ts

diff --git a/backend/dvadmin/system/views/role.py b/backend/dvadmin/system/views/role.py
index a5b5a6f9..07a16376 100644
--- a/backend/dvadmin/system/views/role.py
+++ b/backend/dvadmin/system/views/role.py
@@ -26,6 +26,12 @@ class RoleSerializer(CustomModelSerializer):
     """
     角色-序列化器
     """
+    users = serializers.SerializerMethodField()
+
+    @staticmethod
+    def get_users(instance):
+        users = instance.users_set.exclude(id=1).values('id', 'name', 'dept__name')
+        return users
 
     class Meta:
         model = Role
@@ -116,3 +122,23 @@ class RoleViewSet(CustomModelViewSet, FastCrudMixin,FieldPermissionMixin):
     create_serializer_class = RoleCreateUpdateSerializer
     update_serializer_class = RoleCreateUpdateSerializer
     search_fields = ['name', 'key']
+
+    @action(methods=['PUT'], detail=True, permission_classes=[IsAuthenticated])
+    def set_role_users(self, request, pk):
+        """
+        设置 角色-用户
+        :param request:
+        :return:
+        """
+        data = request.data
+        direction = data.get('direction')
+        movedKeys = data.get('movedKeys')
+        role = Role.objects.get(pk=pk)
+        if direction == "left":
+            # left : 移除用户权限
+            role.users_set.remove(*movedKeys)
+        else:
+            # right : 添加用户权限
+            role.users_set.add(*movedKeys)
+        serializer = RoleSerializer(role)
+        return DetailResponse(data=serializer.data, msg="更新成功")
\ No newline at end of file
diff --git a/web/src/views/system/role/components/RoleDrawer.vue b/web/src/views/system/role/components/RoleDrawer.vue
index c147b665..23b3a602 100644
--- a/web/src/views/system/role/components/RoleDrawer.vue
+++ b/web/src/views/system/role/components/RoleDrawer.vue
@@ -11,38 +11,56 @@
 		<template #header>
 			<div>
 				当前授权角色：
-				<el-tag>{{ RoleDrawer.roleName }}</el-tag>
+				<el-tag style="margin-right: 20px">{{ RoleDrawer.roleName }}</el-tag>
+				授权人员：
+				<el-button size="small" :icon="UserFilled" @click="handleUsers">{{ RoleDrawer.users.length }}</el-button>
 			</div>
 		</template>
 		<splitpanes class="default-theme" style="height: 100%">
 			<pane min-size="20" size="22">
 				<div class="pane-box">
-					<MenuTree />
+					<MenuTreeCom />
 				</div>
 			</pane>
 			<pane min-size="20">
 				<div class="pane-box">
 					<el-tabs v-model="activeName" class="demo-tabs">
-						<el-tab-pane label="接口权限" name="first"><MenuBtn /></el-tab-pane>
-						<el-tab-pane label="列字段权限" name="second"><MenuField /></el-tab-pane>
+						<el-tab-pane label="接口权限" name="first"><MenuBtnCom /></el-tab-pane>
+						<el-tab-pane label="列字段权限" name="second"><MenuFieldCom /></el-tab-pane>
 					</el-tabs>
 				</div>
 			</pane>
 		</splitpanes>
 	</el-drawer>
+
+	<el-dialog v-model="dialogVisible" title="授权用户" width="700px" :close-on-click-modal="false">
+		<RoleUsersCom />
+	</el-dialog>
 </template>
 
 <script setup lang="ts">
 import { Splitpanes, Pane } from 'splitpanes';
 import 'splitpanes/dist/splitpanes.css';
+import { UserFilled } from '@element-plus/icons-vue';
 import { RoleDrawerStores } from '../stores/RoleDrawerStores';
 import { defineAsyncComponent, ref } from 'vue';
+import { RoleUsersStores } from '../stores/RoleUsersStores';
 
-const MenuTree = defineAsyncComponent(() => import('./RoleMenuTree.vue'));
-const MenuBtn = defineAsyncComponent(() => import('./RoleMenuBtn.vue'));
-const MenuField = defineAsyncComponent(() => import('./RoleMenuField.vue'));
+const MenuTreeCom = defineAsyncComponent(() => import('./RoleMenuTree.vue'));
+const MenuBtnCom = defineAsyncComponent(() => import('./RoleMenuBtn.vue'));
+const MenuFieldCom = defineAsyncComponent(() => import('./RoleMenuField.vue'));
+const RoleUsersCom = defineAsyncComponent(() => import('./RoleUsers.vue'));
 const RoleDrawer = RoleDrawerStores(); // 抽屉参数
+const RoleUsers = RoleUsersStores(); // 角色-用户
 const activeName = ref('first');
+
+const dialogVisible = ref(false);
+
+const handleUsers = () => {
+	dialogVisible.value = true;
+	RoleUsers.get_all_users(); // 获取所有用户
+	RoleUsers.set_right_users(RoleDrawer.$state.users); // 设置已选中用户
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/web/src/views/system/role/components/RoleUsers.vue b/web/src/views/system/role/components/RoleUsers.vue
new file mode 100644
index 00000000..92d3bf7a
--- /dev/null
+++ b/web/src/views/system/role/components/RoleUsers.vue
@@ -0,0 +1,35 @@
+<template>
+	<el-transfer
+		v-model="RoleUsers.$state.right_users"
+		filterable
+		:titles="['未授权用户', '已授权用户']"
+		:data="RoleUsers.$state.all_users"
+		:props="{
+			key: 'id',
+			label: 'name',
+		}"
+		@change="handleChange"
+	/>
+</template>
+
+<script lang="ts" setup>
+import { ElMessage } from 'element-plus';
+import { RoleDrawerStores } from '../stores/RoleDrawerStores';
+import { RoleUsersStores } from '../stores/RoleUsersStores';
+import { setRoleUsers } from './api';
+const RoleDrawer = RoleDrawerStores(); // 抽屉参数
+const RoleUsers = RoleUsersStores(); // 角色-用户
+
+/**
+ *
+ * @param value 当前右侧选中的用户
+ * @param direction 移动的方向
+ * @param movedKeys 移动的用户
+ */
+const handleChange = (value: number[] | string[], direction: 'left' | 'right', movedKeys: string[] | number[]) => {
+	setRoleUsers(RoleDrawer.$state.roleId, { direction, movedKeys }).then((res:any) => {
+		RoleDrawer.set_state(res.data)
+		ElMessage({ message: res.msg, type: 'success' });
+	});
+};
+</script>
diff --git a/web/src/views/system/role/components/api.ts b/web/src/views/system/role/components/api.ts
index dc3a5dc1..7d98b6ad 100644
--- a/web/src/views/system/role/components/api.ts
+++ b/web/src/views/system/role/components/api.ts
@@ -86,3 +86,36 @@ export function getRoleToDeptAll(query: object) {
 		params: query,
 	});
 }
+
+/**
+ * 获取所有用户
+ * @param query
+ * @returns
+ */
+export function getAllUsers() {
+	return request({
+		url: '/api/system/user/',
+		method: 'get',
+		params: { limit: 999 },
+	}).then((res: any) => {
+		return XEUtils.map(res.data, (item: any) => {
+			return {
+				id: item.id,
+				name: item.name,
+			};
+		});
+	});
+}
+
+/**
+ * 设置角色-用户
+ * @param query
+ * @returns
+ */
+export function setRoleUsers(roleId: string | number | undefined, data: object) {
+	return request({
+		url: `/api/system/role/${roleId}/set_role_users/`,
+		method: 'put',
+		data,
+	});
+}
diff --git a/web/src/views/system/role/index.vue b/web/src/views/system/role/index.vue
index 19e81242..a7645bec 100644
--- a/web/src/views/system/role/index.vue
+++ b/web/src/views/system/role/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<fs-page>
 		<fs-crud ref="crudRef" v-bind="crudBinding"> </fs-crud>
-		<PermissionDrawerCom ref="PermissionDrawerCom" />
+		<PermissionDrawerCom />
 	</fs-page>
 </template>
 
@@ -12,20 +12,25 @@ import { createCrudOptions } from './crud';
 import { RoleDrawerStores } from './stores/RoleDrawerStores';
 import { RoleMenuBtnStores } from './stores/RoleMenuBtnStores';
 import { RoleMenuFieldStores } from './stores/RoleMenuFieldStores';
+import { RoleUsersStores } from './stores/RoleUsersStores';
 
 const PermissionDrawerCom = defineAsyncComponent(() => import('./components/RoleDrawer.vue'));
 
-const RoleDrawer = RoleDrawerStores(); // 权限配置抽屉参数
+const RoleDrawer = RoleDrawerStores(); // 角色-抽屉
 const RoleMenuBtn = RoleMenuBtnStores(); // 角色-菜单
-const RoleMenuField = RoleMenuFieldStores();
+const RoleMenuField = RoleMenuFieldStores();// 角色-菜单-字段
+const RoleUsers = RoleUsersStores();// 角色-用户
 const { crudBinding, crudRef, crudExpose } = useFs({
 	createCrudOptions,
-	context: { RoleDrawer, RoleMenuBtn,RoleMenuField },
+	context: { RoleDrawer, RoleMenuBtn, RoleMenuField },
 });
 
 // 页面打开后获取列表数据
 onMounted(async () => {
 	// 刷新
 	crudExpose.doRefresh();
+	// 获取全部用户
+	RoleUsers.get_all_users();
+
 });
 </script>
diff --git a/web/src/views/system/role/stores/RoleDrawerStores.ts b/web/src/views/system/role/stores/RoleDrawerStores.ts
index 7121c371..6e77369a 100644
--- a/web/src/views/system/role/stores/RoleDrawerStores.ts
+++ b/web/src/views/system/role/stores/RoleDrawerStores.ts
@@ -7,6 +7,7 @@ const initialState: RoleDrawerType = {
 	drawerVisible: false,
 	roleId: undefined,
 	roleName: undefined,
+	users: [],
 };
 
 export const RoleDrawerStores = defineStore('RoleDrawerStores', {
@@ -19,8 +20,12 @@ export const RoleDrawerStores = defineStore('RoleDrawerStores', {
 		 */
 		handleDrawerOpen(row: any) {
 			this.drawerVisible = true;
+			this.set_state(row);
+		},
+		set_state(row: any) {
 			this.roleName = row.name;
 			this.roleId = row.id;
+			this.users = row.users;
 		},
 		/**
 		 * 关闭权限修改抽屉
diff --git a/web/src/views/system/role/stores/RoleUsersStores.ts b/web/src/views/system/role/stores/RoleUsersStores.ts
new file mode 100644
index 00000000..49c216a7
--- /dev/null
+++ b/web/src/views/system/role/stores/RoleUsersStores.ts
@@ -0,0 +1,24 @@
+import { defineStore } from 'pinia';
+import { RoleUsersType } from '../types';
+import { getAllUsers } from '../components/api';
+import XEUtils from 'xe-utils';
+/**
+ * 权限抽屉：角色-用户
+ */
+
+export const RoleUsersStores = defineStore('RoleUsersStores', {
+	state: (): RoleUsersType => ({
+		all_users: [],
+		right_users: [],
+	}),
+	actions: {
+		get_all_users() {
+			getAllUsers().then((res: any) => {
+				this.$state.all_users = res;
+			});
+		},
+		set_right_users(users: any) {
+			this.$state.right_users = XEUtils.map(users, (item: any) => item.id);
+		},
+	},
+});
diff --git a/web/src/views/system/role/types.ts b/web/src/views/system/role/types.ts
index e38b56f7..40050734 100644
--- a/web/src/views/system/role/types.ts
+++ b/web/src/views/system/role/types.ts
@@ -16,6 +16,15 @@ export interface RoleItemType {
 	creator: string;
 }
 
+export interface UsersType {
+	id: string | number;
+	name: string;
+}
+export interface RoleUsersType {
+	all_users: UsersType[];
+	right_users: UsersType[];
+}
+
 /**
  * 权限配置 抽屉组件参数数据类型
  */
@@ -26,6 +35,8 @@ export interface RoleDrawerType {
 	roleId: string | number | undefined;
 	/** 角色名称*/
 	roleName: string | undefined;
+	/** 用户*/
+	users: UsersType[];
 }
 
 /**
@@ -82,7 +93,7 @@ export interface RoleMenuFieldHeaderType {
 	/** 模型表字段名 */
 	label: string;
 	/** 字段显示名	*/
-	disabled: string ;
+	disabled: string;
 	/** 是否可查询 */
 	checked: boolean;
 }
-- 
Gitee


From 2d69633660710fe966f26338e4f4baf7599a0151 Mon Sep 17 00:00:00 2001
From: lxy <10179281+lxy0722@user.noreply.gitee.com>
Date: Mon, 6 Jan 2025 20:06:24 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E9=97=AE=E9=A2=98=20=EF=BC=88cherry=20picked=20commit?=
 =?UTF-8?q?=20from=20<gitee.com//lxy0722/django-vue3-admin/commit/4a01e551?=
 =?UTF-8?q?43967f0a01d3509804d3ba146724928a>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/stores/userInfo.ts              |  3 ++-
 web/src/views/system/personal/index.vue |  2 +-
 web/src/views/system/user/crud.tsx      | 13 +++++++------
 web/src/views/system/user/index.vue     | 11 +++++++++++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/web/src/stores/userInfo.ts b/web/src/stores/userInfo.ts
index 04d296ae..13dbf2ef 100644
--- a/web/src/stores/userInfo.ts
+++ b/web/src/stores/userInfo.ts
@@ -2,6 +2,7 @@ import { defineStore } from 'pinia';
 import { UserInfosStates } from './interface';
 import { Session } from '/@/utils/storage';
 import { request } from '../utils/service';
+import { getBaseURL } from '../utils/baseUrl';
 /**
  * 用户信息
  * @methods setUserInfos 设置用户信息
@@ -72,7 +73,7 @@ export const useUserInfo = defineStore('userInfo', {
 				method: 'get',
 			}).then((res:any)=>{
 				this.userInfos.username = res.data.name;
-				this.userInfos.avatar = res.data.avatar;
+				this.userInfos.avatar = getBaseURL(res.data.avatar);
 				this.userInfos.name = res.data.name;
 				this.userInfos.email = res.data.email;
 				this.userInfos.mobile = res.data.mobile;
diff --git a/web/src/views/system/personal/index.vue b/web/src/views/system/personal/index.vue
index 79f29d34..216ae770 100644
--- a/web/src/views/system/personal/index.vue
+++ b/web/src/views/system/personal/index.vue
@@ -32,7 +32,7 @@
 										<el-col :xs="24" :sm="24" class="personal-item mb6">
 											<div class="personal-item-label">角色：</div>
 											<div class="personal-item-value">
-												<el-tag v-for="(item, index) in state.personalForm.role_info" :key="index">{{ item.name }}</el-tag>
+												<el-tag v-for="(item, index) in state.personalForm.role_info" :key="index" style="margin-right: 5px;">{{ item.name }}</el-tag>
 											</div>
 										</el-col>
 									</el-row>
diff --git a/web/src/views/system/user/crud.tsx b/web/src/views/system/user/crud.tsx
index dd24c406..4e8b41c9 100644
--- a/web/src/views/system/user/crud.tsx
+++ b/web/src/views/system/user/crud.tsx
@@ -257,10 +257,10 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps)
                     }),
                     column: {
                         minWidth: 200, //最小列宽
-                        formatter({value,row,index}){
-                            const values = row.role_info.map((item:any) => item.name);
-                            return values.join(',')
-                        }
+                        // formatter({value,row,index}){
+                        //     const values = row.role_info.map((item:any) => item.name);
+                        //     return values.join(',')
+                        // }
                     },
                     form: {
                         rules: [
@@ -382,12 +382,13 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps)
                 },
                 avatar: {
                     title: '头像',
-                    type: 'avatar-cropper',
+                    type: 'avatar-uploader',
+                    align: 'center',
                     form: {
                         show: false,
                     },
                     column: {
-                        minWidth: 400, //最小列宽
+                        minWidth: 100, //最小列宽
                     },
                 },
                 ...commonCrudConfig({
diff --git a/web/src/views/system/user/index.vue b/web/src/views/system/user/index.vue
index 71085d1b..117a5597 100644
--- a/web/src/views/system/user/index.vue
+++ b/web/src/views/system/user/index.vue
@@ -33,6 +33,15 @@
             <template #actionbar-right>
               <importExcel api="api/system/user/" v-auth="'user:Import'">导入</importExcel>
             </template>
+            <template #cell_avatar="scope">
+              <div v-if="scope.row.avatar" style="display: flex; justify-content: center; align-items: center;">
+                <el-image 
+                  style="width: 50px; height: 50px; border-radius: 50%; aspect-ratio: 1 /1 ; " 
+                  :src="getBaseURL(scope.row.avatar)"
+                  :preview-src-list="[getBaseURL(scope.row.avatar)]" 
+                  :preview-teleported="true" />
+              </div>
+            </template>
           </fs-crud>
         </el-card>
       </el-col>
@@ -50,6 +59,8 @@ import {ref, onMounted, watch, toRaw, h} from 'vue';
 import XEUtils from 'xe-utils';
 import {getElementLabelLine} from 'element-tree-line';
 import importExcel from '/@/components/importExcel/index.vue'
+import {getBaseURL} from '/@/utils/baseUrl';
+
 
 const ElementTreeLine = getElementLabelLine(h);
 
-- 
Gitee


From e8f5edd9c3404660ecd51a13506fda2e2f914ded Mon Sep 17 00:00:00 2001
From: lxy <10179281+lxy0722@user.noreply.gitee.com>
Date: Mon, 6 Jan 2025 20:36:10 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/dept/components/DeptUserCom/crud.tsx      | 12 ++++++------
 .../system/dept/components/DeptUserCom/index.vue     | 10 ++++++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/web/src/views/system/dept/components/DeptUserCom/crud.tsx b/web/src/views/system/dept/components/DeptUserCom/crud.tsx
index bcee5b09..bf2f9d6a 100644
--- a/web/src/views/system/dept/components/DeptUserCom/crud.tsx
+++ b/web/src/views/system/dept/components/DeptUserCom/crud.tsx
@@ -263,10 +263,10 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 					}),
 					column: {
 						minWidth: 200, //最小列宽
-						formatter({value,row,index}){
-							const values = row.role_info.map((item:any) => item.name);
-							return values.join(',')
-						}
+						// formatter({value,row,index}){
+						// 	const values = row.role_info.map((item:any) => item.name);
+						// 	return values.join(',')
+						// }
 					},
 					form: {
 						rules: [
@@ -385,12 +385,12 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 				},
 				avatar: {
 					title: '头像',
-					type: 'avatar-cropper',
+					type: 'avatar-uploader',
 					form: {
 						show: false,
 					},
 					column:{
-						width:150,
+						width:100,
 						showOverflowTooltip: true,
 					}
 				},
diff --git a/web/src/views/system/dept/components/DeptUserCom/index.vue b/web/src/views/system/dept/components/DeptUserCom/index.vue
index f52db556..689bb1a9 100644
--- a/web/src/views/system/dept/components/DeptUserCom/index.vue
+++ b/web/src/views/system/dept/components/DeptUserCom/index.vue
@@ -42,6 +42,15 @@
 		<template #actionbar-right>
 			<importExcel api="api/system/user/" v-auth="'user:Import'">导入 </importExcel>
 		</template>
+		<template #cell_avatar="scope">
+              <div v-if="scope.row.avatar" style="display: flex; justify-content: center; align-items: center;">
+                <el-image 
+                  style="width: 50px; height: 50px; border-radius: 50%; aspect-ratio: 1 /1 ; " 
+                  :src="getBaseURL(scope.row.avatar)"
+                  :preview-src-list="[getBaseURL(scope.row.avatar)]" 
+                  :preview-teleported="true" />
+              </div>
+            </template>
 	</fs-crud>
 
 	<el-dialog v-model="resetPwdVisible" title="重设密码" width="400px" draggable :before-close="handleResetPwdClose">
@@ -69,6 +78,7 @@ import { ECharts, EChartsOption, init } from 'echarts';
 import { getDeptInfoById, resetPwd } from './api';
 import { warningNotification, successNotification } from '/@/utils/message';
 import { HeadDeptInfoType } from '../../types';
+import {getBaseURL} from '/@/utils/baseUrl';
 
 let deptCountChart: ECharts;
 let deptSexChart: ECharts;
-- 
Gitee


From 73edafb95fd00591942c3da78ad1d410a995b510 Mon Sep 17 00:00:00 2001
From: lxy <10179281+lxy0722@user.noreply.gitee.com>
Date: Tue, 7 Jan 2025 10:29:32 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=A4=B4=E5=83=8F=E7=9A=84=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/stores/userInfo.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/src/stores/userInfo.ts b/web/src/stores/userInfo.ts
index 13dbf2ef..01aea201 100644
--- a/web/src/stores/userInfo.ts
+++ b/web/src/stores/userInfo.ts
@@ -3,6 +3,8 @@ import { UserInfosStates } from './interface';
 import { Session } from '/@/utils/storage';
 import { request } from '../utils/service';
 import { getBaseURL } from '../utils/baseUrl';
+import headerImage from '/@/assets/img/headerImage.png';
+
 /**
  * 用户信息
  * @methods setUserInfos 设置用户信息
@@ -73,7 +75,7 @@ export const useUserInfo = defineStore('userInfo', {
 				method: 'get',
 			}).then((res:any)=>{
 				this.userInfos.username = res.data.name;
-				this.userInfos.avatar = getBaseURL(res.data.avatar);
+				this.userInfos.avatar = (res.data.avatar && getBaseURL(res.data.avatar)) || headerImage;
 				this.userInfos.name = res.data.name;
 				this.userInfos.email = res.data.email;
 				this.userInfos.mobile = res.data.mobile;
-- 
Gitee


From 2015db53ab3acc9f19b9d5182f2c943c5d49bafa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E8=BE=89?= <a@a.com>
Date: Tue, 7 Jan 2025 17:38:01 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E8=AE=BE=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dept/components/DeptUserCom/crud.tsx      | 25 ++++-----
 web/src/views/system/user/crud.tsx            | 52 ++++++++++---------
 2 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/web/src/views/system/dept/components/DeptUserCom/crud.tsx b/web/src/views/system/dept/components/DeptUserCom/crud.tsx
index bcee5b09..2327b3d0 100644
--- a/web/src/views/system/dept/components/DeptUserCom/crud.tsx
+++ b/web/src/views/system/dept/components/DeptUserCom/crud.tsx
@@ -4,7 +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";
+import { auth } from "/@/utils/authFunction";
 
 export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
 	const pageRequest = async (query: UserPageQuery) => {
@@ -100,10 +100,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 							placement: 'top',
 							content: '重设密码',
 						},
-						click: (ctx: any) => {
-							const { row } = ctx;
-							context?.handleResetPwdOpen(row);
-						},
+						click: (ctx: any) => context?.handleResetPwdOpen(ctx.row),
 					},
 				},
 			},
@@ -185,10 +182,10 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 						// value: vm.systemConfig('base.default_password'),
 					},
 					/* valueResolve(row, key) {
-                        if (row.password) {
-                            row.password = vm.$md5(row.password)
-                        }
-                    } */
+						if (row.password) {
+							row.password = vm.$md5(row.password)
+						}
+					} */
 				},
 				name: {
 					title: '姓名',
@@ -221,7 +218,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 					}),
 					column: {
 						minWidth: 200, //最小列宽
-						formatter({value,row,index}){
+						formatter({ value, row, index }) {
 							return row.dept_name_all
 						}
 					},
@@ -263,8 +260,8 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 					}),
 					column: {
 						minWidth: 200, //最小列宽
-						formatter({value,row,index}){
-							const values = row.role_info.map((item:any) => item.name);
+						formatter({ value, row, index }) {
+							const values = row.role_info.map((item: any) => item.name);
 							return values.join(',')
 						}
 					},
@@ -389,8 +386,8 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 					form: {
 						show: false,
 					},
-					column:{
-						width:150,
+					column: {
+						width: 150,
 						showOverflowTooltip: true,
 					}
 				},
diff --git a/web/src/views/system/user/crud.tsx b/web/src/views/system/user/crud.tsx
index dd24c406..5f8b2aa8 100644
--- a/web/src/views/system/user/crud.tsx
+++ b/web/src/views/system/user/crud.tsx
@@ -9,27 +9,28 @@ import {
     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';
-import {SystemConfigStore} from "/@/stores/systemConfig";
-import {storeToRefs} from "pinia";
-import {computed} from "vue";
+import { request } from '/@/utils/service';
+import { dictionary } from '/@/utils/dictionary';
+import { successMessage } from '/@/utils/message';
+import { auth } from '/@/utils/authFunction';
+import { SystemConfigStore } from "/@/stores/systemConfig";
+import { storeToRefs } from "pinia";
+import { computed } from "vue";
 import { Md5 } from 'ts-md5';
-import {commonCrudConfig} from "/@/utils/commonCrud";
-export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps): CreateCrudOptionsRet {
+import { commonCrudConfig } from "/@/utils/commonCrud";
+import { ElMessageBox } from 'element-plus';
+export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
     const pageRequest = async (query: UserPageQuery) => {
         return await api.GetList(query);
     };
-    const editRequest = async ({form, row}: EditReq) => {
+    const editRequest = async ({ form, row }: EditReq) => {
         form.id = row.id;
         return await api.UpdateObj(form);
     };
-    const delRequest = async ({row}: DelReq) => {
+    const delRequest = async ({ row }: DelReq) => {
         return await api.DelObj(row.id);
     };
-    const addRequest = async ({form}: AddReq) => {
+    const addRequest = async ({ form }: AddReq) => {
         return await api.AddObj(form);
     };
 
@@ -37,13 +38,13 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps)
         return await api.exportData(query)
     }
 
-    const resetToDefaultPasswordRequest = async (row:EditReq)=>{
+    const resetToDefaultPasswordRequest = async (row: EditReq) => {
         await api.resetToDefaultPassword(row.id)
         successMessage("重置密码成功")
     }
 
     const systemConfigStore = SystemConfigStore()
-    const {systemConfig} = storeToRefs(systemConfigStore)
+    const { systemConfig } = storeToRefs(systemConfigStore)
     const getSystemConfig = computed(() => {
         // console.log(systemConfig.value)
         return systemConfig.value
@@ -79,9 +80,10 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps)
                         text: "导出",//按钮文字
                         title: "导出",//鼠标停留显示的信息
                         show: auth('user:Export'),
-                        click() {
-                            return exportRequest(crudExpose!.getSearchFormData())
-                        }
+                        click: (ctx: any) => ElMessageBox.confirm(
+                            '确定重设密码吗？', '提示',
+                            { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }
+                        ).then(() => resetToDefaultPasswordRequest(ctx.row))
                     }
                 }
             },
@@ -113,7 +115,7 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps)
                         },
                         //@ts-ignore
                         click: (ctx: any) => {
-                            const {row} = ctx;
+                            const { row } = ctx;
                             resetToDefaultPasswordRequest(row)
                         },
                     },
@@ -122,7 +124,7 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps)
             columns: {
                 _index: {
                     title: '序号',
-                    form: {show: false},
+                    form: { show: false },
                     column: {
                         type: 'index',
                         align: 'center',
@@ -176,7 +178,7 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps)
                             placeholder: '请输入密码',
                         },
                     },
-                    valueResolve({form}) {
+                    valueResolve({ form }) {
                         if (form.password) {
                             form.password = Md5.hashStr(form.password)
                         }
@@ -219,7 +221,7 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps)
                     }),
                     column: {
                         minWidth: 200, //最小列宽
-                        formatter({value,row,index}){
+                        formatter({ value, row, index }) {
                             return row.dept_name_all
                         }
                     },
@@ -235,7 +237,7 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps)
                             filterable: true,
                             placeholder: '请选择',
                             props: {
-                                checkStrictly:true,
+                                checkStrictly: true,
                                 props: {
                                     value: 'id',
                                     label: 'name',
@@ -257,8 +259,8 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps)
                     }),
                     column: {
                         minWidth: 200, //最小列宽
-                        formatter({value,row,index}){
-                            const values = row.role_info.map((item:any) => item.name);
+                        formatter({ value, row, index }) {
+                            const values = row.role_info.map((item: any) => item.name);
                             return values.join(',')
                         }
                     },
@@ -333,7 +335,7 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps)
                             span: 12,
                         },
                     },
-                    component: {props: {color: 'auto'}}, // 自动染色
+                    component: { props: { color: 'auto' } }, // 自动染色
                 },
                 user_type: {
                     title: '用户类型',
-- 
Gitee