wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

富文本组件Editor 改用全局注册，移除代码生成单独注册

Browse Source
This commit is contained in:
不做码农 2021-11-29 20:13:26 +08:00
parent 431c1460e6
commit 5e65941e15
5 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@ -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);

4
ZR.Vue/src/main.js
View File

@ -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, {

1
ZR.Vue/src/views/login.vue
View File

@ -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,

4
ZR.Vue/src/views/system/notice/index.vue
View File

@ -103,13 +103,9 @@ import {
updateNotice,
// exportNotice,
} from "@/api/system/notice";
import Editor from "@/components/Editor";
export default {
name: "Notice",
components: {
Editor,
},
data() {
return {
// 遮罩层

6
ZR.Vue/src/views/tool/email/sendEmail.vue
View File

@ -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;
}