Browse Source

chore: 优化代码

喵你个旺呀 1 year ago
parent
commit
64e5cc7975

+ 2 - 8
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/editDialog.vue.vm

@@ -31,14 +31,8 @@ const state = reactive({
 // 自行添加其他规则
 const rules = ref<FormRules>({
   @foreach (var column in Model.AddUpdateFieldList.Where(col => col.WhetherRequired == "Y")) {
-	// if(column.EffectType == "Input" || @column.EffectType == "InputNumber" || @column.EffectType == "InputTextArea"){
-	// @:@column.LowerPropertyName: [{required: true, message: '请输入@(column.ColumnComment)!', trigger: 'blur',},],
-	// }
-	if(column.EffectType == "DatePicker" || @column.EffectType == "DictSelector" || @column.EffectType == "EnumSelector" || @column.EffectType == "ApiTreeSelector"){
-	@:@column.LowerPropertyName: [{required: true, message: '请选择@(column.ColumnComment)!', trigger: 'change',},],
-	} else {
-	@:@column.LowerPropertyName: [{required: true, message: '请输入@(column.ColumnComment)!', trigger: 'blur',},],
-	}
+	var trigger = column.EffectType == "DatePicker" || @column.EffectType == "DictSelector" || @column.EffectType == "EnumSelector" || @column.EffectType == "ApiTreeSelector" ? "change" : "blur";
+	@:@column.LowerPropertyName: [{required: true, message: '请选择@(column.ColumnComment)!', trigger: '@trigger',},],
   }
 });
 

+ 10 - 12
Web/src/components/table/dictLabel.vue

@@ -29,21 +29,19 @@ const state = reactive({
 });
 
 onMounted(() => {
-	const dict = useUserInfo().dictList[props.code]?.find((x:any) => x[props.propValue] == props.value);
-	if (dict) {
-		state.label = dict[props.propLabel] || props.defaultValue;
-		state.tagType = dict.tagType;
-	}
+  setDictValue(props.value);
 });
 
 watch(
 	() => props.value,
-	(newValue, oldValue) => {
-		const dict = useUserInfo().dictList[props.code]?.find((x:any) => x[props.propValue] == newValue);
-		if (dict) {
-			state.label = dict[props.propLabel] || props.defaultValue;
-			state.tagType = dict.tagType;
-		}
-	}
+	(newValue) => setDictValue(newValue)
 );
+
+const setDictValue = (value: any) => {
+  const dict = useUserInfo().dictList[props.code]?.find((x: any) => x[props.propValue] == value);
+  if (dict) {
+    state.label = dict[props.propLabel] || props.defaultValue;
+    state.tagType = dict.tagType;
+  }
+}
 </script>