首页图表开发

4 years ago · d4a465e161
parent 56ddf931d8
commit d4a465e161
8 changed files with 100717 additions and 1478 deletions
--- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java
@ -648,6 +648,7 @@ public class SpringBootCallable implements Callable {
            File css = Tool.createPath(static_, "css");
            File img = Tool.createPath(static_, "img");
            File dist = Tool.createPath(static_, "dist");
+            File echarts = Tool.createPath(static_, "echarts");
            Tool.outputResource("SpringBoot/resources/static/favicon.ico", Tool.createFile(static_, "favicon.ico"));

            //css文件
@ -663,6 +664,10 @@ public class SpringBootCallable implements Callable {
            Tool.outputResource("SpringBoot/resources/static/dist/index.min.js", Tool.createFile(dist, "index.min.js"));
            Tool.outputResource("SpringBoot/resources/static/dist/index.min.css", Tool.createFile(dist, "index.min.css"));

+            //element-ui
+            Tool.outputResource("SpringBoot/resources/static/dist/echarts/echarts.js", Tool.createFile(echarts, "echarts.js"));
+            Tool.outputResource("SpringBoot/resources/static/dist/echarts/echarts.min.js", Tool.createFile(echarts, "echarts.min.css"));
+
            File fonts = Tool.createPath(dist, "fonts");
 //            Tool.outputResource("SpringBoot/resources/static/dist/fonts/w-e-icon.woff", Tool.createFile(fonts, "w-e-icon.woff"));
            Tool.outputResource("SpringBoot/resources/static/dist/fonts/element-icons.woff", Tool.createFile(fonts, "element-icons.woff"));
@ -676,7 +681,9 @@ public class SpringBootCallable implements Callable {
            Tool.outputResource("SpringBoot/resources/templates/control/nav.ftl", Tool.createFile(control, "nav.ftl"));
            Tool.outputResource("SpringBoot/resources/templates/control/macro.ftl", Tool.createFile(control, "macro.ftl"));
            Tool.outputResource("SpringBoot/resources/templates/layout/default.ftl", Tool.createFile(layout, "default.ftl"));
+            Tool.outputResource("SpringBoot/resources/templates/layout/home.ftl", Tool.createFile(layout, "home.ftl"));
            Tool.outputResource("SpringBoot/resources/templates/screen/home.ftl", Tool.createFile(screen, "home.ftl"));
+            Tool.outputResource("SpringBoot/resources/templates/screen/helpDev.ftl", Tool.createFile(screen, "helpDev.ftl"));
            Tool.outputResource("SpringBoot/resources/templates/screen/login.ftl", Tool.createFile(screen, "login.ftl"));
            Tool.outputResource("SpringBoot/resources/templates/403.ftl", Tool.createFile(templates, "403.ftl"));
            Tool.outputResource("SpringBoot/resources/templates/404.ftl", Tool.createFile(templates, "404.ftl"));
--- a/src/main/resources/modules/SpringBoot/resources/static/css/base.css
+++ b/src/main/resources/modules/SpringBoot/resources/static/css/base.css
@ -463,10 +463,10 @@ code {
 .row {
    position: relative;
    box-sizing: border-box;
+    display: flex;
 }

 [class*=col-] {
-    float: left;
    box-sizing: border-box;
 }

--- a/src/main/resources/modules/SpringBoot/resources/static/dist/echarts/echarts.js
+++ b/src/main/resources/modules/SpringBoot/resources/static/dist/echarts/echarts.js
--- a/src/main/resources/modules/SpringBoot/resources/static/dist/echarts/echarts.min.js
+++ b/src/main/resources/modules/SpringBoot/resources/static/dist/echarts/echarts.min.js
--- a/src/main/resources/modules/SpringBoot/resources/templates/layout/home.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/layout/home.ftl
@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>${title?default("首页")}</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <script src="${context}/static/dist/lib.min.js" type="text/javascript"></script>
+    <script src="${context}/static/dist/echarts/echarts.min.js" type="text/javascript"></script>
+    <link href="${context}/static/css/base.css" rel="stylesheet"/>
+</head>
+<body>
+<#include controlHolder("nav")/>
+<#include screenHolder()/>
+</body>
+</html>
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/helpDev.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/helpDev.ftl
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl
@ -136,8 +136,8 @@
                            <el-link :underline="false" @click="onHome" icon="el-icon-warning-outline">关于</el-link>

                            <wb-dropdown-menu slot="dropdown">
-                                <wb-dropdown-item>开发指导</wb-dropdown-item>
-                                <wb-dropdown-item>使用指导</wb-dropdown-item>
+                                <wb-dropdown-item @click="addTab({title: '开发指导', name: 'helpDev', url: '${r'${context}'}/helpDev.htm'})">开发指导</wb-dropdown-item>
+                                <wb-dropdown-item @click="addTab({title: '使用指导', name: 'help', url: '${r'${context}'}/help.htm'})">使用指导</wb-dropdown-item>
                            </wb-dropdown-menu>
                        </wb-dropdown>
                    </li>
@ -577,6 +577,15 @@
            var tabName = nav.getCookie("tab.name");
            var tabUrl = nav.getCookie("tab.url");
            this.onHome();
+            // 开发模式，默认打开指导页
+            if ('${r'${prop.active}'}' == 'dev') {
+                this.addTab({
+                    title: '开发指导',
+                    name: 'helpDev',
+                    url: '${r'${context}'}/helpDev.htm'
+                })
+            }
+            // 打开最后一次打开的页面
            if (tabTitle && tabName && tabUrl) {
                this.addTab({
                    title: tabTitle,