feat: 系统样式设置中增加首页是否显示按钮

backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java

@@ -7,6 +7,7 @@ import io.dataease.base.domain.SysMenu;
 import io.dataease.base.domain.SysMenuExample;
 import io.dataease.base.mapper.SysMenuMapper;
 import io.dataease.base.mapper.ext.ExtPluginSysMenuMapper;
+import io.dataease.base.mapper.ext.ExtSysMenuMapper;
 import io.dataease.plugins.common.dto.PluginSysMenu;
 import io.dataease.plugins.util.PluginUtils;
 import org.apache.commons.collections4.CollectionUtils;
@@ -30,12 +31,16 @@ public class DynamicMenuServiceImpl implements DynamicMenuService {
     @Resource
     private ExtPluginSysMenuMapper extPluginSysMenuMapper;
 
+    @Resource
+    private ExtSysMenuMapper extSysMenuMapper;
+
     @Override
     public List<DynamicMenuDto> load(String userId) {
-        SysMenuExample sysMenuExample = new SysMenuExample();
-        sysMenuExample.createCriteria().andTypeLessThanOrEqualTo(1);
-        sysMenuExample.setOrderByClause(" menu_sort ");
-        List<SysMenu> sysMenus = sysMenuMapper.selectByExample(sysMenuExample);
+//        SysMenuExample sysMenuExample = new SysMenuExample();
+//        sysMenuExample.createCriteria().andTypeLessThanOrEqualTo(1);
+//        sysMenuExample.setOrderByClause(" menu_sort ");
+//        List<SysMenu> sysMenus = sysMenuMapper.selectByExample(sysMenuExample);
+        List<SysMenu> sysMenus = extSysMenuMapper.querySysMenu();
         List<DynamicMenuDto> dynamicMenuDtos = sysMenus.stream().map(this::convert).collect(Collectors.toList());
         //增加插件中的菜单
         List<PluginSysMenu> pluginSysMenus = PluginUtils.pluginMenus();

backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMenuMapper.java

@@ -1,5 +1,6 @@
 package io.dataease.base.mapper.ext;
 
+import io.dataease.base.domain.SysMenu;
 import io.dataease.base.mapper.ext.query.GridExample;
 import io.dataease.controller.sys.request.SimpleTreeNode;
 
@@ -10,4 +11,6 @@ public interface ExtSysMenuMapper {
     List<SimpleTreeNode> allNodes();
 
     List<SimpleTreeNode> nodesByExample(GridExample example);
+
+    List<SysMenu> querySysMenu();
 }

backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMenuMapper.xml

@@ -7,6 +7,8 @@
         <result property="pid" column="pid" javaType="java.lang.Long"/>
     </resultMap>
 
+    <resultMap id="ExtBaseResultMap"  type="io.dataease.base.domain.SysMenu" extends="io.dataease.base.mapper.SysMenuMapper.BaseResultMap"></resultMap>
+
     <select id="allNodes" resultMap="simpleNode">
         select menu_id as id, pid from sys_menu where hidden != 1
     </select>
@@ -19,4 +21,27 @@
     </select>
 
 
+    <select id="querySysMenu" resultMap="ExtBaseResultMap">
+        SELECT
+        *
+        FROM
+        sys_menu
+        WHERE
+        type &lt;= 1
+        AND (
+        sys_menu.menu_id != 61
+        OR EXISTS (
+        SELECT
+        1
+        FROM
+        system_parameter
+        WHERE
+        param_key = 'ui.openHomePage'
+        AND param_value = 'true'
+        )
+        )
+        ORDER BY
+        menu_sort
+    </select>
+
 </mapper>

backend/src/main/resources/db/migration/V31__1.7.sql

@@ -1 +1,2 @@
 INSERT INTO `sys_menu` (`menu_id`, `pid`, `sub_count`, `type`, `title`, `name`, `component`, `menu_sort`, `icon`, `path`, `i_frame`, `cache`, `hidden`, `permission`, `create_by`, `update_by`, `create_time`, `update_time`) VALUES (61, 0, 0, 1, '首页', 'wizard', 'wizard/index', 0, '', '/wizard', b'1', b'0', b'0', NULL, NULL, NULL, NULL, 1614915491036);
+INSERT INTO `system_parameter` (`param_key`, `param_value`, `type`, `sort`) VALUES ('ui.openHomePage', 'true', 'boolean', 13);

frontend/src/components/canvas/components/Editor/EditBar.vue

@@ -207,6 +207,9 @@ export default {
     },
     linkJumpSet() {
       this.$emit('linkJumpSet')
+    },
+    goFile() {
+      this.$refs.files.click()
     }
   }
 }

frontend/src/lang/en.js

@@ -461,7 +461,8 @@ export default {
   sysParams: {
     display: 'Display Setting',
     ldap: 'LDAP Setting',
-    oidc: 'OIDC Setting'
+    oidc: 'OIDC Setting',
+    theme: 'Theme Setting'
   },
   license: {
     i18n_no_license_record: 'No License Record',
@@ -1511,7 +1512,9 @@ export default {
 
     themeLight: 'Light',
     themeDark: 'Dark',
-    themeCustom: 'Custom'
+    themeCustom: 'Custom',
+    openHomePage: 'Show Home Page'
+
   },
   auth: {
     authConfig: 'Auth Config',
@@ -1763,7 +1766,8 @@ export default {
     cweek: 'This Week',
     cmonth: 'This Month',
     cquarter: 'This Quarter',
-    cyear: 'This Year'
+    cyear: 'This Year',
+    openHomePage: 'Show Home Page'
   },
   dynamic_year: {
     fix: 'Fixed Year',

frontend/src/lang/tw.js

@@ -461,7 +461,8 @@ export default {
   sysParams: {
     display: '顯示設置',
     ldap: 'LDAP設置',
-    oidc: 'OIDC設置'
+    oidc: 'OIDC設置',
+    theme: '主题设置'
   },
   license: {
     i18n_no_license_record: '沒有 License 記錄',
@@ -1521,7 +1522,8 @@ export default {
 
     themeLight: '淺色',
     themeDark: '深色',
-    themeCustom: '自定義'
+    themeCustom: '自定義',
+    openHomePage: '显示首页'
 
   },
   auth: {

frontend/src/lang/zh.js

@@ -1530,7 +1530,8 @@ export default {
 
     themeLight: '浅色',
     themeDark: '深色',
-    themeCustom: '自定义'
+    themeCustom: '自定义',
+    openHomePage: '显示首页'
 
   },
   auth: {

frontend/src/layout/index.vue

@@ -114,6 +114,8 @@ export default {
   @import "~@/styles/variables.scss";
 
   .app-wrapper {
+    min-width: 1000px!important;
+    min-height: 600px!important;
     @include clearfix;
     position: relative;
     height: 100%;

frontend/src/permission.js

@@ -16,6 +16,7 @@ import {
 import {
   isMobile
 } from '@/utils/index'
+import Layout from '@/layout/index'
 // import bus from './utils/bus'
 
 NProgress.configure({
@@ -97,6 +98,23 @@ export const loadMenus = (next, to) => {
     const datas = res.data
     const filterDatas = filterRouter(datas)
     const asyncRouter = filterAsyncRouter(filterDatas)
+    // 如果包含首页 则默认页面是 首页 否则默认页面是仪表板页面
+    if (JSON.stringify(datas).indexOf('wizard') > -1) {
+      asyncRouter.push({
+        path: '/',
+        component: Layout,
+        redirect: '/wizard/index',
+        hidden: true
+      })
+    } else {
+      asyncRouter.push({
+        path: '/',
+        component: Layout,
+        redirect: '/panel/index',
+        hidden: true
+      })
+    }
+
     asyncRouter.push({
       path: '*',
       redirect: '/404',

frontend/src/router/index.js

@@ -91,12 +91,6 @@ export const constantRoutes = [
     path: '/previewFullScreen',
     component: () => import('@/components/canvas/components/Editor/PreviewFullScreen'),
     hidden: true
-  },
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/wizard/index',
-    hidden: true
   }
 
   //   {