Переглянути джерело

!1955 代码生成器: 控件类型新增《富文本编辑器》
Merge pull request !1955 from 纯粹是糖/N/A

zuohuaijun 3 місяців тому
батько
коміт
f1007b9b90

+ 2 - 1
Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs

@@ -8,7 +8,7 @@ namespace Admin.NET.Core;
 
 /// <summary>
 /// 系统字典值表种子数据
-/// </summary>
+/// </summary> 
 public class SysDictDataSeedData : ISqlSugarEntitySeedData<SysDictData>
 {
     /// <summary>
@@ -32,6 +32,7 @@ public class SysDictDataSeedData : ISqlSugarEntitySeedData<SysDictData>
             new SysDictData{ Id=1300000000110, DictTypeId=typeList[0].Id, Label="上传", Value="Upload", OrderNo=100, Remark="上传", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysDictData{ Id=1300000000111, DictTypeId=typeList[0].Id, Label="开关", Value="Switch", OrderNo=100, Remark="开关", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysDictData{ Id=1300000000112, DictTypeId=typeList[0].Id, Label="上传单文件", Value="Upload_SingleFile", OrderNo=120, Remark="上传单文件", Status=StatusEnum.Enable, CreateTime= DateTime.Now },
+            new SysDictData{ Id=1300000000113, DictTypeId=typeList[0].Id, Label="富文本编辑器", Value="Editor", OrderNo=130, Remark="富文本编辑器", Status=StatusEnum.Enable,   CreateTime=DateTime.Parse("2025-12-25 00:00:00") },
 
             new SysDictData{ Id=1300000000201, DictTypeId=typeList[1].Id, Label="等于", Value="==", OrderNo=1, Remark="等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysDictData{ Id=1300000000202, DictTypeId=typeList[1].Id, Label="模糊", Value="like", OrderNo=1, Remark="模糊", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },

+ 7 - 3
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/editDialog.vue.vm

@@ -13,7 +13,9 @@ import type { FormRules } from "element-plus";
 @:import { useUserInfo } from "/@@/stores/userInfo";
 }
 import { use@(Model.ClassName)Api } from '/@@/api/@(Model.PagePath)/@(Model.LowerClassName)';
-
+@if(@Model.TableField.Any(x=>x.EffectType == "Editor")){
+@:import Editor from '/@@/components/editor/index.vue';
+}
 //父级传递来的函数,用于回调
 const emit = defineEmits(["reloadTable"]);
 const @(Model.LowerClassName)Api = use@(Model.ClassName)Api();
@@ -103,8 +105,8 @@ defineExpose({ openDialog });
 					}
 					@foreach (var column in Model.AddUpdateFieldList) {
 					var showStatus = Model.IsStatus(column) ? $"v-if=\"state.ruleForm.{Model.PrimaryKeyFieldList.First().LowerPropertyName}\" " : "";
-					if (column.EffectType == "InputTextArea"){
-						@:<el-col :xs="24" class="mb20" @showStatus>
+					if (column.EffectType == "InputTextArea"||column.EffectType == "Editor"){
+					@:<el-col :xs="24" class="mb20" @showStatus>
 							} else{
 						@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" @showStatus>
 							} 
@@ -168,6 +170,8 @@ defineExpose({ openDialog });
 							@:<el-switch v-model="state.ruleForm.@(column.LowerPropertyName)" />
 						} else if (column.EffectType == "DatePicker") {
 							@:<el-date-picker v-model="state.ruleForm.@(column.LowerPropertyName)" type="date" placeholder="@(column.ColumnComment)" />
+						}else if(@column.EffectType == "Editor"){
+							@:<Editor v-model:get-html="state.ruleForm.@(@column.LowerPropertyName)" /> 
 						} else {
 							var inputType = column.EffectType == "InputTextArea" ? "type=\"textarea\" " : "";
 					        var maxlength = column.ColumnLength > 0 ? $"maxlength=\"{column.ColumnLength}\" " : "";