From 5e65941e15c8f1569990f4be4cb8a9e6a40d6254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Mon, 29 Nov 2021 20:13:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E7=BB=84=E4=BB=B6Ed?=
 =?UTF-8?q?itor=20=E6=94=B9=E7=94=A8=E5=85=A8=E5=B1=80=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=8D=95=E7=8B=AC=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.CodeGenerator/CodeGeneratorTool.cs     | 12 ++++++------
 ZR.Vue/src/main.js                        |  4 +++-
 ZR.Vue/src/views/login.vue                |  1 -
 ZR.Vue/src/views/system/notice/index.vue  |  4 ----
 ZR.Vue/src/views/tool/email/sendEmail.vue |  6 ++----
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 22555fc..35aa113 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -93,12 +93,12 @@ namespace ZR.CodeGenerator
                     sb2.AppendLine($"      this.{FirstLowerCase(dbFieldInfo.CsharpField)}Options = response.data;");
                     sb2.AppendLine("    })");
                 }
-                //引用组件
-                if (dbFieldInfo.HtmlType == GenConstants.HTML_EDITOR)
-                {
-                    replaceDto.VueComponent += "Editor,";
-                    replaceDto.VueComponentImport += "import Editor from '@/components/Editor';\n";
-                }
+                //引用组件 已弃用、改用前端全局注册
+                //if (dbFieldInfo.HtmlType == GenConstants.HTML_EDITOR)
+                //{
+                //    replaceDto.VueComponent += "Editor,";
+                //    replaceDto.VueComponentImport += "import Editor from '@/components/Editor';\n";
+                //}
 
                 CodeGenerateTemplate.GetQueryDtoProperty(dbFieldInfo, replaceDto);
                 replaceDto.ModelProperty += CodeGenerateTemplate.GetModelTemplate(dbFieldInfo);
diff --git a/ZR.Vue/src/main.js b/ZR.Vue/src/main.js
index 4bb5702..38f615a 100644
--- a/ZR.Vue/src/main.js
+++ b/ZR.Vue/src/main.js
@@ -21,6 +21,8 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels,
 import Pagination from "@/components/Pagination";
 //自定义表格工具扩展
 import RightToolbar from "@/components/RightToolbar"
+// 富文本组件
+import Editor from "@/components/Editor";
 // 字典标签组件
 import DictTag from '@/components/DictTag'
 // 字典数据组件
@@ -53,7 +55,7 @@ Vue.prototype.msgInfo = function(msg) {
 Vue.component('Pagination', Pagination)
 Vue.component('RightToolbar', RightToolbar)
 Vue.component('DictTag', DictTag)
-
+Vue.component('Editor', Editor)
 Vue.use(permission)
 
 Vue.use(Element, {
diff --git a/ZR.Vue/src/views/login.vue b/ZR.Vue/src/views/login.vue
index 5bfdd0e..edfe6bc 100644
--- a/ZR.Vue/src/views/login.vue
+++ b/ZR.Vue/src/views/login.vue
@@ -107,7 +107,6 @@ export default {
         if (valid) {
           this.loading = true;
           if (this.loginForm.rememberMe) {
-            console.log(decrypt(this.loginForm.password));
             Cookies.set("username", this.loginForm.username, { expires: 30 });
             Cookies.set("password", this.loginForm.password, {
               expires: 30,
diff --git a/ZR.Vue/src/views/system/notice/index.vue b/ZR.Vue/src/views/system/notice/index.vue
index a2e73b4..05f9735 100644
--- a/ZR.Vue/src/views/system/notice/index.vue
+++ b/ZR.Vue/src/views/system/notice/index.vue
@@ -103,13 +103,9 @@ import {
   updateNotice,
   // exportNotice,
 } from "@/api/system/notice";
-import Editor from "@/components/Editor";
 
 export default {
   name: "Notice",
-  components: {
-    Editor,
-  },
   data() {
     return {
       // 遮罩层
diff --git a/ZR.Vue/src/views/tool/email/sendEmail.vue b/ZR.Vue/src/views/tool/email/sendEmail.vue
index aa5413b..02bdb5e 100644
--- a/ZR.Vue/src/views/tool/email/sendEmail.vue
+++ b/ZR.Vue/src/views/tool/email/sendEmail.vue
@@ -28,11 +28,9 @@
 <script>
 import { sendEmail } from "@/api/common";
 import { getToken } from "@/utils/auth";
-import Editor from "@/components/Editor";
 
 export default {
   name: "sendEmail",
-  components: { Editor },
   data() {
     return {
       form: {
@@ -57,7 +55,6 @@ export default {
     };
   },
   mounted() {
-    console.log(getToken());
     this.headers.Token = getToken();
   },
   methods: {
@@ -79,7 +76,7 @@ export default {
       console.log(response);
       if (response.code == 200) {
         this.$message.success("上传成功");
-        this.form.fileUrl = response.data.fullPath;
+        this.form.fileUrl = response.data;
       } else {
         this.$message.error(response.msg);
       }
@@ -109,6 +106,7 @@ export default {
             loading.close();
           }, 5000);
         } else {
+					console.log('未通过')
           //校验不通过
           return false;
         }