From e80ebeb585f20b569806a83b83d88cc08f90af19 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Thu, 24 Dec 2020 13:03:17 +0800
Subject: [PATCH] =?UTF-8?q?codemirror=E4=BD=BF=E7=94=A8cdn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

亮色侧边栏样式修改
---
 vue/full/package-lock.json                    |  5 ----
 vue/full/package.json                         |  1 -
 vue/full/public/index.html                    |  6 ++++
 vue/full/src/component/editor/JsonEditor.vue  |  6 +---
 .../component/menu/NavMenu/theme-light.scss   | 29 +++++++++++++++++++
 5 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/vue/full/package-lock.json b/vue/full/package-lock.json
index 8e1e0f1..baf4be1 100644
--- a/vue/full/package-lock.json
+++ b/vue/full/package-lock.json
@@ -5587,11 +5587,6 @@
         "q": "^1.1.2"
       }
     },
-    "codemirror": {
-      "version": "5.56.0",
-      "resolved": "https://registry.npm.taobao.org/codemirror/download/codemirror-5.56.0.tgz",
-      "integrity": "sha1-Z1ZA/MeAEFzSLT+qc4tdfqZCb2E="
-    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
diff --git a/vue/full/package.json b/vue/full/package.json
index e48f519..24f16a9 100644
--- a/vue/full/package.json
+++ b/vue/full/package.json
@@ -9,7 +9,6 @@
   },
   "dependencies": {
     "axios": "^0.19.2",
-    "codemirror": "^5.56.0",
     "core-js": "^3.6.5",
     "decimal.js": "^10.2.0",
     "element-ui": "^2.13.2",
diff --git a/vue/full/public/index.html b/vue/full/public/index.html
index 91b1e68..47faa35 100644
--- a/vue/full/public/index.html
+++ b/vue/full/public/index.html
@@ -34,6 +34,12 @@
 <!--富文本-->
 <script async src="https://lib.baomitu.com/tinymce/5.4.1/tinymce.min.js"></script>
 
+<!--codemirror-->
+<link rel="stylesheet" href="https://lib.baomitu.com/codemirror/5.59.0/codemirror.min.css">
+<link rel="stylesheet" href="https://lib.baomitu.com/codemirror/5.59.0/theme/rubyblue.min.css">
+<script defer src="https://lib.baomitu.com/codemirror/5.59.0/codemirror.min.js"></script>
+<script defer src="https://lib.baomitu.com/codemirror/5.59.0/mode/javascript/javascript.min.js"></script>
+
 <!--图片裁剪-->
 <link rel="stylesheet" href="https://lib.baomitu.com/cropperjs/1.5.9/cropper.min.css">
 <script async src="https://lib.baomitu.com/cropperjs/1.5.9/cropper.min.js"></script>
diff --git a/vue/full/src/component/editor/JsonEditor.vue b/vue/full/src/component/editor/JsonEditor.vue
index 1c17991..85f9c5a 100644
--- a/vue/full/src/component/editor/JsonEditor.vue
+++ b/vue/full/src/component/editor/JsonEditor.vue
@@ -3,10 +3,6 @@
 </template>
 
 <script>
-import CodeMirror from 'codemirror'
-import 'codemirror/lib/codemirror.css'
-import 'codemirror/theme/rubyblue.css'
-import 'codemirror/mode/javascript/javascript'
 import {isEmpty} from "@/util"
 
 export default {
@@ -24,7 +20,7 @@ export default {
     },
 
     mounted() {
-        this.jsonEditor = CodeMirror.fromTextArea(
+        this.jsonEditor = window.CodeMirror.fromTextArea(
             this.$el,
             {
                 mode: 'application/json',
diff --git a/vue/full/src/component/menu/NavMenu/theme-light.scss b/vue/full/src/component/menu/NavMenu/theme-light.scss
index b3349ac..d27ebbe 100644
--- a/vue/full/src/component/menu/NavMenu/theme-light.scss
+++ b/vue/full/src/component/menu/NavMenu/theme-light.scss
@@ -13,6 +13,35 @@
                 }
             }
 
+            .el-menu-item::after {
+                position: absolute;
+                top: 10%;
+                right: 0;
+                height: 80%;
+                border-right: 3px solid $--color-primary;
+                opacity: 0;
+                transform: scaleY(0);
+                transition: transform .15s cubic-bezier(.645, .045, .355, 1);
+                content: "";
+            }
+
+            .el-menu-item.is-active {
+                &::before{
+                    position: absolute;
+                    top: 10%;
+                    left: 0;
+                    height: 80%;
+                    width: 100%;
+                    background-color: rgba($--color-primary, .1);
+                    content: "";
+                }
+
+                &::after {
+                    opacity: 1;
+                    transform: scaleY(1);
+                }
+            }
+
             //弹出菜单的父级
             &.el-menu--popup .popover-menu__title {
                 color: $menu-text-hover-color-light;