From 637e8357a7f4eb559c07e46f108248d2a96aac8b Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Fri, 1 Nov 2019 19:35:16 +0800
Subject: [PATCH] =?UTF-8?q?v2.3=20=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                          |  4 ++--
 package.json                       |  2 +-
 src/views/components/Editor.vue    | 28 ++++++++++------------------
 src/views/monitor/online/index.vue |  2 +-
 src/views/system/menu/form.vue     |  8 ++++----
 5 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index da80587..a746da3 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,8 @@ eladmin 前端源码
 
 |     |   后端源码  |   前端源码  |
 |---  |--- | --- |
-|  github   |  https://github.com/elunez/eladmin   |  https://github.com/elunez/eladmin-qd   |
-|  码云   |  https://gitee.com/elunez/eladmin   |  https://gitee.com/elunez/eladmin-qt   |
+|  github   |  https://github.com/elunez/eladmin   |  https://github.com/elunez/eladmin-web   |
+|  码云   |  https://gitee.com/elunez/eladmin   |  https://gitee.com/elunez/eladmin-web   |
 
 #### 开发文档
 [https://docs.auauz.net/#/](https://docs.auauz.net/#/)
diff --git a/package.json b/package.json
index 4c6f09f..ec37f34 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eladmin-web",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "license": "Apache-2.0",
   "description": "eladmin 前端代码",
   "author": "jie <elunez@qq.com>",
diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue
index 5f05b24..1ae75de 100644
--- a/src/views/components/Editor.vue
+++ b/src/views/components/Editor.vue
@@ -1,36 +1,23 @@
 <template>
   <div>
-    <div ref="editor" style="text-align:left;margin: 5px">
-      <div v-html="editorContent"/>
-    </div>
+    <div ref="editor" class="text"/>
     <div style="margin: 12px 5px;font-size: 16px;font-weight: bold;color: #696969">HTML渲染如下：</div>
     <div class="editor-content" v-html="editorContent"/>
   </div>
 </template>
 
 <script>
-import { debounce } from 'lodash'
 import { mapGetters } from 'vuex'
 import E from 'wangeditor'
 import { getToken } from '@/utils/auth'
 export default {
   name: 'Editor',
-  model: {
-    prop: 'value',
-    event: 'editorChange'
-  },
-  props: {
-    value: {
-      type: String,
-      default: () => ''
-    }
-  },
   data() {
     return {
       headers: {
         'Authorization': 'Bearer ' + getToken()
       },
-      editorContent: this.value ||
+      editorContent:
         `<h3 style="text-align: center;">欢迎使用 wangEditor 富文本编辑器!</h3>
         <ul>
           <li>富文本中图片上传使用的是sm.ms图床，支持上传到七牛云：<a style="color: #42b983" target="_blank" href="https://sm.ms/">sm.ms</a></li>
@@ -51,11 +38,12 @@ export default {
     // 自定义文件名，不可修改，修改后会上传失败
     editor.customConfig.uploadFileName = 'file'
     editor.customConfig.uploadImgServer = this.imagesUploadApi // 上传图片到服务器
-    editor.customConfig.onblur = debounce(html => {
-      this.$emit('editorChange', html)
+    editor.customConfig.onchange = (html) => {
       this.editorContent = html
-    }, 1000)
+    }
     editor.create()
+    // 初始化数据
+    editor.txt.html(this.editorContent)
   }
 }
 </script>
@@ -64,4 +52,8 @@ export default {
   .editor-content{
     padding-left: 5px;
   }
+  .text {
+    text-align:left;
+    margin: 5px
+  }
 </style>
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index ba65688..5ed9691 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -26,7 +26,7 @@
           <span>{{ parseTime(scope.row.loginTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="操作" width="100px">
+      <el-table-column prop="createTime" label="操作" width="100px" fixed="right">
         <template slot-scope="scope">
           <el-popover
             v-permission="['admin']"
diff --git a/src/views/system/menu/form.vue b/src/views/system/menu/form.vue
index 2165715..b696f64 100644
--- a/src/views/system/menu/form.vue
+++ b/src/views/system/menu/form.vue
@@ -21,7 +21,7 @@
           </el-input>
         </el-popover>
       </el-form-item>
-      <el-form-item v-show="form.type.toString() === '1'" label="外链菜单">
+      <el-form-item v-show="form.type.toString() !== '2'" label="外链菜单">
         <el-radio-group v-model="form.iframe" size="mini">
           <el-radio-button label="true">是</el-radio-button>
           <el-radio-button label="false">否</el-radio-button>
@@ -33,10 +33,10 @@
           <el-radio-button label="false">否</el-radio-button>
         </el-radio-group>
       </el-form-item>
-      <el-form-item v-show="form.type.toString() === '1'" label="菜单可见">
+      <el-form-item v-show="form.type.toString() !== '2'" label="菜单可见">
         <el-radio-group v-model="form.hidden" size="mini">
-          <el-radio-button label="true">是</el-radio-button>
-          <el-radio-button label="false">否</el-radio-button>
+          <el-radio-button label="false">是</el-radio-button>
+          <el-radio-button label="true">否</el-radio-button>
         </el-radio-group>
       </el-form-item>
       <el-form-item v-show="form.type.toString() !== '2'" label="菜单标题" prop="name">