Prechádzať zdrojové kódy

!640 修改editDialog.vue.vm模板,只生成[必填]的验证规则。
Merge pull request !640 from DaveMa/next

zuohuaijun 3 rokov pred
rodič
commit
a98048eed6

+ 7 - 5
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/editDialog.vue.vm

@@ -156,13 +156,15 @@
 	const ruleFormRef = ref();
 	const isShowDialog = ref(false);
 	const ruleForm = ref<any>({});
-		//自行删除非必填规则
+		//自行添加其他规则
 		const rules = ref<FormRules>({
   @foreach (var column in Model.TableField){
-    if(@column.EffectType == "Input" || @column.EffectType == "InputNumber" ||@column.EffectType == "InputTextArea"){
-  @:@column.LowerColumnName: [{required: true, message: '请输入@(@column.ColumnComment)!', trigger: 'blur',},],
-    }else if(@column.EffectType == "DatePicker" || @column.EffectType == "Select" ||@column.EffectType == "ApiTreeSelect"){
-  @:@column.LowerColumnName: [{required: true, message: '请选择@(@column.ColumnComment)!', trigger: 'change',},],
+		if(@column.WhetherRequired == "Y"){
+			if(@column.EffectType == "Input" || @column.EffectType == "InputNumber" ||@column.EffectType == "InputTextArea"){
+		@:@column.LowerColumnName: [{required: true, message: '请输入@(@column.ColumnComment)!', trigger: 'blur',},],
+			}else if(@column.EffectType == "DatePicker" || @column.EffectType == "Select" ||@column.EffectType == "ApiTreeSelect"){
+		@:@column.LowerColumnName: [{required: true, message: '请选择@(@column.ColumnComment)!', trigger: 'change',},],
+			}
     }
   }
 });