Alex 4 years ago
parent
commit
0947b5feb9

+ 1 - 1
src/components/Editor/index.vue

@@ -154,7 +154,7 @@ export default {
     value: {
       handler(val) {
         if (val !== this.currentValue) {
-          this.currentValue = val;
+          this.currentValue = val === null ? "" : val;
           if (this.Quill) {
             this.Quill.pasteHTML(this.value);
           }

+ 1 - 1
src/router/index.js

@@ -19,7 +19,7 @@ import Layout from '@/layout'
  * meta : {
     roles: ['admin','editor']    // 设置该路由进入的权限,支持多个权限叠加
     title: 'title'               // 设置该路由在侧边栏和面包屑中展示的名字
-    icon: 'svg-name'             // 设置该路由的图标,对应路径src/icons/svg
+    icon: 'svg-name'             // 设置该路由的图标,对应路径src/assets/icons/svg
     breadcrumb: false            // 如果设置为false,则不会在breadcrumb面包屑中显示
   }
  */

+ 1 - 1
src/views/system/personalPage/index.vue

@@ -322,7 +322,7 @@ export default {
     handleStatusChange(row) {
       let text = row.enable === "0" ? "启用" : "停用";
       this.$confirm(
-        '确认要 ' + text + ' [' + row.title + ']吗?',
+        '确认要 ' + text + ' 吗?',
         "警告",
         {
           confirmButtonText: "确定",

+ 1 - 0
src/views/tool/gen/editTable.vue

@@ -90,6 +90,7 @@
                 <el-option label="单选框" value="radio" />
                 <el-option label="复选框" value="checkbox" />
                 <el-option label="日期控件" value="datetime" />
+                <el-option label="富文本控件" value="editor" />
               </el-select>
             </template>
           </el-table-column>