From d740fe30eae5e7d6d9792c75668e367a7f31c726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BD=BB=E9=A3=8E2016?= <616036448@qq.com>
Date: Sat, 31 Aug 2024 12:54:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/template/web_views_editDialog.vue.vm   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm
index f7995927..e73fa539 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm
@@ -181,8 +181,11 @@ import type { FormRules } from "element-plus";
 } else {
 @:import {
 @if(Model.RemoteVerify){
- @:exists@(RemoteField),
-} 
+@:exists@(RemoteField),
+}
+@foreach (var column in Model.TableField.Where(x=>x.EffectType == "fk").ToList()){
+@:get@(@column.FkEntityName)@(@column.PropertyName)Dropdown,
+}
 @:add@(@Model.ClassName), 
 @:update@(@Model.ClassName), 
 @:detail@(@Model.ClassName) } from "/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)";
@@ -192,11 +195,6 @@ if(@Model.TableField.Any(x=>x.EffectType == "Upload")){
 @:import { UploadRequestOptions } from "element-plus";
 @:import { @string.Join(",",Model.TableField.Where(x=>x.EffectType == "Upload").Select(x=>"upload"+x.PropertyName).ToList()) } from '/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)';
 }
-foreach (var column in Model.QueryWhetherList){
-if(@column.EffectType == "fk"){
-@:import { get@(@column.FkEntityName)@(@column.PropertyName)Dropdown } from '/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)';
-		}
-	}
 }
 @if(@Model.TableField.Any(x=>x.EffectType == "ConstSelector")){
 @:import { getConstType } from "/@@/utils/constHelper";
@@ -371,6 +369,7 @@ const submit = async () => {
 
 @foreach (var column in Model.TableField){
 if(@column.EffectType == "fk" && @column.WhetherAddUpdate == "Y"){
+@://下拉列表@(@column.ColumnComment)
 @:const @LowerFirstLetter(@column.FkEntityName)@(@column.PropertyName)DropdownList = ref<any>([]); 
 @:const get@(@column.FkEntityName)@(@column.PropertyName)DropdownList = async () => {
 	@if (@Model.IsApiService) {
@@ -410,6 +409,7 @@ else if(@column.EffectType == "ConstSelector"){
 @foreach (var column in Model.TableField){ 
 if(column.WhetherAddUpdate=="N") continue;
 if(@column.EffectType == "Upload"){
+@://上传@(@column.ColumnComment)
 @:const upload@(@column.PropertyName)Handle = async (options: UploadRequestOptions) => {
 	@if (@Model.IsApiService) {
 	@:let res = await getAPI(@(@Model.ClassName)Api).api@(@Model.ClassName)Upload@(@column.FkEntityName)PostForm(options);