测试

README.md

@@ -2,7 +2,7 @@
 ====
 
 1.安装依赖
-在控制台输入init然后回车，等待就可以了
+在控制台输入npm install然后回车，等待就可以了
 
 2.运行项目
 在控制台输入run或者在左下角“npm脚本”处点击serve后的启动

package.json

@@ -61,7 +61,9 @@
     "html-webpack-plugin": "^4.2.0",
     "less": "^3.9.0",
     "less-loader": "^4.1.0",
-    "vue-template-compiler": "^2.6.10"
+    "mini-css-extract-plugin": "^2.6.0",
+    "vue-template-compiler": "^2.6.10",
+    "webpack": "^4.0.0"
   },
   "eslintConfig": {
     "root": true,

public/color.less

@@ -1,4 +1,4 @@
-@primary-color: #1890ff;
+@primary-color: #07a54d;
 /* stylelint-disable at-rule-empty-line-before,at-rule-name-space-after,at-rule-no-unknown */
 /* stylelint-disable no-duplicate-selectors */
 /* stylelint-disable */
@@ -1375,7 +1375,7 @@ this.tinycolor = tinycolor;
 @blue-3: color(~`colorPalette("@{blue-6}", 3)`);
 @blue-4: color(~`colorPalette("@{blue-6}", 4)`);
 @blue-5: color(~`colorPalette("@{blue-6}", 5)`);
-@blue-6: #1890ff;
+@blue-6: #07a54d;
 @blue-7: color(~`colorPalette("@{blue-6}", 7)`);
 @blue-8: color(~`colorPalette("@{blue-6}", 8)`);
 @blue-9: color(~`colorPalette("@{blue-6}", 9)`);

public/css/common.css

@@ -18,17 +18,15 @@
 html,body{
 	margin: 0;
 	padding: 0;
-  background-color: #f7f7f7;
 }
 a{ 
+  color: #333333;
 	text-decoration:none; 
 	cursor:pointer; 
 	outline:none;
-  color: #333333;
 }
 h1,h2,h3,h4,h5,h6{
 	font-weight: normal;
-  margin-bottom: 0 !important;
 }
 input:focus {
 	outline:none;

public/tinymce/skins/lightgray/skin.min.css

@@ -319,7 +319,7 @@ button::-moz-focus-inner {
 .tox .tox-collection--grid .tox-collection__group {
   display: flex;
   flex-wrap: wrap;
-  max-height: 208px;
+  max-height: 230px;
   overflow-x: hidden;
   overflow-y: auto;
   padding: 0;

src/components/chart/DashChartDemo.vue

@@ -17,7 +17,7 @@
         gemo="point"
         position="value*1"
         shape="pointer"
-        color="#1890FF"
+        color="#07a54d"
         :active="false"
       ></v-series>
       <v-guide
@@ -171,7 +171,7 @@
         },
         arcGuide2Start: [0, 0.945],
         arcGuide2Style: {
-          stroke: '#1890FF',
+          stroke: '#07a54d',
           lineWidth: 18,
         },
         htmlGuidePosition: ['50%', '100%'],

src/components/chart/MiniProgress.vue

@@ -66,7 +66,7 @@
       .progress {
         transition: all .4s cubic-bezier(.08, .82, .17, 1) 0s;
         border-radius: 1px 0 0 1px;
-        background-color: #1890ff;
+        background-color: #07a54d;
         width: 0;
         height: 100%;
       }

src/components/jeecg/JEditor.vue

@@ -51,7 +51,16 @@
       },
       toolbar: {
         type: [String, Array],
-        default: 'undo redo |  formatselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | lists link unlink image media table | removeformat | fullscreen',
+        default: ["undo redo save | cut copy paste | forecolor backcolor bold italic underline strikethrough link unlink " + 
+                    "openlink anchor | alignleft aligncenter alignright alignjustify alignnone outdent indent | " +
+                    "bullist numlist ",
+                    "styleselect formatselect fontselect fontsizeselect | table tabledelete tablecellprops tablemergecells| blockquote subscript superscript removeformat | ltr rtl " +
+                    "tablesplitcells tableinsertrowbefore tableinsertrowafter tabledeleterow tablerowprops tablecutrow " + 
+                    "tablecopyrow tablepasterowbefore tablepasterowafter tableinsertcolbefore tableinsertcolafter tabledeletecol | " + 
+                    "image media fullscreen",
+                    "insertdatetime charmap emoticons hr pagebreak template code pastetext print visualblocks visualchars " +
+                    "nonbreaking searchreplace preview kityformula-editor indent2em ",
+        ],
         branding:false
       }
     },

src/components/menu/SideMenu.vue

@@ -1,7 +1,7 @@
 <template>
   <a-layout-sider
     :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
-    width="208px"
+    width="230px"
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">

src/components/menu/index.js

@@ -8,7 +8,7 @@ export default {
   props: {
     menu: {
       type: Array,
-      required: true
+      required: true/*  */
     },
     theme: {
       type: String,
@@ -76,11 +76,13 @@ export default {
     updateMenu () {
       const routes = this.$route.matched.concat()
       const { hidden } = this.$route.meta
+      let fullPath = ''
       if (routes.length >= 3 && hidden) {
         routes.pop()
         this.selectedKeys = [routes[routes.length - 1].path]
       } else {
-        this.selectedKeys = [routes.pop().path]
+        let route = routes.pop();
+        this.selectedKeys = [route.path]
       }
       const openKeys = []
       if (this.mode === 'inline') {
@@ -88,9 +90,20 @@ export default {
           openKeys.push(item.path)
         })
       }
+      fullPath = this.$route.fullPath
+      console.log('this.selectedKeys[0] => ',this.selectedKeys[0],fullPath,routes);
       //update-begin-author:taoyan date:20190510 for:online表单菜单点击展开的一级目录不对
-      if(!this.selectedKeys || this.selectedKeys[0].indexOf(":")<0){
+      if(!this.selectedKeys || this.selectedKeys[0].indexOf(":")<0 || fullPath.indexOf("?") == -1){
         this.collapsed ? (this.cachedOpenKeys = openKeys) : (this.openKeys = openKeys)
+      }else if(fullPath.indexOf("?") != -1) {
+        if(fullPath.indexOf('/') != -1){
+          let pathList = fullPath.split('/');
+          if(pathList && pathList.length > 1){
+            let newKey = '/'+pathList[1];
+            console.log('newKey =>',newKey);
+            this.collapsed ? (this.cachedOpenKeys = newKey) : (this.openKeys = newKey)
+          }
+        }
       }
       //update-end-author:taoyan date:20190510 for:online表单菜单点击展开的一级目录不对
     },