From 1c25b34120d8da18293e6c2df5becb9f1f40ccd6 Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Mon, 15 Nov 2021 20:54:09 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=9C=AA=E5=AE=8C=E6=88=90=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Vue/src/views/tool/gen/editTable.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ZR.Vue/src/views/tool/gen/editTable.vue b/ZR.Vue/src/views/tool/gen/editTable.vue
index 6f3930c..81a6f7c 100644
--- a/ZR.Vue/src/views/tool/gen/editTable.vue
+++ b/ZR.Vue/src/views/tool/gen/editTable.vue
@@ -51,7 +51,7 @@
               <el-checkbox v-model="scope.row.isList"></el-checkbox>
             </template>
           </el-table-column>
-          <el-table-column label="查询" min-width="5%">
+          <!-- <el-table-column label="查询" min-width="5%">
             <template slot-scope="scope">
               <el-checkbox v-model="scope.row.isQuery"></el-checkbox>
             </template>
@@ -69,7 +69,7 @@
                 <el-option label="BETWEEN" value="BETWEEN" />
               </el-select>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="显示类型" min-width="12%">
             <template slot-scope="scope">
               <el-select v-model="scope.row.htmlType">

From eb6bd4c1c28d3afaf43bdf38804719ef8c07e599 Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Mon, 15 Nov 2021 20:54:53 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=AF=BC=E5=85=A5=E7=BC=96=E8=BE=91=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=95=B0=E6=8D=AE=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.CodeGenerator/CodeGeneratorTool.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 9f547cc..acd00b9 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -482,6 +482,7 @@ namespace ZR.CodeGenerator
                     Create_by = genTable.Create_by,
                     Create_time = DateTime.Now,
                     IsInsert = !column.IsIdentity,//非自增字段都需要插入
+                    IsEdit = true,
                     IsQuery = false,
                     HtmlType = GenConstants.HTML_INPUT
                 };
@@ -509,9 +510,9 @@ namespace ZR.CodeGenerator
                     genTableColumn.HtmlType = GenConstants.HTML_TEXTAREA;
                 }
                 //编辑字段
-                if (GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f)) && !column.IsIdentity && !column.IsPrimarykey)
+                if (column.IsIdentity || column.IsPrimarykey || GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f)) )
                 {
-                    genTableColumn.IsEdit = true;
+                    genTableColumn.IsEdit = false;
                 }
                 //列表字段
                 if (!GenConstants.COLUMNNAME_NOT_LIST.Any(f => column.DbColumnName.Contains(f) && !column.IsPrimarykey))

From 789ee75500bf0979d5f5bf69b9fb0111b933cbba 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: Tue, 16 Nov 2021 17:57:46 +0800
Subject: [PATCH 03/10] =?UTF-8?q?fix=20SqlServer=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=B8=8D=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 document/admin-sqlserver.sql | Bin 111702 -> 111694 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/document/admin-sqlserver.sql b/document/admin-sqlserver.sql
index d4d39a320984b55836d719bf3c4f04ea3171fa54..2d60ad394c88dcc22eb328af0c05fc0d913be057 100644
GIT binary patch
delta 31
pcmV+)0O0@D=myT{2C#G}vz{N60h4|v5R-l%kb|%)x3DS!ritx|4fg;5

delta 78
zcmX^2g6-N1whbj3lQU#QCf9MYO}0>WnyjbHF*(7UV{@Of4&&rHHG#=>@(S1#Ozu<W
Rn8d}=yg_UG1}(;Uod7t)8Z7_-


From cebfa5686d63642d3e55d9f30e19c77e91c28fc2 Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Tue, 16 Nov 2021 21:24:05 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E6=9B=BF=E6=8D=A2node-sass=E4=B8=BAsass?=
 =?UTF-8?q?=EF=BC=8Csass-loader=E5=8D=87=E7=BA=A7=E4=B8=BA10.1.0=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8dev=20=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Vue/README.md                             | 2 +-
 ZR.Vue/package.json                          | 9 +++------
 ZR.Vue/src/components/HeaderSearch/index.vue | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ZR.Vue/README.md b/ZR.Vue/README.md
index b3030b7..6508c90 100644
--- a/ZR.Vue/README.md
+++ b/ZR.Vue/README.md
@@ -30,7 +30,7 @@ npm run build:prod
 ```
 
 # 插件说明
-### Autoprefixer
+### Autoprefixer （已删除）
 浏览器自动补全前缀
 例如：
 ```
diff --git a/ZR.Vue/package.json b/ZR.Vue/package.json
index fcb7cc9..873c7e6 100644
--- a/ZR.Vue/package.json
+++ b/ZR.Vue/package.json
@@ -51,7 +51,6 @@
     "@vue/cli-plugin-babel": "4.4.4",
     "@vue/cli-plugin-eslint": "4.4.4",
     "@vue/cli-service": "4.4.4",
-    "autoprefixer": "9.5.1",
     "babel-eslint": "10.1.0",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "chalk": "4.1.0",
@@ -59,13 +58,11 @@
     "eslint": "6.7.2",
     "eslint-plugin-vue": "6.2.2",
     "lint-staged": "8.1.5",
-    "node-sass": "4.14.1",
-    "runjs": "4.3.2",
-    "sass-loader": "8.0.2",
+    "sass": "1.32.13",
+    "runjs": "4.4.2",
+    "sass-loader": "10.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",
-    "serve-static": "1.13.2",
     "svg-sprite-loader": "4.1.3",
-    "svgo": "2.8.0",
     "vue-template-compiler": "2.6.12"
   },
   "engines": {
diff --git a/ZR.Vue/src/components/HeaderSearch/index.vue b/ZR.Vue/src/components/HeaderSearch/index.vue
index 2980c06..f814c29 100644
--- a/ZR.Vue/src/components/HeaderSearch/index.vue
+++ b/ZR.Vue/src/components/HeaderSearch/index.vue
@@ -168,7 +168,7 @@ export default {
     display: inline-block;
     vertical-align: middle;
 
-    /deep/ .el-input__inner {
+    ::v-deep .el-input__inner {
       border-radius: 0;
       border: 0;
       padding-left: 0;

From a9be8934c69c214cdc2897c41c508456354b13de 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: Wed, 17 Nov 2021 12:33:50 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E6=95=B0=E5=AD=97=E5=AD=97=E6=AF=8D=E7=BB=84?=
 =?UTF-8?q?=E5=90=88=E9=AA=8C=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Controllers/System/SysLoginController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
index 93af7f7..13cfd24 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
@@ -137,7 +137,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         {
             string uuid = Guid.NewGuid().ToString().Replace("-", "");
             var code = SecurityCodeHelper.GetRandomEnDigitalText(4);
-            var imgByte = SecurityCodeHelper.GetGifEnDigitalCodeByte(code);
+            var imgByte = SecurityCodeHelper.GetEnDigitalCodeByte(code);
             string base64Str = Convert.ToBase64String(imgByte);
             CacheHelper.SetCache(uuid, code);
             var obj = new { uuid, img = base64Str };// File(stream, "image/png")

From 4b64ffda398cd39bf0cad3a872bd0575c5f38eb7 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: Thu, 18 Nov 2021 09:41:25 +0800
Subject: [PATCH 06/10] =?UTF-8?q?fix=20sqlserver=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AEsys=5Fdept=E5=88=97=E4=B8=8D=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 document/admin-sqlserver.sql | Bin 111694 -> 110330 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/document/admin-sqlserver.sql b/document/admin-sqlserver.sql
index 2d60ad394c88dcc22eb328af0c05fc0d913be057..7d258206428c456714d78f5fa27433b26163c82a 100644
GIT binary patch
delta 551
zcmX^2g6-E`Hn#u&bQyFRHZs{rPF7RWn4Bi<H+e$2$Ycd6Hb#ZX+ETL9>tY#ICJV?3
z0lAKH?r=pLrix8|Ak8)TleEP27z;+O$p$hyIF#&=m6&XyY=%YFK#^;*gccvC0)qmB
zA%hNs!em7m>&XVq8j}?y<xs2wsuX96vkHGP;l)&SkV-H#BBW<Bn=-_7V?rv$m3kKj
zp_*=jU(a2Z$qj03SoGm{6)4bxG{7N(-KP+9F~eoLK?$SC^lJ``YLgqRxF+{$b2Puv
z+Wtn1@siSZ4nM|!Nz*@gFmg;+*~C~hy<sDx0E8Rh&&V~MZzH3{^f#M;vh#u&d8SKk
pWYht1ou+Tt3>0JA$mj(!4y5eg^l6(IwWeR&z^JiZZ!@C;BLMf&r>Fn`

delta 1226
zcmex$m+jmOHm3joHnQ1BPBs!2ntVt`M?Hrjl_8NK1xOY#=rAZS6fk5k<TK;}`5;~@
zLoQG@lObpFM5*A(23y4@D=CX;8-V518PuWlg>)`IrnsEIAHfh2n0ysO(PT$k$>|Di
zj9im9$mvX;u!d)H-y)957u-1}%iYkJ93Uk}fkPA+)hGXzl4nM@X8H$nMh_~Ottmqb
zvnTD5n*2b4O%WD&A{7^dUrcy06~Z@!1}XLZgl;cWoK-l&UL#uD3yiCc@}k_vbg<{X
zf+)8M&Fr~!MQSpi5*yGzAbV&RZc56a^lhz7i!=!J0~u*hV{(BB$K(P*mg(O-7}X}v
zGvS)NMwO$POLaS!D&r-k$?uAFWc3+}8A^b~MhURsNM_In7Ac7gl?-|eSwL3$_S^1^
z|C1*F5)_&KZWW`><Ug8RlT1aXKUl-KV*0$*i~`g7oEbT$7g#g$faKGrcdTX90;`<<
OZZ)IR_FHQi6&L}@LPb>o


From 0197c238ebf0138ad5cbe7850d20b4bff06c985e 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: Thu, 18 Nov 2021 10:10:04 +0800
Subject: [PATCH 07/10] =?UTF-8?q?fix=20=E7=94=9F=E6=88=90=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/CodeGeneratorController.cs            | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs
index cb778a8..e503f8e 100644
--- a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs
+++ b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs
@@ -90,8 +90,11 @@ namespace ZR.Admin.WebApi.Controllers
 
             var genTableInfo = GenTableService.GetGenTableInfo(dto.TableId);
             genTableInfo.Columns = GenTableColumnService.GenTableColumns(dto.TableId);
-            Dictionary<string, object> options = JsonConvert.DeserializeObject<Dictionary<string, object>>(genTableInfo.Options);
-            dto.ParentMenuId = (long)options.GetValueOrDefault("parentMenuId", 0);
+            if (!string.IsNullOrEmpty(genTableInfo.Options))
+            {
+                Dictionary<string, object> options = JsonConvert.DeserializeObject<Dictionary<string, object>>(genTableInfo.Options);
+                dto.ParentMenuId = (long)options.GetValueOrDefault("parentMenuId", 0);
+            }
             dto.GenTable = genTableInfo;
             //生成代码
             CodeGeneratorTool.Generate(genTableInfo, dto);
@@ -176,9 +179,9 @@ namespace ZR.Admin.WebApi.Controllers
                         ClassName = CodeGeneratorTool.GetClassName(tableName),
                         BusinessName = CodeGeneratorTool.GetClassName(tableName),
                         FunctionAuthor = ConfigUtils.Instance.GetConfig(GenConstants.Gen_author),
-                        FunctionName = tabInfo.Description,
+                        FunctionName = string.IsNullOrEmpty(tabInfo.Description) ? tableName : tabInfo.Description,
                         TableName = tableName,
-                        TableComment = tabInfo.Description,
+                        TableComment = string.IsNullOrEmpty(tabInfo.Description) ? tableName : tabInfo.Description,
                         Create_by = userName,
                     };
                     genTable.TableId = GenTableService.ImportGenTable(genTable);

From 8efb720fa04166359408144653205f8042155196 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: Thu, 18 Nov 2021 10:10:37 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9Controller=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E7=94=9F=E6=88=90=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt
index 97bb3b0..27824d5 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt
@@ -49,7 +49,7 @@ namespace {ApiControllerNamespace}.Controllers
             //开始拼装查询条件
             var predicate = Expressionable.Create<{ModelName}>();
 
-            //TODO 搜索条件
+            //TODO 自己实现搜索条件查询语法参考Sqlsugar，默认查询所有
             //predicate = predicate.And(m => m.Name.Contains(parm.Name));
 
             var response = _{ModelName}Service.GetPages(predicate.ToExpression(), parm);

From bfeef85dee6f888c0e035b0d966cc2a4ec2b6441 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: Thu, 18 Nov 2021 10:16:45 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9ASPNETCORE=5FENVIRONMEN?=
 =?UTF-8?q?T=E9=BB=98=E8=AE=A4=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Properties/launchSettings.json |  2 +-
 ZR.Admin.WebApi/appsettings.json               | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ZR.Admin.WebApi/Properties/launchSettings.json b/ZR.Admin.WebApi/Properties/launchSettings.json
index c5c2293..365059a 100644
--- a/ZR.Admin.WebApi/Properties/launchSettings.json
+++ b/ZR.Admin.WebApi/Properties/launchSettings.json
@@ -19,7 +19,7 @@
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Stage"
+        "ASPNETCORE_ENVIRONMENT": ""
       },
       "applicationUrl": "https://localhost:5001;http://localhost:5000"
     }
diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json
index 51eede7..8b29429 100644
--- a/ZR.Admin.WebApi/appsettings.json
+++ b/ZR.Admin.WebApi/appsettings.json
@@ -7,11 +7,11 @@
     }
   },
   "ConnectionStrings": {
-    "conn_zrAdmin": "server=127.0.0.1;user=zr;pwd=abc;database=admin",
-    "conn_bus": "server=127.0.0.1;user=zr;pwd=abc;database=admin"
+    "conn_zrAdmin": "server=LAPTOP-STKF2M8H\\SQLEXPRESS;uid=sa;pwd=zradmin123;database=ZrAdmin;Trusted_Connection=SSPI",
+    "conn_bus": "server=LAPTOP-STKF2M8H\\SQLEXPRESS;uid=zr;pwd=zradmin123;database=ZrAdmin;Trusted_Connection=SSPI"
   },
-  "conn_zrAdmin_type": 0, //MySql = 0, SqlServer = 1
-  "conn_bus_type": 0,
+  "conn_zrAdmin_type": 1, //MySql = 0, SqlServer = 1
+  "conn_bus_type": 1,
   "urls": "http://localhost:8888", //��Ŀ����url
   "sysConfig": {
     "DBCommandTimeout": 10,
@@ -30,8 +30,8 @@
     "SECRET": "XX"
   },
   "gen": {
-    "conn": "server=127.0.0.1;user=zr;pwd=abc;database={database}",
-    "dbType": 0, //MySql = 0, SqlServer = 1
+    "conn": "server=LAPTOP-STKF2M8H\\SQLEXPRESS;user=zr;pwd=abc;database={database};Trusted_Connection=SSPI",
+    "dbType": 1, //MySql = 0, SqlServer = 1
     "autoPre": true, //�Զ�ȥ����ǰ׺
     "author": "zr",
     "tablePrefix": "live_,sys_" //"��ǰ׺�������������������ǰ׺������ö��ŷָ���",

From db75c7c5987d0fb9f137ca1bb0ff1795a9517826 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: Thu, 18 Nov 2021 13:58:11 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E8=AF=A5=E7=94=A8=E5=AF=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Vue/src/views/system/notice/index.vue  | 185 +++++++---------------
 ZR.Vue/src/views/tool/email/sendEmail.vue |   7 +-
 2 files changed, 65 insertions(+), 127 deletions(-)

diff --git a/ZR.Vue/src/views/system/notice/index.vue b/ZR.Vue/src/views/system/notice/index.vue
index 3160e37..a2e73b4 100644
--- a/ZR.Vue/src/views/system/notice/index.vue
+++ b/ZR.Vue/src/views/system/notice/index.vue
@@ -2,31 +2,14 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公告标题" prop="noticeTitle">
-        <el-input
-          v-model="queryParams.noticeTitle"
-          placeholder="请输入公告标题"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.noticeTitle" placeholder="请输入公告标题" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="操作人员" prop="createBy">
-        <el-input
-          v-model="queryParams.createBy"
-          placeholder="请输入操作人员"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.createBy" placeholder="请输入操作人员" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="类型" prop="noticeType">
         <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small">
-          <el-option
-            v-for="dict in typeOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
+          <el-option v-for="dict in typeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -37,33 +20,15 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:notice:add']"
-        >新增</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:notice:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:notice:edit']"
-        >修改</el-button>
+        <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['system:notice:edit']">修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:notice:remove']"
-        >删除</el-button>
+        <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:notice:remove']">删除
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -71,26 +36,9 @@
     <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="noticeId" width="100" />
-      <el-table-column
-        label="公告标题"
-        align="center"
-        prop="noticeTitle"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="公告类型"
-        align="center"
-        prop="noticeType"
-        :formatter="typeFormat"
-        width="100"
-      />
-      <el-table-column
-        label="状态"
-        align="center"
-        prop="status"
-        :formatter="statusFormat"
-        width="100"
-      />
+      <el-table-column label="公告标题" align="center" prop="noticeTitle" :show-overflow-tooltip="true" />
+      <el-table-column label="公告类型" align="center" prop="noticeType" :formatter="typeFormat" width="100" />
+      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" width="100" />
       <el-table-column label="创建者" align="center" prop="createBy" width="100" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
@@ -99,31 +47,14 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:notice:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:notice:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:notice:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:notice:remove']">删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改公告对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
@@ -137,29 +68,20 @@
           <el-col :span="12">
             <el-form-item label="公告类型" prop="noticeType">
               <el-select v-model="form.noticeType" placeholder="请选择">
-                <el-option
-                  v-for="dict in typeOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
+                <el-option v-for="dict in typeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in statusOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictValue"
-                >{{dict.dictLabel}}</el-radio>
+                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{dict.dictLabel}}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="内容">
-              <editor v-model="form.noticeContent" :min-height="192"/>
+              <editor v-model="form.noticeContent" :min-height="192" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -173,13 +95,20 @@
 </template>
 
 <script>
-import { listNotice, getNotice, delNotice, addNotice, updateNotice, exportNotice } from "@/api/system/notice";
-import Editor from '@/components/Editor';
+import {
+  listNotice,
+  getNotice,
+  delNotice,
+  addNotice,
+  updateNotice,
+  // exportNotice,
+} from "@/api/system/notice";
+import Editor from "@/components/Editor";
 
 export default {
   name: "Notice",
   components: {
-    Editor
+    Editor,
   },
   data() {
     return {
@@ -211,27 +140,27 @@ export default {
         pageSize: 10,
         noticeTitle: undefined,
         createBy: undefined,
-        status: undefined
+        status: undefined,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         noticeTitle: [
-          { required: true, message: "公告标题不能为空", trigger: "blur" }
+          { required: true, message: "公告标题不能为空", trigger: "blur" },
         ],
         noticeType: [
-          { required: true, message: "公告类型不能为空", trigger: "change" }
-        ]
-      }
+          { required: true, message: "公告类型不能为空", trigger: "change" },
+        ],
+      },
     };
   },
   created() {
     this.getList();
-    this.getDicts("sys_notice_status").then(response => {
+    this.getDicts("sys_notice_status").then((response) => {
       this.statusOptions = response.data;
     });
-    this.getDicts("sys_notice_type").then(response => {
+    this.getDicts("sys_notice_type").then((response) => {
       this.typeOptions = response.data;
     });
   },
@@ -239,7 +168,7 @@ export default {
     /** 查询公告列表 */
     getList() {
       this.loading = true;
-      listNotice(this.queryParams).then(response => {
+      listNotice(this.queryParams).then((response) => {
         this.noticeList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -265,7 +194,7 @@ export default {
         noticeTitle: undefined,
         noticeType: undefined,
         noticeContent: undefined,
-        status: "0"
+        status: "0",
       };
       this.resetForm("form");
     },
@@ -281,9 +210,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.noticeId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.noticeId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -294,25 +223,25 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const noticeId = row.noticeId || this.ids
-      getNotice(noticeId).then(response => {
+      const noticeId = row.noticeId || this.ids;
+      getNotice(noticeId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改公告";
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.noticeId != undefined) {
-            updateNotice(this.form).then(response => {
+            updateNotice(this.form).then((response) => {
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addNotice(this.form).then(response => {
+            addNotice(this.form).then((response) => {
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -323,18 +252,24 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const noticeIds = row.noticeId || this.ids
-      this.$confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项?', "警告", {
+      const noticeIds = row.noticeId || this.ids;
+      this.$confirm(
+        '是否确认删除公告编号为"' + noticeIds + '"的数据项?',
+        "警告",
+        {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
+          type: "warning",
+        }
+      )
+        .then(function () {
           return delNotice(noticeIds);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
-    }
-  }
+        });
+    },
+  },
 };
 </script>
\ No newline at end of file
diff --git a/ZR.Vue/src/views/tool/email/sendEmail.vue b/ZR.Vue/src/views/tool/email/sendEmail.vue
index 684de53..aa5413b 100644
--- a/ZR.Vue/src/views/tool/email/sendEmail.vue
+++ b/ZR.Vue/src/views/tool/email/sendEmail.vue
@@ -9,11 +9,12 @@
         <el-input v-model="form.subject"></el-input>
       </el-form-item>
       <el-form-item label="邮件内容" prop="content">
-        <el-input v-model="form.content" rows="3" type="textarea"></el-input>
+				<editor v-model="form.content" :min-height="192" />
       </el-form-item>
 
       <el-form-item label="附件">
-        <el-upload name="file" ref="upload" :data="{savetype: form.saveType, filePath: form.filePath}" :headers="headers" :auto-upload="false" :on-success="uploadSuccess" :action="uploadActionUrl">
+        <el-upload name="file" ref="upload" :data="{savetype: form.saveType, filePath: form.filePath}" :headers="headers" :auto-upload="false"
+          :on-success="uploadSuccess" :action="uploadActionUrl">
           <el-button slot="trigger" size="mini" icon="el-icon-upload">选择文件</el-button>
           <el-button style="margin-left: 10px;" size="mini" type="primary" @click="submitUpload">上传到服务器</el-button>
         </el-upload>
@@ -27,9 +28,11 @@
 <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: {