refactor(file): 调整文件列表视图的认证类配置

- 注释掉了用户头像的在线状态徽章组件
- 移除了相关的头像图片显示逻辑
-保留了用户名显示功能

.gitignore

@@ -4,4 +4,6 @@
 
 .history/
 .vscode/
-web/package-lock.json
+web/package-lock.json
+
+*.bat

README.zh.md

@@ -54,16 +54,21 @@
 ## 交流
 
 - 交流社区：[戳我](https://bbs.django-vue-admin.com)👩‍👦‍👦
-
 - 插件市场：[戳我](https://bbs.django-vue-admin.com/plugMarket.html)👩‍👦‍👦
-
 -  django-vue-admin交流01群(已满)：812482043 [点击链接加入群聊](https://qm.qq.com/cgi-bin/qm/qr?k=aJVwjDvH-Es4MPJQuoO32N0SucK22TE5&jump_from=webapi)
 -  django-vue-admin交流02群(已满)：687252418  [点击链接加入群聊](https://qm.qq.com/cgi-bin/qm/qr?k=4jJN4IjWGfxJ8YJXbb_gTsuWjR34WLdc&jump_from=webapi)
--  django-vue-admin交流03群：442108213  [点击链接加入群聊](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=wsm5oSz3K8dElBYUDtLTcQSEPhINFkl8&authKey=M6sbER0z59ZakgBr5erFeZyFZU15CI52bErNZa%2FxSvvGIuVAbY0N5866v89hm%2FK4&noverify=0&group_code=442108213)
+- django-vue-admin交流03群(已满)：442108213  [点击链接加入群聊](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=wsm5oSz3K8dElBYUDtLTcQSEPhINFkl8&authKey=M6sbER0z59ZakgBr5erFeZyFZU15CI52bErNZa%2FxSvvGIuVAbY0N5866v89hm%2FK4&noverify=0&group_code=442108213)
+- django-vue-admin交流04群：442108213  [点击链接加入群聊](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=wsm5oSz3K8dElBYUDtLTcQSEPhINFkl8&authKey=M6sbER0z59ZakgBr5erFeZyFZU15CI52bErNZa%2FxSvvGIuVAbY0N5866v89hm%2FK4&noverify=0&group_code=442108213)
 
-- 二维码
 
-  <img src='https://images.gitee.com/uploads/images/2022/0530/233203_5fb11883_5074988.jpeg' width='200'>
+
+## 给框架点赞
+
+<div style="display: flex; gap: 10px;">
+ <img src='https://django-vue-admin.com/alipay.jpg' width='200'>
+ <img src='https://django-vue-admin.com/wechat.jpg' width='200'>
+</div>
+
 
 ## 源码地址
 
@@ -88,7 +93,19 @@ github地址：[https://github.com/huge-dream/django-vue3-admin](https://github.
 13.  🔌[插件市场 ](https://bbs.django-vue-admin.com/plugMarket.html)：基于Django-Vue-Admin框架开发的应用和插件。
 
 ##  插件市场 🔌
-更新中...
+1. #### [dvadmin3-folw 后台审批流插件](https://bbs.django-vue-admin.com/plugMarket/139.html)
+
+2. #### [dvadmin3 celery插件前端](https://bbs.django-vue-admin.com/plugMarket/134.html)
+
+3. #### [dvadmin3 celery插件后端](https://bbs.django-vue-admin.com/plugMarket/133.html)
+
+4. #### [dvadmin3-build插件](https://bbs.django-vue-admin.com/plugMarket/136.html)
+
+5. #### [dvadmin3-uniapp](https://e.coding.net/dvadmin-private/code/dvadmin3-uniapp-app.git)
+
+6. #### dvadmin3-folw-uniapp 审批(开发中，近期上线)
+
+
 
 ##  仓库分支说明 💈
 主分支：master（稳定版本）
@@ -114,7 +131,7 @@ cd web
 
 # 安装依赖
 npm install yarn
-yarn install --registry=https://registry.npm.taobao.org
+yarn install --registry=https://registry.npmmirror.com
 
 # 启动服务
 yarn build
@@ -210,5 +227,19 @@ docker-compose up -d --build
 
 ![image-10](https://foruda.gitee.com/images/1701350501421625746/f8dd215e_5074988.png)
 
+## 审批流插件
+
+![输入链接说明](https://bbs.django-vue-admin.com/uploads/20250321/97fbbf29673edfd66a1edd49237791bb.png)
+
+![输入链接说明](https://bbs.django-vue-admin.com/uploads/20250321/c43aa51278cbc478287c718d22397479.png)
+
+
+![输入链接说明](https://bbs.django-vue-admin.com/uploads/20250321/9732a5cca9c1166d1a65c35e313ab90d.png)
+
+
+![输入链接说明](https://bbs.django-vue-admin.com/uploads/20250321/3ca9dd0801ce76d21435abcc8a3d505a.png)
+
+![输入链接说明](https://bbs.django-vue-admin.com/uploads/20250321/a87a8d2329ef66880af5b0f16c5ff823.png)
+
 
 

backend/application/__init__.py

@@ -0,0 +1,5 @@
+# This will make sure the app is always imported when
+# Django starts so that shared_task will use this app.
+from .celery import app as celery_app
+
+__all__ = ('celery_app',)

backend/application/asgi.py

@@ -8,25 +8,25 @@ https://docs.djangoproject.com/en/3.2/howto/deployment/asgi/
 """
 
 import os
+
 from channels.auth import AuthMiddlewareStack
-from channels.security.websocket import AllowedHostsOriginValidator
 from channels.routing import ProtocolTypeRouter, URLRouter
+from channels.security.websocket import AllowedHostsOriginValidator
 from django.core.asgi import get_asgi_application
 
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'application.settings')
 os.environ["DJANGO_ALLOW_ASYNC_UNSAFE"] = "true"
 
 http_application = get_asgi_application()
-
-from application.routing import websocket_urlpatterns
+from application.ws_routing import websocket_urlpatterns
 
 application = ProtocolTypeRouter({
     "http": http_application,
     'websocket': AllowedHostsOriginValidator(
-        AuthMiddlewareStack(
-            URLRouter(
-                websocket_urlpatterns  # 指明路由文件是devops/routing.py
+            AuthMiddlewareStack(
+                URLRouter(
+                    websocket_urlpatterns  # 指明路由文件是devops/routing.py
+                )
             )
-        )
-    ),
+        ),
 })

backend/application/celery.py

@@ -1,6 +1,8 @@
 import functools
 import os
 
+from celery.signals import task_postrun
+
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'application.settings')
 
 from django.conf import settings
@@ -15,7 +17,7 @@ else:
     from celery import Celery
 
     app = Celery(f"application")
-app.config_from_object('django.conf:settings')
+app.config_from_object('django.conf:settings', namespace='CELERY')
 app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
 platforms.C_FORCE_ROOT = True
 
@@ -38,3 +40,12 @@ def retry_base_task_error():
         return wrapper
 
     return wraps
+
+
+@task_postrun.connect
+def add_periodic_task_name(sender, task_id, task, args, kwargs, **extras):
+    periodic_task_name = kwargs.get('periodic_task_name')
+    if periodic_task_name:
+        from django_celery_results.models import TaskResult
+        # 更新 TaskResult 表中的 periodic_task_name 字段
+        TaskResult.objects.filter(task_id=task_id).update(periodic_task_name=periodic_task_name)

backend/application/dispatch.py

@@ -2,6 +2,10 @@
 # -*- coding: utf-8 -*-
 from django.conf import settings
 from django.db import connection
+from django.core.cache import cache
+from dvadmin.utils.validator import CustomValidationError
+
+dispatch_db_type = getattr(settings, 'DISPATCH_DB_TYPE', 'memory')  # redis
 
 
 def is_tenants_mode():
@@ -68,6 +72,9 @@ def init_dictionary():
     :return:
     """
     try:
+        if dispatch_db_type == 'redis':
+            cache.set(f"init_dictionary", _get_all_dictionary())
+            return
         if is_tenants_mode():
             from django_tenants.utils import tenant_context, get_tenant_model
 
@@ -88,7 +95,9 @@ def init_system_config():
     :return:
     """
     try:
-
+        if dispatch_db_type == 'redis':
+            cache.set(f"init_system_config", _get_all_system_config())
+            return
         if is_tenants_mode():
             from django_tenants.utils import tenant_context, get_tenant_model
 
@@ -107,6 +116,9 @@ def refresh_dictionary():
     刷新字典配置
     :return:
     """
+    if dispatch_db_type == 'redis':
+        cache.set(f"init_dictionary", _get_all_dictionary())
+        return
     if is_tenants_mode():
         from django_tenants.utils import tenant_context, get_tenant_model
 
@@ -122,6 +134,9 @@ def refresh_system_config():
     刷新系统配置
     :return:
     """
+    if dispatch_db_type == 'redis':
+        cache.set(f"init_system_config", _get_all_system_config())
+        return
     if is_tenants_mode():
         from django_tenants.utils import tenant_context, get_tenant_model
 
@@ -141,6 +156,11 @@ def get_dictionary_config(schema_name=None):
     :param schema_name: 对应字典配置的租户schema_name值
     :return:
     """
+    if dispatch_db_type == 'redis':
+        init_dictionary_data = cache.get(f"init_dictionary")
+        if not init_dictionary_data:
+            refresh_dictionary()
+        return cache.get(f"init_dictionary") or {}
     if not settings.DICTIONARY_CONFIG:
         refresh_dictionary()
     if is_tenants_mode():
@@ -157,6 +177,12 @@ def get_dictionary_values(key, schema_name=None):
     :param schema_name: 对应字典配置的租户schema_name值
     :return:
     """
+    if dispatch_db_type == 'redis':
+        dictionary_config = cache.get(f"init_dictionary")
+        if not dictionary_config:
+            refresh_dictionary()
+            dictionary_config = cache.get(f"init_dictionary")
+        return dictionary_config.get(key)
     dictionary_config = get_dictionary_config(schema_name)
     return dictionary_config.get(key)
 
@@ -169,8 +195,8 @@ def get_dictionary_label(key, name, schema_name=None):
     :param schema_name: 对应字典配置的租户schema_name值
     :return:
     """
-    children = get_dictionary_values(key, schema_name) or []
-    for ele in children:
+    res = get_dictionary_values(key, schema_name) or []
+    for ele in res.get('children'):
         if ele.get("value") == str(name):
             return ele.get("label")
     return ""
@@ -187,6 +213,11 @@ def get_system_config(schema_name=None):
     :param schema_name: 对应字典配置的租户schema_name值
     :return:
     """
+    if dispatch_db_type == 'redis':
+        init_dictionary_data = cache.get(f"init_system_config")
+        if not init_dictionary_data:
+            refresh_system_config()
+        return cache.get(f"init_system_config") or {}
     if not settings.SYSTEM_CONFIG:
         refresh_system_config()
     if is_tenants_mode():
@@ -203,10 +234,32 @@ def get_system_config_values(key, schema_name=None):
     :param schema_name: 对应系统配置的租户schema_name值
     :return:
     """
+    if dispatch_db_type == 'redis':
+        system_config = cache.get(f"init_system_config")
+        if not system_config:
+            refresh_system_config()
+            system_config = cache.get(f"init_system_config")
+        return system_config.get(key)
     system_config = get_system_config(schema_name)
     return system_config.get(key)
 
 
+def get_system_config_values_to_dict(key, schema_name=None):
+    """
+    获取系统配置数据并转换为字典 **仅限于数组类型系统配置
+    :param key: 对应系统配置的key值(字典编号)
+    :param schema_name: 对应系统配置的租户schema_name值
+    :return:
+    """
+    values_dict = {}
+    config_values = get_system_config_values(key, schema_name)
+    if not isinstance(config_values, list):
+        raise CustomValidationError("该方式仅限于数组类型系统配置")
+    for ele in get_system_config_values(key, schema_name):
+        values_dict[ele.get('key')] = ele.get('value')
+    return values_dict
+
+
 def get_system_config_label(key, name, schema_name=None):
     """
     获取获取系统配置label值

backend/application/settings.py

@@ -399,12 +399,16 @@ DICTIONARY_CONFIG = {}
 # ================================================= #
 # 租户共享app
 TENANT_SHARED_APPS = []
+# 普通租户独有app
+TENANT_EXCLUSIVE_APPS = []
 # 插件 urlpatterns
 PLUGINS_URL_PATTERNS = []
+# 所有模式有的
+SHARED_APPS = []
 # ********** 一键导入插件配置开始 **********
 # 例如:
 # from dvadmin_upgrade_center.settings import *    # 升级中心
-# from dvadmin_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 *            # 租户管理

backend/application/sse_views.py

@@ -0,0 +1,33 @@
+# views.py
+import time
+
+import jwt
+from django.http import StreamingHttpResponse
+
+from application import settings
+from dvadmin.system.models import MessageCenterTargetUser
+from django.core.cache import cache
+
+
+def event_stream(user_id):
+    last_sent_time = 0
+
+    while True:
+        # 从 Redis 中获取最后数据库变更时间
+        last_db_change_time = cache.get('last_db_change_time', 0)
+        # 只有当数据库发生变化时才检查总数
+        if last_db_change_time and last_db_change_time > last_sent_time:
+            count = MessageCenterTargetUser.objects.filter(users=user_id, is_read=False).count()
+            yield f"data: {count}\n\n"
+            last_sent_time = time.time()
+
+        time.sleep(1)
+
+
+def sse_view(request):
+    token = request.GET.get('token')
+    decoded = jwt.decode(token, settings.SECRET_KEY, algorithms=['HS256'])
+    user_id = decoded.get('user_id')
+    response = StreamingHttpResponse(event_stream(user_id), content_type='text/event-stream')
+    response['Cache-Control'] = 'no-cache'
+    return response

backend/application/urls.py

@@ -15,6 +15,7 @@ Including another URLconf
 """
 from django.conf.urls.static import static
 from django.urls import path, include, re_path
+from django.views.static import serve
 from drf_yasg import openapi
 from drf_yasg.views import get_schema_view
 from rest_framework import permissions
@@ -24,6 +25,7 @@ from rest_framework_simplejwt.views import (
 
 from application import dispatch
 from application import settings
+from application.sse_views import sse_view
 from dvadmin.system.views.dictionary import InitDictionaryViewSet
 from dvadmin.system.views.login import (
     LoginView,
@@ -40,6 +42,7 @@ dispatch.init_system_config()
 dispatch.init_dictionary()
 # =========== 初始化系统配置 =================
 
+permission_classes = [permissions.AllowAny, ] if settings.DEBUG else [permissions.IsAuthenticated, ]
 schema_view = get_schema_view(
     openapi.Info(
         title="Snippets API",
@@ -50,7 +53,7 @@ schema_view = get_schema_view(
         license=openapi.License(name="BSD License"),
     ),
     public=True,
-    permission_classes=(permissions.AllowAny,),
+    permission_classes=permission_classes,
     generator_class=CustomOpenAPISchemaGenerator,
 )
 # 前端页面映射
@@ -115,6 +118,8 @@ urlpatterns = (
             # 前端页面映射
             path('web/', web_view, name='web_view'),
             path('web/<path:filename>', serve_web_files, name='serve_web_files'),
+            # sse
+            path('sse/', sse_view, name='sse'),
         ]
         + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
         + static(settings.STATIC_URL, document_root=settings.STATIC_URL)

backend/application/websocketConfig.py

@@ -180,4 +180,4 @@ def create_message_push(title: str, content: str, target_type: int = 0, target_u
                 "type": "push.message",
                 "json": {**message, 'unread': unread_count}
             }
-        )
+        )

backend/application/ws_routing.py

@@ -4,4 +4,4 @@ from application.websocketConfig import MegCenter
 
 websocket_urlpatterns = [
     path('ws/<str:service_uid>/', MegCenter.as_asgi()),  # consumers.DvadminWebSocket 是该路由的消费者
-]
+]

backend/del_migrations.py

@@ -2,7 +2,7 @@
 
 import os
 
-exclude = ["venv"] # 需要排除的文件目录
+exclude = ["venv", ".venv"]  # 需要排除的文件目录
 for root, dirs, files in os.walk('.'):
     dirs[:] = list(set(dirs) - set(exclude))
     if 'migrations' in dirs:

backend/dvadmin/__init__.py

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

backend/dvadmin/system/apps.py

@@ -4,3 +4,7 @@ from django.apps import AppConfig
 class SystemConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'dvadmin.system'
+
+    def ready(self):
+        # 注册信号
+        import dvadmin.system.signals  # 确保路径正确

backend/dvadmin/system/fixtures/initSerializer.py

@@ -19,6 +19,20 @@ class UsersInitSerializer(CustomModelSerializer):
     """
     初始化获取数信息(用于生成初始化json文件)
     """
+    role_key = serializers.SerializerMethodField()
+    dept_key = serializers.SerializerMethodField()
+
+    def get_dept_key(self, obj):
+        if obj.dept:
+            return obj.dept.key
+        else:
+            return None
+
+    def get_role_key(self, obj):
+        if obj.role.all():
+            return [role.key for role in obj.role.all()]
+        else:
+            return []
 
     def save(self, **kwargs):
         instance = super().save(**kwargs)
@@ -35,7 +49,7 @@ class UsersInitSerializer(CustomModelSerializer):
         model = Users
         fields = ["username", "email", 'mobile', 'avatar', "name", 'gender', 'user_type', "dept", 'user_type',
                   'first_name', 'last_name', 'email', 'is_staff', 'is_active', 'creator', 'dept_belong_id',
-                  'password', 'last_login', 'is_superuser']
+                  'password', 'last_login', 'is_superuser', 'role_key' ,'dept_key']
         read_only_fields = ['id']
         extra_kwargs = {
             'creator': {'write_only': True},
@@ -175,15 +189,21 @@ class RoleMenuInitSerializer(CustomModelSerializer):
     """
     初始化角色菜单(用于生成初始化json文件)
     """
-    role__key = serializers.CharField(max_length=100, required=True)
-    menu__web_path = serializers.CharField(max_length=100, required=True)
-    menu__component_name = serializers.CharField(max_length=100, required=True, allow_blank=True)
+    role__key = serializers.CharField(source='role.key')
+    menu__web_path = serializers.CharField(source='menu.web_path')
+    menu__component_name = serializers.CharField(source='menu.component_name', allow_blank=True)
+
+    def update(self, instance, validated_data):
+        init_data = self.initial_data
+        role_id = Role.objects.filter(key=init_data['role__key']).first()
+        menu_id = Menu.objects.filter(web_path=init_data['menu__web_path'], component_name=init_data['menu__component_name']).first()
+        validated_data['role'] = role_id
+        validated_data['menu'] = menu_id
+        return super().update(instance, validated_data)
+    
 
     def create(self, validated_data):
         init_data = self.initial_data
-        validated_data.pop('menu__web_path')
-        validated_data.pop('menu__component_name')
-        validated_data.pop('role__key')
         role_id = Role.objects.filter(key=init_data['role__key']).first()
         menu_id = Menu.objects.filter(web_path=init_data['menu__web_path'], component_name=init_data['menu__component_name']).first()
         validated_data['role'] = role_id
@@ -192,7 +212,7 @@ class RoleMenuInitSerializer(CustomModelSerializer):
 
     class Meta:
         model = RoleMenuPermission
-        fields = ['role__key', 'menu__web_path', 'menu__component_name', 'creator', 'dept_belong_id']
+        fields = ['role__key', 'menu__web_path', 'menu__component_name','creator', 'dept_belong_id']
         read_only_fields = ["id"]
         extra_kwargs = {
             'role': {'required': False},
@@ -206,14 +226,22 @@ class RoleMenuButtonInitSerializer(CustomModelSerializer):
     """
     初始化角色菜单按钮(用于生成初始化json文件)
     """
-    role__key = serializers.CharField(max_length=100, required=True)
-    menu_button__value = serializers.CharField(max_length=100, required=True)
+    role__key = serializers.CharField(source='role.key')
+    menu_button__value = serializers.CharField(source='menu_button.value')
     data_range = serializers.CharField(max_length=100, required=False)
 
+    def update(self, instance, validated_data):
+        init_data = self.initial_data
+        role_id = Role.objects.filter(key=init_data['role__key']).first()
+        menu_button_id = MenuButton.objects.filter(value=init_data['menu_button__value']).first()
+        validated_data['role'] = role_id
+        validated_data['menu_button'] = menu_button_id
+        instance = super().create(validated_data)
+        instance.dept.set([])
+        return super().update(instance, validated_data)
+    
     def create(self, validated_data):
         init_data = self.initial_data
-        validated_data.pop('menu_button__value')
-        validated_data.pop('role__key')
         role_id = Role.objects.filter(key=init_data['role__key']).first()
         menu_button_id = MenuButton.objects.filter(value=init_data['menu_button__value']).first()
         validated_data['role'] = role_id
@@ -223,7 +251,7 @@ class RoleMenuButtonInitSerializer(CustomModelSerializer):
         return instance
 
     def save(self, **kwargs):
-        if self.instance and self.initial_data.get('reset'):
+        if not self.instance or self.initial_data.get('reset'):
             return super().save(**kwargs)
         return self.instance
 

backend/dvadmin/system/fixtures/init_dictionary.json

@@ -546,5 +546,50 @@
                 "children": []
             }
         ]
+    },
+    {
+        "label": "文件存储引擎",
+        "value": "file_engine",
+        "type": 0,
+        "color": null,
+        "is_value": false,
+        "status": true,
+        "sort": 9,
+        "remark": null,
+        "children": [
+            {
+                "label": "本地",
+                "value": "local",
+                "type": 0,
+                "color": "primary",
+                "is_value": true,
+                "status": true,
+                "sort": 1,
+                "remark": null,
+                "children": []
+            },
+            {
+                "label": "阿里云oss",
+                "value": "oss",
+                "type": 0,
+                "color": "success",
+                "is_value": true,
+                "status": true,
+                "sort": 2,
+                "remark": null,
+                "children": []
+            },
+            {
+                "label": "腾讯cos",
+                "value": "cos",
+                "type": 0,
+                "color": "warning",
+                "is_value": true,
+                "status": true,
+                "sort": 3,
+                "remark": null,
+                "children": []
+            }
+        ]
     }
 ]

backend/dvadmin/system/fixtures/init_menu.json

@@ -11,332 +11,11 @@
         "status": true,
         "cache": false,
         "visible": true,
-        "parent": null,
         "children": [
-            {
-                "name": "菜单管理",
-                "icon": "iconfont icon-caidan",
-                "sort": 1,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/menu",
-                "component": "system/menu/index",
-                "component_name": "menu",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "parent": 1,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "查询",
-                        "value": "menu:Search",
-                        "api": "/api/system/menu/",
-                        "method": 0
-                    },
-                    {
-                        "name": "详情",
-                        "value": "menu:Retrieve",
-                        "api": "/api/system/menu/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "查询所有",
-                        "value": "menu:SearchAll",
-                        "api": "/api/system/menu/get_all_menu/",
-                        "method": 0
-                    },
-                    {
-                        "name": "路由",
-                        "value": "menu:router",
-                        "api": "/api/system/menu/web_router/",
-                        "method": 0
-                    },
-                    {
-                        "name": "查询按钮权限",
-                        "value": "btn:Search",
-                        "api": "/api/system/menu_button/",
-                        "method": 0
-                    },
-                    {
-                        "name": "查询列权限",
-                        "value": "column:Search",
-                        "api": "/api/system/column/",
-                        "method": 0
-                    },
-                    {
-                        "name": "新增",
-                        "value": "menu:Create",
-                        "api": "/api/system/menu/",
-                        "method": 1
-                    },
-                    {
-                        "name": "上移",
-                        "value": "menu:MoveUp",
-                        "api": "/api/system/menu/mode_up/",
-                        "method": 1
-                    },
-                    {
-                        "name": "下移",
-                        "value": "menu:MoveDown",
-                        "api": "/api/system/menu/mode_down/",
-                        "method": 1
-                    },
-                    {
-                        "name": "新增按钮权限",
-                        "value": "btn:Create",
-                        "api": "/api/system/menu_button/",
-                        "method": 1
-                    },
-                    {
-                        "name": "新增列权限",
-                        "value": "column:Create",
-                        "api": "/api/system/column/",
-                        "method": 1
-                    },
-                    {
-                        "name": "自动匹配列权限",
-                        "value": "column:Match",
-                        "api": "/api/system/column/auto_match_fields/",
-                        "method": 1
-                    },
-                    {
-                        "name": "编辑",
-                        "value": "menu:Update",
-                        "api": "/api/system/menu/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "修改按钮权限",
-                        "value": "btn:Update",
-                        "api": "/api/system/menu_button/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "编辑列权限",
-                        "value": "column:Update",
-                        "api": "/api/system/column/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "删除",
-                        "value": "menu:Delete",
-                        "api": "/api/system/menu/{id}/",
-                        "method": 3
-                    },
-                    {
-                        "name": "删除按钮权限",
-                        "value": "btn:Delete",
-                        "api": "/api/system/menu_button/{id}/",
-                        "method": 3
-                    },
-                    {
-                        "name": "删除列权限",
-                        "value": "column:Delete",
-                        "api": "/api/system/column/{id}/",
-                        "method": 3
-                    }
-                ],
-                "menu_field": []
-            },
-            {
-                "name": "部门管理",
-                "icon": "ele-OfficeBuilding",
-                "sort": 3,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/dept",
-                "component": "system/dept/index",
-                "component_name": "dept",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "parent": 1,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "查询",
-                        "value": "dept:Search",
-                        "api": "/api/system/dept/",
-                        "method": 0
-                    },
-                    {
-                        "name": "详情",
-                        "value": "dept:Retrieve",
-                        "api": "/api/system/dept/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "查询所有",
-                        "value": "dept:SearchAll",
-                        "api": "/api/system/dept/all_dept/",
-                        "method": 0
-                    },
-                    {
-                        "name": "懒加载查询所有",
-                        "value": "dept:LazySearchAll",
-                        "api": "/api/system/dept/dept_lazy_tree/",
-                        "method": 0
-                    },
-                    {
-                        "name": "头信息",
-                        "value": "dept:HeaderInfo",
-                        "api": "/api/system/dept/dept_info/",
-                        "method": 0
-                    },
-                    {
-                        "name": "新增",
-                        "value": "dept:Create",
-                        "api": "/api/system/dept/",
-                        "method": 1
-                    },
-                    {
-                        "name": "上移",
-                        "value": "dept:MoveUp",
-                        "api": "/api/system/dept/mode_up/",
-                        "method": 1
-                    },
-                    {
-                        "name": "下移",
-                        "value": "dept:MoveDown",
-                        "api": "/api/system/dept/mode_down/",
-                        "method": 1
-                    },
-                    {
-                        "name": "编辑",
-                        "value": "dept:Update",
-                        "api": "/api/system/dept/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "删除",
-                        "value": "dept:Delete",
-                        "api": "/api/system/dept/{id}/",
-                        "method": 3
-                    }
-                ],
-                "menu_field": []
-            },
-            {
-                "name": "角色管理",
-                "icon": "ele-ColdDrink",
-                "sort": 4,
-                "is_link": false,
-                "is_catalog": false,
-                "web_path": "/role",
-                "component": "system/role/index",
-                "component_name": "role",
-                "status": true,
-                "cache": false,
-                "visible": true,
-                "parent": 1,
-                "children": [],
-                "menu_button": [
-                    {
-                        "name": "查询",
-                        "value": "role:Search",
-                        "api": "/api/system/role/",
-                        "method": 0
-                    },
-                    {
-                        "name": "详情",
-                        "value": "role:Retrieve",
-                        "api": "/api/system/role/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "权限配置",
-                        "value": "role:Permission",
-                        "api": "/api/system/role/{id}/",
-                        "method": 0
-                    },
-                    {
-                        "name": "新增",
-                        "value": "role:Create",
-                        "api": "/api/system/role/",
-                        "method": 1
-                    },
-                    {
-                        "name": "编辑",
-                        "value": "role:Update",
-                        "api": "/api/system/role/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "保存",
-                        "value": "role:Save",
-                        "api": "/api/system/role/{id}/",
-                        "method": 2
-                    },
-                    {
-                        "name": "删除",
-                        "value": "role:Delete",
-                        "api": "/api/system/role/{id}/",
-                        "method": 3
-                    }
-                ],
-                "menu_field": [
-                    {
-                        "field_name": "create_datetime",
-                        "title": "创建时间",
-                        "model": "Role"
-                    },
-                    {
-                        "field_name": "creator",
-                        "title": "创建人",
-                        "model": "Role"
-                    },
-                    {
-                        "field_name": "dept_belong_id",
-                        "title": "数据归属部门",
-                        "model": "Role"
-                    },
-                    {
-                        "field_name": "description",
-                        "title": "描述",
-                        "model": "Role"
-                    },
-                    {
-                        "field_name": "id",
-                        "title": "Id",
-                        "model": "Role"
-                    },
-                    {
-                        "field_name": "key",
-                        "title": "权限字符",
-                        "model": "Role"
-                    },
-                    {
-                        "field_name": "modifier",
-                        "title": "修改人",
-                        "model": "Role"
-                    },
-                    {
-                        "field_name": "name",
-                        "title": "角色名称",
-                        "model": "Role"
-                    },
-                    {
-                        "field_name": "sort",
-                        "title": "角色顺序",
-                        "model": "Role"
-                    },
-                    {
-                        "field_name": "status",
-                        "title": "角色状态",
-                        "model": "Role"
-                    },
-                    {
-                        "field_name": "update_datetime",
-                        "title": "修改时间",
-                        "model": "Role"
-                    }
-                ]
-            },
             {
                 "name": "用户管理",
                 "icon": "iconfont icon-icon-",
-                "sort": 6,
+                "sort": 1,
                 "is_link": false,
                 "is_catalog": false,
                 "web_path": "/user",
@@ -345,7 +24,6 @@
                 "status": true,
                 "cache": false,
                 "visible": true,
-                "parent": 1,
                 "children": [],
                 "menu_button": [
                     {
@@ -354,18 +32,24 @@
                         "api": "/api/system/user/",
                         "method": 0
                     },
-                    {
-                        "name": "详情",
-                        "value": "user:Retrieve",
-                        "api": "/api/system/user/{id}/",
-                        "method": 0
-                    },
                     {
                         "name": "新增",
                         "value": "user:Create",
                         "api": "/api/system/user/",
                         "method": 1
                     },
+                    {
+                        "name": "编辑",
+                        "value": "user:Update",
+                        "api": "/api/system/user/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "删除",
+                        "value": "user:Delete",
+                        "api": "/api/system/user/{id}/",
+                        "method": 3
+                    },
                     {
                         "name": "导出",
                         "value": "user:Export",
@@ -379,10 +63,16 @@
                         "method": 1
                     },
                     {
-                        "name": "编辑",
-                        "value": "user:Update",
-                        "api": "/api/system/user/{id}/",
-                        "method": 2
+                        "name": "获取导入模板",
+                        "value": "user:ImportTemplate",
+                        "api": "/api/system/user/import/",
+                        "method": 0
+                    },
+                    {
+                        "name": "批量更新模板",
+                        "value": "user:BatchUpdateTemplate",
+                        "api": "/api/system/user/update_template/",
+                        "method": 0
                     },
                     {
                         "name": "重设密码",
@@ -392,15 +82,9 @@
                     },
                     {
                         "name": "重置密码",
-                        "value": "user:DefaultPassword",
+                        "value": "user:ResetDefaultPassword",
                         "api": "/api/system/user/{id}/reset_to_default_password/",
                         "method": 2
-                    },
-                    {
-                        "name": "删除",
-                        "value": "user:Delete",
-                        "api": "/api/system/user/{id}/",
-                        "method": 3
                     }
                 ],
                 "menu_field": [
@@ -481,6 +165,359 @@
                     }
                 ]
             },
+            {
+                "name": "菜单管理",
+                "icon": "iconfont icon-caidan",
+                "sort": 2,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/menu",
+                "component": "system/menu/index",
+                "component_name": "menu",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "查询",
+                        "value": "menu:Search",
+                        "api": "/api/system/menu/",
+                        "method": 0
+                    },
+                    {
+                        "name": "单例",
+                        "value": "menu:Retrieve",
+                        "api": "/api/system/menu/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "新增",
+                        "value": "menu:Create",
+                        "api": "/api/system/menu/",
+                        "method": 1
+                    },
+                    {
+                        "name": "编辑",
+                        "value": "menu:Update",
+                        "api": "/api/system/menu/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "删除",
+                        "value": "menu:Delete",
+                        "api": "/api/system/menu/{id}/",
+                        "method": 3
+                    },
+                    {
+                        "name": "查询所有",
+                        "value": "menu:SearchAll",
+                        "api": "/api/system/menu/get_all_menu/",
+                        "method": 0
+                    },
+                    {
+                        "name": "路由",
+                        "value": "menu:router",
+                        "api": "/api/system/menu/web_router/",
+                        "method": 0
+                    },
+                    {
+                        "name": "查询按钮",
+                        "value": "menu:SearchButton",
+                        "api": "/api/system/menu_button/",
+                        "method": 0
+                    },
+                    {
+                        "name": "新增按钮",
+                        "value": "menu:CreateButton",
+                        "api": "/api/system/menu_button/",
+                        "method": 1
+                    },
+                    {
+                        "name": "编辑按钮",
+                        "value": "menu:UpdateButton",
+                        "api": "/api/system/menu_button/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "删除按钮",
+                        "value": "menu:DeleteButton",
+                        "api": "/api/system/menu_button/{id}/",
+                        "method": 3
+                    },
+                    {
+                        "name": "上移",
+                        "value": "menu:MoveUp",
+                        "api": "/api/system/menu/mode_up/",
+                        "method": 1
+                    },
+                    {
+                        "name": "下移",
+                        "value": "menu:MoveDown",
+                        "api": "/api/system/menu/mode_down/",
+                        "method": 1
+                    },
+                    {
+                        "name": "查询列权限",
+                        "value": "column:Search",
+                        "api": "/api/system/column/",
+                        "method": 0
+                    },
+                    {
+                        "name": "新增列权限",
+                        "value": "column:Create",
+                        "api": "/api/system/column/",
+                        "method": 1
+                    },
+                    {
+                        "name": "编辑列权限",
+                        "value": "column:Update",
+                        "api": "/api/system/column/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "删除列权限",
+                        "value": "column:Delete",
+                        "api": "/api/system/column/{id}/",
+                        "method": 3
+                    },
+                    {
+                        "name": "自动匹配列权限",
+                        "value": "column:Match",
+                        "api": "/api/system/column/auto_match_fields/",
+                        "method": 1
+                    }
+                ],
+                "menu_field": []
+            },
+            {
+                "name": "部门管理",
+                "icon": "ele-OfficeBuilding",
+                "sort": 3,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/dept",
+                "component": "system/dept/index",
+                "component_name": "dept",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "查询",
+                        "value": "dept:Search",
+                        "api": "/api/system/dept/",
+                        "method": 0
+                    },
+                    {
+                        "name": "详情",
+                        "value": "dept:Retrieve",
+                        "api": "/api/system/dept/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "获取所有部门",
+                        "value": "dept:SearchAll",
+                        "api": "/api/system/dept/all_dept/",
+                        "method": 0
+                    },
+                    {
+                        "name": "部门顶部信息",
+                        "value": "dept:HeaderInfo",
+                        "api": "/api/system/dept/dept_info/",
+                        "method": 0
+                    },
+                    {
+                        "name": "新增",
+                        "value": "dept:Create",
+                        "api": "/api/system/dept/",
+                        "method": 1
+                    },
+                    {
+                        "name": "上移",
+                        "value": "dept:MoveUp",
+                        "api": "/api/system/dept/mode_up/",
+                        "method": 1
+                    },
+                    {
+                        "name": "下移",
+                        "value": "dept:MoveDown",
+                        "api": "/api/system/dept/mode_down/",
+                        "method": 1
+                    },
+                    {
+                        "name": "编辑",
+                        "value": "dept:Update",
+                        "api": "/api/system/dept/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "删除",
+                        "value": "dept:Delete",
+                        "api": "/api/system/dept/{id}/",
+                        "method": 3
+                    }
+                ],
+                "menu_field": []
+            },
+            {
+                "name": "角色管理",
+                "icon": "ele-ColdDrink",
+                "sort": 4,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/role",
+                "component": "system/role/index",
+                "component_name": "role",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "查询",
+                        "value": "role:Search",
+                        "api": "/api/system/role/",
+                        "method": 0
+                    },
+                    {
+                        "name": "单例",
+                        "value": "role:Retrieve",
+                        "api": "/api/system/role/{id}/",
+                        "method": 0
+                    },
+                    {
+                        "name": "新增",
+                        "value": "role:Create",
+                        "api": "/api/system/role/",
+                        "method": 1
+                    },
+                    {
+                        "name": "编辑",
+                        "value": "role:Update",
+                        "api": "/api/system/role/{id}/",
+                        "method": 2
+                    },
+                    {
+                        "name": "删除",
+                        "value": "role:Delete",
+                        "api": "/api/system/role/{id}/",
+                        "method": 3
+                    },
+                    {
+                        "name": "获取所有可授权数据范围的部门",
+                        "value": "role:AllDataRangeDept",
+                        "api": "/api/system/role_menu_button_permision/role_to_dept_all/",
+                        "method": 0
+                    },
+                    {
+                        "name": "获取所有可授权菜单",
+                        "value": "role:AllCanMenu",
+                        "api": "/api/system/role_menu_button_permision/get_role_menu/",
+                        "method": 0
+                    },
+                    {
+                        "name": "获取所有已授权用户",
+                        "value": "role:AllAuthorizedUser",
+                        "api": "/api/system/role/get_role_users/",
+                        "method": 0
+                    },
+                    {
+                        "name": "获取菜单所有可授权按钮",
+                        "value": "role:AllMenuButton",
+                        "api": "/api/system/role_menu_button_permision/get_role_menu_btn_field/",
+                        "method": 0
+                    },
+                    {
+                        "name": "授权菜单",
+                        "value": "role:SetMenu",
+                        "api": "/api/system/role_menu_button_permision/set_role_menu/",
+                        "method": 2
+                    },
+                    {
+                        "name": "授权菜单按钮",
+                        "value": "role:SetMenuButton",
+                        "api": "/api/system/role_menu_button_permision/set_role_menu_btn/",
+                        "method": 2
+                    },
+                    {
+                        "name": "授权数据范围",
+                        "value": "role:SetDataRange",
+                        "api": "/api/system/role_menu_button_permision/set_role_menu_btn_data_range/",
+                        "method": 2
+                    },
+                    {
+                        "name": "获取所有用户",
+                        "value": "role:AllUser",
+                        "api": "/api/system/user/",
+                        "method": 0
+                    },
+                    {
+                        "name": "授权用户予角色",
+                        "value": "role:SetUserRole",
+                        "api": "/api/system/role/{id}/set_role_users/",
+                        "method": 2
+                    }
+                ],
+                "menu_field": [
+                    {
+                        "field_name": "create_datetime",
+                        "title": "创建时间",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "creator",
+                        "title": "创建人",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "dept_belong_id",
+                        "title": "数据归属部门",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "description",
+                        "title": "描述",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "id",
+                        "title": "Id",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "key",
+                        "title": "权限字符",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "modifier",
+                        "title": "修改人",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "name",
+                        "title": "角色名称",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "sort",
+                        "title": "角色顺序",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "status",
+                        "title": "角色状态",
+                        "model": "Role"
+                    },
+                    {
+                        "field_name": "update_datetime",
+                        "title": "修改时间",
+                        "model": "Role"
+                    }
+                ]
+            },
             {
                 "name": "消息中心",
                 "icon": "iconfont icon-xiaoxizhongxin",
@@ -678,6 +715,29 @@
                         "model": "ApiWhiteList"
                     }
                 ]
+            },
+            {
+                "name": "下载中心",
+                "icon": "ele-Download",
+                "sort": 9,
+                "is_link": false,
+                "is_catalog": false,
+                "web_path": "/downloadCenter",
+                "component": "system/downloadCenter/index",
+                "component_name": "downloadCenter",
+                "status": true,
+                "cache": false,
+                "visible": true,
+                "parent": 277,
+                "children": [],
+                "menu_button": [
+                    {
+                        "name": "查询",
+                        "value": "downloadCenter:Search",
+                        "api": "/api/system/download_center/"
+                    }
+                ],
+                "menu_field": []
             }
         ],
         "menu_button": [],

backend/dvadmin/system/fixtures/init_systemconfig.json

@@ -235,5 +235,252 @@
                 "children": []
             }
         ]
-    }
+    },
+    {
+    "title": "文件存储配置",
+    "key": "file_storage",
+    "value": null,
+    "sort": 0,
+    "status": true,
+    "data_options": null,
+    "form_item_type": 0,
+    "rule": null,
+    "placeholder": null,
+    "setting": null,
+    "children": [
+      {
+        "title": "存储引擎",
+        "key": "file_engine",
+        "value": "local",
+        "sort": 1,
+        "status": true,
+        "data_options": null,
+        "form_item_type": 4,
+        "rule": [
+          {
+            "required": false,
+            "message": "必填项不能为空"
+          }
+        ],
+        "placeholder": "请选择存储引擎",
+        "setting": "file_engine",
+        "children": []
+      },
+      {
+        "title": "文件是否备份",
+        "key": "file_backup",
+        "value": false,
+        "sort": 2,
+        "status": true,
+        "data_options": null,
+        "form_item_type": 9,
+        "rule": [
+          {
+            "required": false,
+            "message": "必填项不能为空"
+          }
+        ],
+        "placeholder": "启用云存储时,文件是否备份到本地",
+        "setting": null,
+        "children": []
+      },
+      {
+        "title": "阿里云-AccessKey",
+        "key": "aliyun_access_key",
+        "value": null,
+        "sort": 3,
+        "status": false,
+        "data_options": null,
+        "form_item_type": 0,
+        "rule": [
+          {
+            "required": false,
+            "message": "必填项不能为空"
+          }
+        ],
+        "placeholder": "请输入AccessKey",
+        "setting": null,
+        "children": []
+      },
+      {
+        "title": "阿里云-Secret",
+        "key": "aliyun_access_secret",
+        "value": null,
+        "sort": 4,
+        "status": false,
+        "data_options": null,
+        "form_item_type": 0,
+        "rule": [
+          {
+            "required": false,
+            "message": "必填项不能为空"
+          }
+        ],
+        "placeholder": "请输入Secret",
+        "setting": null,
+        "children": []
+      },
+      {
+        "title": "阿里云-Endpoint",
+        "key": "aliyun_endpoint",
+        "value": null,
+        "sort": 5,
+        "status": false,
+        "data_options": null,
+        "form_item_type": 0,
+        "rule": [
+          {
+            "required": false,
+            "message": "必填项不能为空"
+          }
+        ],
+        "placeholder": "请输入Endpoint",
+        "setting": null,
+        "children": []
+      },
+      {
+        "title": "阿里云-上传路径",
+        "key": "aliyun_path",
+        "value": "/media/",
+        "sort": 5,
+        "status": false,
+        "data_options": null,
+        "form_item_type": 0,
+        "rule": [
+          {
+            "required": false,
+            "message": "必填项不能为空"
+          }
+        ],
+        "placeholder": "请输入上传路径",
+        "setting": null,
+        "children": []
+      },
+      {
+        "title": "阿里云-Bucket",
+        "key": "aliyun_bucket",
+        "value": null,
+        "sort": 7,
+        "status": false,
+        "data_options": null,
+        "form_item_type": 0,
+        "rule": [
+          {
+            "required": false,
+            "message": "必填项不能为空"
+          }
+        ],
+        "placeholder": "请输入Bucket",
+        "setting": null,
+        "children": []
+      },{
+        "title": "阿里云-cdn地址",
+        "key": "aliyun_cdn_url",
+        "value": null,
+        "sort": 7,
+        "status": false,
+        "data_options": null,
+        "form_item_type": 0,
+        "rule": [
+          {
+            "required": false,
+            "message": "必填项不能为空"
+          }
+        ],
+        "placeholder": "请输入cdn地址",
+        "setting": null,
+        "children": []
+      },
+      {
+        "title": "腾讯云-SecretId",
+        "key": "tencent_secret_id",
+        "value": null,
+        "sort": 8,
+        "status": false,
+        "data_options": null,
+        "form_item_type": 0,
+        "rule": [
+          {
+            "required": false,
+            "message": "必填项不能为空"
+          }
+        ],
+        "placeholder": "请输入SecretId",
+        "setting": null,
+        "children": []
+      },
+      {
+        "title": "腾讯云-SecretKey",
+        "key": "tencent_secret_key",
+        "value": null,
+        "sort": 9,
+        "status": false,
+        "data_options": null,
+        "form_item_type": 0,
+        "rule": [
+          {
+            "required": false,
+            "message": "必填项不能为空"
+          }
+        ],
+        "placeholder": "请输入SecretKey",
+        "setting": null,
+        "children": []
+      },
+      {
+        "title": "腾讯云-Region",
+        "key": "tencent_region",
+        "value": null,
+        "sort": 10,
+        "status": false,
+        "data_options": null,
+        "form_item_type": 0,
+        "rule": [
+          {
+            "required": false,
+            "message": "必填项不能为空"
+          }
+        ],
+        "placeholder": "请输入Region",
+        "setting": null,
+        "children": []
+      },
+      {
+        "title": "腾讯云-Bucket",
+        "key": "tencent_bucket",
+        "value": null,
+        "sort": 11,
+        "status": false,
+        "data_options": null,
+        "form_item_type": 0,
+        "rule": [
+          {
+            "required": false,
+            "message": "必填项不能为空"
+          }
+        ],
+        "placeholder": "请输入Bucket",
+        "setting": null,
+        "children": []
+      },
+      {
+        "title": "腾讯云-上传路径",
+        "key": "tencent_path",
+        "value": "/media/",
+        "sort": 12,
+        "status": false,
+        "data_options": null,
+        "form_item_type": 0,
+        "rule": [
+          {
+            "required": false,
+            "message": "必填项不能为空"
+          }
+        ],
+        "placeholder": "请输入上传路径",
+        "setting": null,
+        "children": []
+      }
+    ]
+  }
 ]

backend/dvadmin/system/management/commands/generate_init_json.py

@@ -10,7 +10,7 @@ django.setup()
 from django.core.management.base import BaseCommand
 
 from application.settings import BASE_DIR
-from dvadmin.system.models import Menu, Users, Dept, Role, ApiWhiteList, Dictionary, SystemConfig
+from dvadmin.system.models import Menu, Users, Dept, Role, ApiWhiteList, Dictionary, SystemConfig, RoleMenuButtonPermission, RoleMenuPermission
 from dvadmin.system.fixtures.initSerializer import UsersInitSerializer, DeptInitSerializer, RoleInitSerializer, \
     MenuInitSerializer, ApiWhiteListInitSerializer, DictionaryInitSerializer, SystemConfigInitSerializer, \
     RoleMenuInitSerializer, RoleMenuButtonInitSerializer
@@ -29,7 +29,7 @@ class Command(BaseCommand):
     def serializer_data(self, serializer, query_set: QuerySet):
         serializer = serializer(query_set, many=True)
         data = json.loads(json.dumps(serializer.data, ensure_ascii=False))
-        with open(os.path.join(BASE_DIR, f'init_{query_set.model._meta.model_name}.json'), 'w') as f:
+        with open(os.path.join(BASE_DIR, f'init_{query_set.model._meta.model_name}.json'), 'w',encoding='utf-8') as f:
             json.dump(data, f, indent=4, ensure_ascii=False)
         return
 
@@ -57,6 +57,12 @@ class Command(BaseCommand):
     def generate_system_config(self):
         self.serializer_data(SystemConfigInitSerializer, SystemConfig.objects.filter(parent_id__isnull=True))
 
+    def generate_role_menu(self):
+        self.serializer_data(RoleMenuInitSerializer, RoleMenuPermission.objects.all())
+
+    def generate_role_menu_button(self):
+        self.serializer_data(RoleMenuButtonInitSerializer, RoleMenuButtonPermission.objects.all())
+
     def handle(self, *args, **options):
         generate_name = options.get('generate_name')
         generate_name_dict = {
@@ -67,6 +73,8 @@ class Command(BaseCommand):
             "api_white_list": self.generate_api_white_list,
             "dictionary": self.generate_dictionary,
             "system_config": self.generate_system_config,
+            "role_menu": self.generate_role_menu,
+            "role_menu_button": self.generate_role_menu_button,
         }
         if not generate_name:
             for ele in generate_name_dict.keys():

backend/dvadmin/system/models.py

@@ -1,5 +1,7 @@
 import hashlib
 import os
+from time import time
+from pathlib import PurePosixPath
 
 from django.contrib.auth.models import AbstractUser, UserManager
 from django.db import models
@@ -61,6 +63,8 @@ class Users(CoreModel, AbstractUser):
                                   help_text="关联岗位")
     role = models.ManyToManyField(to="Role", blank=True, verbose_name="关联角色", db_constraint=False,
                                   help_text="关联角色")
+    current_role = models.ForeignKey(to=Role, null=True, blank=True, db_constraint=False, on_delete=models.SET_NULL,
+                                     verbose_name="当前登录角色", help_text="当前登录角色", related_name='current_role_set')
     dept = models.ForeignKey(
         to="Dept",
         verbose_name="所属部门",
@@ -70,11 +74,26 @@ class Users(CoreModel, AbstractUser):
         blank=True,
         help_text="关联部门",
     )
+    manage_dept = models.ManyToManyField(
+        to="Dept",
+        verbose_name="管理部门",
+        db_constraint=False,
+        blank=True,
+        help_text="管理部门",
+        related_name='manage_dept_set'
+    )
     login_error_count = models.IntegerField(default=0, verbose_name="登录错误次数", help_text="登录错误次数")
+    pwd_change_count = models.IntegerField(default=0,blank=True, verbose_name="密码修改次数", help_text="密码修改次数")
     objects = CustomUserManager()
 
     def set_password(self, raw_password):
-        super().set_password(hashlib.md5(raw_password.encode(encoding="UTF-8")).hexdigest())
+        if raw_password:
+            super().set_password(hashlib.md5(raw_password.encode(encoding="UTF-8")).hexdigest())
+
+    def save(self, *args, **kwargs):
+        if self.name == "":
+            self.name = self.username
+        super().save(*args, **kwargs)
 
     class Meta:
         db_table = table_prefix + "system_users"
@@ -119,6 +138,27 @@ class Dept(CoreModel):
         help_text="上级部门",
     )
 
+    @classmethod
+    def _recursion(cls, instance, parent, result):
+        new_instance = getattr(instance, parent, None)
+        res = []
+        data = getattr(instance, result, None)
+        if data:
+            res.append(data)
+        if new_instance:
+            array = cls._recursion(new_instance, parent, result)
+            res += array
+        return res
+
+    @classmethod
+    def get_region_name(cls, obj):
+        """
+        获取某个用户的递归所有部门名称
+        """
+        dept_name_all = cls._recursion(obj, "parent", "name")
+        dept_name_all.reverse()
+        return "/".join(dept_name_all)
+
     @classmethod
     def recursion_all_dept(cls, dept_id: int, dept_all_list=None, dept_list=None):
         """
@@ -138,6 +178,23 @@ class Dept(CoreModel):
                 cls.recursion_all_dept(ele.get("id"), dept_all_list, dept_list)
         return list(set(dept_list))
 
+    @classmethod
+    def recursion_all_parent_dept(cls, dept_id: int, dept_list=None):
+        """
+        递归获取部门的所有上级部门
+        :param dept_id: 需要获取的id
+        :param dept_list: 递归list
+        :return:
+        """
+        if dept_list is None:
+            dept_list = [dept_id]
+        current_dept = Dept.objects.filter(id=dept_id).values('parent').first()
+        if current_dept and current_dept.get('parent'):
+            parent_id = current_dept.get('parent')
+            dept_list.append(parent_id)
+            cls.recursion_all_parent_dept(parent_id, dept_list)
+        return list(set(dept_list))
+
     class Meta:
         db_table = table_prefix + "system_dept"
         verbose_name = "部门表"
@@ -405,6 +462,18 @@ class FileList(CoreModel):
     mime_type = models.CharField(max_length=100, blank=True, verbose_name="Mime类型", help_text="Mime类型")
     size = models.CharField(max_length=36, blank=True, verbose_name="文件大小", help_text="文件大小")
     md5sum = models.CharField(max_length=36, blank=True, verbose_name="文件md5", help_text="文件md5")
+    UPLOAD_METHOD_CHOIDES = (
+        (0, '默认上传'),
+        (1, '文件选择器上传'),
+    )
+    upload_method = models.SmallIntegerField(default=0, blank=True, null=True, choices=UPLOAD_METHOD_CHOIDES, verbose_name='上传方式', help_text='上传方式')
+    FILE_TYPE_CHOIDES = (
+        (0, '图片'),
+        (1, '视频'),
+        (2, '音频'),
+        (3, '其他'),
+    )
+    file_type = models.SmallIntegerField(default=3, choices=FILE_TYPE_CHOIDES, blank=True, null=True, verbose_name='文件类型', help_text='文件类型')
 
     def save(self, *args, **kwargs):
         if not self.md5sum:  # file is new
@@ -595,3 +664,41 @@ class MessageCenterTargetUser(CoreModel):
         db_table = table_prefix + "message_center_target_user"
         verbose_name = "消息中心目标用户表"
         verbose_name_plural = verbose_name
+
+
+def media_file_name_downloadcenter(instance:'DownloadCenter', filename):
+    h = instance.md5sum
+    basename, ext = os.path.splitext(filename)
+    return PurePosixPath("files", "dlct", h[:1], h[1:2], basename + '-' + str(time()).replace('.', '') + ext.lower())
+
+
+class DownloadCenter(CoreModel):
+    TASK_STATUS_CHOICES = [
+        (0, '任务已创建'),
+        (1, '任务进行中'),
+        (2, '任务完成'),
+        (3, '任务失败'),
+    ]
+    task_name = models.CharField(max_length=255, verbose_name="任务名称", help_text="任务名称")
+    task_status = models.SmallIntegerField(default=0, choices=TASK_STATUS_CHOICES, verbose_name='是否可下载', help_text='是否可下载')
+    file_name = models.CharField(max_length=255, null=True, blank=True, verbose_name="文件名", help_text="文件名")
+    url = models.FileField(upload_to=media_file_name_downloadcenter, null=True, blank=True)
+    size = models.BigIntegerField(default=0, verbose_name="文件大小", help_text="文件大小")
+    md5sum = models.CharField(max_length=36, null=True, blank=True, verbose_name="文件md5", help_text="文件md5")
+
+    def save(self, *args, **kwargs):
+        if self.url:
+            if not self.md5sum:  # file is new
+                md5 = hashlib.md5()
+                for chunk in self.url.chunks():
+                    md5.update(chunk)
+                self.md5sum = md5.hexdigest()
+            if not self.size:
+                self.size = self.url.size
+        super(DownloadCenter, self).save(*args, **kwargs)
+
+    class Meta:
+        db_table = table_prefix + "download_center"
+        verbose_name = "下载中心"
+        verbose_name_plural = verbose_name
+        ordering = ("-create_datetime",)

backend/dvadmin/system/signals.py

@@ -0,0 +1,27 @@
+import time
+
+from django.db.models.signals import post_save, post_delete
+from django.dispatch import Signal, receiver
+from django.core.cache import cache
+from dvadmin.system.models import MessageCenterTargetUser
+
+# 初始化信号
+pre_init_complete = Signal()
+detail_init_complete = Signal()
+post_init_complete = Signal()
+# 租户初始化信号
+pre_tenants_init_complete = Signal()
+detail_tenants_init_complete = Signal()
+post_tenants_init_complete = Signal()
+post_tenants_all_init_complete = Signal()
+# 租户创建完成信号
+tenants_create_complete = Signal()
+
+# 全局变量用于标记最后修改时间
+last_db_change_time = time.time()
+
+
+@receiver(post_save, sender=MessageCenterTargetUser)
+@receiver(post_delete, sender=MessageCenterTargetUser)
+def update_last_change_time(sender, **kwargs):
+    cache.set('last_db_change_time', time.time(), timeout=None)  # 设置永不超时的键值对

backend/dvadmin/system/tasks.py

@@ -0,0 +1,107 @@
+from hashlib import md5
+from io import BytesIO
+from datetime import datetime
+from time import sleep
+
+from openpyxl import Workbook
+from openpyxl.worksheet.table import Table, TableStyleInfo
+from openpyxl.utils import get_column_letter
+from django.core.files.base import ContentFile
+
+from application.celery import app
+from dvadmin.system.models import DownloadCenter
+
+def is_number(num):
+    try:
+        float(num)
+        return True
+    except ValueError:
+        pass
+
+    try:
+        import unicodedata
+        unicodedata.numeric(num)
+        return True
+    except (TypeError, ValueError):
+        pass
+    return False
+
+def get_string_len(string):
+    """
+    获取字符串最大长度
+    :param string:
+    :return:
+    """
+    length = 4
+    if string is None:
+        return length
+    if is_number(string):
+        return length
+    for char in string:
+        length += 2.1 if ord(char) > 256 else 1
+    return round(length, 1) if length <= 50 else 50
+
+@app.task
+def async_export_data(data: list, filename: str, dcid: int, export_field_label: dict):
+    instance = DownloadCenter.objects.get(pk=dcid)
+    instance.task_status = 1
+    instance.save()
+    sleep(2)
+    try:
+        wb = Workbook()
+        ws = wb.active
+        header_data = ["序号", *export_field_label.values()]
+        hidden_header = ["#", *export_field_label.keys()]
+        df_len_max = [get_string_len(ele) for ele in header_data]
+        row = get_column_letter(len(export_field_label) + 1)
+        column = 1
+        ws.append(header_data)
+        for index, results in enumerate(data):
+            results_list = []
+            for h_index, h_item in enumerate(hidden_header):
+                for key, val in results.items():
+                    if key == h_item:
+                        if val is None or val == "":
+                            results_list.append("")
+                        elif isinstance(val, datetime):
+                            val = val.strftime("%Y-%m-%d %H:%M:%S")
+                            results_list.append(val)
+                        else:
+                            results_list.append(val)
+                        # 计算最大列宽度
+                        result_column_width = get_string_len(val)
+                        if h_index != 0 and result_column_width > df_len_max[h_index]:
+                            df_len_max[h_index] = result_column_width
+            ws.append([index + 1, *results_list])
+            column += 1
+        # 　更新列宽
+        for index, width in enumerate(df_len_max):
+            ws.column_dimensions[get_column_letter(index + 1)].width = width
+        tab = Table(displayName="Table", ref=f"A1:{row}{column}")  # 名称管理器
+        style = TableStyleInfo(
+            name="TableStyleLight11",
+            showFirstColumn=True,
+            showLastColumn=True,
+            showRowStripes=True,
+            showColumnStripes=True,
+        )
+        tab.tableStyleInfo = style
+        ws.add_table(tab)
+        stream = BytesIO()
+        wb.save(stream)
+        stream.seek(0)
+        s = md5()
+        while True:
+            chunk = stream.read(1024)
+            if not chunk:
+                break
+            s.update(chunk)
+        stream.seek(0)
+        instance.md5sum = s.hexdigest()
+        instance.file_name = filename
+        instance.url.save(filename, ContentFile(stream.read()))
+        instance.task_status = 2
+    except Exception as e:
+        instance.task_status = 3
+        instance.description = str(e)[:250]
+    instance.save()

backend/dvadmin/system/urls.py

@@ -18,6 +18,7 @@ from dvadmin.system.views.role_menu_button_permission import RoleMenuButtonPermi
 from dvadmin.system.views.system_config import SystemConfigViewSet
 from dvadmin.system.views.user import UserViewSet
 from dvadmin.system.views.menu_field import MenuFieldViewSet
+from dvadmin.system.views.download_center import DownloadCenterViewSet
 
 system_url = routers.SimpleRouter()
 system_url.register(r'menu', MenuViewSet)
@@ -35,6 +36,8 @@ system_url.register(r'message_center', MessageCenterViewSet)
 system_url.register(r'role_menu_button_permission', RoleMenuButtonPermissionViewSet)
 system_url.register(r'role_menu_permission', RoleMenuPermissionViewSet)
 system_url.register(r'column', MenuFieldViewSet)
+system_url.register(r'login_log', LoginLogViewSet)
+system_url.register(r'download_center', DownloadCenterViewSet)
 
 
 urlpatterns = [
@@ -44,9 +47,9 @@ urlpatterns = [
     path('system_config/get_association_table/', SystemConfigViewSet.as_view({'get': 'get_association_table'})),
     path('system_config/get_table_data/<int:pk>/', SystemConfigViewSet.as_view({'get': 'get_table_data'})),
     path('system_config/get_relation_info/', SystemConfigViewSet.as_view({'get': 'get_relation_info'})),
-    path('login_log/', LoginLogViewSet.as_view({'get': 'list'})),
-    path('login_log/<int:pk>/', LoginLogViewSet.as_view({'get': 'retrieve'})),
-    path('dept_lazy_tree/', DeptViewSet.as_view({'get': 'dept_lazy_tree'})),
+    # path('login_log/', LoginLogViewSet.as_view({'get': 'list'})),
+    # path('login_log/<int:pk>/', LoginLogViewSet.as_view({'get': 'retrieve'})),
+    # path('dept_lazy_tree/', DeptViewSet.as_view({'get': 'dept_lazy_tree'})),
     path('clause/privacy.html', PrivacyView.as_view()),
     path('clause/terms_service.html', TermsServiceView.as_view()),
 ]

backend/dvadmin/system/views/area.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
+import pypinyin
 from django.db.models import Q
 from rest_framework import serializers
 
 from dvadmin.system.models import Area
+from dvadmin.utils.field_permission import FieldPermissionMixin
 from dvadmin.utils.json_response import SuccessResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
@@ -14,13 +16,21 @@ class AreaSerializer(CustomModelSerializer):
     """
     pcode_count = serializers.SerializerMethodField(read_only=True)
     hasChild = serializers.SerializerMethodField()
+    pcode_info = serializers.SerializerMethodField()
+
+    def get_pcode_info(self, instance):
+        pcode = Area.objects.filter(code=instance.pcode_id).values("name", "code")
+        return pcode
+
     def get_pcode_count(self, instance: Area):
         return Area.objects.filter(pcode=instance).count()
+
     def get_hasChild(self, instance):
         hasChild = Area.objects.filter(pcode=instance.code)
         if hasChild:
             return True
         return False
+
     class Meta:
         model = Area
         fields = "__all__"
@@ -32,12 +42,24 @@ class AreaCreateUpdateSerializer(CustomModelSerializer):
     地区管理 创建/更新时的列化器
     """
 
+    def to_internal_value(self, data):
+        pinyin = ''.join([''.join(i) for i in pypinyin.pinyin(data["name"], style=pypinyin.NORMAL)])
+        data["level"] = 1
+        data["pinyin"] = pinyin
+        data["initials"] = pinyin[0].upper() if pinyin else "#"
+        pcode = data["pcode"] if 'pcode' in data else None
+        if pcode:
+            pcode = Area.objects.get(pk=pcode)
+            data["pcode"] = pcode.code
+            data["level"] = pcode.level + 1
+        return super().to_internal_value(data)
+
     class Meta:
         model = Area
         fields = '__all__'
 
 
-class AreaViewSet(CustomModelViewSet):
+class AreaViewSet(CustomModelViewSet, FieldPermissionMixin):
     """
     地区管理接口
     list:查询
@@ -48,21 +70,28 @@ class AreaViewSet(CustomModelViewSet):
     """
     queryset = Area.objects.all()
     serializer_class = AreaSerializer
+    create_serializer_class = AreaCreateUpdateSerializer
+    update_serializer_class = AreaCreateUpdateSerializer
     extra_filter_class = []
 
-    def get_queryset(self):
+    def list(self, request, *args, **kwargs):
         self.request.query_params._mutable = True
         params = self.request.query_params
-        pcode = params.get('pcode', None)
-        page = params.get('page', None)
-        limit = params.get('limit', None)
-        if page:
-            del params['page']
-        if limit:
-            del params['limit']
-        if params and pcode:
-            queryset = self.queryset.filter(enable=True, pcode=pcode)
-        else:
+        known_params = {'page', 'limit', 'pcode'}
+        # 使用集合操作检查是否有未知参数
+        other_params_exist = any(param not in known_params for param in params)
+        if other_params_exist:
             queryset = self.queryset.filter(enable=True)
-        return queryset
-
+        else:
+            pcode = params.get('pcode', None)
+            params['limit'] = 999
+            if params and pcode:
+                queryset = self.queryset.filter(enable=True, pcode=pcode)
+            else:
+                queryset = self.queryset.filter(enable=True, level=1)
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True, request=request)
+            return self.get_paginated_response(serializer.data)
+        serializer = self.get_serializer(queryset, many=True, request=request)
+        return SuccessResponse(data=serializer.data, msg="获取成功")

backend/dvadmin/system/views/dept.py

@@ -10,6 +10,7 @@ from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
 from dvadmin.system.models import Dept, RoleMenuButtonPermission, Users
+from dvadmin.utils.filters import DataLevelPermissionsFilter
 from dvadmin.utils.json_response import DetailResponse, SuccessResponse, ErrorResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
@@ -124,33 +125,7 @@ class DeptViewSet(CustomModelViewSet):
         data = serializer.data
         return SuccessResponse(data=data)
 
-    @action(methods=["GET"], detail=False, permission_classes=[IsAuthenticated], extra_filter_class=[])
-    def dept_lazy_tree(self, request, *args, **kwargs):
-        parent = self.request.query_params.get('parent')
-        is_superuser = request.user.is_superuser
-        if is_superuser:
-            queryset = Dept.objects.values('id', 'name', 'parent')
-        else:
-            role_ids = request.user.role.values_list('id', flat=True)
-            data_range = RoleMenuButtonPermission.objects.filter(role__in=role_ids).values_list('data_range', flat=True)
-            user_dept_id = request.user.dept.id
-            dept_list = [user_dept_id]
-            data_range_list = list(set(data_range))
-            for item in data_range_list:
-                if item in [0, 2]:
-                    dept_list = [user_dept_id]
-                elif item == 1:
-                    dept_list = Dept.recursion_all_dept(dept_id=user_dept_id)
-                elif item == 3:
-                    dept_list = Dept.objects.values_list('id', flat=True)
-                elif item == 4:
-                    dept_list = request.user.role.values_list('dept', flat=True)
-                else:
-                    dept_list = []
-            queryset = Dept.objects.filter(id__in=dept_list).values('id', 'name', 'parent')
-        return DetailResponse(data=queryset, msg="获取成功")
-
-    @action(methods=["GET"], detail=False, permission_classes=[IsAuthenticated], extra_filter_class=[])
+    @action(methods=["GET"], detail=False, permission_classes=[IsAuthenticated])
     def all_dept(self, request, *args, **kwargs):
         queryset = self.filter_queryset(self.get_queryset())
         data = queryset.filter(status=True).order_by('sort').values('name', 'id', 'parent')

backend/dvadmin/system/views/download_center.py

@@ -0,0 +1,54 @@
+from rest_framework import serializers
+from django.conf import settings
+from django_filters.rest_framework import FilterSet, CharFilter
+
+from dvadmin.utils.serializers import CustomModelSerializer
+from dvadmin.utils.viewset import CustomModelViewSet
+from dvadmin.system.models import DownloadCenter
+
+
+class DownloadCenterSerializer(CustomModelSerializer):
+    url = serializers.SerializerMethodField(read_only=True)
+
+    def get_url(self, instance):
+        if self.request.query_params.get('prefix'):
+            if settings.ENVIRONMENT in ['local']:
+                prefix = 'http://127.0.0.1:8000'
+            elif settings.ENVIRONMENT in ['test']:
+                prefix = 'http://{host}/api'.format(host=self.request.get_host())
+            else:
+                prefix = 'https://{host}/api'.format(host=self.request.get_host())
+            return (f'{prefix}/media/{str(instance.url)}')
+        return f'media/{str(instance.url)}'
+
+    class Meta:
+        model = DownloadCenter
+        fields = "__all__"
+        read_only_fields = ["id"]
+
+
+class DownloadCenterFilterSet(FilterSet):
+    task_name = CharFilter(field_name='task_name', lookup_expr='icontains')
+    file_name = CharFilter(field_name='file_name', lookup_expr='icontains')
+
+    class Meta:
+        model = DownloadCenter
+        fields = ['task_status', 'task_name', 'file_name']
+
+
+class DownloadCenterViewSet(CustomModelViewSet):
+    queryset = DownloadCenter.objects.all()
+    serializer_class = DownloadCenterSerializer
+    filter_class = DownloadCenterFilterSet
+    permission_classes = []
+    extra_filter_class = []
+
+    def get_queryset(self):
+        # 判断是否是 Swagger 文档生成阶段，防止报错
+        if getattr(self, 'swagger_fake_view', False):
+            return self.queryset.model.objects.none()
+
+        # 正常请求下的逻辑
+        if self.request.user.is_superuser:
+            return super().get_queryset()
+        return super().get_queryset().filter(creator=self.request.user)

backend/dvadmin/system/views/file_list.py

@@ -1,12 +1,16 @@
 import hashlib
 import mimetypes
 
+import django_filters
+from django.conf import settings
+from django.db import connection
 from rest_framework import serializers
 from rest_framework.decorators import action
+from rest_framework.permissions import IsAuthenticated
 
 from application import dispatch
 from dvadmin.system.models import FileList
-from dvadmin.utils.json_response import DetailResponse
+from dvadmin.utils.json_response import DetailResponse, SuccessResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
 
@@ -15,7 +19,16 @@ class FileSerializer(CustomModelSerializer):
     url = serializers.SerializerMethodField(read_only=True)
 
     def get_url(self, instance):
-        # return 'media/' + str(instance.url)
+        if self.request.query_params.get('prefix'):
+            if settings.ENVIRONMENT in ['local']:
+                prefix = 'http://127.0.0.1:8000'
+            elif settings.ENVIRONMENT in ['test']:
+                prefix = 'http://{host}/api'.format(host=self.request.get_host())
+            else:
+                prefix = 'https://{host}/api'.format(host=self.request.get_host())
+            if instance.file_url:
+                return instance.file_url if instance.file_url.startswith('http') else f"{prefix}/{instance.file_url}"
+            return (f'{prefix}/media/{str(instance.url)}')
         return instance.file_url or (f'media/{str(instance.url)}')
 
     class Meta:
@@ -23,8 +36,8 @@ class FileSerializer(CustomModelSerializer):
         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")
+        file_engine = dispatch.get_system_config_values("file_storage.file_engine") or 'local'
+        file_backup = dispatch.get_system_config_values("file_storage.file_backup")
         file = self.initial_data.get('file')
         file_size = file.size
         validated_data['name'] = str(file)
@@ -35,18 +48,20 @@ class FileSerializer(CustomModelSerializer):
         validated_data['md5sum'] = md5.hexdigest()
         validated_data['engine'] = file_engine
         validated_data['mime_type'] = file.content_type
+        ft = {'image':0,'video':1,'audio':2}.get(file.content_type.split('/')[0], None)
+        validated_data['file_type'] = 3 if ft is None else ft
         if file_backup:
             validated_data['url'] = file
         if file_engine == 'oss':
-            from dvadmin_cloud_storage.views.aliyun import ali_oss_upload
-            file_path = ali_oss_upload(file)
+            from dvadmin.utils.aliyunoss import ali_oss_upload
+            file_path = ali_oss_upload(file, file_name=validated_data['name'])
             if file_path:
                 validated_data['file_url'] = file_path
             else:
                 raise ValueError("上传失败")
         elif file_engine == 'cos':
-            from dvadmin_cloud_storage.views.tencent import tencent_cos_upload
-            file_path = tencent_cos_upload(file)
+            from dvadmin.utils.tencentcos import tencent_cos_upload
+            file_path = tencent_cos_upload(file, file_name=validated_data['name'])
             if file_path:
                 validated_data['file_url'] = file_path
             else:
@@ -64,6 +79,22 @@ class FileSerializer(CustomModelSerializer):
         return super().create(validated_data)
 
 
+class FileAllSerializer(CustomModelSerializer):
+    
+    class Meta:
+        model = FileList
+        fields = ['id', 'name']
+
+
+class FileFilter(django_filters.FilterSet):
+    name = django_filters.CharFilter(field_name="name", lookup_expr="icontains", help_text="文件名")
+    mime_type = django_filters.CharFilter(field_name="mime_type", lookup_expr="icontains", help_text="文件类型")
+
+    class Meta:
+        model = FileList
+        fields = ['name', 'mime_type', 'upload_method', 'file_type']
+
+
 class FileViewSet(CustomModelViewSet):
     """
     文件管理接口
@@ -75,5 +106,22 @@ class FileViewSet(CustomModelViewSet):
     """
     queryset = FileList.objects.all()
     serializer_class = FileSerializer
-    filter_fields = ['name', ]
-    permission_classes = []
+    filter_class = FileFilter
+    permission_classes = [IsAuthenticated]
+
+    @action(methods=['GET'], detail=False)
+    def get_all(self, request):
+        data1 = self.get_serializer(self.get_queryset(), many=True).data
+        data2 = []
+        if dispatch.is_tenants_mode():
+            from django_tenants.utils import schema_context
+            with schema_context('public'):
+                data2 = self.get_serializer(FileList.objects.all(), many=True).data
+        return DetailResponse(data=data2+data1)
+
+    def list(self, request, *args, **kwargs):
+        if self.request.query_params.get('system', 'False') == 'True' and dispatch.is_tenants_mode():
+            from django_tenants.utils import schema_context
+            with schema_context('public'):
+                return super().list(request, *args, **kwargs)
+        return super().list(request, *args, **kwargs)

backend/dvadmin/system/views/login.py

@@ -4,11 +4,15 @@ from datetime import datetime, timedelta
 from captcha.views import CaptchaStore, captcha_image
 from django.contrib import auth
 from django.contrib.auth import login
+from django.contrib.auth.hashers import check_password, make_password
+from django.db.models import Q
 from django.shortcuts import redirect
 from django.utils.translation import gettext_lazy as _
 from drf_yasg import openapi
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import serializers
+from rest_framework.decorators import action
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.views import APIView
 from rest_framework_simplejwt.serializers import TokenObtainPairSerializer
 from rest_framework_simplejwt.views import TokenObtainPairView
@@ -83,22 +87,30 @@ class LoginSerializer(TokenObtainPairSerializer):
                 else:
                     self.image_code and self.image_code.delete()
                     raise CustomValidationError("图片验证码错误")
-
-        user = Users.objects.get(username=attrs['username'])
+        try:
+            user = Users.objects.get(
+                Q(username=attrs['username']) | Q(email=attrs['username']) | Q(mobile=attrs['username']))
+        except Users.DoesNotExist:
+            raise CustomValidationError("您登录的账号不存在")
+        except Users.MultipleObjectsReturned:
+            raise CustomValidationError("您登录的账号存在多个,请联系管理员检查登录账号唯一性")
         if not user.is_active:
             raise CustomValidationError("账号已被锁定,联系管理员解锁")
         try:
+            # 必须重置用户名为username,否则使用邮箱手机号登录会提示密码错误
+            attrs['username'] = user.username
             data = super().validate(attrs)
+            data["username"] = self.user.username
             data["name"] = self.user.name
             data["userId"] = self.user.id
             data["avatar"] = self.user.avatar
             data['user_type'] = self.user.user_type
+            data['pwd_change_count'] = self.user.pwd_change_count
             dept = getattr(self.user, 'dept', None)
             if dept:
                 data['dept_info'] = {
                     'dept_id': dept.id,
                     'dept_name': dept.name,
-
                 }
             role = getattr(self.user, 'role', None)
             if role:
@@ -114,6 +126,7 @@ class LoginSerializer(TokenObtainPairSerializer):
             user.login_error_count += 1
             if user.login_error_count >= 5:
                 user.is_active = False
+                user.save()
                 raise CustomValidationError("账号已被锁定,联系管理员解锁")
             user.save()
             count = 5 - user.login_error_count

backend/dvadmin/system/views/login_log.py

@@ -7,6 +7,7 @@
 @Remark: 按钮权限管理
 """
 from dvadmin.system.models import LoginLog
+from dvadmin.utils.field_permission import FieldPermissionMixin
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
 
@@ -22,7 +23,7 @@ class LoginLogSerializer(CustomModelSerializer):
         read_only_fields = ["id"]
 
 
-class LoginLogViewSet(CustomModelViewSet):
+class LoginLogViewSet(CustomModelViewSet, FieldPermissionMixin):
     """
     登录日志接口
     list:查询
@@ -33,4 +34,4 @@ class LoginLogViewSet(CustomModelViewSet):
     """
     queryset = LoginLog.objects.all()
     serializer_class = LoginLogSerializer
-    extra_filter_class = []
+    # extra_filter_class = []

backend/dvadmin/system/views/menu.py

@@ -120,11 +120,11 @@ class MenuViewSet(CustomModelViewSet):
         """用于前端获取当前角色的路由"""
         user = request.user
         if user.is_superuser:
-            queryset = self.queryset.filter(status=1)
+            queryset = self.queryset.filter(status=1).order_by("sort")
         else:
             role_list = user.role.values_list('id', flat=True)
             menu_list = RoleMenuPermission.objects.filter(role__in=role_list).values_list('menu_id', flat=True)
-            queryset = Menu.objects.filter(id__in=menu_list)
+            queryset = Menu.objects.filter(id__in=menu_list).order_by("sort")
         serializer = WebRouterSerializer(queryset, many=True, request=request)
         data = serializer.data
         return SuccessResponse(data=data, total=len(data), msg="获取成功")

backend/dvadmin/system/views/menu_button.py

@@ -10,12 +10,14 @@ from django.db.models import F
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
-from dvadmin.system.models import MenuButton, RoleMenuButtonPermission
+from dvadmin.system.models import MenuButton, RoleMenuButtonPermission, Menu
 from dvadmin.utils.json_response import DetailResponse, SuccessResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
 
 
+
+
 class MenuButtonSerializer(CustomModelSerializer):
     """
     菜单按钮-序列化器
@@ -92,17 +94,15 @@ class MenuButtonViewSet(CustomModelViewSet):
         """
         menu_obj = Menu.objects.filter(id=request.data['menu']).first()
         result_list = [
-            {'menu': menu_obj.id, 'name': '新增', 'value': f'{menu_obj.component_name}:Create', 'api': f'/api{menu_obj.web_path}/',
-             'method': 1},
-            {'menu': menu_obj.id, 'name': '删除', 'value': f'{menu_obj.component_name}:Delete', 'api': f'/api{menu_obj.web_path}/{{id}}/',
-             'method': 3},
-            {'menu': menu_obj.id, 'name': '修改', 'value': f'{menu_obj.component_name}:Update', 'api': f'/api{menu_obj.web_path}/{{id}}/',
-             'method': 2},
-            {'menu': menu_obj.id, 'name': '查询', 'value': f'{menu_obj.component_name}:Search', 'api': f'/api{menu_obj.web_path}/',
-             'method': 0},
-            {'menu': menu_obj.id, 'name': '详情', 'value': f'{menu_obj.component_name}:Retrieve', 'api': f'/api{menu_obj.web_path}/{{id}}/',
-             'method': 0}]
+            {'menu': menu_obj.id, 'name': '新增', 'value': f'{menu_obj.component_name}:Create', 'api': f'/api/{menu_obj.component_name}/', 'method': 1},
+            {'menu': menu_obj.id, 'name': '删除', 'value': f'{menu_obj.component_name}:Delete', 'api': f'/api/{menu_obj.component_name}/{{id}}/', 'method': 3},
+            {'menu': menu_obj.id, 'name': '编辑', 'value': f'{menu_obj.component_name}:Update', 'api': f'/api/{menu_obj.component_name}/{{id}}/', 'method': 2},
+            {'menu': menu_obj.id, 'name': '查询', 'value': f'{menu_obj.component_name}:Search', 'api': f'/api/{menu_obj.component_name}/', 'method': 0},
+            {'menu': menu_obj.id, 'name': '详情', 'value': f'{menu_obj.component_name}:Retrieve', 'api': f'/api/{menu_obj.component_name}/{{id}}/', 'method': 0},
+            {'menu': menu_obj.id, 'name': '复制', 'value': f'{menu_obj.component_name}:Copy', 'api': f'/api/{menu_obj.component_name}/', 'method': 1},
+            {'menu': menu_obj.id, 'name': '导入', 'value': f'{menu_obj.component_name}:Import', 'api': f'/api/{menu_obj.component_name}/import_data/', 'method': 1},
+            {'menu': menu_obj.id, 'name': '导出', 'value': f'{menu_obj.component_name}:Export', 'api': f'/api{menu_obj.component_name}/export_data/', 'method': 1},]
         serializer = self.get_serializer(data=result_list, many=True)
         serializer.is_valid(raise_exception=True)
         serializer.save()
-        return SuccessResponse(serializer.data, msg="批量创建成功")
+        return SuccessResponse(serializer.data, msg="批量创建成功")

backend/dvadmin/system/views/message_center.py

@@ -36,6 +36,8 @@ class MessageCenterSerializer(CustomModelSerializer):
         return serializer.data
 
     def get_user_info(self, instance, parsed_query):
+        if instance.target_type in (1, 2, 3):
+            return []
         users = instance.target_user.all()
         # You can do what ever you want in here
         # `parsed_query` param is passed to BookSerializer to allow further querying
@@ -80,6 +82,9 @@ class MessageCenterTargetUserListSerializer(CustomModelSerializer):
     """
     目标用户序列化器-序列化器
     """
+    role_info = DynamicSerializerMethodField()
+    user_info = DynamicSerializerMethodField()
+    dept_info = DynamicSerializerMethodField()
     is_read = serializers.SerializerMethodField()
 
     def get_is_read(self, instance):
@@ -90,12 +95,49 @@ class MessageCenterTargetUserListSerializer(CustomModelSerializer):
             return queryset.is_read
         return False
 
+    def get_role_info(self, instance, parsed_query):
+        roles = instance.target_role.all()
+        # You can do what ever you want in here
+        # `parsed_query` param is passed to BookSerializer to allow further querying
+        from dvadmin.system.views.role import RoleSerializer
+        serializer = RoleSerializer(
+            roles,
+            many=True,
+            parsed_query=parsed_query
+        )
+        return serializer.data
+
+    def get_user_info(self, instance, parsed_query):
+        if instance.target_type in (1, 2, 3):
+            return []
+        users = instance.target_user.all()
+        # You can do what ever you want in here
+        # `parsed_query` param is passed to BookSerializer to allow further querying
+        from dvadmin.system.views.user import UserSerializer
+        serializer = UserSerializer(
+            users,
+            many=True,
+            parsed_query=parsed_query
+        )
+        return serializer.data
+
+    def get_dept_info(self, instance, parsed_query):
+        dept = instance.target_dept.all()
+        # You can do what ever you want in here
+        # `parsed_query` param is passed to BookSerializer to allow further querying
+        from dvadmin.system.views.dept import DeptSerializer
+        serializer = DeptSerializer(
+            dept,
+            many=True,
+            parsed_query=parsed_query
+        )
+        return serializer.data
+
     class Meta:
         model = MessageCenter
         fields = "__all__"
         read_only_fields = ["id"]
 
-
 def websocket_push(user_id, message):
     """
     主动推送消息
@@ -110,7 +152,6 @@ def websocket_push(user_id, message):
         }
     )
 
-
 class MessageCenterCreateSerializer(CustomModelSerializer):
     """
     消息中心-新增-序列化器

backend/dvadmin/system/views/role.py

@@ -10,22 +10,29 @@ from rest_framework import serializers
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
-from dvadmin.system.models import Role, Menu, MenuButton, Dept
+from dvadmin.system.models import Role, Menu, MenuButton, Dept, Users
 from dvadmin.system.views.dept import DeptSerializer
 from dvadmin.system.views.menu import MenuSerializer
 from dvadmin.system.views.menu_button import MenuButtonSerializer
 from dvadmin.utils.crud_mixin import FastCrudMixin
 from dvadmin.utils.field_permission import FieldPermissionMixin
-from dvadmin.utils.json_response import SuccessResponse, DetailResponse
+from dvadmin.utils.json_response import SuccessResponse, DetailResponse, ErrorResponse
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.validator import CustomUniqueValidator
 from dvadmin.utils.viewset import CustomModelViewSet
+from dvadmin.utils.permission import CustomPermission
 
 
 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
@@ -101,7 +108,6 @@ class MenuButtonPermissionSerializer(CustomModelSerializer):
         fields = '__all__'
 
 
-
 class RoleViewSet(CustomModelViewSet, FastCrudMixin,FieldPermissionMixin):
     """
     角色管理接口
@@ -116,3 +122,82 @@ 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="更新成功")
+
+    @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated, CustomPermission])
+    def get_role_users(self, request):
+        """
+        获取角色已授权、未授权的用户
+        已授权的用户:1
+        未授权的用户:0
+        """
+        role_id = request.query_params.get('role_id', None)
+
+        if not role_id:
+            return ErrorResponse(msg="请选择角色")
+
+        if request.query_params.get('authorized', 0) == "1":
+            queryset = Users.objects.filter(role__id=role_id).exclude(is_superuser=True)
+        else:
+            queryset = Users.objects.exclude(role__id=role_id).exclude(is_superuser=True)
+
+        if name := request.query_params.get('name', None):
+            queryset = queryset.filter(name__icontains=name)
+
+        if dept := request.query_params.get('dept', None):
+            queryset = queryset.filter(dept=dept)
+
+        page = self.paginate_queryset(queryset.values('id', 'name', 'dept__name'))
+        if page is not None:
+            return self.get_paginated_response(page)
+
+        return SuccessResponse(data=page)
+
+    @action(methods=['DELETE'], detail=True, permission_classes=[IsAuthenticated, CustomPermission])
+    def remove_role_user(self, request, pk):
+        """
+        角色-删除用户
+        """
+        user_id = request.data.get('user_id', None)
+
+        if not user_id:
+            return ErrorResponse(msg="请选择用户")
+
+        role = self.get_object()
+        role.users_set.remove(*user_id)
+
+        return SuccessResponse(msg="删除成功")
+
+    @action(methods=['POST'], detail=True, permission_classes=[IsAuthenticated, CustomPermission])
+    def add_role_users(self, request, pk):
+        """
+        角色-添加用户
+        """
+        users_id = request.data.get('users_id', None)
+
+        if not users_id:
+            return ErrorResponse(msg="请选择用户")
+
+        role = self.get_object()
+        role.users_set.add(*users_id)
+
+        return DetailResponse(msg="添加成功")

backend/dvadmin/system/views/role_menu_button_permission.py

@@ -6,22 +6,20 @@
 @Created on: 2021/6/3 003 0:30
 @Remark: 菜单按钮管理
 """
-from django.db.models import F, Subquery, OuterRef, Exists
 from rest_framework import serializers
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
-from dvadmin.system.models import RoleMenuButtonPermission, Menu, MenuButton, Dept, RoleMenuPermission, 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:
@@ -32,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)
@@ -43,63 +41,99 @@ class RoleMenuButtonPermissionCreateUpdateSerializer(CustomModelSerializer):
         read_only_fields = ["id"]
 
 
-class RoleButtonPermissionSerializer(CustomModelSerializer):
+class RoleMenuSerializer(CustomModelSerializer):
     """
-    角色按钮权限
+    角色-菜单 序列化
     """
     isCheck = serializers.SerializerMethodField()
-    data_range = 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
 
+    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 Meta:
         model = MenuButton
-        fields = ['id', 'name', 'value', 'isCheck', 'data_range']
-
-
-class RoleFieldPermissionSerializer(CustomModelSerializer):
-    class Meta:
-        model = FieldPermission
-        fields = "__all__"
+        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
@@ -109,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):
     """
     菜单按钮接口
@@ -173,204 +159,110 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
     extra_filter_class = []
 
     @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
-    def get_role_premission(self, request):
+    def get_role_menu(self, request):
         """
-        角色授权获取:
-        :param request: role
-        :return: menu,btns,columns
+        获取 角色-菜单
+        :param request:
+        :return:
+        """
+        menu_queryset = Menu.objects.all()
+        serializer = RoleMenuSerializer(menu_queryset, many=True, request=request)
+        return DetailResponse(data=serializer.data)
+
+    @action(methods=['PUT'], detail=False, permission_classes=[IsAuthenticated])
+    def set_role_menu(self, request):
+        """
+        设置 角色-菜单
+        :param request:
+        :return:
+        """
+        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 get_role_menu_btn_field(self, request):
+        """
+        获取 角色-菜单-按钮-列字段
+        :param request:
+        :return:
         """
         params = request.query_params
-        role = params.get('role', None)
-        if role is None:
-            return ErrorResponse(msg="未获取到角色信息")
-        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('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)
-        # data = []
-        # if is_superuser:
-        #     queryset = Menu.objects.filter(status=1, is_catalog=False).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('id', flat=True)
-        #     queryset = Menu.objects.filter(status=1, is_catalog=False, id__in=menu_list).values('name', 'id')
-        # for item in queryset:
-        #     parent_list = Menu.get_all_parent(item['id'])
-        #     names = [d["name"] for d in parent_list]
-        #     completeName = "/".join(names)
-        #     isCheck = RoleMenuPermission.objects.filter(
-        #         menu__id=item['id'],
-        #         role__id=role,
-        #     ).exists()
-        #     mbCheck = RoleMenuButtonPermission.objects.filter(
-        #         menu_button=OuterRef("pk"),
-        #         role__id=role,
-        #     )
-        #     btns = MenuButton.objects.filter(
-        #         menu__id=item['id'],
-        #     ).annotate(isCheck=Exists(mbCheck)).values('id', 'name', 'value', 'isCheck',
-        #                                                data_range=F('menu_button_permission__data_range'))
-        #     dicts = {
-        #         'name': completeName,
-        #         'id': item['id'],
-        #         'isCheck': isCheck,
-        #         'btns': btns,
-        #
-        #     }
-        #     data.append(dicts)
-        # return DetailResponse(data=data)
+        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_premission(self, request, pk):
+    def set_role_menu_field(self, request, pk):
         """
-        对角色的菜单和按钮及按钮范围授权:
-        :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:
-            for menu in item["menus"]:
-                if menu.get('isCheck'):
-                    menu_parent = Menu.get_all_parent(menu.get('id'))
-                    role_menu_permission_list = []
-                    for d in menu_parent:
-                        role_menu_permission_list.append(RoleMenuPermission(role_id=pk, menu_id=d["id"]))
-                    RoleMenuPermission.objects.bulk_create(role_menu_permission_list)
-                    # RoleMenuPermission.objects.create(role_id=pk, menu_id=menu.get('id'))
-                for btn in menu.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 menu.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="授权成功")
+        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'),
+                })
 
-    @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
-    def role_menu_get_button(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="参数错误")
+        return DetailResponse(data=[], msg="更新成功")
 
-    @action(methods=['GET'], detail=False, permission_classes=[IsAuthenticated])
-    def data_scope(self, request):
+    @action(methods=['PUT'], detail=False, permission_classes=[IsAuthenticated])
+    def set_role_menu_btn(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)
+        data = request.data
+        isCheck = data.get('isCheck', None)
+        roleId = data.get('roleId', None)
+        btnId = data.get('btnId', None)
+        data_range = data.get('data_range', None) or 0  # 默认仅本人权限
+        dept = data.get('dept', None) or []  # 默认空部门
+
+        if isCheck:
+            # 添加权限：创建关联记录
+            instance = RoleMenuButtonPermission.objects.create(role_id=roleId,
+                                                               menu_button_id=btnId,
+                                                               data_range=data_range)
+            # 自定义部门权限
+            if data_range == 4 and dept:
+                instance.dept.set(dept)
         else:
-            data = []
-            role_list = request.user.role.values_list('id', flat=True)
-            if params := request.query_params:
-                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 = [{
-                                "value": 0,
-                                "label": '仅本人数据权限'
-                            }]
-                        elif item == 1:
-                            data = [{
-                                "value": 0,
-                                "label": '仅本人数据权限'
-                            }, {
-                                "value": 1,
-                                "label": '本部门及以下数据权限'
-                            },
-                                {
-                                    "value": 2,
-                                    "label": '本部门数据权限'
-                                }]
-                        elif item == 2:
-                            data = [{
-                                "value": 0,
-                                "label": '仅本人数据权限'
-                            },
-                                {
-                                    "value": 2,
-                                    "label": '本部门数据权限'
-                                }]
-                        elif item == 3:
-                            data = [{
-                                "value": 0,
-                                "label": '仅本人数据权限'
-                            },
-                                {
-                                    "value": 3,
-                                    "label": '全部数据权限'
-                                }, ]
-                        elif item == 4:
-                            data = [{
-                                "value": 0,
-                                "label": '仅本人数据权限'
-                            },
-                                {
-                                    "value": 4,
-                                    "label": '自定义数据权限'
-                                }]
-                        else:
-                            data = []
-                    return DetailResponse(data=data)
-        return ErrorResponse(msg="参数错误")
+            # 删除权限：移除关联记录
+            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):
@@ -379,72 +271,20 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet):
         :param request:
         :return:
         """
-        params = request.query_params
         is_superuser = request.user.is_superuser
-        if is_superuser:
-            queryset = Dept.objects.values('id', 'name', 'parent')
-        else:
-            if not params:
-                return ErrorResponse(msg="参数错误")
-            menu_button = params.get('menu_button')
-            if menu_button is None:
-                return ErrorResponse(msg="参数错误")
-            role_list = request.user.role.values_list('id', flat=True)
-            queryset = RoleMenuButtonPermission.objects.filter(role__in=role_list, menu_button=None).values(
-                dept_id=F('dept__id'),
-                name=F('dept__name'),
-                parent=F('dept__parent')
-            )
-        return DetailResponse(data=queryset)
-
-    @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_list = request.user.role.values_list('id', flat=True)
 
-                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="未获取到参数")
+        menu_button_id = params.get('menu_button')
+        # 当前登录用户角色可以分配的自定义部门权限
+        dept_checked_disabled = RoleMenuButtonPermission.objects.filter(
+            role_id__in=role_list, menu_button_id=menu_button_id
+        ).values_list('dept', flat=True)
+        dept_list = Dept.objects.values('id', 'name', 'parent')
 
-    @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)
+        data = []
+        for dept in dept_list:
+            dept["disabled"] = False if is_superuser else dept["id"] not in dept_checked_disabled
+            data.append(dept)
+        return DetailResponse(data=data)

backend/dvadmin/system/views/user.py

@@ -90,6 +90,8 @@ class UserCreateSerializer(CustomModelSerializer):
         data = super().save(**kwargs)
         data.dept_belong_id = data.dept_id
         data.save()
+        if not self.validated_data.get('manage_dept', None):
+            data.manage_dept.add(data.dept_id)
         data.post.set(self.initial_data.get("post", []))
         return data
 
@@ -119,7 +121,6 @@ class UserUpdateSerializer(CustomModelSerializer):
         """
         更改激活状态
         """
-        print(111, value)
         if value:
             self.initial_data["login_error_count"] = 0
         return value
@@ -128,6 +129,8 @@ class UserUpdateSerializer(CustomModelSerializer):
         data = super().save(**kwargs)
         data.dept_belong_id = data.dept_id
         data.save()
+        if not self.validated_data.get('manage_dept', None):
+            data.manage_dept.add(data.dept_id)
         data.post.set(self.initial_data.get("post", []))
         return data
 
@@ -287,6 +290,7 @@ class UserViewSet(CustomModelViewSet):
             "dept": user.dept_id,
             "is_superuser": user.is_superuser,
             "role": user.role.values_list('id', flat=True),
+            "pwd_change_count":user.pwd_change_count
         }
         if hasattr(connection, 'tenant'):
             result['tenant_id'] = connection.tenant and connection.tenant.id
@@ -320,7 +324,6 @@ class UserViewSet(CustomModelViewSet):
         """密码修改"""
         data = request.data
         old_pwd = data.get("oldPassword")
-        print(old_pwd)
         new_pwd = data.get("newPassword")
         new_pwd2 = data.get("newPassword2")
         if old_pwd is None or new_pwd is None or new_pwd2 is None:
@@ -331,13 +334,33 @@ class UserViewSet(CustomModelViewSet):
         if not verify_password:
             old_pwd_md5 = hashlib.md5(old_pwd.encode(encoding='UTF-8')).hexdigest()
             verify_password = check_password(str(old_pwd_md5), request.user.password)
+            # 创建用户时、自定义密码无法修改问题
+            if not verify_password:
+                old_pwd_md5 = hashlib.md5(old_pwd_md5.encode(encoding='UTF-8')).hexdigest()
+                verify_password = check_password(str(old_pwd_md5), request.user.password)
         if verify_password:
+            # request.user.password = make_password(hashlib.md5(new_pwd.encode(encoding='UTF-8')).hexdigest())
             request.user.password = make_password(hashlib.md5(new_pwd.encode(encoding='UTF-8')).hexdigest())
+            request.user.pwd_change_count += 1
             request.user.save()
             return DetailResponse(data=None, msg="修改成功")
         else:
             return ErrorResponse(msg="旧密码不正确")
 
+    @action(methods=["post"], detail=False, permission_classes=[IsAuthenticated])
+    def login_change_password(self, request, *args, **kwargs):
+        """初次登录进行密码修改"""
+        data = request.data
+        new_pwd = data.get("password")
+        new_pwd2 = data.get("password_regain")
+        if new_pwd != new_pwd2:
+            return ErrorResponse(msg="两次密码不匹配")
+        else:
+            request.user.password = make_password(new_pwd)
+            request.user.pwd_change_count += 1
+            request.user.save()
+            return DetailResponse(data=None, msg="修改成功")
+
     @action(methods=["PUT"], detail=True, permission_classes=[IsAuthenticated])
     def reset_to_default_password(self, request,pk):
         """恢复默认密码"""

backend/dvadmin/utils/aliyunoss.py

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+
+import oss2
+from rest_framework.exceptions import ValidationError
+
+from application import dispatch
+
+
+# 进度条
+# 当无法确定待上传的数据长度时，total_bytes的值为None。
+def percentage(consumed_bytes, total_bytes):
+    if total_bytes:
+        rate = int(100 * (float(consumed_bytes) / float(total_bytes)))
+        print('\r{0}% '.format(rate), end='')
+
+
+def ali_oss_upload(file, file_name):
+    """
+    阿里云OSS上传
+    """
+    try:
+        file.seek(0)
+        file_read = file.read()
+    except Exception as e:
+        file_read = file
+    if not file:
+        raise ValidationError('请上传文件')
+    # 转存到oss
+    path_prefix = dispatch.get_system_config_values("file_storage.aliyun_path")
+    if not path_prefix.endswith('/'):
+        path_prefix = path_prefix + '/'
+    if path_prefix.startswith('/'):
+        path_prefix = path_prefix[1:]
+    base_fil_name = f'{path_prefix}{file_name}'
+    # 获取OSS配置
+    # 获取的AccessKey
+    access_key_id = dispatch.get_system_config_values("file_storage.aliyun_access_key")
+    access_key_secret = dispatch.get_system_config_values("file_storage.aliyun_access_secret")
+    auth = oss2.Auth(access_key_id, access_key_secret)
+    # 这个是需要用特定的地址，不同地域的服务器地址不同，不要弄错了
+    # 参考官网给的地址配置https://www.alibabacloud.com/help/zh/object-storage-service/latest/regions-and-endpoints#concept-zt4-cvy-5db
+    endpoint = dispatch.get_system_config_values("file_storage.aliyun_endpoint")
+    bucket_name = dispatch.get_system_config_values("file_storage.aliyun_bucket")
+    if bucket_name.endswith(endpoint):
+        bucket_name = bucket_name.replace(f'.{endpoint}', '')
+    # 你的项目名称，类似于不同的项目上传的图片前缀url不同
+    bucket = oss2.Bucket(auth, endpoint, bucket_name)  # 项目名称
+    # 生成外网访问的文件路径
+    aliyun_cdn_url = dispatch.get_system_config_values("file_storage.aliyun_cdn_url")
+    if aliyun_cdn_url:
+        if aliyun_cdn_url.endswith('/'):
+            aliyun_cdn_url = aliyun_cdn_url[1:]
+        file_path = f"{aliyun_cdn_url}/{base_fil_name}"
+    else:
+        file_path = f"https://{bucket_name}.{endpoint}/{base_fil_name}"
+    # 这个是阿里提供的SDK方法
+    res = bucket.put_object(base_fil_name, file_read, progress_callback=percentage)
+    # 如果上传状态是200 代表成功 返回文件外网访问路径
+    if res.status == 200:
+        return file_path
+    else:
+        return None

backend/dvadmin/utils/field_permission.py

@@ -5,34 +5,39 @@ 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:
-    @action(methods=['get'], detail=False,permission_classes=[IsAuthenticated])
+    @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated])
     def field_permission(self, request):
         """
         获取字段权限
         """
-        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
-        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
+        # 创建一个默认字典来存储最终的结果
+        if user.is_superuser == 1:
+            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['model'],role__in=roles
-            ).values( 'is_create', 'is_query', 'is_update',field_name=F('field__field_name'))
-        return DetailResponse(data=data)
+            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)

backend/dvadmin/utils/filters.py

@@ -15,15 +15,16 @@ import six
 from django.db import models
 from django.db.models import Q, F
 from django.db.models.constants import LOOKUP_SEP
-from django_filters import utils, FilterSet
 from django_filters.constants import ALL_FIELDS
-from django_filters.filters import CharFilter, DateTimeFromToRangeFilter
 from django_filters.rest_framework import DjangoFilterBackend
-from django_filters.utils import get_model_field
+from django_filters.utils import get_model_field, translate_validation, deprecate
+from rest_framework.request import Request
 from rest_framework.filters import BaseFilterBackend
 from django_filters.conf import settings
-from dvadmin.system.models import Dept, ApiWhiteList, RoleMenuButtonPermission
-from dvadmin.utils.models import CoreModel
+
+from dvadmin.system.models import Dept, ApiWhiteList, RoleMenuButtonPermission, MenuButton, Users
+from util.currency import recursion_down_fast
+
 
 class CoreModelFilterBankend(BaseFilterBackend):
     """
@@ -33,15 +34,15 @@ class CoreModelFilterBankend(BaseFilterBackend):
         create_datetime_after = request.query_params.get('create_datetime_after', None)
         create_datetime_before = request.query_params.get('create_datetime_before', None)
         update_datetime_after = request.query_params.get('update_datetime_after', None)
-        update_datetime_before = request.query_params.get('update_datetime_after', None)
+        update_datetime_before = request.query_params.get('update_datetime_before', None)
         if any([create_datetime_after, create_datetime_before, update_datetime_after, update_datetime_before]):
             create_filter = Q()
             if create_datetime_after and create_datetime_before:
-                create_filter &= Q(create_datetime__gte=create_datetime_after) & Q(create_datetime__lte=create_datetime_before)
+                create_filter &= Q(create_datetime__gte=create_datetime_after) & Q(create_datetime__lte=f'{create_datetime_before} 23:59:59')
             elif create_datetime_after:
                 create_filter &= Q(create_datetime__gte=create_datetime_after)
             elif create_datetime_before:
-                create_filter &= Q(create_datetime__lte=create_datetime_before)
+                create_filter &= Q(create_datetime__lte=f'{create_datetime_before} 23:59:59')
 
             # 更新时间范围过滤条件
             update_filter = Q()
@@ -149,13 +150,16 @@ class DataLevelPermissionsFilter(BaseFilterBackend):
         if _pk: # 判断是否是单例查询
             re_api = re.sub(_pk,'{id}', api)
         role_id_list = request.user.role.values_list('id', flat=True)
-        role_permission_list=RoleMenuButtonPermission.objects.filter(
-            role__in=role_id_list,
-            role__status=1,
-            menu_button__api=re_api,
-            menu_button__method=method).values(
-            'data_range'
-        )
+        # 修复权限获取bug
+        menu_button_ids = MenuButton.objects.filter(api=re_api,method=method).values_list('id', flat=True)
+        role_permission_list = []
+        if menu_button_ids:
+            role_permission_list=RoleMenuButtonPermission.objects.filter(
+                role__in=role_id_list,
+                role__status=1,
+                menu_button_id__in=menu_button_ids).values(
+                'data_range'
+            )
         dataScope_list = []  # 权限范围列表
         for ele in role_permission_list:
                 # 判断用户是否为超级管理员角色/如果拥有[全部数据权限]则返回所有数据
@@ -197,6 +201,86 @@ class DataLevelPermissionsFilter(BaseFilterBackend):
         return queryset.filter(dept_belong_id__in=list(set(dept_list)))
 
 
+class DataLevelPermissionsSubFilter(DataLevelPermissionsFilter):
+    """数据级权限过滤的子过滤器，过滤管理部门字段manage_dept"""
+
+    def _extracted_from_filter_queryset_33(self, request:Request, queryset, api, method):
+        u:Users = request.user
+        if u.is_superuser:
+            return queryset
+        # (0, "仅本人数据权限"),
+        # (1, "本部门及以下数据权限"),
+        # (2, "本部门数据权限"),
+        # (3, "全部数据权限"),
+        # (4, "自定数据权限")
+        re_api = api
+        _pk = request.parser_context["kwargs"].get('pk')
+        if _pk: # 判断是否是单例查询
+            re_api = re.sub(_pk,'{id}', api)
+        role_id_list = request.user.role.values_list('id', flat=True)
+        menu_button_ids = MenuButton.objects.filter(api=re_api,method=method).values_list('id', flat=True)
+        role_permission_list = []
+        if menu_button_ids:
+            role_permission_list=RoleMenuButtonPermission.objects.filter(
+                role__in=role_id_list,
+                role__status=1,
+                menu_button_id__in=menu_button_ids).values(
+                'data_range'
+            )
+        dataScope_list = []  # 权限范围列表
+        for ele in role_permission_list:
+                # 判断用户是否为超级管理员角色/如果拥有[全部数据权限]则返回所有数据
+            if ele.get("data_range") == 3:
+                return queryset
+            dataScope_list.append(ele.get("data_range"))
+        dataScope_list = list(set(dataScope_list))
+        # 4. 只为仅本人数据权限时只返回过滤本人数据，并且部门为自己本部门(考虑到用户会变部门，只能看当前用户所在的部门数据)
+        if 0 in dataScope_list:
+            return queryset.filter(
+                creator=request.user, dept_belong_id=u.dept_id
+            )
+        dept_list = []
+        # 5. 自定数据权限 获取部门，根据部门过滤
+        for ele in dataScope_list:
+            if ele == 1:
+                dept_list.append(u.dept_id)
+                dept_list.extend(
+                    get_dept(
+                        u.dept_id,
+                    )
+                )
+            elif ele == 2:
+                dept_list.append(u.dept_id)
+            elif ele == 4:
+                dept_ids = RoleMenuButtonPermission.objects.filter(
+                    role__in=role_id_list,
+                    role__status=1,
+                    data_range=4).values_list(
+                    'dept__id',flat=True
+                )
+                dept_list.extend(
+                    dept_ids
+                )
+        # 自己部门 交 管理部门
+        if u.manage_dept.exists(): # 兼容旧数据
+            for dept in u.manage_dept.all():
+                dept_list.extend(recursion_down_fast(dept, 'parent', 'id'))
+        else:
+            dept_list = recursion_down_fast(u.dept, 'parent', 'id')
+        dept_list = set(recursion_down_fast(u.dept)) & set(dept_list)
+        # 自己创建的数据要能看到
+        # 应对归属a管b、c等情况，如果自己创建数据则是a，不显式指定自己的数据就查不到
+        if queryset.model._meta.model_name == 'dept':
+            return queryset.filter(Q(id__in=dept_list) | Q(creator=u))
+        return queryset.filter(Q(dept_belong_id__in=dept_list) | Q(creator=u))
+
+
+class DataLevelPermissionMargeFilter(DataLevelPermissionsFilter):
+    def _extracted_from_filter_queryset_33(self, request, queryset, api, method):
+        queryset = super()._extracted_from_filter_queryset_33(request, queryset, api, method)
+        return DataLevelPermissionsSubFilter._extracted_from_filter_queryset_33(self, request, queryset, api, method)
+
+
 class CustomDjangoFilterBackend(DjangoFilterBackend):
     lookup_prefixes = {
         "^": "istartswith",
@@ -237,14 +321,14 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
 
         # TODO: remove assertion in 2.1
         if filterset_class is None and hasattr(view, "filter_class"):
-            utils.deprecate(
+            deprecate(
                 "`%s.filter_class` attribute should be renamed `filterset_class`." % view.__class__.__name__
             )
             filterset_class = getattr(view, "filter_class", None)
 
         # TODO: remove assertion in 2.1
         if filterset_fields is None and hasattr(view, "filter_fields"):
-            utils.deprecate(
+            deprecate(
                 "`%s.filter_fields` attribute should be renamed `filterset_fields`." % view.__class__.__name__
             )
             self.filter_fields = getattr(view, "filter_fields", None)
@@ -340,7 +424,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:
@@ -424,5 +508,5 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
                 return queryset
 
         if not filterset.is_valid() and self.raise_exception:
-            raise utils.translate_validation(filterset.errors)
+            raise translate_validation(filterset.errors)
         return filterset.qs

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

backend/dvadmin/utils/import_export_mixin.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import datetime
 from urllib.parse import quote
 
 from django.db import transaction
@@ -11,8 +12,10 @@ from rest_framework.decorators import action
 from rest_framework.request import Request
 
 from dvadmin.utils.import_export import import_to_data
-from dvadmin.utils.json_response import DetailResponse
+from dvadmin.utils.json_response import DetailResponse, SuccessResponse
 from dvadmin.utils.request_util import get_verbose_name
+from dvadmin.system.tasks import async_export_data
+from dvadmin.system.models import DownloadCenter
 
 
 class ImportSerializerMixin:
@@ -301,6 +304,16 @@ class ExportSerializerMixin:
         assert self.export_field_label, "'%s' 请配置对应的导出模板字段。" % self.__class__.__name__
         assert self.export_serializer_class, "'%s' 请配置对应的导出序列化器。" % self.__class__.__name__
         data = self.export_serializer_class(queryset, many=True, request=request).data
+        try:
+            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_id).pk,
+                self.export_field_label
+            )
+            return SuccessResponse(msg="导入任务已创建，请前往‘下载中心’等待下载")
+        except:
+            pass
         # 导出excel 表
         response = HttpResponse(content_type="application/msexcel")
         response["Access-Control-Expose-Headers"] = f"Content-Disposition"

backend/dvadmin/utils/middleware.py

@@ -32,6 +32,14 @@ class ApiLoggingMiddleware(MiddlewareMixin):
         request.request_path = get_request_path(request)
 
     def __handle_response(self, request, response):
+
+        # 判断有无log_id属性，使用All记录时，会出现此情况
+        if request.request_data.get('log_id', None) is None:
+            return
+        
+        # 移除log_id，不记录此ID
+        log_id = request.request_data.pop('log_id')
+
         # request_data,request_ip由PermissionInterfaceMiddleware中间件中添加的属性
         body = getattr(request, 'request_data', {})
         # 请求含有password则用*替换掉(暂时先用于所有接口的password请求参数)
@@ -60,7 +68,7 @@ class ApiLoggingMiddleware(MiddlewareMixin):
             'status': True if response.data.get('code') in [2000, ] else False,
             'json_result': {"code": response.data.get('code'), "msg": response.data.get('msg')},
         }
-        operation_log, creat = OperationLog.objects.update_or_create(defaults=info, id=self.operation_log_id)
+        operation_log, creat = OperationLog.objects.update_or_create(defaults=info, id=log_id)
         if not operation_log.request_modular and settings.API_MODEL_MAP.get(request.request_path, None):
             operation_log.request_modular = settings.API_MODEL_MAP[request.request_path]
             operation_log.save()
@@ -71,7 +79,8 @@ class ApiLoggingMiddleware(MiddlewareMixin):
                 if self.methods == 'ALL' or request.method in self.methods:
                     log = OperationLog(request_modular=get_verbose_name(view_func.cls.queryset))
                     log.save()
-                    self.operation_log_id = log.id
+                    # self.operation_log_id = log.id
+                    request.request_data['log_id'] = log.id
 
         return
 

backend/dvadmin/utils/models.py

@@ -6,13 +6,14 @@
 @Created on: 2021/5/31 031 22:08
 @Remark: 公共基础model类
 """
+from datetime import datetime
 from importlib import import_module
 
-from django.apps import apps
-from django.db import models
-from django.conf import settings
-
 from application import settings
+from django.apps import apps
+from django.conf import settings
+from django.db import models
+from rest_framework.request import Request
 
 table_prefix = settings.TABLE_PREFIX  # 数据库表名前缀
 
@@ -60,9 +61,45 @@ class SoftDeleteModel(models.Model):
         """
         重写删除方法,直接开启软删除
         """
-        self.is_deleted = True
-        self.save(using=using)
+        if soft_delete:
+            self.is_deleted = True
+            self.save(using=using)
+            # 级联软删除关联对象
+            for related_object in self._meta.related_objects:
+                related_model = getattr(self, related_object.get_accessor_name())
+                # 处理一对多和多对多的关联对象
+                if related_object.one_to_many or related_object.many_to_many:
+                    related_objects = related_model.all()
+                elif related_object.one_to_one:
+                    related_objects = [related_model]
+                else:
+                    continue
 
+                for obj in related_objects:
+                    obj.delete(soft_delete=True)
+        else:
+            super().delete(using=using, *args, **kwargs)
+
+
+class CoreModelManager(models.Manager):
+    def get_queryset(self):
+        is_deleted = getattr(self.model, 'is_soft_delete', False)
+        flow_work_status = getattr(self.model, 'flow_work_status', False)
+        queryset = super().get_queryset()
+        if flow_work_status:
+            queryset = queryset.filter(flow_work_status=1)
+        if is_deleted:
+            queryset = queryset.filter(is_deleted=False)
+        return queryset
+    def create(self,request: Request=None, **kwargs):
+        data = {**kwargs}
+        if request:
+            request_user = request.user
+            data["creator"] = request_user
+            data["modifier"] = request_user.id
+            data["dept_belong_id"] = request_user.dept_id
+        # 调用父类的create方法执行实际的创建操作
+        return super().create(**data)
 
 class CoreModel(models.Model):
     """
@@ -81,12 +118,118 @@ class CoreModel(models.Model):
                                            verbose_name="修改时间")
     create_datetime = models.DateTimeField(auto_now_add=True, null=True, blank=True, help_text="创建时间",
                                            verbose_name="创建时间")
-
+    objects = CoreModelManager()
+    all_objects = models.Manager()
     class Meta:
         abstract = True
         verbose_name = '核心模型'
         verbose_name_plural = verbose_name
 
+    def get_request_user(self, request: Request):
+        if getattr(request, "user", None):
+            return request.user
+        return None
+
+    def get_request_user_id(self, request: Request):
+        if getattr(request, "user", None):
+            return getattr(request.user, "id", None)
+        return None
+
+    def get_request_user_name(self, request: Request):
+        if getattr(request, "user", None):
+            return getattr(request.user, "name", None)
+        return None
+
+    def get_request_user_username(self, request: Request):
+        if getattr(request, "user", None):
+            return getattr(request.user, "username", None)
+        return None
+
+    def common_insert_data(self, request: Request):
+        data = {
+            'create_datetime': datetime.now(),
+            'creator': self.get_request_user(request)
+        }
+        return {**data, **self.common_update_data(request)}
+
+    def common_update_data(self, request: Request):
+        return {
+            'update_datetime': datetime.now(),
+            'modifier': self.get_request_user_username(request)
+        }
+
+    exclude_fields = [
+        '_state',
+        'pk',
+        'id',
+        'create_datetime',
+        'update_datetime',
+        'creator',
+        'creator_id',
+        'creator_pk',
+        'creator_name',
+        'modifier',
+        'modifier_id',
+        'modifier_pk',
+        'modifier_name',
+        'dept_belong_id',
+    ]
+
+    def get_exclude_fields(self):
+        return self.exclude_fields
+
+    def get_all_fields(self):
+        return self._meta.fields
+
+    def get_all_fields_names(self):
+        return [field.name for field in self.get_all_fields()]
+
+    def get_need_fields_names(self):
+        return [field.name for field in self.get_all_fields() if field.name not in self.exclude_fields]
+
+    def to_data(self):
+        """将模型转化为字典（去除不包含字段）(注意与to_dict_data区分)。
+        """
+        res = {}
+        for field in self.get_need_fields_names():
+            field_value = getattr(self, field)
+            res[field] = field_value.id if (issubclass(field_value.__class__, CoreModel)) else field_value
+        return res
+
+    @property
+    def DATA(self):
+        return self.to_data()
+
+    def to_dict_data(self):
+        """需要导出的字段（去除不包含字段）（注意与to_data区分）
+        """
+        return {field: getattr(self, field) for field in self.get_need_fields_names()}
+
+    @property
+    def DICT_DATA(self):
+        return self.to_dict_data()
+
+    def insert(self, request):
+        """插入模型
+        """
+        assert self.pk is None, f'模型{self.__class__.__name__}还没有保存到数据中，不能手动指定ID'
+        validated_data = {**self.common_insert_data(request), **self.DICT_DATA}
+        return self.__class__._default_manager.create(**validated_data)
+
+    def update(self, request, update_data: dict[str, any] = None):
+        """更新模型
+        """
+        assert isinstance(update_data, dict), 'update_data必须为字典'
+        validated_data = {**self.common_insert_data(request), **update_data}
+        for key, value in validated_data.items():
+            # 不允许修改id,pk,uuid字段
+            if key in ['id', 'pk', 'uuid']:
+                continue
+            if hasattr(self, key):
+                setattr(self, key, value)
+        self.save()
+        return self
+
 
 def get_all_models_objects(model_name=None):
     """
@@ -97,16 +240,9 @@ def get_all_models_objects(model_name=None):
     if not settings.ALL_MODELS_OBJECTS:
         all_models = apps.get_models()
         for item in list(all_models):
-            table = {
-                "tableName": item._meta.verbose_name,
-                "table": item.__name__,
-                "tableFields": []
-            }
+            table = {"tableName": item._meta.verbose_name, "table": item.__name__, "tableFields": []}
             for field in item._meta.fields:
-                fields = {
-                    "title": field.verbose_name,
-                    "field": field.name
-                }
+                fields = {"title": field.verbose_name, "field": field.name}
                 table['tableFields'].append(fields)
             settings.ALL_MODELS_OBJECTS.setdefault(item.__name__, {"table": table, "object": item})
     if model_name:
@@ -117,25 +253,20 @@ def get_all_models_objects(model_name=None):
 def get_model_from_app(app_name):
     """获取模型里的字段"""
     model_module = import_module(app_name + '.models')
+    exclude_models = getattr(model_module, 'exclude_models', [])
     filter_model = [
-        getattr(model_module, item) for item in dir(model_module)
-        if item != 'CoreModel' and issubclass(getattr(model_module, item).__class__, models.base.ModelBase)
+        value for key, value in model_module.__dict__.items()
+        if key != 'CoreModel'
+        and isinstance(value, type)
+        and issubclass(value, models.Model)
+        and key not in exclude_models
     ]
     model_list = []
     for model in filter_model:
         if model.__name__ == 'AbstractUser':
             continue
-        fields = [
-            {'title': field.verbose_name, 'name': field.name, 'object': field}
-            for field in model._meta.fields
-        ]
-        model_list.append({
-            'app': app_name,
-            'verbose': model._meta.verbose_name,
-            'model': model.__name__,
-            'object': model,
-            'fields': fields
-        })
+        fields = [{'title': field.verbose_name, 'name': field.name, 'object': field} for field in model._meta.fields]
+        model_list.append({'app': app_name, 'verbose': model._meta.verbose_name, 'model': model.__name__, 'object': model, 'fields': fields})
     return model_list
 
 

backend/dvadmin/utils/permission.py

@@ -44,6 +44,35 @@ class AnonymousUserPermission(BasePermission):
         return True
 
 
+class SuperuserPermission(BasePermission):
+    """
+    超级管理员权限类
+    """
+
+    def has_permission(self, request, view):
+        if isinstance(request.user, AnonymousUser):
+            return False
+        # 判断是否是超级管理员
+        if request.user.is_superuser:
+            return True
+
+
+class AdminPermission(BasePermission):
+    """
+    普通管理员权限类
+    """
+
+    def has_permission(self, request, view):
+        if isinstance(request.user, AnonymousUser):
+            return False
+        # 判断是否是超级管理员
+        is_superuser = request.user.is_superuser
+        # 判断是否是管理员角色
+        is_admin = request.user.role.values_list('admin', flat=True)
+        if is_superuser or True in is_admin:
+            return True
+
+
 def ReUUID(api):
     """
     将接口的uuid替换掉
@@ -81,8 +110,9 @@ class CustomPermission(BasePermission):
             # ********#
             if not hasattr(request.user, "role"):
                 return False
-            role_id_list = request.user.role.values_list('id',flat=True)
-            userApiList = RoleMenuButtonPermission.objects.filter(role__in=role_id_list).values(permission__api=F('menu_button__api'), permission__method=F('menu_button__method'))  # 获取当前用户的角色拥有的所有接口
+            role_id_list = request.user.role.values_list('id', flat=True)
+            userApiList = RoleMenuButtonPermission.objects.filter(role__in=role_id_list).values(
+                permission__api=F('menu_button__api'), permission__method=F('menu_button__method'))  # 获取当前用户的角色拥有的所有接口
             ApiList = [
                 str(item.get('permission__api').replace('{id}', '([a-zA-Z0-9-]+)')) + ":" + str(
                     item.get('permission__method')) + '$' for item in userApiList if item.get('permission__api')]

backend/dvadmin/utils/serializers.py

@@ -26,7 +26,6 @@ class CustomModelSerializer(DynamicFieldsMixin, ModelSerializer):
     # 修改人的审计字段名称, 默认modifier, 继承使用时可自定义覆盖
     modifier_field_id = "modifier"
     modifier_name = serializers.SerializerMethodField(read_only=True)
-    dept_belong_id = serializers.IntegerField(required=False, allow_null=True)
 
     def get_modifier_name(self, instance):
         if not hasattr(instance, "modifier"):
@@ -52,7 +51,7 @@ class CustomModelSerializer(DynamicFieldsMixin, ModelSerializer):
         format="%Y-%m-%d %H:%M:%S", required=False, read_only=True
     )
     update_datetime = serializers.DateTimeField(
-        format="%Y-%m-%d %H:%M:%S", required=False
+        format="%Y-%m-%d %H:%M:%S", required=False, read_only=True
     )
 
     def __init__(self, instance=None, data=empty, request=None, **kwargs):
@@ -71,11 +70,11 @@ class CustomModelSerializer(DynamicFieldsMixin, ModelSerializer):
                     validated_data[self.creator_field_id] = self.request.user
 
                 if (
-                    self.dept_belong_id_field_name in self.fields.fields
-                    and validated_data.get(self.dept_belong_id_field_name, None) is None
+                        self.dept_belong_id_field_name in self.fields.fields
+                        and validated_data.get(self.dept_belong_id_field_name, None) is None
                 ):
                     validated_data[self.dept_belong_id_field_name] = getattr(
-                        self.request.user, "dept_id", None
+                        self.request.user, "dept_id", validated_data.get(self.dept_belong_id_field_name, None)
                     )
         return super().create(validated_data)
 

backend/dvadmin/utils/tencentcos.py

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+from rest_framework.exceptions import ValidationError
+
+from application import dispatch
+from qcloud_cos import CosConfig
+from qcloud_cos import CosS3Client
+
+
+# 进度条
+# 当无法确定待上传的数据长度时，total_bytes的值为None。
+def percentage(consumed_bytes, total_bytes):
+    if total_bytes:
+        rate = int(100 * (float(consumed_bytes) / float(total_bytes)))
+        print('\r{0}% '.format(rate), end='')
+
+def tencent_cos_upload(file, file_name):
+    try:
+        file.seek(0)
+        file_read = file.read()
+    except Exception as e:
+        file_read = file
+    if not file:
+        raise ValidationError('请上传文件')
+    # 生成文件名
+    path_prefix = dispatch.get_system_config_values("file_storage.tencent_path")
+    if not path_prefix.endswith('/'):
+        path_prefix = path_prefix + '/'
+    if path_prefix.startswith('/'):
+        path_prefix = path_prefix[1:]
+    base_fil_name = f'{path_prefix}{file_name}'
+    # 获取cos配置
+    # 1. 设置用户属性, 包括 secret_id, secret_key, region等。Appid 已在 CosConfig 中移除，请在参数 Bucket 中带上 Appid。Bucket 由 BucketName-Appid 组成
+    secret_id = dispatch.get_system_config_values("file_storage.tencent_secret_id") # 用户的 SecretId，建议使用子账号密钥，授权遵循最小权限指引，降低使用风险。子账号密钥获取可参见 https://cloud.tencent.com/document/product/598/37140
+    secret_key = dispatch.get_system_config_values("file_storage.tencent_secret_key")  # 用户的 SecretKey，建议使用子账号密钥，授权遵循最小权限指引，降低使用风险。子账号密钥获取可参见 https://cloud.tencent.com/document/product/598/37140
+    region = dispatch.get_system_config_values("file_storage.tencent_region") # 替换为用户的 region，已创建桶归属的 region 可以在控制台查看，https://console.cloud.tencent.com/cos5/bucket                          # COS 支持的所有 region 列表参见https://cloud.tencent.com/document/product/436/6224
+    bucket = dispatch.get_system_config_values("file_storage.tencent_bucket")  # 要访问的桶名称
+    config = CosConfig(Region=region, SecretId=secret_id, SecretKey=secret_key)
+    client = CosS3Client(config)
+    # 访问地址
+    base_file_url = f'https://{bucket}.cos.{region}.myqcloud.com'
+    # 生成外网访问的文件路径
+    if base_file_url.endswith('/'):
+        file_path = base_file_url + base_fil_name
+    else:
+        file_path = f'{base_file_url}/{base_fil_name}'
+    # 这个是阿里提供的SDK方法 bucket是调用的4.1中配置的变量名
+    try:
+        response = client.put_object(
+            Bucket=bucket,
+            Body=file_read,
+            Key=base_fil_name,
+            EnableMD5=False
+        )
+        return file_path
+    except:
+        return None

backend/dvadmin/utils/viewset.py

@@ -6,6 +6,8 @@
 @Created on: 2021/6/1 001 22:57
 @Remark: 自定义视图集
 """
+import copy
+
 from django.db import transaction
 from django_filters import DateTimeFromToRangeFilter
 from django_filters.rest_framework import FilterSet
@@ -14,7 +16,7 @@ from drf_yasg.utils import swagger_auto_schema
 from rest_framework.decorators import action
 from rest_framework.viewsets import ModelViewSet
 
-from dvadmin.utils.filters import DataLevelPermissionsFilter, CoreModelFilterBankend
+from dvadmin.utils.filters import CoreModelFilterBankend, DataLevelPermissionMargeFilter
 from dvadmin.utils.import_export_mixin import ExportSerializerMixin, ImportSerializerMixin
 from dvadmin.utils.json_response import SuccessResponse, ErrorResponse, DetailResponse
 from dvadmin.utils.permission import CustomPermission
@@ -39,7 +41,7 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
     update_serializer_class = None
     filter_fields = '__all__'
     search_fields = ()
-    extra_filter_class = [CoreModelFilterBankend,DataLevelPermissionsFilter]
+    extra_filter_class = [CoreModelFilterBankend,DataLevelPermissionMargeFilter]
     permission_classes = [CustomPermission]
     import_field_dict = {}
     export_field_label = {}
@@ -67,12 +69,14 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
         kwargs.setdefault('context', self.get_serializer_context())
         # 全部以可见字段为准
         can_see = self.get_menu_field(serializer_class)
-        # 排除掉序列化器级的字段
-        # sub_set = set(serializer_class._declared_fields.keys()) - set(can_see)
-        # for field in sub_set:
-        #     serializer_class._declared_fields.pop(field)
+        # 排除掉序列化器级的字段(排除字段权限中未授权的字段)
         # if not self.request.user.is_superuser:
-        #     serializer_class.Meta.fields = can_see
+        #     exclude_set = set(serializer_class._declared_fields.keys()) - set(can_see)
+        #     for field in exclude_set:
+        #         serializer_class._declared_fields.pop(field)
+        #     meta = copy.deepcopy(serializer_class.Meta)
+        #     meta.fields = list(can_see)
+        #     serializer_class.Meta = meta
         # 在分页器中使用
         self.request.permission_fields = can_see
         if isinstance(self.request.data, list):
@@ -83,15 +87,17 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
 
     def get_menu_field(self, serializer_class):
         """获取字段权限"""
-        finded = False
-        for model in get_custom_app_models():
-            if model['object'] is serializer_class.Meta.model:
-                finded = True
-                break
-        if finded is False:
+
+        if not any(model['object'] is serializer_class.Meta.model for model in get_custom_app_models()):
             return []
-        return MenuField.objects.filter(model=model['model']
-        ).values('field_name', 'title')
+
+        # 匿名用户没有角色
+        ret = FieldPermission.objects.filter(field__model=serializer_class.Meta.model.__name__)
+        if hasattr(self.request.user, 'role'):
+            roles = self.request.user.role.values_list('id', flat=True)
+            ret = ret.filter(is_query=True, role__in=roles)
+
+        return ret.values_list('field__field_name', flat=True)
 
     def create(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data, request=request)
@@ -131,8 +137,7 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
         instance.delete()
         return DetailResponse(data=[], msg="删除成功")
 
-    keys = openapi.Schema(description='主键列表', type=openapi.TYPE_ARRAY, items=openapi.TYPE_STRING)
-
+    keys = openapi.Schema(description='主键列表', type=openapi.TYPE_ARRAY, items=openapi.Schema(type=openapi.TYPE_STRING))
     @swagger_auto_schema(request_body=openapi.Schema(
         type=openapi.TYPE_OBJECT,
         required=['keys'],
@@ -147,3 +152,13 @@ class CustomModelViewSet(ModelViewSet, ImportSerializerMixin, ExportSerializerMi
             return SuccessResponse(data=[], msg="删除成功")
         else:
             return ErrorResponse(msg="未获取到keys字段")
+
+    @action(methods=['post'], detail=False)
+    def get_by_ids(self, request):
+        """通过IDS列表获取数据"""
+        ids = request.data.get('ids', [])
+        if ids and ids != ['']:
+            queryset = self.get_queryset().filter(id__in=ids)
+            serializer = self.get_serializer(queryset, many=True)
+            return DetailResponse(data=serializer.data)
+        return DetailResponse(data=None)

backend/main.py

@@ -9,5 +9,9 @@ from application.settings import LOGGING
 
 if __name__ == '__main__':
     multiprocessing.freeze_support()
-    uvicorn.run("application.asgi:application", reload=False, host="0.0.0.0", port=8000, workers=4,
+    workers = 4
+    if os.sys.platform.startswith('win'):
+        # Windows操作系统
+        workers = None
+    uvicorn.run("application.asgi:application", reload=False, host="0.0.0.0", port=8000, workers=workers,
                 log_config=LOGGING)

backend/requirements.txt

@@ -1,32 +1,33 @@
-Django==4.2.7
+Django==4.2.14
 django-comment-migrate==0.1.7
-django-cors-headers==4.3.0
-django-filter==23.3
+django-cors-headers==4.4.0
+django-filter==24.2
 django-ranged-response==0.2.0
-djangorestframework==3.14.0
-django-restql==0.15.3
-django-simple-captcha==0.5.20
-django-timezone-field==6.0.1
-djangorestframework-simplejwt==5.3.0
+djangorestframework==3.15.2
+django-restql==0.15.4
+django-simple-captcha==0.6.0
+django-timezone-field==7.0
+djangorestframework_simplejwt==5.4.0
 drf-yasg==1.21.7
 mysqlclient==2.2.0
-pypinyin==0.49.0
+pypinyin==0.51.0
 ua-parser==0.18.0
-pyparsing==3.1.1
-openpyxl==3.1.2
-requests==2.31.0
-typing-extensions==4.8.0
-tzlocal==5.1
-channels==3.0.5
-channels-redis==4.1.0
-websockets==11.0.3
+pyparsing==3.1.2
+openpyxl==3.1.5
+requests==2.32.4
+typing-extensions==4.12.2
+tzlocal==5.2
+channels==4.1.0
+channels-redis==4.2.0
 user-agents==2.2.0
 six==1.16.0
-whitenoise==6.6.0
+whitenoise==6.7.0
 psycopg2==2.9.9
-uvicorn==0.23.2
-gunicorn==21.2.0
-gevent==23.9.1
-Pillow==10.1.0
-dvadmin-celery==1.0.5
-pyinstaller==6.8.0
+uvicorn==0.30.3
+gunicorn==23.0.0
+gevent==24.2.1
+Pillow==10.4.0
+pyinstaller==6.9.0
+dvadmin3-celery==3.1.6
+oss2==2.19.1
+cos-python-sdk-v5==1.9.37

backend/templates/terms_service.html

@@ -82,7 +82,7 @@
     <br>
     <h2>五、巨梦科技企业客户服务说明</h2>
     <h3>
-        1、巨梦科技平台提供给多家企业客户使用，企业客户通过巨梦科技平台进行发布用户活动等。如果功夫企火星企业用户违反了隐私政策或发生其它侵犯用户权益的行为，用户可要求巨梦科技提供必要的配合与巨梦科技企业用户进行沟通和维权，维权过程中产生的费用由用户自行承担。</h3>
+        1、巨梦科技平台提供给多家企业客户使用，企业客户通过巨梦科技平台进行发布用户活动等。如果企业用户违反了隐私政策或发生其它侵犯用户权益的行为，用户可要求巨梦科技提供必要的配合与巨梦科技企业用户进行沟通和维权，维权过程中产生的费用由用户自行承担。</h3>
     <br>
     <h2>六、其他事宜</h2>
     <h3>

backend/util/currency.py

@@ -0,0 +1,78 @@
+from uuid import uuid4
+from datetime import datetime
+
+from django.db import connection
+from django.db.models import  Model
+from django.core.cache import cache
+
+
+def create_code(model,prefix):
+    current_date = datetime.now().strftime('%Y%m%d%H%M%S')
+    code = f"{prefix}{current_date}" + str(uuid4().int)[:6]
+    return code
+
+def lock(key):
+    if callable(key):  # @lock
+        def inner(*args, **kwargs):
+            with cache.lock(key='lock'):
+                return key(*args, **kwargs)
+        inner.__name__ = key.__name__
+    else:  # @lock(key='aaa')
+        def inner(func):
+            def _inner(*args, **kwargs):
+                with cache.lock(key=key):
+                    return func(*args, **kwargs)
+            _inner.__name__ = func.__name__
+            return _inner
+    return inner
+
+def recursion_down_fast(instance:Model, parent='parent', key='id') -> list[int]:
+    """向下递归instance的所有子级，且返回一维列表，使用sql优化，速度非常快"""
+    if not instance:
+        return []
+    sql = f"""
+    WITH RECURSIVE children AS (
+        SELECT id, {key} AS param_{key} FROM {instance.__class__._meta.db_table} WHERE {parent}_id = %s UNION ALL
+        SELECT a.id, a.{key} AS param_{key} FROM {instance.__class__._meta.db_table} a
+        INNER JOIN children b ON a.{parent}_id = b.id
+    ) SELECT param_{key} FROM children;
+    """
+    with connection.cursor() as cursor:
+        cursor.execute(sql, [getattr(instance, key)])
+        data = cursor.fetchall()
+        return [getattr(instance, key), *[i[0] for i in data]]
+
+def recursion_up_fast(instance: Model, parent='parent', key='id') -> list[int]:
+    """向上递归instance的所有父级，使用sql优化，速度非常快"""
+    if not instance:
+        return []
+    sql = f"""
+    WITH RECURSIVE parents AS (
+        SELECT id, {key} as param_{key}, {parent}_id FROM {instance.__class__._meta.db_table} WHERE id = %s UNION ALL
+        SELECT a.id, a.{key} as param_{key}, a.{parent}_id FROM {instance.__class__._meta.db_table} a
+        INNER JOIN parents b ON a.id = b.{parent}_id
+    ) SELECT param_{key} FROM parents;
+    """
+    with connection.cursor() as cursor:
+        cursor.execute(sql, [getattr(instance, key)])
+        data = cursor.fetchall()
+        return [i[0] for i in data]
+
+def recursion_up_joint(instance: Model, parent='parent', key='name', joint='/') -> str:
+    """向上递归instance所有父级并拼接需要的值，返回完整路径，使用sql优化，速度非常快"""
+    if instance is None:
+        return ''
+    sql = f"""
+    WITH RECURSIVE parents AS (
+        SELECT id, {parent}_id, {key}::TEXT AS path FROM {instance.__class__._meta.db_table} WHERE {key} = %s AND id = %s UNION ALL
+        SELECT a.id, a.{parent}_id, (a.{key} || '{joint}' || b.path)::TEXT FROM {instance.__class__._meta.db_table} a
+        INNER JOIN parents b ON a.id = b.{parent}_id
+    ) SELECT path FROM parents where {parent}_id IS NULL;
+    """
+    with connection.cursor() as cursor:
+        cursor.execute(sql, [getattr(instance, key), instance.pk])
+        data = cursor.fetchall()
+        try:
+            return data[0][0]
+        except IndexError:
+            raise Exception('找不到初始数据')

crud-gen.sh

@@ -0,0 +1,87 @@
+if ! [ -f ".env" ];then
+    echo ".env file not found"
+    exit 1
+fi
+
+if [ -z "$3" ]; then
+    echo "Use: $0 <app_name> <view_name> <table_name>"
+    exit 1
+fi
+
+
+DIR=./web/src/views/$1/$2
+
+
+# 设置数据库连接信息
+HOST="177.10.0.13"
+USER="root"
+PASSWORD=$(cat .env | grep MYSQL_PASSWORD |  sed 's/^.*MYSQL_PASSWORD=//g')
+DATABASE="django-vue3-admin"
+TABLE=$3
+TARGET_FILE="./web/src/views/$1/$2/crud.tsx"
+
+
+# 表是否存在
+TABLE_EXISTS=$(mysql -h $HOST -u $USER -p$PASSWORD -D $DATABASE -e "SHOW TABLES LIKE '$TABLE';" -N | grep "$TABLE" | wc -l)
+
+if [ "$TABLE_EXISTS" -eq 0 ]; then
+    echo "Table $TABLE does not exist in database $DATABASE."
+    exit 1
+fi
+
+mkdir -p $DIR
+cp -r ./web/src/views/template/* $DIR
+sed -i "s/VIEWSETNAME/$2/g" $DIR/*
+
+sed -n -e :a -e '1,5!{P;N;D;};N;ba' -i $TARGET_FILE
+
+# 查询表结构
+QUERY="SELECT COLUMN_NAME, DATA_TYPE, COLUMN_COMMENT, IS_NULLABLE FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = '$DATABASE' AND TABLE_NAME = '$TABLE' ORDER BY ORDINAL_POSITION;"
+
+# 使用 MySQL 查询获取字段信息，并生成 fast-crud 配置
+mysql -h $HOST -u $USER -p$PASSWORD -D $DATABASE -e "$QUERY" -N | while read COLUMN_NAME DATA_TYPE COLUMN_COMMENT IS_NULLABLE; do
+    # 映射 MySQL 数据类型到 fast-crud 类型
+    case "$DATA_TYPE" in
+        "int"|"bigint"|"smallint"|"mediumint"|"tinyint"|"decimal"|"float"|"double")
+            TYPE="number"
+            ;;
+        "date"|"datetime"|"timestamp")
+            TYPE="date"
+            ;;
+        *)
+            TYPE="text"
+            ;;
+    esac
+
+    echo "                $COLUMN_NAME: {
+                    title: '$COLUMN_NAME',
+                    type: '$TYPE',
+                    search: { show: true },
+                    column: {
+                        minWidth: 120,
+                        sortable: 'custom',
+                    },
+                    form: {" >> $TARGET_FILE
+
+    if [ "$IS_NULLABLE" = "NO" ]; then
+        echo "                        helper: {
+                            render() {
+                                return <div style={"color:blue"}>$COLUMN_NAME 是必填的</div>;
+                            }
+                        },
+                        rules: [{
+                            required: true, message: '$COLUMN_NAME 是必填的'
+                        }]," >> $TARGET_FILE
+    fi
+
+    echo "                        component: {
+                            placeholder: '请输入 $COLUMN_NAME',
+                        },
+                    },
+                }," >> $TARGET_FILE
+done
+
+echo "            },
+        },
+    };
+}" >> $TARGET_FILE

docker_env/django/Dockerfile

@@ -6,4 +6,4 @@ RUN awk 'BEGIN { cmd="cp -i ./conf/env.example.py   ./conf/env.py "; print "n" |
 RUN sed -i "s|DATABASE_HOST = '127.0.0.1'|DATABASE_HOST = '177.10.0.1'|g" ./conf/env.py
 RUN sed -i "s|REDIS_HOST = '127.0.0.1'|REDIS_HOST = '177.10.0.1'|g" ./conf/env.py
 RUN python3 -m pip install -i https://pypi.tuna.tsinghua.edu.cn/simple/ -r requirements.txt
-CMD ["/backend/docker_start.sh"]
+CMD ["sh","docker_start.sh"]

docker_env/nginx/my-80.conf

@@ -7,6 +7,10 @@ server {
         index index.html index.htm;
         root /usr/share/nginx/html;
         try_files $uri $uri/ /index.html;
+        # 禁止缓存html文件,避免前端页面不及时更新，需要用户手动刷新的情况
+        if ($request_uri ~* "^/$|^/index.html|^/index.htm") {
+             add_header Cache-Control "no-store";
+        }
     }
 
     location ~ ^/api/ {

docker_env/nginx/my.conf

@@ -11,6 +11,10 @@ server {
         real_ip_header X-Forwarded-For;
         root /usr/share/nginx/html;
         index  index.html index.php index.htm;
+        # 禁止缓存html文件,避免前端页面不及时更新，需要用户手动刷新的情况
+        if ($request_uri ~* "^/$|^/index.html|^/index.htm") {
+             add_header Cache-Control "no-store";
+        }
     }
 
     location /api/ {

docker_env/web/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/dvadmin3-base-web:16.19-alpine
+FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/dvadmin3-base-web:18.20-alpine
 WORKDIR /web/
 COPY web/. .
 RUN yarn install --registry=https://registry.npmmirror.com

init.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 ENV_FILE=".env"
+HOST="177.10.0.13"
 # 检查 .env 文件是否存在
 if [ -f "$ENV_FILE" ]; then
     echo "$ENV_FILE 文件已存在。"
@@ -15,17 +16,60 @@ else
     echo "REDIS随机密码已生成并写入 $ENV_FILE 文件。"
     
     awk 'BEGIN { cmd="cp -i ./backend/conf/env.example.py   ./backend/conf/env.py "; print "n" |cmd; }'
-    sed -i "s|DATABASE_HOST = '127.0.0.1'|DATABASE_HOST = '177.10.0.13'|g" ./backend/conf/env.py
+    sed -i "s|DATABASE_HOST = '127.0.0.1'|DATABASE_HOST = '$HOST'|g" ./backend/conf/env.py
     sed -i "s|REDIS_HOST = '127.0.0.1'|REDIS_HOST = '177.10.0.15'|g" ./backend/conf/env.py
     sed -i "s|DATABASE_PASSWORD = 'DVADMIN3'|DATABASE_PASSWORD = '$MYSQL_PASSWORD'|g" ./backend/conf/env.py
     sed -i "s|REDIS_PASSWORD = 'DVADMIN3'|REDIS_PASSWORD = '$REDIS_PASSWORD'|g" ./backend/conf/env.py
     echo "初始化密码创建成功"
 fi
 
+echo "正在启动容器..."
 docker-compose up -d
-docker exec dvadmin3-django python manage.py makemigrations
-docker exec dvadmin3-django python manage.py migrate
-docker exec dvadmin3-django python manage.py init
-echo "欢迎使用dvadmin3项目"
-echo "登录地址：http://ip:8080"
-echo "如访问不到，请检查防火墙配置"
+
+if [ $? -ne 0 ]; then
+    echo "docker-compose up -d 执行失败！"
+    exit 1
+fi
+
+MYSQL_PORT=3306
+REDIS_PORT=6379
+
+check_mysql() {
+    if nc -z "$HOST" "$MYSQL_PORT" >/dev/null 2>&1; then
+        echo "MySQL 服务正在运行在 $HOST:$MYSQL_PORT"
+        return 0
+    else
+        return 1
+    fi
+}
+
+check_redis() {
+    if nc -z "$HOST" "$REDIS_PORT" >/dev/null 2>&1; then
+        echo "Redis 服务正在运行在 $HOST:$REDIS_PORT"
+        return 0
+    else
+        return 1
+    fi
+}
+
+i=1
+while [ $i -le 8 ]; do
+    if check_mysql || check_redis; then
+        echo "正在迁移数据..."
+        docker exec dvadmin3-django python3 manage.py makemigrations
+        docker exec dvadmin3-django python3 manage.py migrate
+        echo "正在初始化数据..."
+        docker exec dvadmin3-django python3 manage.py init
+        echo "欢迎使用dvadmin3项目"
+        echo "登录地址：http://ip:8080"
+        echo "如访问不到，请检查防火墙配置"
+        exit 0
+    else
+        echo "第 $i 次尝试：MySQL 或 REDIS服务未运行，等待 2 秒后重试..."
+        sleep 2
+    fi
+    i=$((i+1))
+done
+
+echo "尝试 5 次后，MySQL 或 REDIS服务仍未运行"
+exit 1

web/.env

@@ -1,6 +1,6 @@
 # port 端口号
 VITE_PORT = 8080
-VITE_API_URL = 'http://dvadmin3api.django.icu:8001'
+VITE_API_URL = 'http://127.0.0.1:8000'
 # open 运行 npm run dev 时自动打开浏览器
 VITE_OPEN = false
 

web/.gitignore

@@ -21,3 +21,5 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+# 构建版本文件，无需上传git
+public/version-build

web/README.md

@@ -49,6 +49,10 @@
 👩‍👦‍👦文档地址：[coding](https://dvadmin-private.coding.net/share/km/cec69f3d-30fe-47d5-bd97-e9e851f0b776/K-2)
 
 
+## 给框架点赞
+ <img src='https://django-vue-admin.com/alipay.jpg' width='200'>
+ <img src='https://django-vue-admin.com/wechat.jpg' width='200'>
+
 
 ## 交流
 

web/flowH5.config.ts

@@ -0,0 +1,77 @@
+import { defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue';
+import path, {resolve} from 'path';
+import vueJsx from "@vitejs/plugin-vue-jsx";
+import vueSetupExtend from "vite-plugin-vue-setup-extend";
+import { terser } from 'rollup-plugin-terser';
+import postcss from 'rollup-plugin-postcss';
+import pxtorem from 'postcss-pxtorem';
+const pathResolve = (dir: string) => {
+  return resolve(__dirname, '.', dir);
+};
+export default defineConfig({
+  build: {
+    // outDir: '../backend/static/previewer',
+    lib: {
+      entry: path.resolve(__dirname, 'src/views/plugins/dvadmin3-flow-web/src/flowH5/index.ts'), // 库的入口文件
+      name: 'previewer', // 库的全局变量名称
+      fileName: (format) => `index.${format}.js`, // 输出文件名格式
+    },
+    rollupOptions: {
+      input:{
+        previewer: path.resolve(__dirname, 'src/views/plugins/dvadmin3-flow-web/src/flowH5/index.ts'),
+      },
+      external: ['vue','xe-utils'], // 指定外部依赖
+      output:{
+        // dir: '../backend/static/previewer', // 输出目录
+        entryFileNames: 'index.[format].js', // 入口文件名格式
+        format: 'commonjs',
+        globals: {
+          vue: 'Vue'
+        },
+        chunkFileNames: `[name].[hash].js`
+      },
+      plugins: [
+        terser({
+          compress: {
+            drop_console: false, // 确保不移除 console.log
+          },
+        }),
+        postcss({
+          plugins: [
+            pxtorem({
+              rootValue: 37.5,
+              unitPrecision: 5,
+              propList: ['*'],
+              selectorBlackList: [],
+              replace: true,
+              mediaQuery: false,
+              minPixelValue: 0,
+              exclude: /node_modules/i,
+            }),
+          ],
+        }),
+      ],
+    },
+  },
+  plugins: [
+    vue(),
+    vueJsx(),
+    vueSetupExtend(),
+  ],
+  resolve: {
+    alias: {
+      '/@': path.resolve(__dirname, 'src'), // '@' 别名指向 'src' 目录
+      '@views': pathResolve('./src/views'),
+      '/src':path.resolve(__dirname, 'src')
+    },
+  },
+  css:{
+    postcss:{
+
+    }
+  },
+  define: {
+    'process.env': {}
+  }
+});

web/package.json

@@ -1,41 +1,48 @@
 {
 	"name": "django-vue3-admin",
-	"version": "3.0.3",
+	"version": "3.2.0",
 	"description": "是一套全部开源的快速开发平台，毫无保留给个人免费使用、团体授权使用。\n    django-vue3-admin 基于RBAC模型的权限控制的一整套基础开发平台，权限粒度达到列级别，前后端分离，后端采用django + django-rest-framework，前端采用基于 vue3 + CompositionAPI + typescript + vite + element plus",
 	"license": "MIT",
 	"scripts": {
 		"dev": "vite --force",
+		"build:dev": "vite build --mode development",
 		"build": "vite build",
 		"build:local": "vite build --mode local_prod",
-		"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
+		"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/",
+		"build:flowH5": "vite build --config flowH5.config.ts"
 	},
 	"dependencies": {
-		"@element-plus/icons-vue": "^2.0.10",
-		"@fast-crud/fast-crud": "^1.20.1",
-		"@fast-crud/fast-extends": "^1.20.1",
-		"@fast-crud/ui-element": "^1.20.1",
-		"@fast-crud/ui-interface": "^1.20.1",
-		"@iconify/vue": "^4.1.1",
-		"@types/lodash": "^4.14.202",
-		"@vitejs/plugin-vue-jsx": "^3.0.0",
+		"@element-plus/icons-vue": "^2.3.1",
+		"@fast-crud/fast-crud": "^1.21.2",
+		"@fast-crud/fast-extends": "^1.21.2",
+		"@fast-crud/ui-element": "^1.21.2",
+		"@fast-crud/ui-interface": "^1.21.2",
+		"@great-dream/dvadmin3-celery-web": "^3.1.3",
+		"@iconify/vue": "^4.1.2",
+		"@meetjs/vant4-kit": "^1.0.1",
+		"@types/lodash": "^4.17.7",
+		"@vitejs/plugin-vue-jsx": "^4.0.1",
 		"@wangeditor/editor": "^5.1.23",
 		"@wangeditor/editor-for-vue": "^5.1.12",
-		"autoprefixer": "^10.4.14",
-		"axios": "^1.2.1",
-		"countup.js": "^2.3.2",
-		"cropperjs": "^1.5.13",
+		"autoprefixer": "^10.4.20",
+		"axios": "^1.7.4",
+		"countup.js": "^2.8.0",
+		"cropperjs": "^1.6.2",
+		"date-holidays": "^3.24.1",
 		"e-icon-picker": "2.1.1",
-		"echarts": "^5.4.1",
+		"echarts": "^5.5.1",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.5.5",
+		"element-plus": "^2.8.0",
 		"element-tree-line": "^0.2.1",
 		"font-awesome": "^4.7.0",
-		"js-cookie": "^3.0.1",
-		"js-table2excel": "^1.0.3",
+		"js-cookie": "^3.0.5",
+		"js-table2excel": "^1.1.2",
 		"jsplumb": "^2.15.6",
+		"less": "^4.3.0",
 		"lodash-es": "^4.17.21",
-		"mitt": "^3.0.0",
+		"lunar-javascript": "^1.7.1",
+		"mitt": "^3.0.1",
 		"nprogress": "^0.2.0",
 		"pinia": "^2.0.28",
 		"pinia-plugin-persist": "^1.0.0",
@@ -43,37 +50,43 @@
 		"print-js": "^1.6.0",
 		"qrcodejs2-fixes": "^0.0.2",
 		"qs": "^6.11.0",
+		"rollup-plugin-postcss": "^4.0.2",
+		"rollup-plugin-terser": "^7.0.2",
 		"screenfull": "^6.0.2",
 		"sortablejs": "^1.15.0",
 		"splitpanes": "^3.1.5",
 		"tailwindcss": "^3.2.7",
 		"ts-md5": "^1.3.1",
 		"upgrade": "^1.1.0",
-		"vue": "^3.2.45",
+		"vant": "^4.9.19",
+		"vant4-kit": "^1.0.3",
+		"vue": "^3.4.38",
 		"vue-clipboard3": "^2.0.0",
 		"vue-cropper": "^1.0.8",
+		"vue-draggable-plus": "^0.6.0",
 		"vue-grid-layout": "^3.0.0-beta1",
-		"vue-i18n": "^9.2.2",
-		"vue-router": "^4.1.6",
-		"vxe-table": "^4.4.1",
-		"xe-utils": "^3.5.7"
+		"vue-i18n": "^9.14.0",
+		"vue-qr": "^4.0.9",
+		"vue-router": "^4.4.3",
+		"vxe-table": "^4.6.18",
+		"xe-utils": "^3.5.30"
 	},
 	"devDependencies": {
-		"@types/node": "^18.11.13",
-		"@types/nprogress": "^0.2.0",
-		"@types/sortablejs": "^1.15.0",
+		"@types/node": "^18.19.42",
+		"@types/nprogress": "^0.2.3",
+		"@types/sortablejs": "^1.15.8",
 		"@typescript-eslint/eslint-plugin": "^5.46.0",
 		"@typescript-eslint/parser": "^5.46.0",
-		"@vitejs/plugin-vue": "^4.0.0",
-		"@vue/compiler-sfc": "^3.2.45",
-		"eslint": "^8.54.0",
-		"eslint-plugin-vue": "^9.8.0",
+		"@vitejs/plugin-vue": "^5.1.2",
+		"@vue/compiler-sfc": "^3.4.38",
+		"eslint": "^9.9.0",
+		"eslint-plugin-vue": "^9.27.0",
 		"prettier": "^2.8.1",
 		"sass": "^1.56.2",
 		"typescript": "^4.9.4",
-		"vite": "^4.0.0",
+		"vite": "^5.4.1",
 		"vite-plugin-vue-setup-extend": "^0.4.0",
-		"vue-eslint-parser": "^9.1.0"
+		"vue-eslint-parser": "^9.4.3"
 	},
 	"browserslist": [
 		"> 1%",

web/src/App.vue

@@ -11,7 +11,7 @@
 
 <script setup lang="ts" name="app">
 import { defineAsyncComponent, computed, ref, onBeforeMount, onMounted, onUnmounted, nextTick, watch, onBeforeUnmount } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { storeToRefs } from 'pinia';
 import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
@@ -20,13 +20,15 @@ import other from '/@/utils/other';
 import { Local, Session } from '/@/utils/storage';
 import mittBus from '/@/utils/mitt';
 import setIntroduction from '/@/utils/setIconfont';
+import websocket from '/@/utils/websocket';
 
 // 引入组件
 const LockScreen = defineAsyncComponent(() => import('/@/layout/lockScreen/index.vue'));
 const Setings = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/setings.vue'));
 const CloseFull = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/closeFull.vue'));
 const Upgrade = defineAsyncComponent(() => import('/@/layout/upgrade/index.vue'));
-
+import { ElMessageBox, ElNotification, NotificationHandle } from 'element-plus';
+import { useCore } from '/@/utils/cores';
 // 定义变量内容
 const { messages, locale } = useI18n();
 const setingsRef = ref();
@@ -34,8 +36,8 @@ const route = useRoute();
 const stores = useTagsViewRoutes();
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
-import websocket from '/@/utils/websocket';
-import { ElNotification } from 'element-plus';
+const core = useCore();
+const router = useRouter();
 // 获取版本号
 const getVersion = computed(() => {
 	let isVersion = false;
@@ -67,7 +69,15 @@ onMounted(() => {
 		mittBus.on('openSetingsDrawer', () => {
 			setingsRef.value.openDrawer();
 		});
+    // 设置皮肤缓存版本，每次更新版本可以所有用户清空缓存
+    const themeConfigVersion = '1.0.0'
 		// 获取缓存中的布局配置
+    if (Local.get('themeConfigVersion') !== themeConfigVersion) {
+        Local.clear();
+        Local.set('themeConfigVersion', themeConfigVersion);
+	      window.location.reload();
+        return
+    }
 		if (Local.get('themeConfig')) {
 			storesThemeConfig.setThemeConfig({ themeConfig: Local.get('themeConfig') });
 			document.documentElement.style.cssText = Local.get('themeConfigStyle');
@@ -84,43 +94,61 @@ onUnmounted(() => {
 });
 // 监听路由的变化，设置网站标题
 watch(
-	() => route.path,
-	() => {
-		other.useTitle();
-    other.useFavicon();
-    if (!websocket.websocket) {
-      //websockt 模块
-      try {
-        websocket.init(wsReceive)
-      } catch (e) {
-        console.log('websocket错误');
+    () => route.path,
+    () => {
+      other.useTitle();
+      other.useFavicon();
+      if (!websocket.websocket) {
+        //websockt 模块
+        try {
+          websocket.init(wsReceive)
+        } catch (e) {
+          console.log('websocket错误');
+        }
       }
+    },
+    {
+      deep: true,
     }
-	},
-	{
-		deep: true,
-	}
 );
 
 // websocket相关代码
 import { messageCenterStore } from '/@/stores/messageCenter';
 const wsReceive = (message: any) => {
-	const data = JSON.parse(message.data);
-	const { unread } = data;
-	const messageCenter = messageCenterStore();
-	messageCenter.setUnread(unread);
-	if (data.contentType === 'SYSTEM') {
-		ElNotification({
-			title: '系统消息',
-			message: data.content,
-			type: 'success',
-			position: 'bottom-right',
-			duration: 5000,
-		});
-	}
+  const data = JSON.parse(message.data);
+  const { unread } = data;
+  const messageCenter = messageCenterStore();
+  messageCenter.setUnread(unread);
+  if (data.contentType === 'SYSTEM') {
+    ElNotification({
+      title: '系统消息',
+      message: data.content,
+      type: 'success',
+      position: 'bottom-right',
+      duration: 5000,
+    });
+  } else if (data.contentType === 'Content') {
+    ElMessageBox.confirm(data.content, data.notificationTitle, {
+      confirmButtonText: data.notificationButton,
+      dangerouslyUseHTMLString: true,
+      cancelButtonText: '关闭',
+      type: 'info',
+      closeOnClickModal: false,
+    }).then(() => {
+      ElMessageBox.close();
+      const path = data.path;
+      if (route.path === path) {
+        core.bus.emit('onNewTask', { name: 'onNewTask' });
+      } else {
+        router.push({ path});
+      }
+    })
+        .catch(() => {});
+  }
+
 };
 onBeforeUnmount(() => {
-	// 关闭连接
-	websocket.close();
+  // 关闭连接
+  websocket.close();
 });
 </script>

web/src/assets/iconfont/iconfont-01/iconfont.css

@@ -0,0 +1,55 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 3882322 */
+  src: url('iconfont.woff2?t=1676037377315') format('woff2'),
+       url('iconfont.woff?t=1676037377315') format('woff'),
+       url('iconfont.ttf?t=1676037377315') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-xiaoxizhongxin:before {
+  content: "\e665";
+}
+
+.icon-xitongshezhi:before {
+  content: "\e7ba";
+}
+
+.icon-caozuorizhi:before {
+  content: "\e611";
+}
+
+.icon-guanlidenglurizhi:before {
+  content: "\ea45";
+}
+
+.icon-rizhi:before {
+  content: "\e60c";
+}
+
+.icon-system:before {
+  content: "\e684";
+}
+
+.icon-Area:before {
+  content: "\eaa2";
+}
+
+.icon-file:before {
+  content: "\e671";
+}
+
+.icon-dict:before {
+  content: "\e626";
+}
+
+.icon-configure:before {
+  content: "\e733";
+}
+

web/src/assets/iconfont/iconfont-02/iconfont.css

@@ -0,0 +1,427 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 2298093 */
+  src: url('iconfont.woff2?t=1627014681704') format('woff2'),
+       url('iconfont.woff?t=1627014681704') format('woff'),
+       url('iconfont.ttf?t=1627014681704') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-diannao101:before {
+  content: "\e670";
+}
+
+.icon-diannao:before {
+  content: "\e618";
+}
+
+.icon-diannao1:before {
+  content: "\e622";
+}
+
+.icon-diannao-shuju:before {
+  content: "\e63e";
+}
+
+.icon-shoujidiannao:before {
+  content: "\e62e";
+}
+
+.icon-diannaobangong:before {
+  content: "\e647";
+}
+
+.icon-LoggedinPC:before {
+  content: "\e604";
+}
+
+.icon-barcode-qr:before {
+  content: "\e61e";
+}
+
+.icon-zhongduancanshuchaxun:before {
+  content: "\e638";
+}
+
+.icon-shouye_dongtaihui:before {
+  content: "\e606";
+}
+
+.icon-putong:before {
+  content: "\e603";
+}
+
+.icon-dongtai:before {
+  content: "\e659";
+}
+
+.icon-wenducanshu-05:before {
+  content: "\e634";
+}
+
+.icon-zhongduancanshu:before {
+  content: "\e63b";
+}
+
+.icon-tongzhi1:before {
+  content: "\e63a";
+}
+
+.icon-tongzhi2:before {
+  content: "\e649";
+}
+
+.icon-tongzhi3:before {
+  content: "\e648";
+}
+
+.icon-tongzhi4:before {
+  content: "\e60c";
+}
+
+.icon-dianhua:before {
+  content: "\e615";
+}
+
+.icon-xianshimima:before {
+  content: "\e63c";
+}
+
+.icon-yincangmima:before {
+  content: "\e63d";
+}
+
+.icon-shuxing:before {
+  content: "\e67a";
+}
+
+.icon-juxingkaobei:before {
+  content: "\e7a5";
+}
+
+.icon-shuxingtu:before {
+  content: "\e685";
+}
+
+.icon-bolangneng:before {
+  content: "\e745";
+}
+
+.icon-bolangnengshiyanchang:before {
+  content: "\e746";
+}
+
+.icon--chaifenhang:before {
+  content: "\e6d1";
+}
+
+.icon--chaifenlie:before {
+  content: "\e6d0";
+}
+
+.icon-tupianyulan:before {
+  content: "\e67e";
+}
+
+.icon-15tupianyulan:before {
+  content: "\e624";
+}
+
+.icon-728bianjiqi_zitidaxiao:before {
+  content: "\e660";
+}
+
+.icon-ziti:before {
+  content: "\e7b1";
+}
+
+.icon-font-size:before {
+  content: "\eaef";
+}
+
+.icon-tuodong:before {
+  content: "\e6a8";
+}
+
+.icon-zhongyingwen1:before {
+  content: "\e7a3";
+}
+
+.icon-fuhao-yingwen:before {
+  content: "\e714";
+}
+
+.icon-fuhao-zhongwen:before {
+  content: "\e712";
+}
+
+.icon-diqiu:before {
+  content: "\e689";
+}
+
+.icon-xingqiu:before {
+  content: "\e65c";
+}
+
+.icon-diqiu1:before {
+  content: "\e631";
+}
+
+.icon-huanjingxingqiu:before {
+  content: "\e617";
+}
+
+.icon-zidingyibuju:before {
+  content: "\e637";
+}
+
+.icon-dayin:before {
+  content: "\e612";
+}
+
+.icon-step:before {
+  content: "\e601";
+}
+
+.icon-30xuanzhongyuanxingfill:before {
+  content: "\e677";
+}
+
+.icon-shibai:before {
+  content: "\e60b";
+}
+
+.icon-7_round_solid:before {
+  content: "\e64d";
+}
+
+.icon-6_round_solid:before {
+  content: "\e64e";
+}
+
+.icon-9_round_solid:before {
+  content: "\e64f";
+}
+
+.icon-1_round_solid:before {
+  content: "\e650";
+}
+
+.icon-5_round_solid:before {
+  content: "\e651";
+}
+
+.icon-2_round_solid:before {
+  content: "\e654";
+}
+
+.icon-0_round_solid:before {
+  content: "\e655";
+}
+
+.icon-3_round_solid:before {
+  content: "\e656";
+}
+
+.icon-4_round_solid:before {
+  content: "\e657";
+}
+
+.icon-8_round_solid:before {
+  content: "\e658";
+}
+
+.icon-radio-off-full:before {
+  content: "\ea6b";
+}
+
+.icon-tongzhi:before {
+  content: "\e600";
+}
+
+.icon-ditu:before {
+  content: "\e8bc";
+}
+
+.icon-ico:before {
+  content: "\e646";
+}
+
+.icon-chazhaobiaodanliebiao:before {
+  content: "\e76a";
+}
+
+.icon-biaodan:before {
+  content: "\e61d";
+}
+
+.icon-siweidaotu:before {
+  content: "\e614";
+}
+
+.icon-jiliandongxuanzeqi:before {
+  content: "\e616";
+}
+
+.icon-caijian:before {
+  content: "\e611";
+}
+
+.icon-fuwenben:before {
+  content: "\e7e4";
+}
+
+.icon-fuwenbenkuang:before {
+  content: "\e66f";
+}
+
+.icon-shangchuan:before {
+  content: "\e663";
+}
+
+.icon-xuanzeqi:before {
+  content: "\e635";
+}
+
+.icon-fangkuang:before {
+  content: "\e642";
+}
+
+.icon-gouxuan-weixuanzhong-xianxingfangkuang:before {
+  content: "\e77b";
+}
+
+.icon-shidu:before {
+  content: "\e60a";
+}
+
+.icon-yangan:before {
+  content: "\e67d";
+}
+
+.icon-wendu:before {
+  content: "\e686";
+}
+
+.icon-zaosheng:before {
+  content: "\e61c";
+}
+
+.icon-jinridaiban:before {
+  content: "\e60f";
+}
+
+.icon-AIshiyanshi:before {
+  content: "\e609";
+}
+
+.icon-shenqingkaiban:before {
+  content: "\e639";
+}
+
+.icon-zhongyingwenqiehuan:before {
+  content: "\e611";
+}
+
+.icon-zhongyingwen:before {
+  content: "\e605";
+}
+
+.icon-zhongyingzhuanhuan:before {
+  content: "\e6a2";
+}
+
+.icon-zhongyingwenyuyan:before {
+  content: "\e609";
+}
+
+.icon-shuju:before {
+  content: "\e613";
+}
+
+.icon-ico_shuju:before {
+  content: "\e6ff";
+}
+
+.icon-shuju1:before {
+  content: "\e60e";
+}
+
+.icon-fuzhiyemian:before {
+  content: "\e772";
+}
+
+.icon-caozuo-wailian:before {
+  content: "\e711";
+}
+
+.icon-icon-:before {
+  content: "\e620";
+}
+
+.icon-gerenzhongxin:before {
+  content: "\e60d";
+}
+
+.icon-caidan:before {
+  content: "\e652";
+}
+
+.icon-xitongshezhi:before {
+  content: "\e69b";
+}
+
+.icon-neiqianshujuchucun:before {
+  content: "\e62f";
+}
+
+.icon-shouye:before {
+  content: "\e653";
+}
+
+.icon-quanxian:before {
+  content: "\e610";
+}
+
+.icon-zujian:before {
+  content: "\e85e";
+}
+
+.icon-crew_feature:before {
+  content: "\e602";
+}
+
+.icon-gongju:before {
+  content: "\e62d";
+}
+
+.icon-skin:before {
+  content: "\e636";
+}
+
+.icon-shixinyuan:before {
+  content: "\e669";
+}
+
+.icon-webicon318:before {
+  content: "\e6a9";
+}
+
+.icon-dian:before {
+  content: "\e608";
+}
+
+.icon-fullscreen:before {
+  content: "\e623";
+}
+
+.icon-tuichuquanping:before {
+  content: "\e641";
+}
+

web/src/components/avatarSelector/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="user-info-head" @click="editCropper()">
-		<el-avatar :size="100" :src="options.img" />
+		<el-avatar :size="100" :src="getBaseURL(options.img)" />
 		<el-dialog :title="title" v-model="dialogVisiable" width="600px" append-to-body @opened="modalOpened" @close="closeDialog">
 			<el-row>
 				<el-col class="flex justify-center">
@@ -50,10 +50,11 @@ import { VueCropper } from 'vue-cropper';
 import { useUserInfo } from '/@/stores/userInfo';
 import { getCurrentInstance, nextTick, reactive, ref, computed, onMounted, defineExpose } from 'vue';
 import { base64ToFile } from '/@/utils/tools';
+import headerImage from "/@/assets/img/headerImage.png";
+import {getBaseURL} from "/@/utils/baseUrl";
 const userStore = useUserInfo();
 const { proxy } = getCurrentInstance();
 
-const open = ref(false);
 const visible = ref(false);
 const title = ref('修改头像');
 const emit = defineEmits(['uploadImg']);
@@ -75,7 +76,7 @@ const dialogVisiable = computed({
 
 //图片裁剪数据
 const options = reactive({
-	img: userStore.userInfos.avatar, // 裁剪图片的地址
+	img: userStore.userInfos.avatar || headerImage, // 裁剪图片的地址
 	fileName: '',
 	autoCrop: true, // 是否默认生成截图框
 	autoCropWidth: 200, // 默认生成截图框宽度
@@ -165,6 +166,7 @@ const updateAvatar = (img) => {
 
 defineExpose({
 	updateAvatar,
+	editCropper
 });
 </script>
 
@@ -172,7 +174,6 @@ defineExpose({
 .user-info-head {
 	position: relative;
 	display: inline-block;
-	height: 120px;
 }
 
 .user-info-head:hover:after {

web/src/components/calendar/index.vue

@@ -0,0 +1,402 @@
+<template>
+  <div style="width: 100%; height: 100%;">
+    <div class="selected-show" v-if="props.modelValue && props.selectable">
+      <el-text>已选择:</el-text>
+      <el-tag v-if="props.multiple" v-for="item in data" closable @close="handleTagClose(item)">
+        {{ item.toLocaleDateString('en-CA') }}
+      </el-tag>
+      <el-tag v-else closable @close="handleTagClose(data)">{{ data?.toLocaleDateString('en-CA') }}</el-tag>
+      <el-button v-if="props.modelValue" size="small" type="text" @click="clear">清空</el-button>
+    </div>
+    <div class="controls">
+      <div>
+        今天：<el-text size="large">{{ today.toLocaleDateString('en-CA') }}</el-text>
+      </div>
+      <!-- <div class="current-month">
+          <el-tag size="large" type="primary">
+            {{ currentCalendarDate.getFullYear() }}年{{ currentCalendarDate.getMonth() + 1 }}月
+          </el-tag>
+        </div> -->
+      <div class="control-button" v-if="!(!!props.range && props.range[0] && props.range[1]) && props.showPageTurn">
+        <el-button-group size="small" type="default" v-if="props.pageTurn">
+          <el-popover trigger="click" width="160px">
+            <template #reference>
+              <el-button type="text" size="small">节假日设置</el-button>
+            </template>
+            <el-switch v-model="showHoliday" active-text="显示节日" inactive-text="关闭节日" inline-prompt />
+            <el-checkbox v-model="showLunarHoliday" label="农历节日" />
+            <el-checkbox v-model="showJieQi" label="节气" />
+            <el-checkbox v-model="showDetailedHoliday" label="更多节日" />
+          </el-popover>
+          <el-button icon="DArrowLeft" @click="turnToPreY">上年</el-button>
+          <el-button icon="ArrowLeft" @click="turnToPreM">上月</el-button>
+          <el-button @click="turnToToday">今天</el-button>
+          <el-button icon="ArrowRight" @click="turnToNextM">下月</el-button>
+          <el-button icon="DArrowRight" @click="turnToNextY">下年</el-button>
+        </el-button-group>
+      </div>
+    </div>
+    <el-divider style="margin: 4px;" />
+    <div class="calender">
+      <table style="width: 100%; border-collapse: collapse;">
+        <thead>
+          <tr>
+            <th class="calender-header" v-for="item, ind in ['日', '一', '二', '三', '四', '五', '六']" :key="ind">
+              {{ item }}
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="week in calendarList">
+            <td class="calender-td" v-for="item in week">
+              <div class="calender-cell" :data-date="item.date.toLocaleDateString('en-CA')" :class="{
+                'no-current-month': item.date.getMonth() !== currentCalendarDate.getMonth(),
+                'today': item.date.toDateString() === today.toDateString(),
+                'selected': item.selected,
+                'disabled': item.disabled,
+              }" @mouseenter="onCalenderCellHover" @mouseleave="onCalenderCellUnhover"
+                @click="(e: MouseEvent) => item.disabled ? null : onCalenderCellClick(e)">
+                <div class="calender-cell-header calender-cell-line">
+                  <span>{{ item.date.getDate() }}</span>
+                  <span v-if="item.selected">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 1024 1024">
+                      <path fill="currentColor"
+                        d="M77.248 415.04a64 64 0 0 1 90.496 0l226.304 226.304L846.528 188.8a64 64 0 1 1 90.56 90.496l-543.04 543.04-316.8-316.8a64 64 0 0 1 0-90.496z">
+                      </path>
+                    </svg>
+                  </span>
+                </div>
+                <div class="calender-cell-body calender-cell-line">
+                  <slot name="cell-body" v-bind="item">
+                  </slot>
+                </div>
+                <div class="calender-cell-footer calender-cell-line">
+                  <span>{{ item.holiday || '&nbsp;' }}</span>
+                  <el-text v-if="item.date.toDateString() === today.toDateString()" type="danger">今天</el-text>
+                </div>
+                <!-- {{ item }} -->
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="watermark" v-if="props.watermark" :style="watermarkPositionMap[props.watermarkPosition]">
+        {{ (currentCalendarDate.toLocaleDateString('en-CA').split('-').slice(0, 2)).join('-') }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { useUi } from '@fast-crud/fast-crud';
+import { ref, defineProps, PropType, watch, computed, onMounted } from 'vue';
+import Holidays from 'date-holidays';
+import Lunar from 'lunar-javascript';
+const LUNAR = Lunar.Lunar; // 农历
+const SOLAR = Lunar.Solar; // 阳历
+
+const props = defineProps({
+  modelValue: {},
+  // 日期多选
+  multiple: { type: Boolean, default: false },
+  // 日期范围
+  range: { type: Object as PropType<[Date, Date]> },
+  // 可以翻页
+  pageTurn: { type: Boolean, default: true },
+  // 跨页选择
+  crossPage: { type: Boolean, default: false },
+  // 显示年月水印和水印位置
+  watermark: { type: Boolean, default: true },
+  watermarkPosition: { type: Object as PropType<PositionType>, default: 'bottom-right' },
+  // 显示翻页控件
+  showPageTurn: { type: Boolean, default: true },
+  // 是否可选
+  selectable: { type: Boolean, default: true },
+  // 验证日期是否有效
+  validDate: { type: Object as PropType<ValidDateFunc>, default: () => ((d: Date) => true) }
+});
+type ValidDateFunc = (d: Date) => boolean;
+type PositionType = 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right' | 'center' | 'center-left' | 'center-right' | 'center-top';
+const today = new Date();
+const showHoliday = ref<boolean>(true); // 显示节日
+const showDetailedHoliday = ref<boolean>(false); // 显示详细的国际节日
+const showJieQi = ref<boolean>(true); // 显示节气
+const showLunarHoliday = ref<boolean>(true); // 显示农历节日
+const watermarkPositionMap: { [key: string]: any } = {
+  'top-left': { top: '40px', left: 0, transformOrigin: '0 0' },
+  'top-right': { top: '40px', right: 0, transformOrigin: '100% 0' },
+  'bottom-left': { bottom: 0, left: 0, transformOrigin: '0 100%' },
+  'bottom-right': { bottom: 0, right: 0, transformOrigin: '100% 100%' },
+  'center': { top: '50%', left: '50%', transformOrigin: '50% 50%', transform: 'translate(-50%, -50%) scale(10)' },
+  'center-left': { top: '50%', left: 0, transformOrigin: '0 50%' },
+  'center-right': { top: '50%', right: 0, transformOrigin: '100% 50%' },
+  'center-top': { top: 0, left: '50%', transformOrigin: '50% 0', transform: 'translate(-50%, 40px) scale(10)' },
+  'center-bottom': { bottom: 0, left: '50%', transformOrigin: '50% 100%', transform: 'translate(-50%, 0) scale(10)' },
+};
+// 获取当月第一周的第一天（包括上个月）
+const calendarFirstDay = (current: Date = new Date()) => {
+  let today = new Date(current); // 指定天
+  let firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1); // 月初天
+  let weekOfFirstDay = firstDayOfMonth.getDay(); // 周几，0日
+  if (weekOfFirstDay === 0) return new Date(firstDayOfMonth); // 是周日则直接返回
+  let firstDayOfWeek = new Date(firstDayOfMonth);
+  // 月初减去周几，不+1是因为从日历周日开始
+  firstDayOfWeek.setDate(firstDayOfMonth.getDate() - weekOfFirstDay);
+  return new Date(firstDayOfWeek);
+};
+// 获取当月最后一周的最后一天（包括下个月）
+const calendarLastDay = (current: Date = new Date()) => {
+  let today = new Date(current); // 指定天
+  let lastDayOfMonth = new Date(today.getFullYear(), today.getMonth() + 1, 1); // 月末天
+  lastDayOfMonth.setDate(lastDayOfMonth.getDate() - 1);
+  let weekOfFirstDay = lastDayOfMonth.getDay();
+  if (weekOfFirstDay === 6) return new Date(lastDayOfMonth); // 是周六则直接返回
+  let lastDayOfWeek = new Date(lastDayOfMonth);
+  // 月末加剩下周几，要-1是因为日历到周六结束
+  lastDayOfWeek.setDate(lastDayOfMonth.getDate() + (7 - weekOfFirstDay - 1));
+  return new Date(lastDayOfWeek);
+};
+const generateDateList = (startDate: Date, endDate: Date): Date[] => { // 生成日期列表
+  let dates = [];
+  let s = new Date(startDate);
+  let e = new Date(endDate);
+  while (s <= e) {
+    dates.push(new Date(s));
+    s.setDate(s.getDate() + 1);
+  }
+  return dates;
+};
+// 日历当前页范围
+interface CalendarCell {
+  date: Date;
+  selected: boolean;
+  disabled: boolean;
+  currentMonth: boolean;
+  holiday: string;
+};
+const currentCalendarDate = ref<Date>(new Date());
+const calendarList = computed(() => {
+  let dates = (!!props.range && props.range[0] && props.range[1]) ?
+    generateDateList(props.range[0], props.range[1]) :
+    generateDateList(calendarFirstDay(currentCalendarDate.value), calendarLastDay(currentCalendarDate.value));
+  let proce_dates: CalendarCell[] = dates.map((value) => {
+    let solarDate = SOLAR.fromDate(value);
+    let lunarDate = solarDate.getLunar();
+    let solarHolidays: string[] = solarDate.getFestivals(); // 国历节日
+    let lunarHolidays: string[] = lunarDate.getFestivals(); // 农历节日
+    let jieQi: string = lunarDate.getJieQi(); // 节气
+    // 农历节日、国际节日、节气三选一
+    let holiday = showHoliday.value ? ((showLunarHoliday.value ? lunarHolidays[0] : '') || (showJieQi.value ? jieQi : '') ||
+      (showDetailedHoliday.value ? solarHolidays[0] : yearHolidays.value[value.toLocaleDateString('en-CA')])) : ''; // yearHolidays国际的
+    return {
+      date: value,
+      selected: props.multiple ?
+        (data.value as Date[]).findIndex((v) => v.toLocaleDateString('en-CA') === value.toLocaleDateString('en-CA')) !== -1 :
+        data.value?.toLocaleDateString('en-CA') === value.toLocaleDateString('en-CA'),
+      disabled: !props.validDate(value),
+      currentMonth: value.getMonth() === currentCalendarDate.value.getMonth(),
+      // 农历节日、节气、法定日三选一
+      holiday: holiday
+    }
+  });
+  let res: CalendarCell[][] = [];
+  for (let i = 0; i < 6; i++) res.push(proce_dates.slice(i * 7, (i + 1) * 7));
+  return res;
+});
+// 控件
+const turnToPreM = () => currentCalendarDate.value = new Date(currentCalendarDate.value.getFullYear(), currentCalendarDate.value.getMonth() - 1, 1);
+const turnToNextM = () => currentCalendarDate.value = new Date(currentCalendarDate.value.getFullYear(), currentCalendarDate.value.getMonth() + 1, 1);
+const turnToPreY = () => currentCalendarDate.value = new Date(currentCalendarDate.value.getFullYear() - 1, currentCalendarDate.value.getMonth(), 1);
+const turnToNextY = () => currentCalendarDate.value = new Date(currentCalendarDate.value.getFullYear() + 1, currentCalendarDate.value.getMonth(), 1);
+const turnToToday = () => currentCalendarDate.value = new Date();
+// 如果禁止跨页则跨页时清空选择
+watch(
+  () => currentCalendarDate.value,
+  (v, ov) => props.crossPage ? {} :
+    (v.toLocaleDateString('en-CA') === ov.toLocaleDateString('en-CA') ? {} : clear())
+);
+// 单元格事件
+const onCalenderCellHover = ({ target }: MouseEvent) => (target as HTMLElement).classList.add('onhover');
+const onCalenderCellUnhover = ({ target }: MouseEvent) => (target as HTMLElement).classList.remove('onhover');
+const onCalenderCellClick = (e: MouseEvent) => {
+  if (!props.selectable) return;
+  let strValue = (e.target as HTMLElement).dataset.date as string;
+  if (strValue === undefined) return;
+  let value = new Date(strValue);
+  if (props.multiple) {
+    let d = (data.value as Date[]).map((v) => v.toLocaleDateString('en-CA'));
+    let ind = d.findIndex((v) => v === strValue);
+    if (ind === -1) d.push(strValue);
+    else d.splice(ind, 1);
+    onDataChange(d);
+  }
+  // 这里阻止了点击取消选中，需要通过tag的x来取消
+  else (data.value?.toLocaleDateString('en-CA') === strValue ? {} : onDataChange(value));
+};
+// 选择回显
+const handleTagClose = (d: Date) => {
+  let strValue = d.toLocaleDateString('en-CA');
+  if (props.multiple) {
+    let d = (data.value as Date[]).map((v) => v.toLocaleDateString('en-CA'));
+    d.splice(d.findIndex((v) => v === strValue), 1);
+    onDataChange(d);
+  }
+  else onDataChange(null);
+};
+// 节假日
+const holidays = new Holidays('CN');
+const yearHolidays = computed(() => {
+  let h = holidays.getHolidays(currentCalendarDate.value.getFullYear());
+  let proce_h: { [key: string]: string } = {};
+  let _h: string[] = [];
+  for (let i of h) {
+    let d = i.date.split(' ')[0];
+    let hn = i.name.split(' ')[0];
+    if (_h.includes(hn)) continue;
+    proce_h[d] = hn;
+    _h.push(hn);
+  }
+  return proce_h
+});
+
+// fs-crud部分
+const data = ref<any>();
+const emit = defineEmits(['update:modelValue', 'onSave', 'onClose', 'onClosed']);
+watch(
+  () => props.modelValue,
+  (val) => {
+    if (val === undefined) data.value = props.multiple ? [] : null;
+    else data.value = props.multiple ? (val as Date[]).map((v: Date) => new Date(v)) : val;
+  },
+  { immediate: true }
+);
+const { ui } = useUi();
+const formValidator = ui.formItem.injectFormItemContext();
+const onDataChange = (value: any) => {
+  emit('update:modelValue', value);
+  formValidator.onChange();
+  formValidator.onBlur();
+};
+const reset = () => { // 重置日历
+  currentCalendarDate.value = new Date();
+  onDataChange(props.multiple ? [] : null);
+};
+const clear = () => onDataChange(props.multiple ? [] : null); // 清空数据
+defineExpose({
+  data,
+  onDataChange,
+  reset,
+  clear,
+  showHoliday,
+  showDetailedHoliday,
+  showJieQi,
+  showLunarHoliday
+});
+
+
+</script>
+
+<style lang="scss" scoped>
+.selected-show {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.controls {
+  width: 100%;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.calender {
+  position: relative;
+  width: 100%;
+  overflow-x: auto;
+  overflow-y: hidden;
+  scrollbar-width: thin;
+
+  .watermark {
+    position: absolute;
+    font-size: 16px;
+    transform: scale(10);
+    color: #aaa;
+    opacity: 0.1;
+    pointer-events: none;
+  }
+
+  table {
+    position: relative;
+  }
+
+  .calender-header {
+    padding: 16px 0;
+  }
+
+  .calender-td {
+    border: 1px solid #eee;
+    width: calc(100% / 7);
+  }
+
+  .calender-cell {
+    min-height: 96px;
+    min-width: 100px;
+    box-sizing: border-box;
+    padding: 12px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    cursor: pointer;
+
+    &.today {
+      color: var(--el-color-warning) !important;
+      background-color: var(--el-color-warning-light-9) !important;
+    }
+
+    &.onhover {
+      color: var(--el-color-primary);
+      background-color: var(--el-color-primary-light-9);
+    }
+
+    &.disabled {
+      cursor: not-allowed;
+      color: #bbb;
+      background: none;
+    }
+
+    &.no-current-month {
+      color: #bbb;
+    }
+
+    &.selected {
+      color: var(--el-color-primary);
+      background-color: var(--el-color-primary-light-9);
+    }
+
+    .calender-cell-line {
+      min-height: 0px;
+
+      &.calender-cell-header {
+        display: flex;
+        gap: 4px;
+        align-items: center;
+        pointer-events: none;
+      }
+
+      &.calender-cell-body {
+        display: flex;
+        gap: 4px;
+        align-items: center;
+      }
+
+      &.calender-cell-footer {
+        display: flex;
+        justify-content: space-between;
+        pointer-events: none;
+      }
+    }
+  }
+}
+</style>

web/src/components/fileSelector/fileItem.vue

@@ -0,0 +1,84 @@
+<template>
+  <div ref="itemRef" class="file-item" :title="data.name" @mouseenter="isShow = true" @mouseleave="isShow = false">
+    <div v-if="showTitle" class="file-name" :class="{ show: isShow }">{{ data.name }}</div>
+    <component :is="FileTypes[data.file_type].tag" v-bind="FileTypes[data.file_type].attr" />
+    <div v-if="props.showClose" class="file-del" :class="{ show: isShow }">
+      <el-icon :size="24" color="white" @click.stop="delFileHandle" style="cursor: pointer;">
+        <CircleClose style="mix-blend-mode: difference;" />
+      </el-icon>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import { defineComponent } from 'vue';
+import { ref, defineProps, PropType, watch, onMounted, h } from 'vue';
+import { successNotification } from '/@/utils/message';
+import { getBaseURL } from '/@/utils/baseUrl';
+const props = defineProps({
+  fileData: { type: Object as PropType<any>, required: true },
+  api: { type: Object as PropType<any>, required: true },
+  showTitle: { type: Boolean, default: true },
+  showClose: { type: Boolean, default: true },
+});
+const _OtherFileComponent = defineComponent({ template: '<el-icon><Files /></el-icon>' });
+const FileTypes = [
+  { tag: 'img', attr: { src: getBaseURL(props.fileData.url), draggable: false } },
+  { tag: 'video', attr: { src: getBaseURL(props.fileData.url), controls: false, autoplay: true, muted: true, loop: true } },
+  { tag: 'audio', attr: { src: getBaseURL(props.fileData.url), controls: true, autoplay: false, muted: false, loop: false, volume: 0 } },
+  { tag: _OtherFileComponent, attr: { style: { fontSize: '2rem' } } },
+];
+const isShow = ref<boolean>(false);
+const itemRef = ref<HTMLDivElement>();
+const data = ref<any>(null);
+const delFileHandle = () => props.api.DelObj(props.fileData.id).then(() => {
+  successNotification('删除成功');
+  emit('onDelFile');
+});
+watch(props.fileData, (nVal) => data.value = nVal, { immediate: true, deep: true });
+const emit = defineEmits(['onDelFile']);
+defineExpose({});
+onMounted(() => { });
+</script>
+<style scoped>
+.file-item {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-items: center;
+}
+
+.file-item>* {
+  width: 100% !important;
+}
+
+.file-name {
+  display: none;
+  position: absolute;
+  top: 0;
+  left: 0;
+  padding: 4px 12px;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+  word-break: break-all;
+  white-space: normal;
+  color: white;
+  background-color: rgba(0, 0, 0, .5);
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.file-del {
+  display: none;
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  justify-content: flex-end;
+}
+
+.show {
+  display: flex !important;
+}
+</style>

web/src/components/fileSelector/index.vue

@@ -0,0 +1,521 @@
+<template>
+  <div style="width: 100%;" :class="props.class" :style="props.style">
+    <slot name="input" v-bind="{}">
+      <div v-if="props.showInput" style="width: 100%;" :class="props.inputClass" :style="props.inputStyle">
+        <el-select v-if="props.inputType === 'selector'" v-model="data" suffix-icon="arrow-down" clearable
+          :multiple="props.multiple" placeholder="请选择文件" @click="selectVisiable = true && !props.disabled"
+          :disabled="props.disabled" @clear="selectedInit" @remove-tag="selectedInit">
+          <el-option v-for="item, index in listAllData" :key="index" :value="String(item[props.valueKey])"
+            :label="item.name" />
+        </el-select>
+
+        <div v-if="props.inputType === 'image' && props.multiple"
+          style="width: 100%; display: flex; gap: 4px; flex-wrap: wrap; margin-bottom: 4px;">
+          <div v-for="item, index in (data || [])" style="position: relative;"
+            :style="{ width: props.inputSize + 'px', height: props.inputSize + 'px' }">
+            <el-image :src="item" :key="index" fit="scale-down" class="itemList"
+              :style="{ width: props.inputSize + 'px', aspectRatio: '1 / 1' }" />
+            <el-icon v-show="(!!data && !props.disabled)" class="closeHover" :size="16" @click="clearOne(item)">
+              <Close />
+            </el-icon>
+          </div>
+          <div style="position: relative;" :style="{ width: props.inputSize + 'px', height: props.inputSize + 'px' }">
+            <div
+              style="position: absolute; left: 0; top: 0; width: 100%; height: 100%; display: flex; justify-content: center; align-items: center;">
+              <el-icon :size="24">
+                <Plus />
+              </el-icon>
+            </div>
+            <div @click="selectVisiable = true && !props.disabled" class="addControllorHover"
+              :style="{ cursor: props.disabled ? 'not-allowed' : 'pointer' }"></div>
+          </div>
+        </div>
+        <div v-if="props.inputType === 'image' && !props.multiple" class="form-display" style="position: relative;"
+          @mouseenter="formDisplayEnter" @mouseleave="formDisplayLeave"
+          :style="{ width: props.inputSize + 'px', height: props.inputSize + 'px' }">
+          <el-image :src="data" fit="scale-down" :style="{ width: props.inputSize + 'px', aspectRatio: '1 / 1' }">
+            <template #error>
+              <div></div>
+            </template>
+          </el-image>
+          <div v-show="!(!!data)"
+            style="position: absolute; left: 0; top: 0; width: 100%; height: 100%; display: flex; justify-content: center; align-items: center;">
+            <el-icon :size="24">
+              <Plus />
+            </el-icon>
+          </div>
+          <div @click="selectVisiable = true && !props.disabled" class="addControllorHover"
+            :style="{ cursor: props.disabled ? 'not-allowed' : 'pointer' }"></div>
+          <el-icon v-show="(!!data && !props.disabled) && !props.multiple" class="closeHover" :size="16" @click="clear">
+            <Close />
+          </el-icon>
+        </div>
+
+        <div v-if="props.inputType === 'video'" class="form-display" @mouseenter="formDisplayEnter"
+          @mouseleave="formDisplayLeave"
+          style="position: relative; display: flex; align-items: center;  justify-items: center;"
+          :style="{ width: props.inputSize * 2 + 'px', height: props.inputSize + 'px' }">
+          <video :src="data" :controls="false" :autoplay="true" :muted="true" :loop="true"
+            :style="{ maxWidth: props.inputSize * 2 + 'px', maxHeight: props.inputSize + 'px', margin: '0 auto' }"></video>
+          <div v-show="!(!!data)"
+            style="position: absolute; left: 0; top: 0; width: 100%; height: 100%; display: flex; justify-content: center; align-items: center;">
+            <el-icon :size="24">
+              <Plus />
+            </el-icon>
+          </div>
+          <div @click="selectVisiable = true && !props.disabled" class="addControllorHover"
+            :style="{ cursor: props.disabled ? 'not-allowed' : 'pointer' }"></div>
+          <el-icon v-show="!!data && !props.disabled" class="closeHover" :size="16" @click="clear">
+            <Close />
+          </el-icon>
+        </div>
+
+        <div v-if="props.inputType === 'audio'" class="form-display" @mouseenter="formDisplayEnter"
+          @mouseleave="formDisplayLeave"
+          style="position: relative; display: flex; align-items: center;  justify-items: center;"
+          :style="{ width: props.inputSize * 2 + 'px', height: props.inputSize + 'px' }">
+          <audio :src="data" :controls="!!data" :autoplay="false" :muted="true" :loop="true"
+            style="width: 100%; z-index: 1;"></audio>
+          <div v-show="!(!!data)"
+            style="position: absolute; left: 0; top: 0; width: 100%; height: 100%; display: flex; justify-content: center; align-items: center;">
+            <el-icon :size="24">
+              <Plus />
+            </el-icon>
+          </div>
+          <div @click="selectVisiable = true && !props.disabled" class="addControllorHover"
+            :style="{ cursor: props.disabled ? 'not-allowed' : 'pointer' }"></div>
+          <el-icon v-show="!!data && !props.disabled" class="closeHover" :size="16" @click="clear">
+            <Close />
+          </el-icon>
+        </div>
+      </div>
+    </slot>
+    <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>
+        <el-divider style="margin: 0;" />
+      </template>
+      <div style="padding: 4px;">
+        <div style="width: 100%; display: flex; justify-content: space-between; gap: 12px;">
+          <el-tabs style="width: 100%;" v-model="tabsActived" :type="props.tabsType" :stretch="true"
+            @tab-change="handleTabChange" v-if="!isSuperTenent">
+            <el-tab-pane v-if="props.tabsShow & SHOW.IMAGE" :name="0" label="图片" />
+            <el-tab-pane v-if="props.tabsShow & SHOW.VIDEO" :name="1" label="视频" />
+            <el-tab-pane v-if="props.tabsShow & SHOW.AUDIO" :name="2" label="音频" />
+            <el-tab-pane v-if="props.tabsShow & SHOW.OTHER" :name="3" label="其他" />
+          </el-tabs>
+          <el-tabs style="width: 100%;" v-model="tabsActived" :type="props.tabsType" :stretch="true"
+            @tab-change="handleTabChange" v-if="isTenentMode">
+            <el-tab-pane v-if="props.tabsShow & SHOW.IMAGE" :name="4" label="系统图片" />
+            <el-tab-pane v-if="props.tabsShow & SHOW.VIDEO" :name="5" label="系统视频" />
+            <el-tab-pane v-if="props.tabsShow & SHOW.AUDIO" :name="6" label="系统音频" />
+            <el-tab-pane v-if="props.tabsShow & SHOW.OTHER" :name="7" label="系统其他" />
+          </el-tabs>
+        </div>
+        <el-row justify="space-between" class="headerBar">
+          <el-col :span="12">
+            <slot name="actionbar-left">
+              <el-input v-model="filterForm.name" :placeholder="`请输入${TypeLabel[tabsActived % 4]}名`"
+                prefix-icon="search" clearable @change="listRequest" />
+              <div>
+                <el-tag v-if="props.multiple" type="primary" effect="light">
+                  一共选中&nbsp;{{ data?.length || 0 }}&nbsp;个文件
+                </el-tag>
+              </div>
+            </slot>
+          </el-col>
+          <el-col :span="12" style="width: 100%; display: flex; gap: 12px; justify-content: flex-end;">
+            <slot name="actionbar-right" v-bind="{}">
+              <el-button type="default" circle icon="refresh" @click="listRequest" />
+              <template v-if="tabsActived > 3 ? isSuperTenent : true">
+                <el-upload ref="uploadRef" :action="getBaseURL() + 'api/system/file/'" :multiple="false" :drag="false"
+                  :data="{ upload_method: 1 }" :show-file-list="true" :accept="AcceptList[tabsActived % 4]"
+                  :on-success="() => { listRequest(); listRequestAll(); uploadRef.clearFiles(); }"
+                  v-if="props.showUploadButton">
+                  <el-button type="primary" icon="plus">上传{{ TypeLabel[tabsActived % 4] }}</el-button>
+                </el-upload>
+                <el-button type="info" icon="link" @click="netVisiable = true" v-if="props.showNetButton">
+                  网络{{ TypeLabel[tabsActived % 4] }}
+                </el-button>
+              </template>
+            </slot>
+          </el-col>
+        </el-row>
+        <div v-if="!listData.length">
+          <slot name="empty">
+            <el-empty description="无内容，请上传" style="width: 100%; height: calc(50vh); margin-top: 24px; padding: 4px;" />
+          </slot>
+        </div>
+        <div ref="listContainerRef" class="listContainer" v-else>
+          <div v-for="item, index in listData" :key="index" @click="onItemClick($event)" :data-id="item[props.valueKey]"
+            :style="{ width: (props.itemSize || 100) + 'px', cursor: props.selectable ? 'pointer' : 'normal' }">
+            <slot name="item" :data="item">
+              <FileItem :fileData="item" :api="fileApi" :showClose="tabsActived < 4 || isSuperTenent"
+                @onDelFile="listRequest(); listRequestAll();" />
+            </slot>
+          </div>
+        </div>
+        <div class="listPaginator">
+          <el-pagination background size="small" layout="total, sizes, prev, pager, next" :total="pageForm.total"
+            v-model:page-size="pageForm.limit" :page-sizes="[10, 20, 30, 40, 50]" v-model:current-page="pageForm.page"
+            :hide-on-single-page="false" @change="handlePageChange" />
+        </div>
+      </div>
+      <!-- 只要在获取中，就最大程度阻止关闭dialog -->
+      <el-dialog v-model="netVisiable" :draggable="false" width="50%" :align-center="false" :append-to-body="true"
+        :title="'网络' + TypeLabel[tabsActived % 4] + '上传'" @closed="netUrl = ''" :close-on-click-modal="!netLoading"
+        :close-on-press-escape="!netLoading" :show-close="!netLoading" modal-class="_overlay">
+        <el-form-item :label="TypeLabel[tabsActived % 4] + '链接'">
+          <el-input v-model="netUrl" placeholder="请输入网络连接" clearable @input="netChange">
+            <template #prepend>
+              <el-select v-model="netPrefix" style="width: 110px;">
+                <el-option v-for="item, index in ['HTTP://', 'HTTPS://']" :key="index" :label="item" :value="item" />
+              </el-select>
+            </template>
+          </el-input>
+        </el-form-item>
+        <template #footer>
+          <el-button v-if="!netLoading" type="default" @click="netVisiable = false">取消</el-button>
+          <el-button type="primary" @click="confirmNetUrl" :loading="netLoading">
+            {{ netLoading ? '网络文件获取中...' : '确定' }}
+          </el-button>
+        </template>
+      </el-dialog>
+      <template #footer v-if="props.showInput">
+        <el-button type="default" @click="onClose">取消</el-button>
+        <el-button type="primary" @click="onSave">确定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useUi, UserPageQuery, AddReq, EditReq, DelReq } from '@fast-crud/fast-crud';
+import { ref, reactive, defineProps, PropType, watch, onMounted, nextTick } from 'vue';
+import { getBaseURL } from '/@/utils/baseUrl';
+import { request } from '/@/utils/service';
+import { SHOW } from './types';
+import FileItem from './fileItem.vue';
+import { pluginsAll } from '/@/views/plugins/index';
+import { storeToRefs } from "pinia";
+import { useUserInfo } from "/@/stores/userInfo";
+import { errorNotification, successNotification } from '/@/utils/message';
+
+const userInfos = storeToRefs(useUserInfo()).userInfos;
+const isTenentMode = !!(pluginsAll && pluginsAll.length && pluginsAll.indexOf('dvadmin3-tenants-web') >= 0);
+const isSuperTenent = (userInfos.value as any).schema_name === 'public';
+
+const TypeLabel = ['图片', '视频', '音频', '文件']
+const AcceptList = ['image/*', 'video/*', 'audio/*', ''];
+const props = defineProps({
+  modelValue: {},
+  class: { type: Object as PropType<String | Object>, default: '' },
+  inputClass: { type: Object as PropType<String | Object>, default: '' },
+  style: { type: Object as PropType<Object | string>, default: {} },
+  inputStyle: { type: Object as PropType<Object | string>, default: {} },
+  disabled: { type: Boolean, default: false },
+
+  tabsType: { type: Object as PropType<'' | 'card' | 'border-card'>, default: '' },
+  itemSize: { type: Number, default: 100 },
+
+  // 1000图片 100视频 10音频 1 其他 控制tabs的显示
+  tabsShow: { type: Number, default: SHOW.ALL },
+
+  // 是否可以多选，默认单选
+  // 该值为true时inputType必须是selector或image（暂不支持其他type的多选）
+  multiple: { type: Boolean, default: false },
+
+  // 是否可选，该参数用于只上传和展示而不选择和绑定model的情况
+  selectable: { type: Boolean, default: true },
+
+  // 该参数用于控制是否显示表单item。若赋值为false，则不会显示表单item，也不会显示底部按钮
+  // 如果不显示表单item，则无法触发dialog，需要父组件通过修改本组件暴露的 selectVisiable 状态来控制dialog
+  showInput: { type: Boolean, default: true },
+
+  // 表单item类型，不为selector是需要设置valueKey，否则可能获取不到媒体数据
+  inputType: { type: Object as PropType<'selector' | 'image' | 'video' | 'audio'>, default: 'selector' },
+  // inputType不为selector时生效
+  inputSize: { type: Number, default: 100 },
+
+  // v-model绑定的值是file数据的哪个key，默认是url
+  valueKey: { type: String, default: 'url' },
+
+  showUploadButton: { type: Boolean, default: true },
+  showNetButton: { type: Boolean, default: true },
+} as any);
+
+const selectVisiable = ref<boolean>(false);
+const tabsActived = ref<number>([3, 2, 1, 0][((props.tabsShow & (props.tabsShow - 1)) === 0) ? Math.log2(props.tabsShow) : 3]);
+const fileApiPrefix = '/api/system/file/';
+const fileApi = {
+  GetList: (query: UserPageQuery) => request({ url: fileApiPrefix, method: 'get', params: query }),
+  AddObj: (obj: AddReq) => request({ url: fileApiPrefix, method: 'post', data: obj }),
+  DelObj: (id: DelReq) => request({ url: fileApiPrefix + id + '/', method: 'delete', data: { id } }),
+  GetAll: () => request({ url: fileApiPrefix + 'get_all/' }),
+};
+// 过滤表单
+const filterForm = reactive({ name: '' });
+// 分页表单
+const pageForm = reactive({ page: 1, limit: 10, total: 0 });
+// 展示的数据列表
+const listData = ref<any[]>([]);
+const listAllData = ref<any[]>([]);
+const listRequest = async () => {
+  let res = await fileApi.GetList({
+    page: pageForm.page,
+    limit: pageForm.limit,
+    file_type: isTenentMode ? tabsActived.value % 4 : tabsActived.value,
+    system: tabsActived.value > 3,
+    upload_method: 1,
+    ...filterForm
+  });
+  listData.value = [];
+  await nextTick();
+  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;
+  selectedInit();
+};
+const formDisplayEnter = (e: MouseEvent) => (e.target as HTMLElement).style.setProperty('--fileselector-close-display', 'block');
+const formDisplayLeave = (e: MouseEvent) => (e.target as HTMLElement).style.setProperty('--fileselector-close-display', 'none');
+const listRequestAll = async () => {
+  if (props.inputType !== 'selector') return;
+  let res = await fileApi.GetAll();
+  listAllData.value = res.data;
+};
+// tab改变时触发
+const handleTabChange = (name: string) => { pageForm.page = 1; listRequest(); };
+// 分页器改变时触发
+const handlePageChange = (currentPage: number, pageSize: number) => { pageForm.page = currentPage; pageForm.limit = pageSize; listRequest(); };
+// 选择的行为
+const listContainerRef = ref<any>();
+const onItemClick = async (e: MouseEvent) => {
+  if (!props.selectable) return;
+  let target = e.target as HTMLElement;
+  let flat = 0;  // -1删除 0不变 1添加
+  while (!target.dataset.id) target = target.parentElement as HTMLElement;
+  let fileId = target.dataset.id;
+  if (props.multiple) {
+    if (!!!data.value) data.value = [];
+    if (target.classList.contains('active')) { target.classList.remove('active'); flat = -1; }
+    else { target.classList.add('active'); flat = 1; }
+    if (data.value.length) {
+      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();
+  } else {
+    for (let i of listContainerRef.value?.children) (i as HTMLElement).classList.remove('active');
+    target.classList.add('active');
+    data.value = fileId;
+  }
+  // onDataChange(data.value);
+};
+// 每次列表刷新都得更新一下选择状态，因为所有标签页共享列表
+const selectedInit = async () => {
+  if (!props.selectable) return;
+  await nextTick(); // 不等待一次不会刷新
+  for (let i of (listContainerRef.value?.children || [])) {
+    i.classList.remove('active');
+    let fid = (i as HTMLElement).dataset.id;
+    if (props.multiple) { if (data.value?.includes(fid)) i.classList.add('active'); }
+    else { if (fid === data.value) i.classList.add('active'); }
+  }
+};
+const uploadRef = ref<any>();
+const onSave = () => {
+  onDataChange(data.value);
+  emit('onSave', data.value);
+  selectVisiable.value = false;
+};
+const onClose = () => {
+  data.value = props.modelValue;
+  emit('onClose');
+  selectVisiable.value = false;
+};
+const onClosed = () => {
+  clearState();
+  emit('onClosed');
+};
+// 清空状态
+const clearState = () => {
+  filterForm.name = '';
+  pageForm.page = 1;
+  pageForm.limit = 10;
+  pageForm.total = 0;
+  listData.value = [];
+  // all数据不能清，因为all只会在挂载的时候赋值一次
+  // listAllData.value = [];
+};
+const clear = () => { data.value = null; onDataChange(null); };
+const clearOne = (item: any) => {
+  let _l = (JSON.parse(JSON.stringify(data.value)) as any[]).filter((i: any) => i !== item)
+  data.value = _l;
+  onDataChange(_l);
+};
+
+// 网络文件部分
+const netLoading = ref<boolean>(false);
+const netVisiable = ref<boolean>(false);
+const netUrl = ref<string>('');
+const netPrefix = ref<string>('HTTP://');
+const netChange = () => {
+  let s = netUrl.value.trim();
+  if (s.toUpperCase().startsWith('HTTP://') || s.toUpperCase().startsWith('HTTPS://')) s = s.split('://')[1];
+  if (s.startsWith('/')) s = s.substring(1);
+  netUrl.value = s;
+};
+const confirmNetUrl = () => {
+  if (!netUrl.value) return;
+  netLoading.value = true;
+  let controller = new AbortController();
+  let timeout = setTimeout(() => {
+    controller.abort();
+  }, 10 * 1000);
+  fetch(netPrefix.value + netUrl.value, { signal: controller.signal }).then(async (res: Response) => {
+    clearTimeout(timeout);
+    if (!res.ok) errorNotification(`网络${TypeLabel[tabsActived.value % 4]}获取失败！`);
+    const _ = res.url.split('?')[0].split('/');
+    let filename = _[_.length - 1];
+    // let filetype = res.headers.get('content-type')?.split('/')[1] || '';
+    let blob = await res.blob();
+    let file = new File([blob], filename, { type: blob.type });
+    let form = new FormData();
+    form.append('file', file);
+    form.append('upload_method', '1');
+    fetch(getBaseURL() + 'api/system/file/', { method: 'post', body: form })
+      .then(() => successNotification('网络文件上传成功！'))
+      .then(() => { netVisiable.value = false; listRequest(); listRequestAll(); })
+      .catch(() => errorNotification('网络文件上传失败！'))
+      .then(() => netLoading.value = false);
+  }).catch((err: any) => {
+    console.log(err);
+    clearTimeout(timeout);
+    errorNotification(`网络${TypeLabel[tabsActived.value % 4]}获取失败！`);
+    netLoading.value = false;
+  });
+};
+
+
+
+
+// fs-crud部分
+const data = ref<any>(null);
+const emit = defineEmits(['update:modelValue', 'onSave', 'onClose', 'onClosed']);
+watch(
+  () => props.modelValue,
+  (val) => data.value = props.multiple ? JSON.parse(JSON.stringify(val)) : val,
+  { immediate: true }
+);
+const { ui } = useUi();
+const formValidator = ui.formItem.injectFormItemContext();
+const onDataChange = (value: any) => {
+  let _v = null;
+  if (value) {
+    if (typeof value === 'string') _v = value.replace(/\\/g, '/');
+    else {
+      _v = [];
+      for (let i of value) _v.push(i.replace(/\\/g, '/'));
+    }
+  }
+  emit('update:modelValue', _v);
+  formValidator.onChange();
+  formValidator.onBlur();
+};
+
+defineExpose({ data, onDataChange, selectVisiable, clearState, clear });
+
+onMounted(() => {
+
+  if (props.multiple && !['selector', 'image'].includes(props.inputType))
+    throw new Error('FileSelector组件属性multiple为true时inputType必须为selector');
+  listRequestAll();
+  console.log('fileselector tenentmdoe', isTenentMode);
+  console.log('fileselector supertenent', isSuperTenent);
+});
+</script>
+
+<style scoped>
+.form-display {
+  --fileselector-close-display: none;
+  overflow: hidden;
+}
+
+._overlay {
+  width: unset !important;
+}
+
+.headerBar>* {
+  display: flex;
+  justify-content: space-between;
+  gap: 12px;
+}
+
+:deep(.el-input-group__prepend) {
+  padding: 0 20px;
+}
+
+.listContainer {
+  display: grid;
+  justify-items: center;
+  grid-template-columns: repeat(4, 1fr);
+  grid-auto-rows: min-content;
+  grid-gap: 36px;
+  margin-top: 24px;
+  padding: 8px;
+  height: calc(50vh);
+  overflow-y: auto;
+  scrollbar-width: thin;
+}
+
+.listContainer>* {
+  aspect-ratio: 1 / 1;
+  box-shadow: 0 0 4px rgba(0, 0, 0, .2);
+  border-radius: 8px;
+  overflow: hidden;
+}
+
+.active {
+  box-shadow: 0 0 8px var(--el-color-primary);
+}
+
+.listPaginator {
+  display: flex;
+  justify-content: flex-end;
+  justify-items: center;
+  padding-top: 24px;
+}
+
+.addControllorHover {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  left: 0;
+  top: 0;
+  cursor: pointer;
+  border-radius: 8px;
+  border: 1px solid #dcdfe6;
+}
+
+.addControllorHover:hover {
+  border-color: #c0c4cc;
+}
+
+.closeHover {
+  display: var(--fileselector-close-display);
+  position: absolute;
+  right: 2px;
+  top: 2px;
+  cursor: pointer;
+}
+
+.itemList {
+  border: 1px solid #dcdfe6;
+  border-radius: 8px;
+}
+</style>

web/src/components/fileSelector/types.ts

@@ -0,0 +1,7 @@
+export const SHOW = {
+	IMAGE: 0b1000, // 图片
+	VIDEO: 0b0100, // 视频
+	AUDIO: 0b0010, // 音频
+	OTHER: 0b0001, // 其他
+	ALL: 0b1111, // 全部
+};

web/src/components/importExcel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="display: inline-block">
-    <el-button size="default" type="success" @click="handleImport()">
+    <el-button  type="success" @click="handleImport()">
       <slot>导入</slot>
     </el-button>
     <el-dialog :title="props.upload.title" v-model="uploadShow" width="400px" append-to-body>

web/src/components/tableSelector/index.vue

@@ -1,203 +1,237 @@
 <template>
-  <el-select popper-class="popperClass" class="tableSelector" :multiple="props.tableConfig.isMultiple"
-             @remove-tag="removeTag" v-model="data" placeholder="请选择" @visible-change="visibleChange">
-    <template #empty>
-      <div class="option">
-        <el-input style="margin-bottom: 10px" v-model="search" clearable placeholder="请输入关键词" @change="getDict"
-                  @clear="getDict">
-          <template #append>
-            <el-button type="primary" icon="Search"/>
-          </template>
-        </el-input>
-        <el-table
-            ref="tableRef"
-            :data="tableData"
-            size="mini"
-            border
-            row-key="id"
-            style="width: 400px"
-            max-height="200"
-            height="200"
-            :highlight-current-row="!props.tableConfig.isMultiple"
-            @selection-change="handleSelectionChange"
-            @current-change="handleCurrentChange"
-        >
-          <el-table-column v-if="props.tableConfig.isMultiple" fixed type="selection" width="55"/>
-          <el-table-column fixed type="index" label="#" width="50"/>
-          <el-table-column :prop="item.prop" :label="item.label" :width="item.width"
-                           v-for="(item,index) in props.tableConfig.columns" :key="index"/>
-        </el-table>
-        <el-pagination style="margin-top: 10px" background
-                       v-model:current-page="pageConfig.page"
-                       v-model:page-size="pageConfig.limit"
-                       layout="prev, pager, next"
-                       :total="pageConfig.total"
-                       @current-change="handlePageChange"
-        />
-      </div>
-    </template>
-  </el-select>
+	<el-select
+		popper-class="popperClass"
+		class="tableSelector"
+		multiple
+    :collapseTags="props.tableConfig.collapseTags"
+		v-model="data"
+		placeholder="请选择"
+		@visible-change="visibleChange"
+	>
+		<template #empty>
+			<div class="option">
+				<el-input style="margin-bottom: 10px" v-model="search" clearable placeholder="请输入关键词" @change="getDict" @clear="getDict">
+					<template #append>
+						<el-button type="primary" icon="Search" />
+					</template>
+				</el-input>
+				<el-table
+					ref="tableRef"
+					:data="tableData"
+					:size="props.tableConfig.size"
+					border
+					row-key="id"
+					:lazy="props.tableConfig.lazy"
+					:load="props.tableConfig.load"
+					:tree-props="props.tableConfig.treeProps"
+					style="width: 600px"
+					max-height="200"
+					height="200"
+					:highlight-current-row="!props.tableConfig.isMultiple"
+					@selection-change="handleSelectionChange"
+					@select="handleSelectionChange"
+					@selectAll="handleSelectionChange"
+					@current-change="handleCurrentChange"
+				>
+					<el-table-column v-if="props.tableConfig.isMultiple" fixed type="selection" reserve-selection width="55" />
+					<el-table-column fixed type="index" label="#" width="50" />
+					<el-table-column
+						:prop="item.prop"
+						:label="item.label"
+						:width="item.width"
+						v-for="(item, index) in props.tableConfig.columns"
+						:key="index"
+					/>
+				</el-table>
+				<el-pagination
+					style="margin-top: 10px"
+					background
+					v-model:current-page="pageConfig.page"
+					v-model:page-size="pageConfig.limit"
+					layout="prev, pager, next"
+					:total="pageConfig.total"
+					@current-change="handlePageChange"
+				/>
+			</div>
+		</template>
+	</el-select>
 </template>
 
 <script setup lang="ts">
-import {defineProps, onMounted, reactive, ref, toRaw, watch} from 'vue'
-import {dict} from '@fast-crud/fast-crud'
-import XEUtils from 'xe-utils'
-import {request} from '/@/utils/service'
+import { computed, defineProps, onMounted, reactive, ref, watch } from 'vue';
+import XEUtils from 'xe-utils';
+import { request } from '/@/utils/service';
+
 const props = defineProps({
-  modelValue: {},
-  tableConfig: {
-    url: null,
-    label: null, //显示值
-    value: null, //数据值
-    isTree: false,
-    data: [],//默认数据
-    isMultiple: false, //是否多选
-    columns: [], //每一项对应的列表项
-  },
-  displayLabel: {}
-} as any)
-const emit = defineEmits(['update:modelValue'])
+	modelValue: {
+		type: Array || String || Number,
+		default: () => [],
+	},
+	tableConfig: {
+		type: Object,
+		default: {
+			url: null,
+			label: null, //显示值
+			value: null, //数据值
+			isTree: false,
+			lazy: true,
+			size: 'default',
+			load: () => {},
+			data: [], //默认数据
+			isMultiple: false, //是否多选
+			collapseTags: false,
+			treeProps: { children: 'children', hasChildren: 'hasChildren' },
+			columns: [], //每一项对应的列表项
+		},
+	},
+	displayLabel: {},
+} as any);
+console.log(props.tableConfig);
+
+const emit = defineEmits(['update:modelValue']);
 // tableRef
-const tableRef = ref()
+const tableRef = ref();
 // template上使用data
-const data = ref()
+const data = ref();
 // 多选值
-const multipleSelection = ref()
-watch(multipleSelection, // 监听multipleSelection的变化，
-    (value) => {
-      const {tableConfig} = props
-      //是否多选
-      if (!tableConfig.isMultiple) {
-        data.value = value ? value[tableConfig.label] : null
-      } else {
-
-        const result = value ? value.map((item: any) => {
-          return item[tableConfig.label]
-        }) : null
-        data.value = result
-      }
-    }, // 当multipleSelection值触发后，同步修改data.value的值
-    {immediate: true} // 立即触发一次，给data赋值初始值
-)
-
-
+const multipleSelection = ref();
 // 搜索值
-const search = ref(undefined)
+const search = ref(undefined);
 //表格数据
-const tableData = ref()
+const tableData = ref([]);
 // 分页的配置
 const pageConfig = reactive({
-  page: 1,
-  limit: 10,
-  total: 0
-})
+	page: 1,
+	limit: 10,
+	total: 0,
+});
 
 /**
  * 表格多选
  * @param val:Array
  */
 const handleSelectionChange = (val: any) => {
-  multipleSelection.value = val
-  const {tableConfig} = props
-  const result = val.map((item: any) => {
-    return item[tableConfig.value]
-  })
-  emit('update:modelValue', result)
-}
+	const { tableConfig } = props;
+	const result = val.map((item: any) => {
+		return item[tableConfig.value];
+	});
+	data.value = val.map((item: any) => {
+		return item[tableConfig.label];
+	});
 
+	emit('update:modelValue', result);
+};
 /**
  * 表格单选
  * @param val:Object
  */
 const handleCurrentChange = (val: any) => {
-  multipleSelection.value = val
-  const {tableConfig} = props
-  emit('update:modelValue', val[tableConfig.value])
-}
+	const { tableConfig } = props;
+	if (!tableConfig.isMultiple && val) {
+		// data.value = [val[tableConfig.label]];
+		emit('update:modelValue', val[tableConfig.value]);
+	}
+};
 
 /**
  * 获取字典值
  */
 const getDict = async () => {
-  const url = props.tableConfig.url
-  const params = {
-    page: pageConfig.page,
-    limit: pageConfig.limit,
-    search: search.value
-  }
-  const {data, page, limit, total} = await request({
-    url:url,
-    params:params
-  })
-  pageConfig.page = page
-  pageConfig.limit = limit
-  pageConfig.total = total
-  if (props.tableConfig.data === undefined || props.tableConfig.data.length === 0) {
-    if (props.tableConfig.isTree) {
-      tableData.value = XEUtils.toArrayTree(data, {parentKey: 'parent', key: 'id', children: 'children'})
-    } else {
-      tableData.value = data
-    }
-  } else {
-    tableData.value = props.tableConfig.data
-  }
-}
+	const url = props.tableConfig.url;
+	console.log(url);
+
+	const params = {
+		page: pageConfig.page,
+		limit: pageConfig.limit,
+		search: search.value,
+	};
+	const { data, page, limit, total } = await request({
+		url: url,
+		params: params,
+	});
+	pageConfig.page = page;
+	pageConfig.limit = limit;
+	pageConfig.total = total;
+	if (props.tableConfig.data === undefined || props.tableConfig.data.length === 0) {
+		if (props.tableConfig.isTree) {
+			tableData.value = XEUtils.toArrayTree(data, { parentKey: 'parent', key: 'id', children: 'children' });
+		} else {
+			tableData.value = data;
+		}
+	} else {
+		tableData.value = props.tableConfig.data;
+	}
+};
+
+// 获取节点值
+const getNodeValues = () => {
+	console.log(props.tableConfig.url);
+	
+	request({
+		url: props.tableConfig.url,
+		method: 'post',
+		data: { ids: props.modelValue },
+	}).then((res) => {
+		if (res.data.length > 0) {
+			data.value = res.data.map((item: any) => {
+				return item[props.tableConfig.label];
+			});
+
+			tableRef.value!.clearSelection();
+			res.data.forEach((row) => {
+				tableRef.value!.toggleRowSelection(row, true, false);
+			});
+		}
+	});
+};
 
 /**
  * 下拉框展开/关闭
  * @param bool
  */
 const visibleChange = (bool: any) => {
-  if (bool) {
-    getDict()
-  }
-}
+	if (bool) {
+		getDict();
+	}
+};
 
 /**
  * 分页
  * @param page
  */
 const handlePageChange = (page: any) => {
-  pageConfig.page = page
-  getDict()
-}
-
-// 监听displayLabel的变化，更新数据
-watch(() => {
-  return props.displayLabel
-}, (value) => {
-  const {tableConfig} = props
-  const result = value ? value.map((item: any) => {
-    return item[tableConfig.label]
-  }) : null
-  data.value = result
-}, {immediate: true})
-
+	pageConfig.page = page;
+	getDict();
+};
 
+onMounted(() => {
+	// setTimeout(() => {
+	// 	getNodeValues();
+	// }, 1000);
+});
 </script>
 
 <style scoped>
 .option {
-  height: auto;
-  line-height: 1;
-  padding: 5px;
-  background-color: #fff;
+	height: auto;
+	line-height: 1;
+	padding: 5px;
+	background-color: #fff;
 }
-
 </style>
 <style lang="scss">
 .popperClass {
-  height: 320px;
+	height: 320px;
 }
 
 .el-select-dropdown__wrap {
-  max-height: 310px !important;
+	max-height: 310px !important;
 }
 
 .tableSelector {
-  .el-icon, .el-tag__close {
-    display: none;
-  }
+	.el-icon,
+	.el-tag__close {
+		display: none;
+	}
 }
 </style>

web/src/i18n/pages/login/en.ts

@@ -3,6 +3,7 @@ export default {
 	label: {
 		one1: 'User name login',
 		two2: 'Mobile number',
+		changePwd: 'Change The Password',
 	},
 	link: {
 		one3: 'Third party login',

web/src/i18n/pages/login/zh-cn.ts

@@ -3,15 +3,18 @@ export default {
 	label: {
 		one1: '账号密码登录',
 		two2: '手机号登录',
+		changePwd: '密码修改',
 	},
 	link: {
 		one3: '第三方登录',
 		two4: '友情链接',
 	},
 	account: {
-		accountPlaceholder1: '请输入登录账号',
+		accountPlaceholder1: '请输入登录账号/邮箱/手机号',
 		accountPlaceholder2: '请输入登录密码',
 		accountPlaceholder3: '请输入验证码',
+		accountPlaceholder4:'请输入新密码',
+		accountPlaceholder5:'请再次输入新密码',
 		accountBtnText: '登 录',
 	},
 	mobile: {

web/src/i18n/pages/login/zh-tw.ts

@@ -3,6 +3,7 @@ export default {
 	label: {
 		one1: '用戶名登入',
 		two2: '手機號登入',
+		changePwd: '密码修改',
 	},
 	link: {
 		one3: '協力廠商登入',

web/src/layout/component/aside.vue

@@ -17,13 +17,15 @@ import { useRoutesList } from '/@/stores/routesList';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
 import mittBus from '/@/utils/mitt';
-
+import { useRoute } from 'vue-router';
+const route = useRoute();
 // 引入组件
 const Logo = defineAsyncComponent(() => import('/@/layout/logo/index.vue'));
 const Vertical = defineAsyncComponent(() => import('/@/layout/navMenu/vertical.vue'));
 
 // 定义变量内容
 const layoutAsideScrollbarRef = ref();
+const routesIndex = ref(0);
 const stores = useRoutesList();
 const storesThemeConfig = useThemeConfig();
 const storesTagsViewRoutes = useTagsViewRoutes();
@@ -83,10 +85,36 @@ const closeLayoutAsideMobileMode = () => {
 	if (clientWidth < 1000) themeConfig.value.isCollapse = false;
 	document.body.setAttribute('class', '');
 };
+const findFirstLevelIndex = (data, path) => {
+	for (let index = 0; index < data.length; index++) {
+		const item = data[index];
+    // 检查当前菜单项是否有子菜单，并查找是否在子菜单中找到路径
+		if (item.children && item.children.length > 0) {
+			// 检查子菜单中是否有匹配的路径
+			const childIndex = item.children.findIndex((child) => child.path === path);
+			if (childIndex !== -1) {
+				return index; // 返回当前一级菜单的索引
+			}
+			// 递归查找子菜单
+			const foundIndex = findFirstLevelIndex(item.children, path);
+			if (foundIndex !== null) {
+				return index; // 返回找到的索引
+			}
+		}
+	}
+	return null; // 找不到路径时返回 null
+};
 // 设置/过滤路由（非静态路由/是否显示在菜单中）
-const setFilterRoutes = () => {
+const setFilterRoutes = (path='') => {
 	if (themeConfig.value.layout === 'columns') return false;
-	state.menuList = filterRoutesFun(routesList.value);
+	let { layout, isClassicSplitMenu } = themeConfig.value;
+	if (layout === 'classic' && isClassicSplitMenu) {
+		// 获取当前地址的索引，不用从参数选取
+    routesIndex.value = findFirstLevelIndex(routesList.value,path || route.path) || 0
+		state.menuList = filterRoutesFun(routesList.value[routesIndex.value].children || [routesList.value[routesIndex.value]]);
+	} else {
+		state.menuList = filterRoutesFun(routesList.value);
+	}
 };
 // 路由过滤递归函数
 const filterRoutesFun = <T extends RouteItem>(arr: T[]): T[] => {
@@ -122,7 +150,8 @@ onBeforeMount(() => {
 		let { layout, isClassicSplitMenu } = themeConfig.value;
 		if (layout === 'classic' && isClassicSplitMenu) {
 			state.menuList = [];
-			state.menuList = res.children;
+			// state.menuList = res.children;
+			setFilterRoutes(res.path);
 		}
 	});
 	mittBus.on('getBreadcrumbIndexSetFilterRoutes', () => {

web/src/layout/logo/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="layout-logo" v-if="setShowLogo" @click="onThemeConfigChange">
 		<img :src="siteLogo" class="layout-logo-medium-img" />
-		<span style="font-size: x-large">{{ getSystemConfig['login.site_title'] || themeConfig.globalTitle }}</span>
+		<span style="font-size: x-large; ">{{ getSystemConfig['login.site_title'] || themeConfig.globalTitle }}</span>
 	</div>
 	<div class="layout-logo-size" v-else @click="onThemeConfigChange">
 		<img :src="siteLogo" class="layout-logo-size-img" />

web/src/layout/navBars/breadcrumb/index.vue

@@ -102,6 +102,5 @@ onUnmounted(() => {
 	display: flex;
 	align-items: center;
 	background: var(--next-bg-topBar);
-	border-bottom: 1px solid var(--next-border-color-light);
 }
 </style>

web/src/layout/navBars/breadcrumb/user.vue

@@ -1,5 +1,10 @@
 <template>
 	<div class="layout-navbars-breadcrumb-user pr15" :style="{ flex: layoutUserFlexNum }">
+    <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
+      <el-icon :title="$t('message.user.title2')">
+        <ele-Search />
+      </el-icon>
+    </div>
 		<el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
 			<div class="layout-navbars-breadcrumb-user-icon">
 				<i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
@@ -28,16 +33,12 @@
 				</el-dropdown-menu>
 			</template>
 		</el-dropdown>
-		<div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
-			<el-icon :title="$t('message.user.title2')">
-				<ele-Search />
-			</el-icon>
-		</div>
+
 		<div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
 			<i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>
 		</div>
 		<div class="layout-navbars-breadcrumb-user-icon">
-			<el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
+			<el-popover placement="bottom" trigger="hover" transition="el-zoom-in-top" :width="300" :persistent="false">
 				<template #reference>
 					<el-badge :value="messageCenter.unread" :hidden="messageCenter.unread === 0">
 						<el-icon :title="$t('message.user.title4')">
@@ -58,32 +59,31 @@
 			></i>
 		</div>
     <div>
-      <span v-if="!isSocketOpen">
+      <span v-if="!isSocketOpen" class="online-status-span">
         <el-popconfirm
-          width="250"
-          ref="onlinePopoverRef"
-          :confirm-button-text="$t('message.user.retry')"
-          :icon="InfoFilled"
-          trigger="hover"
-          icon-color="#626AEF"
-          :title="$t('message.user.onlinePrompt')"
-          @confirm="onlineConfirmEvent"
+            width="250"
+            ref="onlinePopoverRef"
+            :confirm-button-text="$t('message.user.retry')"
+            :icon="InfoFilled"
+            trigger="hover"
+            icon-color="#626AEF"
+            :title="$t('message.user.onlinePrompt')"
+            @confirm="onlineConfirmEvent"
         >
           <template #reference>
             <el-badge is-dot class="item" :class="{'online-status': isSocketOpen,'online-down':!isSocketOpen}">
-              <img :src="userInfos.avatar || headerImage" class="layout-navbars-breadcrumb-user-link-photo mr5" />
+              <img :src="getBaseURL(userInfos.avatar) || headerImage" class="layout-navbars-breadcrumb-user-link-photo mr5" />
             </el-badge>
           </template>
         </el-popconfirm>
       </span>
     </div>
+		<div></div>
 		<el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
 			<span class="layout-navbars-breadcrumb-user-link">
-        <span v-if="isSocketOpen">
-          <el-badge is-dot class="item" :class="{'online-status': isSocketOpen,'online-down':!isSocketOpen}">
-            <img :src="userInfos.avatar || headerImage" class="layout-navbars-breadcrumb-user-link-photo mr5" />
-          </el-badge>
-        </span>
+<!--				<el-badge is-dot class="item online-status">-->
+<!--					<img :src="userInfos.avatar || headerImage" class="layout-navbars-breadcrumb-user-link-photo mr5" />-->
+<!--				</el-badge>-->
 				{{ userInfos.username === '' ? 'common' : userInfos.username }}
 				<el-icon class="el-icon--right">
 					<ele-ArrowDown />
@@ -93,7 +93,7 @@
 				<el-dropdown-menu>
 					<el-dropdown-item command="/home">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
 					<el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
-					<el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>
+					<el-dropdown-item command="/versionUpgradeLog">更新日志</el-dropdown-item>
 					<el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
 				</el-dropdown-menu>
 			</template>
@@ -115,8 +115,8 @@ import other from '/@/utils/other';
 import mittBus from '/@/utils/mitt';
 import { Session, Local } from '/@/utils/storage';
 import headerImage from '/@/assets/img/headerImage.png';
+import { InfoFilled } from '@element-plus/icons-vue';
 import websocket from '/@/utils/websocket';
-import { InfoFilled } from '@element-plus/icons-vue'
 // 引入组件
 const UserNews = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/userNews.vue'));
 const Search = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/search.vue'));
@@ -152,13 +152,14 @@ const { isSocketOpen } = storeToRefs(useUserInfo());
 const onlinePopoverRef = ref()
 const onlineConfirmEvent = () => {
   if (!isSocketOpen.value) {
-      websocket.is_reonnect = true
-      websocket.reconnect_current = 1
-      websocket.reconnect()
+    websocket.is_reonnect = true
+    websocket.reconnect_current = 1
+    websocket.reconnect()
   }
   // 手动隐藏弹出
   unref(onlinePopoverRef).popperRef?.delayHide?.()
 }
+
 // 全屏点击时
 const onScreenfullClick = () => {
 	if (!screenfull.isEnabled) {
@@ -237,8 +238,10 @@ const onLanguageChange = (lang: string) => {
 	initI18nOrSize('globalI18n', 'disabledI18n');
 };
 // 初始化组件大小/i18n
-const initI18nOrSize = (value: string, attr: string) => {
-	state[attr] = Local.get('themeConfig')[value];
+const initI18nOrSize = (value: string, attr: keyof typeof state) => {
+	const themeConfig = Local.get('themeConfig') as { [key: string]: any } | null;
+	const configValue = ((themeConfig && themeConfig[value]) as string) || '';
+	state[attr] = configValue as unknown as never;
 };
 // 页面加载时
 onMounted(() => {
@@ -246,11 +249,41 @@ onMounted(() => {
 		initI18nOrSize('globalComponentSize', 'disabledSize');
 		initI18nOrSize('globalI18n', 'disabledI18n');
 	}
+	getMessageCenterCount();
 });
 
 //消息中心的未读数量
 import { messageCenterStore } from '/@/stores/messageCenter';
+import { getBaseURL } from '/@/utils/baseUrl';
 const messageCenter = messageCenterStore();
+let eventSource: EventSource | null = null; // 存储 EventSource 实例
+const token = Session.get('token');
+const isConnected = ref(false); // 标志变量，记录是否已连接过
+const getMessageCenterCount = () => {
+	// 创建 EventSource 实例并连接到后端 SSE 端点
+	eventSource = new EventSource(`${getBaseURL()}sse/?token=${token}`); // 替换为你的后端地址
+	// 首次连接成功时打印一次
+	eventSource.onopen = function () {
+		if (!isConnected.value) {
+			console.log('SSE 首次连接成功');
+			isConnected.value = true; // 设置标志为已连接
+		}
+	};
+	// 监听消息事件
+	eventSource.onmessage = function (event) {
+		console.log(event.data);
+
+		messageCenter.setUnread(+event.data); // 更新总记录数
+	};
+
+	// 错误处理
+	eventSource.onerror = function (err) {
+		console.error('SSE 错误:', err);
+		if (eventSource !== null && eventSource.readyState === EventSource.CLOSED) {
+			console.log('连接已关闭');
+		}
+	};
+};
 </script>
 
 <style scoped lang="scss">
@@ -297,29 +330,29 @@ const messageCenter = messageCenterStore();
 	:deep(.el-badge__content.is-fixed) {
 		top: 12px;
 	}
-  .online-status{
-    cursor: pointer;
-    :deep(.el-badge__content.is-fixed) {
-      top: 30px;
-      font-size: 14px;
-      left: 5px;
-      height: 12px;
-      width: 12px;
-      padding: 0;
-      background-color: #18bc9c;
-    }
-  }
-  .online-down{
-    cursor: pointer;
-    :deep(.el-badge__content.is-fixed) {
-      top: 30px;
-      font-size: 14px;
-      left: 5px;
-      height: 12px;
-      width: 12px;
-      padding: 0;
-      background-color: #979b9c;
-    }
-  }
+	.online-status {
+		cursor: pointer;
+		:deep(.el-badge__content.is-fixed) {
+			top: 30px;
+			font-size: 14px;
+			left: 5px;
+			height: 12px;
+			width: 12px;
+			padding: 0;
+			background-color: #18bc9c;
+		}
+	}
+	.online-down {
+		cursor: pointer;
+		:deep(.el-badge__content.is-fixed) {
+			top: 30px;
+			font-size: 14px;
+			left: 5px;
+			height: 12px;
+			width: 12px;
+			padding: 0;
+			background-color: #979b9c;
+		}
+	}
 }
 </style>

web/src/layout/navBars/breadcrumb/userNews.vue

@@ -2,7 +2,8 @@
 	<div class="layout-navbars-breadcrumb-user-news">
 		<div class="head-box">
 			<div class="head-box-title">{{ $t('message.user.newTitle') }}</div>
-<!--			<div class="head-box-btn" v-if="state.newsList.length > 0" @click="onAllReadClick">{{ $t('message.user.newBtn') }}</div>-->
+
+			<!-- <div class="head-box-btn" v-if="state.newsList.length > 0" @click="onAllReadClick">{{ $t('message.user.newBtn') }}</div> -->
 		</div>
 		<div class="content-box">
 			<template v-if="state.newsList.length > 0">
@@ -21,7 +22,7 @@
 </template>
 
 <script setup lang="ts" name="layoutBreadcrumbUserNews">
-import { reactive,onBeforeMount,ref,onMounted } from 'vue';
+import { reactive, onBeforeMount, ref, onMounted } from 'vue';
 
 // 定义变量内容
 const state = reactive({
@@ -33,27 +34,27 @@ const onAllReadClick = () => {
 	state.newsList = [];
 };
 // 前往通知中心点击
-import {useRouter } from "vue-router";
-const route = useRouter()
+import { useRouter } from 'vue-router';
+const route = useRouter();
 const onGoToGiteeClick = () => {
-  route.push('/messageCenter')
+	route.push('/messageCenter');
 };
 //获取最新消息
-import { request } from "/@/utils/service";
-const getLastMsg= ()=>{
-  request({
-    url: '/api/system/message_center/get_newest_msg/',
-    method: 'get',
-    params: {}
-  }).then((res:any) => {
-    const { data } = res
-    state.newsList= [data]
-  })
-}
-onMounted(()=>{
-  getLastMsg()
-})
-
+import { request } from '/@/utils/service';
+const getLastMsg = () => {
+	request({
+		url: '/api/system/message_center/get_newest_msg/',
+		method: 'get',
+		params: {},
+	}).then((res: any) => {
+		const { data } = res;
+		if (data) state.newsList = [data];
+		
+	});
+};
+onMounted(() => {
+	getLastMsg();
+});
 </script>
 
 <style scoped lang="scss">

web/src/layout/navBars/tagsView/tagsView.vue

@@ -591,10 +591,13 @@ watch(
 
 <style scoped lang="scss">
 .layout-navbars-tagsview {
-	background-color: var(--el-color-white);
-	border-bottom: 1px solid var(--next-border-color-light);
 	position: relative;
 	z-index: 4;
+  height: 45px;
+  border-radius: 8px;
+  margin-left: 15px;
+  margin-right: 15px;
+
 	:deep(.el-scrollbar__wrap) {
 		overflow-x: auto !important;
 	}
@@ -602,7 +605,7 @@ watch(
 		list-style: none;
 		margin: 0;
 		padding: 0;
-		height: 34px;
+		height: 36px;
 		display: flex;
 		align-items: center;
 		color: var(--el-text-color-regular);
@@ -610,7 +613,7 @@ watch(
 		white-space: nowrap;
 		padding: 0 15px;
 		&-li {
-			height: 26px;
+			height: 30px;
 			line-height: 26px;
 			display: flex;
 			align-items: center;

web/src/layout/navMenu/horizontal.vue

@@ -1,8 +1,8 @@
 <template>
 	<div class="el-menu-horizontal-warp">
-		<el-scrollbar @wheel.native.prevent="onElMenuHorizontalScroll" ref="elMenuHorizontalScrollRef">
-			<el-menu router :default-active="state.defaultActive" :ellipsis="false" background-color="transparent" mode="horizontal">
-				<template v-for="val in menuLists">
+<!--		<el-scrollbar @wheel.native.prevent="onElMenuHorizontalScroll" ref="elMenuHorizontalScrollRef">-->
+			<el-menu :default-active="defaultActive"  background-color="transparent" mode="horizontal">
+				<template v-for="(val,index) in menuLists">
 					<el-sub-menu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
 						<template #title>
 							<SvgIcon :name="val.meta.icon" />
@@ -11,7 +11,7 @@
 						<SubItem :chil="val.children" />
 					</el-sub-menu>
 					<template v-else>
-						<el-menu-item :index="val.path" :key="val.path">
+						<el-menu-item :index="val.path" :key="val.path" style="--el-menu-active-color: #fff" @click="onToRouteClick(val,index)">
 							<template #title v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
 								<SvgIcon :name="val.meta.icon" />
 								{{ $t(val.meta.title) }}
@@ -26,22 +26,25 @@
 					</template>
 				</template>
 			</el-menu>
-		</el-scrollbar>
+<!--		</el-scrollbar>-->
 	</div>
 </template>
 
 <script setup lang="ts" name="navMenuHorizontal">
 import { defineAsyncComponent, reactive, computed, onMounted, nextTick, onBeforeMount, ref } from 'vue';
-import { useRoute, onBeforeRouteUpdate, RouteRecordRaw } from 'vue-router';
+import {useRoute, onBeforeRouteUpdate, RouteRecordRaw, useRouter} from 'vue-router';
 import { storeToRefs } from 'pinia';
 import { useRoutesList } from '/@/stores/routesList';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import other from '/@/utils/other';
 import mittBus from '/@/utils/mitt';
-
+const router = useRouter()
 // 引入组件
 const SubItem = defineAsyncComponent(() => import('/@/layout/navMenu/subItem.vue'));
-
+const state = reactive<AsideState>({
+	menuList: [],
+  clientWidth: 0
+});
 // 定义父组件传过来的值
 const props = defineProps({
 	// 菜单列表
@@ -58,25 +61,39 @@ const storesThemeConfig = useThemeConfig();
 const { routesList } = storeToRefs(stores);
 const { themeConfig } = storeToRefs(storesThemeConfig);
 const route = useRoute();
-const state = reactive({
-	defaultActive: '' as string | undefined,
-});
-
+const defaultActive = ref('')
 // 获取父级菜单数据
 const menuLists = computed(() => {
+  <RouteItems>props.menuList.shift()
 	return <RouteItems>props.menuList;
 });
-// 设置横向滚动条可以鼠标滚轮滚动
-const onElMenuHorizontalScroll = (e: WheelEventType) => {
-	const eventDelta = e.wheelDelta || -e.deltaY * 40;
-	elMenuHorizontalScrollRef.value.$refs.wrapRef.scrollLeft = elMenuHorizontalScrollRef.value.$refs.wrapRef.scrollLeft + eventDelta / 4;
+// 递归获取当前路由的顶级索引
+const findFirstLevelIndex = (data, path) => {
+	for (let index = 0; index < data.length; index++) {
+		const item = data[index];
+    // 检查当前菜单项是否有子菜单，并查找是否在子菜单中找到路径
+		if (item.children && item.children.length > 0) {
+			// 检查子菜单中是否有匹配的路径
+			const childIndex = item.children.findIndex((child) => child.path === path);
+			if (childIndex !== -1) {
+				return index; // 返回当前一级菜单的索引
+			}
+			// 递归查找子菜单
+			const foundIndex = findFirstLevelIndex(item.children, path);
+			if (foundIndex !== null) {
+				return index; // 返回找到的索引
+			}
+		}
+	}
+	return null; // 找不到路径时返回 null
 };
+
 // 初始化数据，页面刷新时，滚动条滚动到对应位置
 const initElMenuOffsetLeft = () => {
 	nextTick(() => {
 		let els = <HTMLElement>document.querySelector('.el-menu.el-menu--horizontal li.is-active');
 		if (!els) return false;
-		elMenuHorizontalScrollRef.value.$refs.wrapRef.scrollLeft = els.offsetLeft;
+		// elMenuHorizontalScrollRef.value.$refs.wrapRef.scrollLeft = els.offsetLeft;
 	});
 };
 // 路由过滤递归函数
@@ -107,17 +124,41 @@ const setSendClassicChildren = (path: string) => {
 const setCurrentRouterHighlight = (currentRoute: RouteToFrom) => {
 	const { path, meta } = currentRoute;
 	if (themeConfig.value.layout === 'classic') {
-		state.defaultActive = `/${path?.split('/')[1]}`;
+    let firstLevelIndex = (findFirstLevelIndex(routesList.value, route.path) || 0) - 1
+    defaultActive.value = firstLevelIndex < 0 ? defaultActive.value : menuLists.value[firstLevelIndex].path
 	} else {
 		const pathSplit = meta?.isDynamic ? meta.isDynamicPath!.split('/') : path!.split('/');
-		if (pathSplit.length >= 4 && meta?.isHide) state.defaultActive = pathSplit.splice(0, 3).join('/');
-		else state.defaultActive = path;
+		if (pathSplit.length >= 4 && meta?.isHide) defaultActive.value = pathSplit.splice(0, 3).join('/');
+		else defaultActive.value = path;
 	}
 };
 // 打开外部链接
 const onALinkClick = (val: RouteItem) => {
 	other.handleOpenLink(val);
 };
+// 跳转页面
+const onToRouteClick = (val: RouteItem,index) => {
+  // 跳转到子级页面
+   let children = val.children
+  if (children === undefined){
+    defaultActive.value = val.path
+    children = setSendClassicChildren(val.path).children
+  }
+  if (children.length >= 1){
+    if (children[0].is_catalog) {
+      onToRouteClick(children[0],index)
+      return
+    }
+    router.push(children[0].path)
+    let { layout, isClassicSplitMenu } = themeConfig.value;
+    if (layout === 'classic' && isClassicSplitMenu) {
+      mittBus.emit('setSendClassicChildren', children[0]);
+    }
+  } else {
+    router.push('/home')
+  }
+};
+
 // 页面加载前
 onBeforeMount(() => {
 	setCurrentRouterHighlight(route);
@@ -126,16 +167,6 @@ onBeforeMount(() => {
 onMounted(() => {
 	initElMenuOffsetLeft();
 });
-// 路由更新时
-onBeforeRouteUpdate((to) => {
-	// 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G
-	setCurrentRouterHighlight(to);
-	// 修复经典布局开启切割菜单时，点击tagsView后左侧导航菜单数据不变的问题
-	let { layout, isClassicSplitMenu } = themeConfig.value;
-	if (layout === 'classic' && isClassicSplitMenu) {
-		mittBus.emit('setSendClassicChildren', setSendClassicChildren(to.path));
-	}
-});
 </script>
 
 <style scoped lang="scss">

web/src/layout/navMenu/subItem.vue

@@ -8,7 +8,21 @@
 			<sub-item :chil="val.children" />
 		</el-sub-menu>
 		<template v-else>
-			<el-menu-item :index="val.path" :key="val.path">
+      <a v-if="val.name==='templateCenter'" href="#/templateCenter" target="_blank">
+        <el-menu-item   :key="val.path">
+          <template v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
+            <SvgIcon :name="val.meta.icon" />
+            <span>{{ $t(val.meta.title) }}</span>
+          </template>
+          <template v-else>
+            <a class="w100" @click.prevent="onALinkClick(val)">
+              <SvgIcon :name="val.meta.icon" />
+              {{ $t(val.meta.title) }}
+            </a>
+          </template>
+        </el-menu-item>
+      </a>
+			<el-menu-item v-else :index="val.path" :key="val.path">
 				<template v-if="!val.meta.isLink || (val.meta.isLink && val.meta.isIframe)">
 					<SvgIcon :name="val.meta.icon" />
 					<span>{{ $t(val.meta.title) }}</span>

web/src/layout/routerView/iframes.vue

@@ -23,6 +23,7 @@
 <script setup lang="ts" name="layoutIframeView">
 import { computed, watch, ref, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
+import {cookie} from "xe-utils";
 
 // 定义父组件传过来的值
 const props = defineProps({
@@ -49,7 +50,15 @@ const route = useRoute();
 
 // 处理 list 列表，当打开时，才进行加载
 const setIframeList = computed(() => {
-	return (<RouteItems>props.list).filter((v: RouteItem) => v.meta?.isIframeOpen);
+	return (<RouteItems>props.list).filter((v: RouteItem) => {
+    if (v.meta?.isIframeOpen) {
+        const isLink = v.meta?.isLink || '';
+      	if (isLink.includes("{{token}}")) {
+          v.meta.isLink = isLink.replace("{{token}}", cookie.get('token'))
+        }
+    }
+    return v.meta?.isIframeOpen
+  });
 });
 // 获取 iframe 当前路由 path
 const getRoutePath = computed(() => {

web/src/layout/routerView/link.vue

@@ -17,19 +17,31 @@
 import { reactive, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import { verifyUrl } from '/@/utils/toolsValidate';
+import {cookie} from "xe-utils";
 
 // 定义变量内容
 const route = useRoute();
 const state = reactive<LinkViewState>({
 	title: '',
 	isLink: '',
+  query: null
 });
 
 // 立即前往
 const onGotoFullPage = () => {
 	const { origin, pathname } = window.location;
+  if (state.isLink.includes("{{token}}")) {
+		state.isLink = state.isLink.replace("{{token}}", cookie.get('token'))
+	}
 	if (verifyUrl(<string>state.isLink)) window.open(state.isLink);
-	else window.open(`${origin}${pathname}#${state.isLink}`);
+	else {
+    function objectToUrlParams(obj: { [key: string]: string | number }): string {
+      return Object.keys(obj)
+          .map(key => encodeURIComponent(key) + '=' + encodeURIComponent(obj[key]))
+          .join('&');
+    }
+    window.open(`${origin}${pathname}#${state.isLink}?${objectToUrlParams(state.query)}`)
+  };
 };
 // 监听路由的变化，设置内容
 watch(
@@ -37,6 +49,7 @@ watch(
 	() => {
 		state.title = <string>route.meta.title;
 		state.isLink = <string>route.meta.isLink;
+    state.query = <any>route.query;
 	},
 	{
 		immediate: true,

web/src/main.ts

@@ -25,6 +25,8 @@ import fontAwesome470 from 'e-icon-picker/icon/fontawesome/font-awesome.v4.7.0.j
 import eIconList from 'e-icon-picker/icon/default-icon/eIconList.js';
 import iconfont from '/@/assets/iconfont/iconfont.json'; //引入json文件
 import '/@/assets/iconfont/iconfont.css'; //引入css
+import '/@/assets/iconfont/iconfont-01/iconfont.css'; //引入css
+import '/@/assets/iconfont/iconfont-02/iconfont.css'; //引入css
 // 自动注册插件
 import { scanAndInstallPlugins } from '/@/views/plugins/index';
 import VXETable from 'vxe-table'

web/src/router/backEnd.ts

@@ -21,13 +21,14 @@ const menuApi = useMenuApi();
 
 const layouModules: any = import.meta.glob('../layout/routerView/*.{vue,tsx}');
 const viewsModules: any = import.meta.glob('../views/**/*.{vue,tsx}');
+const greatDream: any = import.meta.glob('@great-dream/**/*.{vue,tsx}');
 
 /**
  * 获取目录下的 .vue、.tsx 全部文件
  * @method import.meta.glob
  * @link 参考：https://cn.vitejs.dev/guide/features.html#json
  */
-const dynamicViewsModules: Record<string, Function> = Object.assign({}, { ...layouModules }, { ...viewsModules });
+const dynamicViewsModules: Record<string, Function> = Object.assign({}, { ...layouModules }, { ...viewsModules }, { ...greatDream });
 
 /**
  * 后端控制路由：初始化方法，防止刷新时路由丢失
@@ -44,7 +45,7 @@ export async function initBackEndControlRoutes() {
 	if (!Session.get('token')) return false;
 	// 触发初始化用户信息 pinia
 	// https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP
-	await useUserInfo().setUserInfos();
+	await useUserInfo().getApiUserInfo();
 	// 获取路由菜单数据
 	const res = await getBackEndControlRoutes();
 	// 无登录权限时，添加判断
@@ -198,7 +199,10 @@ export function dynamicImport(dynamicViewsModules: Record<string, Function>, com
 	const keys = Object.keys(dynamicViewsModules);
 	const matchKeys = keys.filter((key) => {
 		const k = key.replace(/..\/views|../, '');
-		return k.startsWith(`${component}`) || k.startsWith(`/${component}`);
+		const k0 = k.replace("ode_modules/@great-dream/", '')
+		const k1 = k0.replace("/plugins", '')
+		const newComponent = component.replace("plugins/", "")
+		return k1.startsWith(`${newComponent}`) || k1.startsWith(`/${newComponent}`);
 	});
 	if (matchKeys?.length === 1) {
 		const matchKey = matchKeys[0];

web/src/router/index.ts

@@ -13,6 +13,7 @@ import {initBackEndControlRoutes, setRouters} from '/@/router/backEnd';
 import {useFrontendMenuStore} from "/@/stores/frontendMenu";
 import {useTagsViewRoutes} from "/@/stores/tagsViewRoutes";
 import {toRaw} from "vue";
+import {checkVersion} from "/@/utils/upgrade";
 
 /**
  * 1、前端控制路由时：isRequestRoutes 为 false，需要写 roles，需要走 setFilterRoute 方法。
@@ -27,6 +28,8 @@ import {toRaw} from "vue";
 const storesThemeConfig = useThemeConfig(pinia);
 const {themeConfig} = storeToRefs(storesThemeConfig);
 const {isRequestRoutes} = themeConfig.value;
+import {useUserInfo} from "/@/stores/userInfo";
+const { userInfos } = storeToRefs(useUserInfo());
 
 /**
  * 创建一个可以被 Vue 应用程序使用的路由实例
@@ -93,8 +96,24 @@ export function formatTwoStageRoutes(arr: any) {
     return newArr;
 }
 
+const frameOutRoutes = staticRoutes.map(item => item.path)
+
+const checkToken = ()=>{
+    const urlParams = new URLSearchParams(window.location.search);
+    const _oauth2_token = urlParams.get('_oauth2_token');
+    if (_oauth2_token) {
+        Session.set('token', _oauth2_token);
+        const cleanUrl = window.location.href.split('?')[0];
+        window.history.replaceState({}, '', cleanUrl);
+        useUserInfo(pinia).setUserInfos();
+
+    }
+}
 // 路由加载前
 router.beforeEach(async (to, from, next) => {
+    // 检查浏览器本地版本与线上版本是否一致，判断是否需要刷新页面进行更新
+    await checkVersion()
+    checkToken()
     NProgress.configure({showSpinner: false});
     if (to.meta.title) NProgress.start();
     const token = Session.get('token');
@@ -106,11 +125,15 @@ router.beforeEach(async (to, from, next) => {
             next(`/login?redirect=${to.path}&params=${JSON.stringify(to.query ? to.query : to.params)}`);
             Session.clear();
             NProgress.done();
-        } else if (token && to.path === '/login') {
+        }else if (token && to.path === '/login' && userInfos.value.pwd_change_count===0 ) {
+            next('/login');
+            NProgress.done();
+        } else if (token && to.path === '/login' && userInfos.value.pwd_change_count>0) {
             next('/home');
             NProgress.done();
+        }else if(token &&  frameOutRoutes.includes(to.path) ){
+            next()
         } else {
-
             const storesRoutesList = useRoutesList(pinia);
             const {routesList} = storeToRefs(storesRoutesList);
             if (routesList.value.length === 0) {

web/src/settings.ts

@@ -53,9 +53,12 @@ export default {
                     },
                     form: {
                         afterSubmit(ctx: any) {
+                            const {res} = ctx
                             // 增加crud提示
-                            if (ctx.res.code == 2000) {
+                            if (res?.code == 2000) {
                                 successNotification(ctx.res.msg);
+                            }else{
+                                return
                             }
                         },
                     },

web/src/stores/interface/index.ts

@@ -2,16 +2,19 @@
  * 定义接口来定义对象的类型
  * `stores` 全部类型定义在这里
  */
-import {useFrontendMenuStore} from "/@/stores/frontendMenu";
+import { useFrontendMenuStore } from "/@/stores/frontendMenu";
 
 // 用户信息
 export interface UserInfosState {
+	id: '',
 	avatar: string;
+	is_superuser: boolean,
 	username: string;
 	name: string;
 	email: string;
 	mobile: string;
 	gender: string;
+	pwd_change_count: null | number;
 	dept_info: {
 		dept_id: number;
 		dept_name: string;
@@ -106,9 +109,9 @@ export interface ConfigStates {
 
 export interface FrontendMenu {
 	arrayRouter: Array<any>;
-	treeRouter:Array<any>;
+	treeRouter: Array<any>;
 
-	frameOutRoutes:Array<any>;
+	frameOutRoutes: Array<any>;
 
-	frameInRoutes:Array<any>;
+	frameInRoutes: Array<any>;
 }

web/src/stores/themeConfig.ts

@@ -18,7 +18,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 			 * 全局主题
 			 */
 			// 默认 primary 主题颜色
-			primary: '#409eff',
+			primary: "#193755",
 			// 是否开启深色模式
 			isIsDark: false,
 
@@ -26,9 +26,9 @@ export const useThemeConfig = defineStore('themeConfig', {
 			 * 顶栏设置
 			 */
 			// 默认顶栏导航背景颜色
-			topBar: '#ffffff',
+			topBar: "#f8f8f8",
 			// 默认顶栏导航字体颜色
-			topBarColor: '#606266',
+			topBarColor: "#000000",
 			// 是否开启顶栏背景颜色渐变
 			isTopBarColorGradual: false,
 
@@ -36,11 +36,11 @@ export const useThemeConfig = defineStore('themeConfig', {
 			 * 菜单设置
 			 */
 			// 默认菜单导航背景颜色
-			menuBar: '#334054',
+			menuBar: "#f8f8f8",
 			// 默认菜单导航字体颜色
-			menuBarColor: '#eaeaea',
+			menuBarColor: "#000000",
 			// 默认菜单高亮背景色
-			menuBarActiveColor: 'rgba(0, 0, 0, 0.2)',
+			menuBarActiveColor: "rgba(0, 48, 255, 0.38)",
 			// 是否开启菜单背景颜色渐变
 			isMenuBarColorGradual: false,
 
@@ -48,9 +48,9 @@ export const useThemeConfig = defineStore('themeConfig', {
 			 * 分栏设置
 			 */
 			// 默认分栏菜单背景颜色
-			columnsMenuBar: '#334054',
+			columnsMenuBar:"#334054",
 			// 默认分栏菜单字体颜色
-			columnsMenuBarColor: '#e6e6e6',
+			columnsMenuBarColor: "#e6e6e6",
 			// 是否开启分栏菜单背景颜色渐变
 			isColumnsMenuBarColorGradual: false,
 			// 是否开启分栏菜单鼠标悬停预加载(预览菜单)

web/src/stores/userInfo.ts

@@ -2,6 +2,9 @@ import { defineStore } from 'pinia';
 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 设置用户信息
@@ -9,12 +12,15 @@ import { request } from '../utils/service';
 export const useUserInfo = defineStore('userInfo', {
 	state: (): UserInfosStates => ({
 		userInfos: {
+			id:'',
 			avatar: '',
 			username: '',
 			name: '',
 			email: '',
 			mobile: '',
 			gender: '',
+			pwd_change_count:null,
+			is_superuser: false,
 			dept_info: {
 				dept_id: 0,
 				dept_name: '',
@@ -29,16 +35,21 @@ export const useUserInfo = defineStore('userInfo', {
 		isSocketOpen: false
 	}),
 	actions: {
-		async updateUserInfos() {
-			let userInfos: any = await this.getApiUserInfo();
-			this.userInfos.username = userInfos.data.name;
-			this.userInfos.avatar = userInfos.data.avatar;
-			this.userInfos.name = userInfos.data.name;
-			this.userInfos.email = userInfos.data.email;
-			this.userInfos.mobile = userInfos.data.mobile;
-			this.userInfos.gender = userInfos.data.gender;
-			this.userInfos.dept_info = userInfos.data.dept_info;
-			this.userInfos.role_info = userInfos.data.role_info;
+		async setPwdChangeCount(count: number) {
+			this.userInfos.pwd_change_count = count;
+		},
+		async updateUserInfos(userInfos:any) {
+			this.userInfos.id = userInfos.id;
+			this.userInfos.username = userInfos.name;
+			this.userInfos.avatar = userInfos.avatar;
+			this.userInfos.name = userInfos.name;
+			this.userInfos.email = userInfos.email;
+			this.userInfos.mobile = userInfos.mobile;
+			this.userInfos.gender = userInfos.gender;
+			this.userInfos.dept_info = userInfos.dept_info;
+			this.userInfos.role_info = userInfos.role_info;
+			this.userInfos.pwd_change_count = userInfos.pwd_change_count;
+			this.userInfos.is_superuser = userInfos.is_superuser;
 			Session.set('userInfo', this.userInfos);
 		},
 		async setUserInfos() {
@@ -47,6 +58,7 @@ export const useUserInfo = defineStore('userInfo', {
 				this.userInfos = Session.get('userInfo');
 			} else {
 				let userInfos: any = await this.getApiUserInfo();
+				this.userInfos.id = userInfos.id;
 				this.userInfos.username = userInfos.data.name;
 				this.userInfos.avatar = userInfos.data.avatar;
 				this.userInfos.name = userInfos.data.name;
@@ -55,6 +67,8 @@ export const useUserInfo = defineStore('userInfo', {
 				this.userInfos.gender = userInfos.data.gender;
 				this.userInfos.dept_info = userInfos.data.dept_info;
 				this.userInfos.role_info = userInfos.data.role_info;
+				this.userInfos.pwd_change_count = userInfos.data.pwd_change_count;
+				this.userInfos.is_superuser = userInfos.data.is_superuser;
 				Session.set('userInfo', this.userInfos);
 			}
 		},
@@ -65,7 +79,20 @@ export const useUserInfo = defineStore('userInfo', {
 			return request({
 				url: '/api/system/user/user_info/',
 				method: 'get',
-			});
+			}).then((res:any)=>{
+				this.userInfos.id = res.data.id;
+				this.userInfos.username = res.data.name;
+				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;
+				this.userInfos.gender = res.data.gender;
+				this.userInfos.dept_info = res.data.dept_info;
+				this.userInfos.role_info = res.data.role_info;
+				this.userInfos.pwd_change_count = res.data.pwd_change_count;
+				this.userInfos.is_superuser = res.data.is_superuser;
+				Session.set('userInfo', this.userInfos);
+			})
 		},
 	},
 });