gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://101.43.53.74:3000/Admin.NET/Admin.NET

Browse Source
This commit is contained in:
zuohuaijun 2024-09-01 01:48:10 +08:00
commit eea4832b58
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm
View File

@ -160,6 +160,9 @@
:deep(.el-input-number) { :deep(.el-input-number) {
width: 100%; width: 100%;
} }
:deep(.el-slider .el-input-number){
width: auto;
}
</style> </style>
<script lang="ts" setup> <script lang="ts" setup>
@ -178,8 +181,11 @@ import type { FormRules } from "element-plus";
} else { } else {
@:import { @:import {
@if(Model.RemoteVerify){ @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), @:add@(@Model.ClassName),
@:update@(@Model.ClassName), @:update@(@Model.ClassName),
@:detail@(@Model.ClassName) } from "/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)"; @:detail@(@Model.ClassName) } from "/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)";
@ -189,11 +195,6 @@ if(@Model.TableField.Any(x=>x.EffectType == "Upload")){
@:import { UploadRequestOptions } from "element-plus"; @: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)'; @: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")){ @if(@Model.TableField.Any(x=>x.EffectType == "ConstSelector")){
@:import { getConstType } from "/@@/utils/constHelper"; @:import { getConstType } from "/@@/utils/constHelper";
@ -368,6 +369,7 @@ const submit = async () => {
@foreach (var column in Model.TableField){ @foreach (var column in Model.TableField){
if(@column.EffectType == "fk" && @column.WhetherAddUpdate == "Y"){ if(@column.EffectType == "fk" && @column.WhetherAddUpdate == "Y"){
@://下拉列表@(@column.ColumnComment)
@:const @LowerFirstLetter(@column.FkEntityName)@(@column.PropertyName)DropdownList = ref<any>([]); @:const @LowerFirstLetter(@column.FkEntityName)@(@column.PropertyName)DropdownList = ref<any>([]);
@:const get@(@column.FkEntityName)@(@column.PropertyName)DropdownList = async () => { @:const get@(@column.FkEntityName)@(@column.PropertyName)DropdownList = async () => {
@if (@Model.IsApiService) { @if (@Model.IsApiService) {
@ -407,6 +409,7 @@ else if(@column.EffectType == "ConstSelector"){
@foreach (var column in Model.TableField){ @foreach (var column in Model.TableField){
if(column.WhetherAddUpdate=="N") continue; if(column.WhetherAddUpdate=="N") continue;
if(@column.EffectType == "Upload"){ if(@column.EffectType == "Upload"){
@://上传@(@column.ColumnComment)
@:const upload@(@column.PropertyName)Handle = async (options: UploadRequestOptions) => { @:const upload@(@column.PropertyName)Handle = async (options: UploadRequestOptions) => {
@if (@Model.IsApiService) { @if (@Model.IsApiService) {
@:let res = await getAPI(@(@Model.ClassName)Api).api@(@Model.ClassName)Upload@(@column.FkEntityName)PostForm(options); @:let res = await getAPI(@(@Model.ClassName)Api).api@(@Model.ClassName)Upload@(@column.FkEntityName)PostForm(options);

3
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_el_table_index.vue.vm
View File

@ -390,6 +390,9 @@
:deep(.el-input-number) { :deep(.el-input-number) {
width: 100%; width: 100%;
} }
:deep(.el-slider .el-input-number){
width: auto;
}
</style> </style>
@{ @{

3
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_index.vue.vm
View File

@ -463,4 +463,7 @@ const handleDelete = (row: any) => {
:deep(.el-input-number) { :deep(.el-input-number) {
width: 100%; width: 100%;
} }
:deep(.el-slider .el-input-number){
width: auto;
}
</style> </style>