Merge remote-tracking branch 'origin/dev' into dev

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

@@ -3,6 +3,7 @@ import logging
 from django.core.management.base import BaseCommand
 
 from application import settings
+from dvadmin.system import signals
 
 logger = logging.getLogger(__name__)
 
@@ -29,9 +30,9 @@ class Command(BaseCommand):
             reset = True
         if isinstance(options.get("n"), list) or isinstance(options.get("N"), list):
             reset = False
-
+        signals.pre_init_complete.send(sender=None, msg='开始初始化', data={"reset": reset})
         for app in settings.INSTALLED_APPS:
-
+            signals.detail_init_complete.send(sender=None, msg='初始化中', data={"app": app, "reset": reset})
             try:
                 exec(
                     f"""
@@ -50,4 +51,5 @@ main(reset={reset})
                     )
                 except ModuleNotFoundError:
                     pass
+        signals.post_init_complete.send(sender=None, msg='初始化完成', data={"reset": reset})
         print("初始化数据完成！")

backend/dvadmin/system/models.py

@@ -131,6 +131,7 @@ class Dept(CoreModel):
         null=True,
         blank=True,
         help_text="上级部门",
+        db_index=True
     )
 
     @classmethod

backend/dvadmin/system/signals.py

@@ -0,0 +1,12 @@
+from django.dispatch import Signal
+# 初始化信号
+pre_init_complete = Signal(providing_args=['msg', 'data'])
+detail_init_complete = Signal(providing_args=['msg', 'data'])
+post_init_complete = Signal(providing_args=['msg', 'data'])
+# 租户初始化信号
+pre_tenants_init_complete = Signal(providing_args=['msg', 'data'])
+detail_tenants_init_complete = Signal(providing_args=['msg', 'data'])
+post_tenants_init_complete = Signal(providing_args=['msg', 'data'])
+post_tenants_all_init_complete = Signal(providing_args=['msg', 'data'])
+# 租户创建完成信号
+tenants_create_complete = Signal(providing_args=['msg', 'data'])

backend/dvadmin/system/views/dept.py

@@ -13,6 +13,7 @@ from dvadmin.utils.json_response import DetailResponse, SuccessResponse
 from dvadmin.utils.permission import AnonymousUserPermission
 from dvadmin.utils.serializers import CustomModelSerializer
 from dvadmin.utils.viewset import CustomModelViewSet
+from dvadmin.utils.filters import LazyLoadFilter
 
 
 class DeptSerializer(CustomModelSerializer):
@@ -120,6 +121,12 @@ class DeptCreateUpdateSerializer(CustomModelSerializer):
         fields = '__all__'
 
 
+class DeptLazyFilter(LazyLoadFilter):
+    class Meta:
+        model = Dept
+        fields = ['name', 'parent', 'status']
+
+
 class DeptViewSet(CustomModelViewSet):
     """
     部门管理接口
@@ -129,11 +136,13 @@ class DeptViewSet(CustomModelViewSet):
     retrieve:单例
     destroy:删除
     """
+
     queryset = Dept.objects.all()
     serializer_class = DeptSerializer
     create_serializer_class = DeptCreateUpdateSerializer
     update_serializer_class = DeptCreateUpdateSerializer
-    filter_fields = ['name', 'id', 'parent']
+    # filter_fields = ["name", "id", "parent"]
+    filter_class = DeptLazyFilter
     search_fields = []
     # extra_filter_backends = []
     import_serializer_class = DeptImportSerializer

backend/dvadmin/system/views/menu.py

@@ -114,7 +114,7 @@ class MenuInitSerializer(CustomModelSerializer):
     class Meta:
         model = Menu
         fields = ['name', 'icon', 'sort', 'is_link', 'is_catalog', 'web_path', 'component', 'component_name', 'status',
-                  'cache', 'visible', 'parent', 'children', 'menu_button', 'creator', 'dept_belong_id']
+                  'cache', 'visible', 'parent', 'children', 'menu_button', 'frame_out', 'creator', 'dept_belong_id']
         extra_kwargs = {
             'creator': {'write_only': True},
             'dept_belong_id': {'write_only': True}
@@ -137,7 +137,8 @@ class WebRouterSerializer(CustomModelSerializer):
         else:
             # 根据当前角色获取权限按钮id集合
             permissionIds = self.request.user.role.values_list('permission', flat=True)
-            queryset = instance.menuPermission.filter(id__in=permissionIds, menu=instance.id).values_list('value', flat=True)
+            queryset = instance.menuPermission.filter(id__in=permissionIds, menu=instance.id).values_list('value',
+                                                                                                          flat=True)
             if queryset:
                 return queryset
             else:
@@ -145,7 +146,8 @@ class WebRouterSerializer(CustomModelSerializer):
 
     class Meta:
         model = Menu
-        fields = ('id', 'parent', 'icon', 'sort', 'path', 'name', 'title', 'is_link', 'is_catalog', 'web_path', 'component',
+        fields = (
+        'id', 'parent', 'icon', 'sort', 'path', 'name', 'title', 'is_link', 'is_catalog', 'web_path', 'component',
         'component_name', 'cache', 'visible', 'menuPermission', 'frame_out')
         read_only_fields = ["id"]
 
@@ -165,6 +167,7 @@ class MenuViewSet(CustomModelViewSet):
     update_serializer_class = MenuCreateSerializer
     search_fields = ['name', 'status']
     filter_fields = ['parent', 'name', 'status', 'is_link', 'visible', 'cache', 'is_catalog']
+
     # extra_filter_backends = []
 
     @action(methods=['GET'], detail=False, permission_classes=[])
@@ -179,7 +182,7 @@ class MenuViewSet(CustomModelViewSet):
         data = serializer.data
         return SuccessResponse(data=data, total=len(data), msg="获取成功")
 
-    def list(self,request):
+    def list(self, request):
         """懒加载"""
         params = request.query_params
         parent = params.get('parent', None)

backend/dvadmin/system/views/menu_button.py

@@ -23,7 +23,7 @@ class MenuButtonSerializer(CustomModelSerializer):
 
     class Meta:
         model = MenuButton
-        fields = ['id', 'name', 'value', 'api', 'method', 'menu']
+        fields = ["id", "name", "value", "api", "method", "menu"]
         read_only_fields = ["id"]
 
 
@@ -34,7 +34,7 @@ class MenuButtonInitSerializer(CustomModelSerializer):
 
     class Meta:
         model = MenuButton
-        fields = ['id', 'name', 'value', 'api', 'method', 'menu']
+        fields = ["id", "name", "value", "api", "method", "menu"]
         read_only_fields = ["id"]
 
 
@@ -58,21 +58,26 @@ class MenuButtonViewSet(CustomModelViewSet):
     retrieve:单例
     destroy:删除
     """
+
     queryset = MenuButton.objects.all()
     serializer_class = MenuButtonSerializer
     create_serializer_class = MenuButtonCreateUpdateSerializer
     update_serializer_class = MenuButtonCreateUpdateSerializer
     extra_filter_backends = []
 
-    @action(methods=['get'], detail=False)
-    def get_btn_permission(self,request):
+    @action(methods=["GET"], detail=False, permission_classes=[])
+    def get_btn_permission(self, request):
         """
         获取当前用户的按钮权限
         """
         user = request.user
         if not user.is_superuser:
-            menuIds = user.role.values_list('menu__id', flat=True)
+            menuIds = user.role.values_list("menu__id", flat=True)
         else:
             menuIds = Menu.objects.filter(status=1)
-        queryset = MenuButton.objects.filter(menu__in=menuIds).annotate(permission=Concat('menu__web_path',Value(':'),'value',output_field=CharField())).values_list('permission',flat=True)
+        queryset = (
+            MenuButton.objects.filter(menu__in=menuIds)
+            .annotate(permission=Concat("menu__web_path", Value(":"), "value", output_field=CharField()))
+            .values_list("permission", flat=True)
+        )
         return DetailResponse(data=queryset)

backend/dvadmin/system/views/system_config.py

@@ -7,6 +7,7 @@
 @Remark: 系统配置
 """
 import django_filters
+from django.db import connection
 from django.db.models import Q
 from django_filters.rest_framework import BooleanFilter
 from rest_framework import serializers
@@ -276,5 +277,6 @@ class InitSettingsViewSet(APIView):
                           SystemConfig.objects.filter(status=False, parent_id__isnull=False).values('parent__key',
                                                                                                     'key')]
         data = dict(filter(lambda x: x[0] not in backend_config, data.items()))
-        data = self.filter_system_config_values(data=data)
+        if hasattr(connection, 'tenant'):
+            data['schema_name'] = connection.tenant.schema_name
         return DetailResponse(data=data)

backend/dvadmin/utils/exception.py

@@ -11,7 +11,7 @@ import traceback
 
 from django.db.models import ProtectedError, RestrictedError
 from django.http import Http404
-from rest_framework.exceptions import APIException as DRFAPIException, AuthenticationFailed
+from rest_framework.exceptions import APIException as DRFAPIException, AuthenticationFailed, PermissionDenied
 from rest_framework.status import HTTP_407_PROXY_AUTHENTICATION_REQUIRED, HTTP_401_UNAUTHORIZED
 from rest_framework.views import set_rollback, exception_handler
 
@@ -50,6 +50,8 @@ def CustomExceptionHandler(ex, context):
     elif isinstance(ex, DRFAPIException):
         set_rollback()
         msg = ex.detail
+        if isinstance(ex, PermissionDenied):
+            msg = f'{msg} ({context["request"].method}: {context["request"].path})'
         if isinstance(msg, dict):
             for k, v in msg.items():
                 for i in v:

backend/dvadmin/utils/filters.py

@@ -12,13 +12,15 @@ from collections import OrderedDict
 from functools import reduce
 
 import six
+from django import forms
 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
 from django_filters.conf import settings
 from django_filters.constants import ALL_FIELDS
-from django_filters.filters import CharFilter
+from django_filters.filters import CharFilter, BooleanFilter
+from django_filters.filterset import FilterSet, FilterSetMetaclass
 from django_filters.rest_framework import DjangoFilterBackend
 from django_filters.utils import get_model_field
 from rest_framework.filters import BaseFilterBackend
@@ -71,9 +73,7 @@ class DataLevelPermissionsFilter(BaseFilterBackend):
             permission__api=F("url"), permission__method=F("method")
         )
         api_white_list = [
-            str(item.get("permission__api").replace("{id}", ".*?"))
-            + ":"
-            + str(item.get("permission__method"))
+            str(item.get("permission__api").replace("{id}", ".*?")) + ":" + str(item.get("permission__method"))
             for item in api_white_list
             if item.get("permission__api")
         ]
@@ -119,19 +119,13 @@ class DataLevelPermissionsFilter(BaseFilterBackend):
 
             # 4. 只为仅本人数据权限时只返回过滤本人数据，并且部门为自己本部门(考虑到用户会变部门，只能看当前用户所在的部门数据)
             if 0 in dataScope_list:
-                return queryset.filter(
-                    creator=request.user, dept_belong_id=user_dept_id
-                )
+                return queryset.filter(creator=request.user, dept_belong_id=user_dept_id)
 
             # 5. 自定数据权限 获取部门，根据部门过滤
             dept_list = []
             for ele in dataScope_list:
                 if ele == 4:
-                    dept_list.extend(
-                        request.user.role.filter(status=1).values_list(
-                            "dept__id", flat=True
-                        )
-                    )
+                    dept_list.extend(request.user.role.filter(status=1).values_list("dept__id", flat=True))
                 elif ele == 2:
                     dept_list.append(user_dept_id)
                 elif ele == 1:
@@ -141,7 +135,7 @@ class DataLevelPermissionsFilter(BaseFilterBackend):
                             user_dept_id,
                         )
                     )
-            if queryset.model._meta.model_name == 'dept':
+            if queryset.model._meta.model_name == "dept":
                 return queryset.filter(id__in=list(set(dept_list)))
             return queryset.filter(dept_belong_id__in=list(set(dept_list)))
         else:
@@ -186,16 +180,14 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
         # TODO: remove assertion in 2.1
         if filterset_class is None and hasattr(view, "filter_class"):
             utils.deprecate(
-                "`%s.filter_class` attribute should be renamed `filterset_class`."
-                % view.__class__.__name__
+                "`%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(
-                "`%s.filter_fields` attribute should be renamed `filterset_fields`."
-                % view.__class__.__name__
+                "`%s.filter_fields` attribute should be renamed `filterset_fields`." % view.__class__.__name__
             )
             filterset_fields = getattr(view, "filter_fields", None)
 
@@ -224,8 +216,9 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
                     return [
                         f.name
                         for f in sorted(opts.fields + opts.many_to_many)
-                        if (f.name == 'id') or not isinstance(f, models.AutoField)
-                           and not (getattr(f.remote_field, "parent_link", False))
+                        if (f.name == "id")
+                        or not isinstance(f, models.AutoField)
+                        and not (getattr(f.remote_field, "parent_link", False))
                     ]
 
                 @classmethod
@@ -239,9 +232,9 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
                     exclude = cls._meta.exclude
 
                     assert not (fields is None and exclude is None), (
-                            "Setting 'Meta.model' without either 'Meta.fields' or 'Meta.exclude' "
-                            "has been deprecated since 0.15.0 and is now disallowed. Add an explicit "
-                            "'Meta.fields' or 'Meta.exclude' to the %s class." % cls.__name__
+                        "Setting 'Meta.model' without either 'Meta.fields' or 'Meta.exclude' "
+                        "has been deprecated since 0.15.0 and is now disallowed. Add an explicit "
+                        "'Meta.fields' or 'Meta.exclude' to the %s class." % cls.__name__
                     )
 
                     # Setting exclude with no fields implies all other fields.
@@ -255,9 +248,7 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
                     # Remove excluded fields
                     exclude = exclude or []
                     if not isinstance(fields, dict):
-                        fields = [
-                            (f, [settings.DEFAULT_LOOKUP_EXPR]) for f in fields if f not in exclude
-                        ]
+                        fields = [(f, [settings.DEFAULT_LOOKUP_EXPR]) for f in fields if f not in exclude]
                     else:
                         fields = [(f, lookups) for f, lookups in fields.items() if f not in exclude]
 
@@ -291,9 +282,12 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
                         if field is None:
                             undefined.append(field_name)
                         # 更新默认字符串搜索为模糊搜索
-                        if isinstance(field, (models.CharField)) and filterset_fields == '__all__' and lookups == [
-                            'exact']:
-                            lookups = ['icontains']
+                        if (
+                            isinstance(field, (models.CharField))
+                            and filterset_fields == "__all__"
+                            and lookups == ["exact"]
+                        ):
+                            lookups = ["icontains"]
                         for lookup_expr in lookups:
                             filter_name = cls.get_filter_name(field_name, lookup_expr)
 
@@ -303,20 +297,15 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
                                 continue
 
                             if field is not None:
-                                filters[filter_name] = cls.filter_for_field(
-                                    field, field_name, lookup_expr
-                                )
+                                filters[filter_name] = cls.filter_for_field(field, field_name, lookup_expr)
 
                     # Allow Meta.fields to contain declared filters *only* when a list/tuple
                     if isinstance(cls._meta.fields, (list, tuple)):
-                        undefined = [
-                            f for f in undefined if f not in cls.declared_filters
-                        ]
+                        undefined = [f for f in undefined if f not in cls.declared_filters]
 
                     if undefined:
                         raise TypeError(
-                            "'Meta.fields' must not contain non-model field names: %s"
-                            % ", ".join(undefined)
+                            "'Meta.fields' must not contain non-model field names: %s" % ", ".join(undefined)
                         )
 
                     # Add in declared filters. This is necessary since we don't enforce adding
@@ -364,3 +353,146 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
         if not filterset.is_valid() and self.raise_exception:
             raise utils.translate_validation(filterset.errors)
         return filterset.qs
+
+
+# ####################### 懒加载FilterSet ####################### #
+
+import time
+
+
+def calculate_execution_time(func):
+    def wrapper(*args, **kwargs):
+        start_time = time.time()
+        result = func(*args, **kwargs)
+        end_time = time.time()
+        execution_time = end_time - start_time
+        print(f"Function {func.__name__} took {execution_time:.6f} seconds to execute.", flush=True)
+        return result
+
+    return wrapper
+
+
+# def get_children(model: models, obj_id: int, all_qs=None, rec_list=None):
+#     if not all_qs:
+#         all_qs = model.objects.all().values("id", "parent")
+#     if rec_list is None:
+#         rec_list = [obj_id]
+#     for ele in all_qs:
+#         if ele.get("parent") == obj_id:
+#             rec_list.append(ele.get("id"))
+#             get_dept(ele.get("id"), all_qs, rec_list)
+#     return list(set(rec_list))
+
+
+# @calculate_execution_time
+# def get_qs_children(model, qs):
+#     dept_ids = []
+#     for d in qs:
+#         r = get_children(model, d.id)
+#         dept_ids.extend(r)
+#     return list(set(dept_ids))
+
+
+def next_layer_data(qs_filter, qs_node):
+    parent_nodes = set(qs_node.values_list("id", flat=True))
+    if set(qs_filter) == set(qs_node):
+        return parent_nodes
+    # qs_filter内所有父级id     去重
+    parent_ids = set()
+    for node in qs_filter:
+        while node.parent:
+            if node.id in parent_nodes:
+                parent_ids.add(node.id)
+                break
+            if node.parent.id in parent_nodes:
+                parent_ids.add(node.parent.id)
+                break
+            node = node.parent
+    # print(f"过滤查询集           ==>         {qs_filter}", flush=True)
+    # print(f"待渲染节点的id        ==>         {parent_nodes=}", flush=True)
+    # print(f"过滤查询集的父节点id   ==>         {parent_ids=}", flush=True)
+    return parent_ids
+
+
+def construct_data(qs_filter, qs_node, is_parent):
+    filter_node_ids = set(qs_filter.values_list("id", flat=True))
+    render_node_ids = set(qs_node.values_list("id", flat=True))
+
+    hidden_node_ids = set()
+    for node in qs_filter:
+        while node.parent:
+            if node.parent in qs_filter:
+                hidden_node_ids.add(node.id)
+            node = node.parent
+    on_show = filter_node_ids.difference(hidden_node_ids)
+    on_expand = hidden_node_ids & render_node_ids
+    # print(f"完整查询结果 {filter_node_ids}")
+    # print(f"待展示的节点(未过滤) {render_node_ids}")
+    # print(f"查询结果中的子节点 {hidden_node_ids}")
+    # print(f"查询后首先渲染的父节点 {on_show}")
+    # print(f"展开父节点时要渲染的节点 {on_expand}")
+    return on_expand if is_parent else on_show
+
+
+class FilterSetOptions:
+    def __init__(self, options=None):
+        self.model = getattr(options, "model", None)
+        self.fields = getattr(options, "fields", None)
+        self.exclude = getattr(options, "exclude", None)
+
+        # CharField默认模糊查询
+        self.filter_overrides = getattr(
+            options,
+            "filter_overrides",
+            {
+                models.CharField: {
+                    "filter_class": CharFilter,
+                    "extra": lambda f: {
+                        "lookup_expr": "icontains",
+                    },
+                },
+                models.BooleanField: {
+                    "filter_class": BooleanFilter,
+                    "extra": lambda f: {
+                        "widget": forms.RadioSelect,
+                    },
+                },
+            },
+        )
+
+        self.form = getattr(options, "form", forms.Form)
+
+
+class LazyLoadFilterSetMetaclass(FilterSetMetaclass):
+    def __new__(cls, name, bases, attrs):
+        attrs["declared_filters"] = cls.get_declared_filters(bases, attrs)
+
+        new_class = super().__new__(cls, name, bases, attrs)
+        new_class._meta = FilterSetOptions(getattr(new_class, "Meta", None))
+        new_class.base_filters = new_class.get_filters()
+
+        return new_class
+
+
+class LazyLoadFilter(FilterSet, metaclass=LazyLoadFilterSetMetaclass):
+    @property
+    # @calculate_execution_time
+    def qs(self):
+        queryset = self.queryset
+        # print(self.form.cleaned_data, flush=True)
+        filter_params = [k for k, v in self.form.cleaned_data.items() if v in [None, ""]]
+        for field in filter_params:
+            self.form.cleaned_data.pop(field)
+        is_parent = self.form.cleaned_data.pop("parent", None) is not None
+        # print(queryset, flush=True)
+        if self.form.cleaned_data:
+            self.queryset = queryset.model.objects.all()
+
+            # 从根节点开始
+            # node_ids = next_layer_data(super().qs, queryset)
+
+            # 按匹配结果显示
+            node_ids = construct_data(super().qs, queryset, is_parent)
+
+            return queryset.model.objects.filter(id__in=node_ids)
+        return super().qs

web/package.json

@@ -19,6 +19,7 @@
     "china-division": "^2.4.0",
     "core-js": "^3.4.3",
     "cropperjs": "^1.5.6",
+    "crypto-js": "^4.1.1",
     "d2-crud-plus": "^2.17.9",
     "d2-crud-x": "^2.17.9",
     "d2p-extends": "^2.17.9",
@@ -43,7 +44,9 @@
     "ua-parser-js": "^0.7.20",
     "viser-vue": "^2.4.8",
     "vue": "2.7.14",
+    "vue-clipboard2": "^0.3.3",
     "vue-core-video-player": "^0.2.0",
+    "vue-cropper": "^0.6.2",
     "vue-echarts": "^6.5.4",
     "vue-grid-layout": "^2.4.0",
     "vue-html2pdf": "^1.8.0",
@@ -51,6 +54,7 @@
     "vue-infinite-scroll": "^2.0.2",
     "vue-router": "^3.6.5",
     "vue-splitpane": "^1.0.6",
+    "vue-swiper-component": "^2.1.3",
     "vuex": "^3.1.2",
     "vxe-table": "^3.3.2",
     "xe-utils": "^3.2.1"

web/src/components/file-uploader/lib/file-uploader.vue

@@ -180,10 +180,10 @@ export default {
       if (this.fileList.length > 0) {
         const file = this.fileList[0]
         log.debug('file,', file, file.status)
-        if (file.response != null && file.response.url != null) {
-          return file.response.url
-        } else if (file.url != null) {
+        if (file.url != null) {
           return file.url
+        } else if (file.response != null && file.response.url != null) {
+          return file.response.url
         }
       }
       return null

web/src/components/foreign-key-crud-form/foreign-key-crud-form.vue

@@ -24,6 +24,7 @@
             :rules="[
                 { required: elProps.fields[key].required, message: '不能为空', trigger: 'blur' },
               ]"
+            style="text-align: center"
           >
             <el-select v-model="field[key]" v-if="elProps.fields[key].type === 'select'" placeholder="请选择">
               <el-option
@@ -34,13 +35,22 @@
               </el-option>
             </el-select>
             <el-input-number style="width: 100%" v-else-if="elProps.fields[key].type === 'number'" controls-position="right" v-model="field[key]"></el-input-number>
-            <div v-else-if="elProps.fields[key].type === 'image'" style="height: 50px;width: 50px;">
+            <div v-else-if="elProps.fields[key].type === 'image'" style="height: 30px;width: 30px;">
                 <d2p-file-uploader v-model="field[key]" :elProps="elProps.fields[key].elProps || { listType: 'picture-card', accept: '.png,.jpeg,.jpg,.ico,.bmp,.gif', limit: 1 }"></d2p-file-uploader>
             </div>
             <!--     富文本     -->
             <span v-else-if="elProps.fields[key].type === 'ueditor'">
               <values-popover v-model="field[key]" :elProps="{ type: 'ueditor' }" @previewClick="previewClick(index,key)"></values-popover>
             </span>
+            <!--     多对多     -->
+            <span v-else-if="elProps.fields[key].type === 'many_to_many'">
+              <values-popover
+                v-model="field[key]"
+                :dict="elProps.fields[key].dict"
+                :elProps="{ type: elProps.fields[key].value?.type || 'strList',  rowKey: elProps.fields[key].value?.rowKey || 'title', label: elProps.value?.title || '答复选项内容' }"
+                @listClick="manyToManyClick(index,key)">
+              </values-popover>
+            </span>
             <el-input v-model="field[key]" v-else placeholder="请输入"></el-input>
           </el-form-item>
         </el-col>
@@ -63,11 +73,31 @@
       :visible.sync="previewVisible"
       append-to-body
       width="900">
-      <d2p-ueditor v-model="currentForm.data[ueditorIndex][ueditorKey]" :config="ueditorConfig"></d2p-ueditor>
+      <d2p-ueditor
+        v-if="currentForm.data && currentForm.data[ueditorIndex] && ueditorKey"
+        v-model="currentForm.data[ueditorIndex][ueditorKey]"
+        :config="ueditorConfig">
+      </d2p-ueditor>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="previewVisible = false">完成</el-button>
       </span>
     </el-dialog>
+    <el-dialog
+      title="编辑"
+      :visible.sync="manyToManyVisible"
+      append-to-body
+      v-if="currentForm.data && currentForm.data[manyToManyIndex] && manyToManyKey"
+      :width="elProps.fields[manyToManyKey].dialogWidth">
+      <foreign-key-crud-form
+        v-model="currentForm.data[manyToManyIndex][manyToManyKey]"
+        :isInitRows="elProps.fields[manyToManyKey].isInitRows"
+        :elProps="elProps.fields[manyToManyKey].elProps"
+        @change="foreignChange"
+      ></foreign-key-crud-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="manyToManyVisible = false">保存</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -124,6 +154,50 @@ export default {
               required: true,
               min: 0,
               max: null
+            },
+            option_data: {
+              name: '选项题目',
+              type: 'many_to_many',
+              span: 2,
+              default: [],
+              required: false,
+              unit: '个',
+              value: {
+                type: 'strList',
+                rowKey: 'name',
+                title: '选项内容'
+              },
+              // 子级多对多
+              isInitRows: true,
+              dialogWidth: '700',
+              dict: {
+                value: 'id', // 数据字典中value字段的属性名
+                label: 'name' // 数据字典中label字段的属性名
+              },
+              elProps: {
+                index: {
+                  name: '序号',
+                  span: 2
+                },
+                fields: {
+                  name: {
+                    name: '题目选项内容',
+                    type: 'input',
+                    span: 10,
+                    default: null,
+                    required: true
+                  },
+                  sort: {
+                    name: '排序',
+                    type: 'number',
+                    span: 8,
+                    default: 0,
+                    required: true,
+                    min: 0,
+                    max: null
+                  }
+                }
+              }
             }
           }
         }
@@ -160,7 +234,11 @@ export default {
       // 富文本弹窗编辑框
       previewVisible: false,
       ueditorIndex: 0,
-      ueditorKey: null
+      ueditorKey: null,
+      // 多对多弹窗
+      manyToManyIndex: 0,
+      manyToManyKey: null,
+      manyToManyVisible: false
     }
   },
   computed: {
@@ -250,6 +328,20 @@ export default {
       this.ueditorKey = key
       this.previewVisible = true
       console.log('previewClick', index, key)
+    },
+    // 多对多点击事件
+    manyToManyClick (index, key) {
+      this.manyToManyIndex = index
+      this.manyToManyKey = key
+      this.manyToManyVisible = true
+      if (!this.currentForm.data[this.manyToManyIndex][this.manyToManyKey]) {
+        this.currentForm.data[this.manyToManyIndex][this.manyToManyKey] = []
+      }
+    },
+    foreignChange (res) {
+      if (this.manyToManyKey) {
+        this.currentForm.data[this.manyToManyIndex][this.manyToManyKey] = res
+      }
     }
   }
 }

web/src/components/selector-table/selector-table.vue

@@ -54,7 +54,7 @@
       </div>
       <div slot="reference" ref="divRef" :style="{'pointerEvents': disabled?'none':''}">
         <div v-if="currentValue" class="div-input el-input__inner" :class="disabled?'div-disabled':''">
-          <div>
+          <div v-if="currentValue instanceof Array">
             <el-tag
               style="margin-right: 5px"
               v-for="(item,index) in currentValue"
@@ -70,7 +70,7 @@
             </el-tag>
           </div>
         </div>
-        <el-input v-else placeholder="请选择" slot:reference clearable :disabled="disabled"></el-input>
+        <el-input v-else placeholder="请选择" slot:reference clearable :disabled="disabled" :size="size"></el-input>
       </div>
     </el-popover>
   </div>
@@ -95,6 +95,11 @@ export default {
       required: false,
       default: ''
     },
+    size: {
+      type: String,
+      required: false,
+      default: ''
+    },
     // 数据字典配置
     dict: {
       type: Object,

web/src/components/values-popover/values-popover.vue

@@ -18,10 +18,10 @@
             {{ item[dict.label] }}
           </el-descriptions-item>
         </el-descriptions>
-        <el-button type="primary" plain size="mini" slot="reference"><span> {{ value.length }} {{ elProps.unit }}</span>
+        <el-button type="primary" plain size="mini" slot="reference" @click="listClick"><span> {{ value.length }} {{ elProps.unit }}</span>
         </el-button>
       </el-popover>
-      <el-button v-else type="primary" plain size="mini" slot="reference"><span> {{
+      <el-button v-else type="primary" plain size="mini" slot="reference" @click="listClick"><span> {{
           value.length
         }} {{ elProps.unit }}</span>
       </el-button>
@@ -46,10 +46,10 @@
         @show="showEvents"
         @hide="show=false">
         <div v-html="value" v-if="show"></div>
-        <el-button type="primary" plain size="mini" slot="reference"><span>预览</span>
+        <el-button type="primary" plain size="mini" slot="reference" @click="previewClick"><span>预览</span>
         </el-button>
       </el-popover>
-      <el-button v-else type="primary" plain size="mini" slot="reference"><span>预览</span>
+      <el-button v-else type="primary" plain size="mini" slot="reference" @click="previewClick"><span>预览</span>
       </el-button>
     </div>
   </div>
@@ -125,7 +125,9 @@ export default {
       if (this.value.constructor === Array) {
         const ids = []
         this.value.map(res => {
-          ids.push(res[this.dict.value])
+          if (res) {
+            ids.push(res[this.dict.value])
+          }
         })
         params[this.dict.value] = ids
       } else {
@@ -135,12 +137,18 @@ export default {
       request({ url: this.dict.url, params: params }).then(ret => {
         this.data = ret.data.data || ret.data
       })
+    },
+    previewClick () {
+      this.$emit('previewClick')
+    },
+    listClick () {
+      this.$emit('listClick')
     }
   }
 }
 </script>
-<style >
-.userprjtreepop{
+<style>
+.userprjtreepop {
   width: 80%;
   overflow-x: auto;
   max-height: 80%;

web/src/layout/header-aside/components/header-user/index.vue

@@ -1,11 +1,3 @@
-<!--
- * @创建文件时间: 2021-06-01 22:41:20
- * @Auther: 猿小天
- * @最后修改人: 猿小天
- * @最后修改时间: 2021-07-27 00:18:52
- * 联系Qq:1638245306
- * @文件介绍:
--->
 <template>
   <el-dropdown size="small" class="d2-mr">
     <el-link
@@ -28,6 +20,9 @@
       <el-dropdown-item @click.native="userInfo">
         <d2-icon name="cog" class="d2-mr-5" />个人信息
       </el-dropdown-item>
+      <el-dropdown-item @click.native="clientInfo" v-if="info.tenant_id === 100000">
+        <d2-icon name="cog" class="d2-mr-5" />租户信息
+      </el-dropdown-item>
       <el-dropdown-item @click.native="logOff" divided>
         <d2-icon name="power-off" class="d2-mr-5" />
         注销
@@ -61,6 +56,10 @@ export default {
     /** 个人信息 */
     userInfo () {
       this.$router.push({ path: 'userInfo' })
+    },
+    /** 租户信息 */
+    clientInfo () {
+      this.$router.push({ path: 'myClientInfo' })
     }
   }
 }

web/src/main.js

@@ -38,7 +38,9 @@ import util from '@/libs/util'
 import VueCoreVideoPlayer from 'vue-core-video-player'
 // 引入echarts
 import * as echarts from 'echarts' // 注册echarts组件
-
+// 第三方组件
+import VueClipboard from 'vue-clipboard2'
+Vue.use(VueClipboard)
 Vue.use(VueCoreVideoPlayer)
 // 核心插件
 Vue.use(d2Admin)

web/src/menu/index.js

@@ -1,11 +1,3 @@
-/*
- * @创建文件时间: 2021-06-01 22:41:21
- * @Auther: 猿小天
- * @最后修改人: 猿小天
- * @最后修改时间: 2021-11-19 21:35:56
- * 联系Qq:1638245306
- * @文件介绍: 菜单获取
- */
 import { uniqueId } from 'lodash'
 import { request } from '@/api/service'
 import store from '@/store'
@@ -78,7 +70,8 @@ export const handleRouter = function (menuData) {
         meta: {
           title: item.name,
           auth: true,
-          cache: item.cache
+          cache: item.cache,
+          openInNewWindow: item.frame_out
         }
       }
       if (item.frame_out) {

web/src/router/index.js

@@ -1,11 +1,3 @@
-/*
- * @创建文件时间: 2021-06-01 22:41:21
- * @Auther: 猿小天
- * @最后修改人: 猿小天
- * @最后修改时间: 2021-11-19 21:49:43
- * 联系Qq:1638245306
- * @文件介绍:
- */
 import Vue from 'vue'
 import VueRouter from 'vue-router'
 // 进度条
@@ -42,7 +34,7 @@ const router = new VueRouter({
  */
 router.beforeEach(async (to, from, next) => {
   // 白名单
-  const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/oauth2']
+  const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/clientRenew', '/oauth2']
   // 确认已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201
   await store.dispatch('d2admin/page/isLoaded')
   // 确认已经加载组件尺寸设置 https://github.com/d2-projects/d2-admin/issues/198
@@ -92,11 +84,21 @@ router.beforeEach(async (to, from, next) => {
         next({ path: to.fullPath, replace: true, params: to.params })
       })
     } else {
-      next()
       const childrenPath = window.qiankunActiveRule || []
       if (to.name) {
         // 有 name 属性，说明是主应用的路由
-        next()
+        if (to.meta.openInNewWindow && !to.query.newWindow) {
+          // 在新窗口中打开路由
+          const { href } = router.resolve({
+            path: to.path + '?newWindow=1'
+          })
+          window.open(href, '_blank')
+          // 取消当前导航
+          NProgress.done()
+          next(false)
+        } else {
+          next()
+        }
       } else if (childrenPath.some((item) => to.path.includes(item))) {
         next()
       } else {

web/src/views/system/dept/crud.js

@@ -13,6 +13,7 @@ export const crudOptions = (vm) => {
       height: '100%', // 表格高度100%, 使用toolbar必须设置
       highlightCurrentRow: false,
       defaultExpandAll: true,
+      resizable: true,
       treeConfig: {
         transform: true,
         rowField: 'id',
@@ -20,7 +21,13 @@ export const crudOptions = (vm) => {
         hasChild: 'hasChild',
         lazy: true,
         loadMethod: ({ row }) => {
-          return api.GetList({ parent: row.id }).then(ret => {
+          let query = JSON.parse(JSON.stringify(vm.getSearch().getForm()))
+          query = Object.fromEntries(
+            Object.entries(query).filter(([_, value]) => ![undefined, null, [], '[]', ''].includes(value))
+          )
+          query.parent = row.id
+          // console.log(query)
+          return api.GetList({ ...query }).then(ret => {
             return ret.data.data
           })
         },
@@ -28,6 +35,7 @@ export const crudOptions = (vm) => {
       }
     },
     rowHandle: {
+      fixed: 'right',
       width: 140,
       view: {
         thin: true,
@@ -55,7 +63,7 @@ export const crudOptions = (vm) => {
       // 或者直接传true,不显示title，不居中
       title: '序号',
       align: 'center',
-      width: 100
+      width: 70
     },
 
     viewOptions: {
@@ -71,7 +79,7 @@ export const crudOptions = (vm) => {
         show: false,
         disabled: true,
         search: {
-          disabled: false
+          disabled: true
         },
         form: {
           disabled: true,
@@ -136,8 +144,8 @@ export const crudOptions = (vm) => {
             }
           }
         },
-        width: 180,
         type: 'input',
+        showOverflow: 'tooltip',
         form: {
           rules: [
             // 表单校验规则

web/src/views/system/login/base.vue

@@ -6,6 +6,7 @@
 import { mapActions, mapState } from 'vuex'
 import localeMixin from '@/locales/mixin.js'
 import * as api from '@/views/system/login/api'
+import { checkPlugins } from '@/views/plugins'
 
 export default {
   mixins: [localeMixin],
@@ -55,7 +56,8 @@ export default {
           username: 'admin',
           password: 'admin123456'
         }
-      ]
+      ],
+      isTenant: checkPlugins('dvadmin-tenants-web')
     }
   },
   computed: {
@@ -68,7 +70,8 @@ export default {
       helpUrl: state => state.settings.data['login.help_url'], // 帮助
       privacyUrl: state => state.settings.data['login.privacy_url'], // 隐私
       clauseUrl: state => state.settings.data['login.clause_url'], // 条款
-      captchaState: state => state.settings.data['base.captcha_state'] !== undefined ? state.settings.data['base.captcha_state'] : true // 验证码
+      captchaState: state => state.settings.data['base.captcha_state'] !== undefined ? state.settings.data['base.captcha_state'] : true, // 验证码
+      isPublic: state => state.settings.data.schema_name === 'public' // 是否超级租户
     })
   },
   mounted () {
@@ -78,8 +81,8 @@ export default {
   methods: {
     ...mapActions('d2admin/account', ['login']),
     /**
-       * 获取验证码
-       */
+     * 获取验证码
+     */
     getCaptcha () {
       if (this.captchaState !== undefined && !this.captchaState) return
       api.getCaptcha().then((ret) => {
@@ -89,8 +92,8 @@ export default {
       })
     },
     /**
-       * @description 提交表单
-       */
+     * @description 提交表单
+     */
     // 提交登录信息
     submit () {
       const that = this
@@ -138,106 +141,106 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  // ----
-  .page-login {
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 100%;
-    width: 100%;
-    background-position: center 0;
-    background-repeat: no-repeat;
-    background-attachment: fixed;
-    background-size: cover;
-    -webkit-background-size: cover; /* 兼容Webkit内核浏览器如Chrome和Safari */
-    -o-background-size: cover; /* 兼容Opera */
-    zoom: 1;
-  }
+// ----
+.page-login {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+  width: 100%;
+  background-position: center 0;
+  background-repeat: no-repeat;
+  background-attachment: fixed;
+  background-size: cover;
+  -webkit-background-size: cover; /* 兼容Webkit内核浏览器如Chrome和Safari */
+  -o-background-size: cover; /* 兼容Opera */
+  zoom: 1;
+}
 
-  ::v-deep .el-card__body {
-    height: 100%;
-    padding: 0;
-  }
+::v-deep .el-card__body {
+  height: 100%;
+  padding: 0;
+}
 
-  .card {
-    height: 100%;
-    width: 100%;
-    border-radius: 30px;
-    padding: 0;
-    margin-top: 12%;
-  }
+.card {
+  height: 100%;
+  width: 100%;
+  border-radius: 30px;
+  padding: 0;
+  margin-top: 12%;
+}
 
-  .right-card {
-    float: right;
+.right-card {
+  float: right;
+  text-align: center;
+  width: 50%;
+  height: 100%;
+}
+
+.right-card h1 {
+  color: #098dee;
+  margin-bottom: 40px;
+  margin-top: 40px;
+}
+
+.button-login {
+  width: 100%;
+  margin-top: 30px;
+}
+
+::v-deep .el-input-group__append {
+  padding: 0;
+}
+
+// footer
+.page-login--content-footer {
+  margin-top: 10%;
+  padding: 1em 0;
+
+  .page-login--content-footer-locales {
+    padding: 0px;
+    margin: 0px;
+    margin-bottom: 15px;
+    font-size: 12px;
+    line-height: 12px;
     text-align: center;
-    width: 50%;
-    height: 100%;
-  }
+    color: $color-text-normal;
 
-  .right-card h1 {
-    color: #098dee;
-    margin-bottom: 40px;
-    margin-top: 40px;
-  }
-
-  .button-login {
-    width: 100%;
-    margin-top: 30px;
-  }
-
-  ::v-deep .el-input-group__append {
-    padding: 0;
-  }
-
-  // footer
-  .page-login--content-footer {
-    margin-top: 10%;
-    padding: 1em 0;
-
-    .page-login--content-footer-locales {
-      padding: 0px;
-      margin: 0px;
-      margin-bottom: 15px;
-      font-size: 12px;
-      line-height: 12px;
-      text-align: center;
+    a {
       color: $color-text-normal;
+      margin: 0 0.5em;
 
-      a {
-        color: $color-text-normal;
-        margin: 0 0.5em;
-
-        &:hover {
-          color: $color-text-main;
-        }
-      }
-    }
-
-    .page-login--content-footer-copyright {
-      padding: 0px;
-      margin: 0px;
-      margin-bottom: 10px;
-      font-size: 12px;
-      line-height: 12px;
-      text-align: center;
-      color: $color-text-normal;
-
-      a {
-        color: $color-text-normal;
-      }
-    }
-
-    .page-login--content-footer-options {
-      padding: 0px;
-      margin: 0px;
-      font-size: 12px;
-      line-height: 12px;
-      text-align: center;
-
-      a {
-        color: $color-text-normal;
-        margin: 0 1em;
+      &:hover {
+        color: $color-text-main;
       }
     }
   }
+
+  .page-login--content-footer-copyright {
+    padding: 0px;
+    margin: 0px;
+    margin-bottom: 10px;
+    font-size: 12px;
+    line-height: 12px;
+    text-align: center;
+    color: $color-text-normal;
+
+    a {
+      color: $color-text-normal;
+    }
+  }
+
+  .page-login--content-footer-options {
+    padding: 0px;
+    margin: 0px;
+    font-size: 12px;
+    line-height: 12px;
+    text-align: center;
+
+    a {
+      color: $color-text-normal;
+      margin: 0 1em;
+    }
+  }
+}
 </style>

web/src/views/system/login/page.vue

@@ -69,9 +69,20 @@
                     </el-input>
                   </el-form-item>
                 </el-form>
-                <button class="btn btn-primary btn-block" style="padding: 10px 10px;" @click="submit">
-                  登录
-                </button>
+                <el-row v-if="isTenant && isPublic">
+                  <el-col :span="11">
+                    <button class="btn btn-primary btn-block" style="padding: 10px 10px;" @click="submit">登录</button>
+                  </el-col>
+                  <el-col :span="11" :offset="2">
+                    <button
+                      class="btn btn-primary btn-block"
+                      style="padding: 10px 10px;background-color: #409eff;color: #fff;"
+                      @click="$router.push('/register')">
+                      免费试用
+                    </button>
+                  </el-col>
+                </el-row>
+                <button v-else class="btn btn-primary btn-block" style="padding: 10px 10px;" @click="submit">登录</button>
                 <component v-if="componentTag" :is="componentTag"></component>
               </el-tab-pane>
             </el-tabs>

web/src/views/system/messageCenter/crud.js

@@ -275,7 +275,7 @@ export const crudOptions = (vm) => {
             return request({
               url: url
             }).then(ret => {
-              return ret.data.data
+              return ret.data
             })
           }
         },