Merge remote-tracking branch 'origin/v2.x' into v2.x

backend/application/urls.py

@@ -35,8 +35,8 @@ from dvadmin.system.views.system_config import InitSettingsViewSet
 from dvadmin.utils.swagger import CustomOpenAPISchemaGenerator
 
 # =========== 初始化系统配置 =================
-dispatch.init_system_config()
+# dispatch.init_system_config()
-dispatch.init_dictionary()
+# dispatch.init_dictionary()
 # =========== 初始化系统配置 =================
 
 schema_view = get_schema_view(

backend/del_migrations.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+import os
+
+exclude = ["venv"] # 需要排除的文件目录
+for root, dirs, files in os.walk('.'):
+    dirs[:] = [d for d in set(dirs) - set(exclude)]
+    if 'migrations' in dirs:
+        dir = dirs[dirs.index('migrations')]
+        for root_j, dirs_j, files_j in os.walk(os.path.join(root, dir)):
+            for file_k in files_j:
+                if file_k != '__init__.py':
+                    dst_file = os.path.join(root_j, file_k)
+                    print('删除文件>>> ', dst_file)
+                    os.remove(dst_file)

web/src/views/system/rolePermission/index.vue

@@ -93,7 +93,7 @@
               :default-checked-keys="menuCheckedKeys"
               :check-on-click-node="false"
               empty-text="请先选择角色"
-              :check-strictly="true"
+              :check-strictly="false"
               @check-change="handleCheckClick"
             >
               <span class="custom-tree-node" slot-scope="{ node, data }">
@@ -104,8 +104,7 @@
                       v-for="(item, index) in data.menuPermission"
                       :key="index"
                       v-model="item.checked"
-                    >{{ item.name }}</el-checkbox
+                    >{{ item.name }}</el-checkbox>
-                    >
                   </div>
                 </div>
               </span>
@@ -290,12 +289,13 @@ export default {
     handleCheckClick (data, checked) {
       const {
         menuPermission,
-        children
+        children,
+        parent
       } = data
       for (const item of menuPermission) {
         this.$set(item, 'checked', checked)
       }
-      if (children) {
+      if (children && parent) {
         for (const item of children) {
           this.$refs.menuTree.setChecked(item.id, checked)
         }