解决文件冲突

.gitignore

@@ -29,3 +29,9 @@ dist/
 node_modules/
 /Admin.NET/Admin.NET.Web.Entry/wwwroot/Avatar
 /Admin.NET/Admin.NET.Web.Entry/wwwroot/Signature
+/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Manage.js - Copy.cshtml
+/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/editDialog.vue - Copy.cshtml
+/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue - Copy (2).cshtml
+/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue - Copy.vm
+/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Manage - Copy.js.vm
+/Admin.NET/Admin.NET.Application/AppConfig.json

Admin.NET/Admin.NET.Application/AppConfig.json

@@ -1,62 +0,0 @@
-{
-  "$schema": "https://gitee.com/dotnetchina/Furion/raw/net6/schemas/v3/furion-schema.json",
-  "DbConnection": {
-    "ConnectionConfigs": [
-      // 默认第一个为主库
-      {
-        "ConfigId": "default",
-        "DbType": "MySql", // MySql、SqlServer、Sqlite、Oracle、PostgreSQL、Dm、Kdbndp、Oscar、MySqlConnector、Access
-        "ConnectionString": "Server=localhost;uid=root;pwd=123456;Database=eolane_platform;pooling=true;min pool size=5;max pool size=32767;connect timeout=30000;charset=utf8;", // DataSource=C:\\db\\Admin.NET.db
-        "EnableInitDb": false, // 启用库表初始化
-        "EnableDiffLog": false // 启用库表差异日志
-      },
-      // 其他业务库
-      {
-        "ConfigId": "test",
-        "DbType": "Sqlite",
-        "ConnectionString": "DataSource=./Test.db",
-        "EnableInitDb": false, // 启用库表初始化
-        "EnableDiffLog": false // 启用库表差异日志
-      },
-      // 其他业务库
-      {
-        "ConfigId": "wms",
-        "DbType": "SqlServer",
-        "ConnectionString": "Server=.;Database=WMS_TEST;User=sa;Password=P@SSWORD123;MultipleActiveResultSets=True;",
-        "EnableInitDb": false, // 启用库表初始化
-        "EnableDiffLog": false // 启用库表差异日志
-      }
-    ]
-  },
-  // 代码生成配置项-程序集名称集合
-  "CodeGen": {
-    "EntityAssemblyNames": [ "Admin.NET.Core", "Admin.NET.Application" ],
-    "FrontRootPath": "Web", //前端文件根目录
-    "BackendApplicationNamespace": "Admin.NET.Application" //后端生成到的项目
-  },
-  "Wechat": {
-    // 公众号
-    "WechatAppId": "",
-    "WechatAppSecret": "",
-    "EncodingAESKey": "",
-    "Token": "",
-    // 小程序
-    "WxOpenAppId": "",
-    "WxOpenAppSecret": "",
-    "WxOpenToken": "",
-    "WxOpenEncodingAESKey": ""
-  },
-  "WechatPay": {
-    "AppId": "", // 微信公众平台AppId、开放平台AppId、小程序AppId、企业微信CorpId
-    "MerchantId": "", // 商户平台的商户号
-    "MerchantV3Secret": "", // 商户平台的APIv3密钥
-    "MerchantCertificateSerialNumber": "", // 商户平台的证书序列号
-    "MerchantCertificatePrivateKey": "\\WxPayCert\\apiclient_key.pem" // 商户平台的API证书私钥(apiclient_key.pem文件内容)
-  },
-  "PayCallBack": {
-    "WechatPayUrl": "/notify/weChatPay/unifiedorder", // 微信支付回调
-    "WechatRefundUrl": "/notify/weChatPay/refund", // 微信退款回调
-    "AlipayUrl": "", // 支付宝支付回调
-    "AlipayRefundUrl": "" // 支付宝退款回调
-  }
-}

Admin.NET/Admin.NET.Application/Entity/generatetest.cs

@@ -1,35 +0,0 @@
-using System;
-using SqlSugar;
-using System.ComponentModel;
-using Admin.NET.Core;
-namespace Admin.NET.Application.Entity
-{
-     /// <summary>
-     /// 代码测试
-     /// </summary>
-      [SugarTable("generate_test")]
-      [Description("代码测试")]
-      public class generatetest  : EntityBase
-      {
-          /// <summary>
-          /// 编码
-          /// </summary>
-          public string Code { get; set; }
-          /// <summary>
-          /// 名称
-          /// </summary>
-          public string Name { get; set; }
-          /// <summary>
-          /// 价格
-          /// </summary>
-          public decimal Price { get; set; }
-          /// <summary>
-          /// 过期日期
-          /// </summary>
-          public DateTime ExpireDate { get; set; }
-          /// <summary>
-          /// 状态
-          /// </summary>
-          public bool Status { get; set; }
-}	
-}

Admin.NET/Admin.NET.Application/Service/generatetest/Dto/generatetestDto.cs

@@ -1,41 +0,0 @@
-using System;
-
-namespace Admin.NET.Application
-{
-    /// <summary>
-    /// GenerateTest输出参数
-    /// </summary>
-    public class generatetestDto
-    {
-        /// <summary>
-        /// 主键Id
-        /// </summary>
-        public long Id { get; set; }
-        
-        /// <summary>
-        /// 编码
-        /// </summary>
-        public string Code { get; set; }
-        
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string Name { get; set; }
-        
-        /// <summary>
-        /// 价格
-        /// </summary>
-        public decimal Price { get; set; }
-        
-        /// <summary>
-        /// 过期日期
-        /// </summary>
-        public DateTime ExpireDate { get; set; }
-        
-        /// <summary>
-        /// 状态
-        /// </summary>
-        public bool Status { get; set; }
-        
-    }
-}

Admin.NET/Admin.NET.Application/Service/generatetest/Dto/generatetestInput.cs

@@ -1,80 +0,0 @@
-using System;
-using Admin.NET.Core;
-using System.ComponentModel.DataAnnotations;
-using System.Collections.Generic;
-
-namespace Admin.NET.Application
-{
-    /// <summary>
-    /// GenerateTest输入参数
-    /// </summary>
-    public class generatetestInput : BasePageInput
-    {
-        /// <summary>
-        /// 编码
-        /// </summary>
-        public virtual string Code { get; set; }
-        
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public virtual string Name { get; set; }
-        
-        /// <summary>
-        /// 价格
-        /// </summary>
-        public virtual decimal Price { get; set; }
-        
-        /// <summary>
-        /// 过期日期
-        /// </summary>
-        public virtual DateTime ExpireDate { get; set; }
-        
-        /// <summary>
-        /// 状态
-        /// </summary>
-        public virtual bool Status { get; set; }
-        
-    }
-
-    public class AddgeneratetestInput : generatetestInput
-    {
-        /// <summary>
-        /// 编码
-        /// </summary>
-        [Required(ErrorMessage = "编码不能为空")]
-        public override string Code { get; set; }
-        
-        /// <summary>
-        /// 名称
-        /// </summary>
-        [Required(ErrorMessage = "名称不能为空")]
-        public override string Name { get; set; }
-        
-    }
-
-    public class DeletegeneratetestInput : BaseIdInput
-    {
-        /// <summary>
-        /// 主键Id
-        /// </summary>
-        [Required(ErrorMessage = "主键Id不能为空")]
-        public long Id { get; set; }
-        
-    }
-
-    public class UpdategeneratetestInput : generatetestInput
-    {
-        /// <summary>
-        /// 主键Id
-        /// </summary>
-        [Required(ErrorMessage = "主键Id不能为空")]
-        public long Id { get; set; }
-        
-    }
-
-    public class QueryegeneratetestInput : DeletegeneratetestInput
-    {
-
-    }
-}

Admin.NET/Admin.NET.Application/Service/generatetest/Dto/generatetestOutput.cs

@@ -1,46 +0,0 @@
-using SqlSugar;
-using Admin.NET.Core;
-using Admin.NET.Core.Service;
-using System.Collections.Generic;
-using System;
-namespace Admin.NET.Application
-{
-    /// <summary>
-    /// GenerateTest输出参数
-    /// </summary>
-    public class generatetestOutput
-    {
-       /// <summary>
-       /// 主键Id
-       /// </summary>
-       public long Id { get; set; }
-    
-       /// <summary>
-       /// 编码
-       /// </summary>
-       public string Code { get; set; }
-    
-       /// <summary>
-       /// 名称
-       /// </summary>
-       public string Name { get; set; }
-    
-       /// <summary>
-       /// 价格
-       /// </summary>
-       public decimal Price { get; set; }
-    
-       /// <summary>
-       /// 过期日期
-       /// </summary>
-       public DateTime ExpireDate { get; set; }
-    
-       /// <summary>
-       /// 状态
-       /// </summary>
-       public bool Status { get; set; }
-    
-    }
-
-
-}

Admin.NET/Admin.NET.Application/Service/generatetest/generatetestService.cs

@@ -1,96 +0,0 @@
-using Admin.NET.Application.Const;
-using Admin.NET.Application.Entity;
-using Mapster;
-
-namespace Admin.NET.Application;
-/// <summary>
-/// GenerateTest服务
-/// </summary>
-[ApiDescriptionSettings(ApplicationConst.GroupName, Order = 100)]
-public class generatetestService : IDynamicApiController, ITransient
-{
-    private readonly SqlSugarRepository<generatetest> _rep;
-    public generatetestService(SqlSugarRepository<generatetest> rep)
-    {
-        _rep = rep;
-    }
-
-    /// <summary>
-    /// 分页查询GenerateTest
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpPost("/generatetest/page")]
-    public async Task<dynamic> Page(generatetestInput input)
-    {
-        var query= _rep.Context.Queryable<generatetest>()
-
-                    .WhereIF(!string.IsNullOrWhiteSpace(input.Code), u => u.Code.Contains(input.Code.Trim()))
-                    .WhereIF(!string.IsNullOrWhiteSpace(input.Name), u => u.Name.Contains(input.Name.Trim()))
-;
-
-        query = query.OrderBuilder(input);
-        return await query.ToPagedListAsync(input.Page, input.PageSize);
-    }
-
-    /// <summary>
-    /// 增加GenerateTest
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpPost("/generatetest/add")]
-    public async Task Add(AddgeneratetestInput input)
-    {
-        var entity = input.Adapt<generatetest>();
-        await _rep.InsertWithDiffLogAsync(entity);
-    }
-
-    /// <summary>
-    /// 删除GenerateTest
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpPost("/generatetest/delete")]
-    public async Task Delete(DeletegeneratetestInput input)
-    {
-        var entity = await _rep.GetFirstAsync(u => u.Id == input.Id);
-        await _rep.FakeDeleteAsync(entity);   //假删除
-    }
-
-    /// <summary>
-    /// 更新GenerateTest
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpPost("/generatetest/edit")]
-    public async Task Update(UpdategeneratetestInput input)
-    {
-        var entity = input.Adapt<generatetest>();
-        await _rep.UpdateWithDiffLogAsync(entity);
-    }
-
-    /// <summary>
-    /// 获取GenerateTest
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpGet("/generatetest/detail")]
-    public async Task<generatetest> Get([FromQuery] QueryegeneratetestInput input)
-    {
-        return await _rep.GetFirstAsync(u => u.Id == input.Id);
-    }
-
-    /// <summary>
-    /// 获取GenerateTest列表
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpGet("/generatetest/list")]
-    public async Task<dynamic> List([FromQuery] generatetestInput input)
-    {
-        return await _rep.AsQueryable().ToListAsync();
-    }
-
-
-
-}

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Manage - Copy.js.vm

@@ -1,42 +0,0 @@
-import { defHttp } from '/@@/utils/http/axios';
-enum Api {
-  Add@(@Model.ClassName) = '/@(@Model.ClassName)/add',
-  Delete@(@Model.ClassName) = '/@(@Model.ClassName)/delete',
-  Update@(@Model.ClassName) = '/@(@Model.ClassName)/edit',
-  Get@(@Model.ClassName)Page = '/@(@Model.ClassName)/page',
-  @foreach (var column in Model.TableField){
-if(@column.EffectType == "fk"){
-  @:Get@(@column.FkEntityName)Dropdown = '/@(@Model.ClassName)/@(@column.FkEntityName)Dropdown',
-}else if(@column.EffectType == "ApiTreeSelect"){
-  @:Get@(@column.FkEntityName)Tree = '/@(@Model.ClassName)/@(@column.FkEntityName)Tree',
-}
-}
-}
-
-//增加@(@Model.BusName)
-export function add@(@Model.ClassName)(params: any) {
-  return defHttp.post<any>({ url: Api.Add@(@Model.ClassName), params });
-}
-//删除@(@Model.BusName)
-export function delete@(@Model.ClassName)(params: any) {
-  return defHttp.post<any>({ url: Api.Delete@(@Model.ClassName), params });
-}
-//编辑@(@Model.BusName)
-export function update@(@Model.ClassName)(params: any) {
-  return defHttp.post<any>({ url: Api.Update@(@Model.ClassName), params });
-}
-//分页查询@(@Model.BusName)
-export function get@(@Model.ClassName)PageList(params?: any) {
-  return defHttp.post<any>({ url: Api.Get@(@Model.ClassName)Page, params });
-}
-@foreach (var column in Model.TableField){
-if(@column.EffectType == "fk"){
-@:export function get@(@column.FkEntityName)Dropdown() {
-  @:return defHttp.get<any>({ url: Api.Get@(@column.FkEntityName)Dropdown });
-@:}
-}else if(@column.EffectType == "ApiTreeSelect"){
-@:export function get@(@column.FkEntityName)Tree() {
-  @:return defHttp.get<any>({ url: Api.Get@(@column.FkEntityName)Tree });
-@:}
-}
-}

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Manage.js - Copy.cshtml

@@ -1,64 +0,0 @@
-@Model  Admin.Net.Core.CustomEngine
-import request from '/@@/utils/request';
-
-enum Api {
-  Add@(@Model.ClassName) = '/@(@Model.ClassName)/add',
-  Delete@(@Model.ClassName) = '/@(@Model.ClassName)/delete',
-  Update@(@Model.ClassName) = '/@(@Model.ClassName)/edit',
-  Get@(@Model.ClassName)Page = '/@(@Model.ClassName)/page',
-  @foreach (var column in Model.TableField){
-if(@column.EffectType == "fk"){
-  @:Get@(@column.FkEntityName)Dropdown = '/@(@Model.ClassName)/@(@column.FkEntityName)Dropdown',
-}else if(@column.EffectType == "ApiTreeSelect"){
-  @:Get@(@column.FkEntityName)Tree = '/@(@Model.ClassName)/@(@column.FkEntityName)Tree',
-}
-}
-}
-
-// 增加@(@Model.BusName)
-export function add@(@Model.ClassName)(params?: any) =>
-	request({
-		url: Api.Add@(@Model.ClassName),
-		method: 'post',
-		data: params,
-	});
-
-// 删除@(@Model.BusName)
-export function delete@(@Model.ClassName)(params?: any) => 
-	request({
-			url: Api.Delete@(@Model.ClassName),
-			method: 'post',
-			data: params,
-		});
-
-// 编辑@(@Model.BusName)
-export function update@(@Model.ClassName)(params?: any) => 
-	request({
-			url: Api.Update@(@Model.ClassName),
-			method: 'post',
-			data: params,
-		});
-
-// 分页查询@(@Model.BusName)
-export function get@(@Model.ClassName)PageList(params?: any) => 
-	request({
-			url: Api.Get@(@Model.ClassName)Page,
-			method: 'get',
-			data: params,
-		});
-
-@foreach (var column in Model.TableField){
-if(@column.EffectType == "fk"){
-@:export function get@(@column.FkEntityName)Dropdown() =>
-  @:request({
-			@:url: Api.Get@(@Model.FkEntityName)Dropdown,
-			@:method: 'get'
-		@:});
-}else if(@column.EffectType == "ApiTreeSelect"){
-@:export function get@(@column.FkEntityName)Tree() =>
-   @:request({
-			@:url: Api.Get@(@Model.FkEntityName)Tree,
-			@:method: 'get'
-		@:});
-	}
-}

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/editDialog.vue - Copy.cshtml

@@ -1,220 +0,0 @@
-@Model  Admin.Net.Core.CustomEngine
-<template>
-	<div class="@(@Model.ClassName)-container">
-		<el-dialog
-		v-model="isShowDialog"
-		:title="title"
-		:width="700"
-		draggable>
-			<el-form :model="ruleForm" ref="ruleFormRef" size="default" label-width="100px" :rules="rules">
-				<el-row :gutter="35">
-					@foreach (var column in Model.TableField){
-					if(@column.ColumnKey == "True"){
-					@:<el-form-item v-show="false"><el-input v-model="ruleForm.@(@column.ColumnName)" /></el-form-item>
-					}else{
-					if (@column.WhetherAddUpdate == "Y"){
-					if(@column.EffectType == "fk"){
-					@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						@:<el-form-item label="@column.ColumnComment">
-							@:<el-select clearable= v-model="ruleForm.@(@column.ColumnName)" placeholder="请选择@(@column.ColumnComment)">
-								@:<el-select-option v-for="(item,index) in get@(@column.FkEntityName)DropdownList" :key="index" :value="item.code">{{ item.name }}</el-select-option>
-								@:</el-select>
-							@:</el-form-item>
-						@:</el-col>
-					}else if(@column.EffectType == "Input"){
-					@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						@:<el-form-item label="@column.ColumnComment">
-							@:<el-input v-model="ruleForm.@(@column.ColumnName)" placeholder="ruleForm.@(@column.ColumnName)" clearable/>
-						@:</el-form-item>
-					@:</el-col>
-					}else if(@column.EffectType == "InputNumber"){
-					@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						@:<el-form-item label="@column.ColumnComment">
-							@:<el-input-number v-model="ruleForm.@(@column.ColumnName)" placeholder="ruleForm.@(@column.ColumnName)" clearable/>
-						@:</el-form-item>
-					@:</el-col>
-					}else if(@column.EffectType == "InputTextArea"){
-					@:<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-						@:<el-form-item label="@column.ColumnComment">
-							@:<el-input v-model="ruleForm.@(@column.ColumnName)" placeholder="ruleForm.@(@column.ColumnName)" type="textarea" clearable/>
-						@:</el-form-item>
-					@:</el-col>
-					}else if(@column.EffectType == "Select"){
-					@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						@:<el-form-item label="@column.ColumnComment">
-							@:<el-select clearable v-model="ruleForm.@(@column.ColumnName)" placeholder="请选择@(@column.ColumnComment)">
-								@:<el-select-option v-for="(item,index) in getDictDataDropdownList('@(@column.DictTypeCode)')" :key="index" :value="item.value">{{ item.label }}</el-select-option>
-							@:</el-select>
-						@:</el-form-item>
-					@:</el-col>
-					}else if(@column.EffectType == "ConstSelector"){
-					@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						@:<el-form-item label="@column.ColumnComment">
-							@:<el-select clearable="" v-model="ruleForm.@(@column.ColumnName)" placeholder="请选择@(@column.ColumnComment)">
-								@:<el-select-option v-for="(item,index) in getSelectorList('@(@column.DictTypeCode)')" :key="index" :value="item.code">{{ item.name }}</el-select-option>
-								@:</el-select>
-							@:</el-form-item>
-						@:</el-col>
-					}else if(@column.EffectType == "Switch"){				
-					@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						@:<el-form-item label="@column.ColumnComment">
-							@:<el-switch v-model="ruleForm.@(@column.ColumnName)" active-text="是" inactive-text="否" />
-						@:</el-form-item>
-					@:</el-col>
-					}else if(@column.EffectType == "DatePicker"){
-					@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						@:<el-form-item label="@column.ColumnComment">
-							@:<el-date-picker v-model="ruleForm.@(@column.ColumnName)" type="datetime" placeholder="@column.ColumnComment"  />
-						@:</el-form-item>
-					@:</el-col>
-					}else if(@column.EffectType == "Upload"){
-					
-					}else{
-
-					}
-					}
-					}
-					}
-						</el-row>
-					</el-form>
-					<template #footer="">
-						<span class="dialog-footer">
-							<el-button @@click="cancel" size="default">取 消</el-button>
-							<el-button type="primary" @@click="submit" size="default">确 定</el-button>
-						</span>
-					</template>
-		</el-dialog>	
-	</div>
-</template>
-
-<script>
-	import { ref, toRefs, reactive, onMounted, defineComponent, getCurrentInstance, onUnmounted } from 'vue';
-	import { ElMessageBox, ElMessage } from 'element-plus';
-	import { auth } from '/@@/utils/authFunction';
-	import { formatDate } from '/@@/utils/formatTime';
-	import type { FormInstance, FormRules } from 'element-plus'
-
-	@foreach (var column in Model.TableField){
-	if(@column.EffectType == "fk"){
-	@:import { get@(@column.FkEntityName)Dropdown } from '/@@/api/main/@(@Model.ClassName)';
-	}
-	}
-	@foreach (var column in Model.TableField){
-	if(@column.EffectType == "Select"){
-	@:import { getDictDataDropdown } from '/@@/api/system/admin';
-	}
-	}
-
-	export default defineComponent({
-	name: 'edit@(@Model.ClassName)',
-	props: {
-	title: {
-	type: String,
-	default: '',
-	},
-	},
-	setup() {
-	const { proxy } = getCurrentInstance() as any;
-	const state = reactive({
-	isShowDialog: false,
-	ruleForm: {} as any,
-	});
-
-	const rules = reactive<FormRules>({
-	@foreach (var column in Model.TableField){
-		if(@column.WhetherRequired == "Y"){
-			if(@column.EffectType == "Input" || @column.EffectType == "InputNumber" ||@column.EffectType == "InputTextArea"){
-			@:@column.ColumnName: [{required: true, message: '请输入@(@column.ColumnComment)！', trigger: 'blur',},],
-			}else if(@column.EffectType == "DatePicker" || @column.EffectType == "Select" ||@column.EffectType == "ApiTreeSelect"){
-			@:@column.ColumnName: [{required: true, message: '请选择@(@column.ColumnComment)！', trigger: 'change',},],
-			}
-		}
-	}
-	});
-	onMounted(async () => {
-	handleQuery();
-
-	proxy.mittBus.on('submitRefresh', () => {
-	handleQuery();
-	});
-	});
-
-	onUnmounted(() => {
-	proxy.mittBus.off('submitRefresh');
-	});
-
-	// 打开弹窗
-	const openDialog = (row: any) => {
-	state.ruleForm = row;
-	state.isShowDialog = true;
-	};
-
-	// 关闭弹窗
-	const closeDialog = () => {
-	proxy.mittBus.emit('submitRefresh');
-	state.isShowDialog = false;
-	};
-
-	// 取消
-	const cancel = () => {
-	state.isShowDialog = false;
-	};
-
-	// 提交
-	const submit = () => {
-	ruleFormRef.value.validate(async (valid: boolean) => {
-	if (!valid) return;
-	if (state.ruleForm.id != undefined && state.ruleForm.id > 0) {
-	await update@(@Model.ClassName)(values);
-	} else {
-	await add@(@Model.ClassName)(state.ruleForm);
-	}
-	closeDialog();
-	});
-	};
-
-	@foreach (var column in Model.QueryWhetherList){
-	if(@column.EffectType == "fk"){
-	@:const get@(@column.FkEntityName)DropdownList = await () => {
-	@:let list = await get@(@column.FkEntityName)Dropdown();
-	@:return list.data.result ?? [];
-	@:};
-	break;
-	}
-	}
-
-	@foreach (var column in Model.TableField){
-	if(@column.EffectType == "Select"){
-	@:const getDictDataDropdownList = await (val: any) => {
-	@:let list = await getDictDataDropdownList(val);
-	@:return list.data.result ?? [];
-	@:};
-	break;
-	}
-	}
-	return {
-	@foreach (var column in Model.TableField){
-	if(@column.EffectType == "fk"){
-	@:get@(@column.FkEntityName)DropdownList,
-	break;
-	}
-	}
-	@foreach (var column in Model.TableField){
-	if(@column.EffectType == "Select"){
-	@:getDictDataDropdownList,
-	break;
-	}
-	}
-	ruleFormRef,
-	openDialog,
-	closeDialog,
-	cancel,
-	submit,
-	...toRefs(state),
-	rules,
-	};
-	}
-	})
-
-	}
-</script>

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue - Copy (2).cshtml

@@ -1,270 +0,0 @@
-@Model  Admin.Net.Core.CustomEngine
-<template>
-  <div class="@(@Model.ClassName)-container">
-    <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
-		          
-@if(Model.QueryWhetherList.Count > 0){
-     @:<el-form :model="queryParams" ref="queryForm" :inline="true">
-		 @:<a-row>
-foreach (var column in Model.QueryWhetherList){
-    if(@column.EffectType == "Input" || @column.EffectType == "InputTextArea"){
-       @:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
-       @:<el-form-item label="@column.ColumnComment">
-       @:<el-input v-model="queryParam.@(@column.ColumnName)" clearable placeholder="请输入@(@column.ColumnComment)"/>
-       @:</el-form-item>
-       @:</el-col>
-    }else if(@column.EffectType == "InputTextArea"){
-		@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
-        @:<el-form-item label="@column.ColumnComment">
-        @:<el-input-number v-model="queryParam.@(@column.ColumnName)"  clearable placeholder="请输入@(@column.ColumnComment)"/>
-        @:</el-form-item>
-        @:</el-col>
-    }else if(@column.EffectType == "InputNumber"){
-		@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
-        @:<el-form-item label="@column.ColumnComment">
-        @:<el-input-number v-model="queryParam.@(@column.ColumnName)"  clearable placeholder="请输入@(@column.ColumnComment)"/>
-        @:</el-form-item>
-        @:</el-col>
-    }else if(@column.EffectType == "fk"){
-        @:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
-        @:<el-form-item label="@column.ColumnComment">
-        @:<el-select clearable v-model="queryParam.@(@column.ColumnName)" placeholder="请选择@(@column.ColumnComment)">
-        @:<el-select-option v-for="(item,index) in get@(@column.FkEntityName)DropdownList" :key="index" :value="item.vaue">{{ item.label }}</el-select-option>
-        @:</el-select>
-        @:</el-form-item>
-        @:</el-col>
-    }else if(@column.EffectType == "Select"){
-         @:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
-         @:<el-form-item label="@column.ColumnComment">
-         @:<el-select clearable v-model="queryParam.@(@column.ColumnName)" placeholder="请选择@(@column.ColumnComment)">
-         @:<el-select-option v-for="(item,index) in getDictDataDropdownList('@(@column.DictTypeCode)')" :key="index" :value="item.code">{{ item.name }}</el-select-option>
-         @:</el-select>
-         @:</el-form-item>
-         @:</el-col>
-    }else if(@column.EffectType == "DatePicker"){
-        @:<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" >
-        @:<el-form-item label="@column.ColumnComment">
-        @:<el-date-picker placeholder="请选择@(@column.ColumnComment)" v-model="queryParam.@(@column.ColumnName)Date" />
-        @:</el-form-item>
-        @:</el-col>
-    }
-			@:<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" >
-             @: <span class="table-page-search-submitButtons">
-                @: <el-button icon="ele-Refresh" @@click="() => queryParam = {}"> 重置 </el-button>
-              @: <el-button type="primary" icon="ele-Search" @@click="handleQuery" v-auth="'@(@Model.ClassName):page'"> 查询 </el-button>
-				@:  <el-button icon="ele-Plus" @@click="openAdd@(@Model.ClassName)" v-auth="'@(@Model.ClassName):add'"> 新增 </el-button>  
-             @: </span>
-           @: </el-col>
-          @:</a-row>
-        @:</a-form>
-}
-}
-      
-    </a-card>
-    <a-card :bordered="false">
-	<el-table 
-		:data="userData" 
-		style="width: 100%" 
-		v-loading="loading" 
-		tooltip-effect="light"
-		row-key="id"
-		border>
-		<el-table-column type="index" label="序号" width="55" align="center" fixed />
-		@foreach (var column in Model.TableField){		   
-		     if(@column.WhetherTable == "Y"){
-			     if(@column.EffectType == "Upload"||@column.EffectType == "fk"||@column.EffectType == "Switch"||@column.EffectType == "ConstSelector"){
-				 @: <el-table-column prop="@column.ColumnName" label="@column.ColumnComment" fixed show-overflow-tooltip>
-					    @:<template #default="scope">
-			                if(@column.EffectType == "Upload"){
-								@:<el-image
-							        @:style="width: 60px; height: 60px"
-							        @::src="scope.row.url"
-							        @::lazy="true"
-							        @::hide-on-click-modal="true"
-							        @::preview-src-list="[scope.row.url]"
-							        @::initial-index="0"
-							        @:fit="scale-down"
-							        @:preview-teleported
-						         @:/>
-                            }else if(@column.EffectType == "fk"){
-                                @:<span>{{scope.row.fk@(@column.ColumnName).@(@column.LowerFkColumnName)}}</span>
-                            }else if(@column.EffectType == "Switch"){
-								@:<el-tag v-if="scope.row.@(@column.LowerColumnName)"> 是 </el-tag>
-								@:<el-tag type="danger" v-else> 否 </el-tag>
-                            }else if(@column.EffectType == "ConstSelector"){
-								@:<span>{{codeToName(scope.row.@(@column.LowerColumnName), '@(@column.DictTypeCode)')}</span>
-                            }
-					    @:</template>
-					@:</el-table-column>
-			     }
-                 else {
-				    @: <el-table-column prop="@column.ColumnName" label="@column.ColumnComment" fixed show-overflow-tooltip />
-				 }
-		    }
-			}
-			           <el-table-column label="操作" width="110" align="center" fixed="right" show-overflow-tooltip v-if="auth('@(@Model.ClassName):edit') || auth('@(@Model.ClassName):delete')">
-							<template #default="scope">
-								<el-button icon="ele-Edit" size="small" text type="primary" @@click="openEdit@(@Model.ClassName)(scope.row)" v-auth="'@(@Model.ClassName):update'"> 编辑 </el-button>
-								<el-button icon="ele-Edit" size="small" text type="primary" @@click="del@(@Model.ClassName)(scope.row)" v-auth="'@(@Model.ClassName):delete'"> 删除 </el-button>								
-							</template>
-		</el-table-column>
-	</el-table>
-	<el-pagination
-		v-model:currentPage="tableParams.page"
-		v-model:page-size="tableParams.pageSize"
-		:total="tableParams.total"
-		:page-sizes="[10, 20, 50, 100]"
-		small
-		background
-		@@size-change="handleSizeChange"
-		@@current-change="handleCurrentChange"
-		layout="total, sizes, prev, pager, next, jumper"
-	/>	 
-<editDialog ref="editDialogRef" :title="edit@(@Model.ClassName)Title"/>
-    </a-card>
-  </div>
-</template>
-
-<script lang="ts">
-	import { ref, toRefs, reactive, onMounted, defineComponent, getCurrentInstance, onUnmounted } from 'vue';
-    import { ElMessageBox, ElMessage } from 'element-plus';
-	import { auth } from '/@@/utils/authFunction';
-	import { formatDate } from '/@@/utils/formatTime';
-	
-	import editDialog from '/@@/views/main/@(@Model.ClassName)/component/editDialog.vue'
-	import { get@(@Model.ClassName)Page, delete@(@Model.ClassName) } from '/@@/api/main/@(@Model.ClassName)';
-@foreach (var column in Model.QueryWhetherList){
-	if(@column.EffectType == "fk"){
-  @:import { get@(@column.FkEntityName)Dropdown } from '/@@/api/main/@(@Model.ClassName)';		
-	}
-}
-@foreach (var column in Model.QueryWhetherList){
-	if(@column.EffectType == "Select"){
-  @:import { getDictDataDropdown } from '/@@/api/system/admin';
-  break;
-	}
-}	
-	export default defineComponent({
-	    name: '@(@Model.ClassName)',
-		components: { editDialog },
-		setup() {
-		    const { proxy } = getCurrentInstance() as any;
-			const editDialogRef = ref();
-			const state = reactive({
-			    loading: false,
-			    tableData: [] as any,
-			    queryParams: {} as any,
-			    tableParams: {
-				    page: 1,
-				    pageSize: 10,
-				    total: 0 as any,
-			    },
-			    edit@(@Model.ClassName)Title: '',
-		    });
-			
-			onMounted(async () => {
-			    handleQuery();
-
-			    proxy.mittBus.on('submitRefresh', () => {
-				    handleQuery();
-			    });
-		    });
-			
-		    onUnmounted(() => {
-			    proxy.mittBus.off('submitRefresh');
-		    });	
-			
-			// 查询操作
-		    const handleQuery = async () => {
-			    state.loading = true;
-			    var res = await get@(@Model.ClassName)Page(Object.assign(state.queryParams, state.tableParams));
-			    state.tableData = res.data.result?.items ?? [];
-			    state.tableParams.total = res.data.result?.total;
-			    state.loading = false;
-		    };
-			
-			// 打开新增页面
-		    const openAdd@(@Model.ClassName) = () => {
-			    state.edit@(@Model.ClassName)Title = '添加@(@Model.BusName)';
-			    editDialogRef.value.openDialog({});
-		    };
-			
-		    // 打开编辑页面
-		    const openEdit@(@Model.ClassName) = (row: any) => {
-			    state.edit@(@Model.ClassName)Title = '编辑@(@Model.BusName)';
-			    editDialogRef.value.openDialog(row);
-		    };
-			
-		    // 删除
-		    const del@(@Model.ClassName) = (row: any) => {
-			    ElMessageBox.confirm(`确定要删除吗?`, '提示', {
-				    confirmButtonText: '确定',
-				    cancelButtonText: '取消',
-				    type: 'warning',
-			    })
-				    .then(async () => {
-					    await delete@(@Model.ClassName)(row);
-					    handleQuery();
-					    ElMessage.success('删除成功');
-				    })
-				    .catch(() => {});
-		    };
-			
-		    // 改变页面容量
-		    const handleSizeChange = (val: number) => {
-			    state.tableParams.pageSize = val;
-			    handleQuery();
-		    };
-			
-		    // 改变页码序号
-		    const handleCurrentChange = (val: number) => {
-			    state.tableParams.page = val;
-			    handleQuery();
-		    };
-			
-@foreach (var column in Model.QueryWhetherList){
-	if(@column.EffectType == "fk"){
-			@:const get@(@column.FkEntityName)DropdownList = await () => {
-				@:let list = await get@(@column.FkEntityName)Dropdown();
-			    @:return list.data.result ?? [];
-		    @:};
-			break;
-	}
-}
-
-@foreach (var column in Model.QueryWhetherList){
-	if(@column.EffectType == "Select"){
-			@:const getDictDataDropdownList = await (val: any) => {
-				@:let list = await getDictDataDropdownList(val);
-			    @:return list.data.result ?? [];
-		    @:};
-			break;
-	}
-}
-            return {
-			    handleQuery,
-			    editDialogRef,
-			    openAdd@(@Model.ClassName),
-			    openEdit@(@Model.ClassName),
-			    del@(@Model.ClassName),
-			    handleSizeChange,
-			    handleCurrentChange,
-			    formatDate,
-@foreach (var column in Model.QueryWhetherList){
-	if(@column.EffectType == "fk"){
-			@:get@(@column.FkEntityName)DropdownList,
-			break;
-	}
-}
-@foreach (var column in Model.QueryWhetherList){
-	if(@column.EffectType == "Select"){
-			@:getDictDataDropdownList,
-			break;
-	}
-}				
-			    auth,
-			    ...toRefs(state),
-		   };
-		}
-	})
-</script>

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue - Copy.vm

@@ -1,133 +0,0 @@
-<template>
-  <div>
-    <BasicTable @@register="registerTable">
-      <template #toolbar>
-        <a-button type="primary" @@click="handleCreate" :disabled="!hasPermission('@(@Model.ClassName):add')">新增@(@Model.BusName)</a-button>
-      </template>
-@foreach (var column in Model.TableField){
-if(@column.EffectType == "Upload"){
-      @:<template #@(@column.LowerColumnName)="{ text, record }">
-        <TableImg
-          v-if="record.@(@column.LowerColumnName)Attachment"
-          :size="60"
-          :simpleShow="true"
-          :showBadge="false"
-          :imgList="[downUrl + '/' + record.@(@column.LowerColumnName)Attachment.id + record.@(@column.LowerColumnName)Attachment.suffix]"
-        />
-      </template>
-}
-}
-      <template #bodyCell="{ column, record }">
-        <template v-if="column.key === 'action'">
-          <TableAction
-            :actions="[
-              {
-                icon: 'clarity:note-edit-line',
-                label: '编辑',
-                onClick: handleEdit.bind(null, record),
-                disabled: !hasPermission('@(@Model.ClassName):edit'),
-              },
-              {
-                icon: 'ant-design:delete-outlined',
-                color: 'error',
-                label: '删除',
-                ifShow: hasPermission('@(@Model.ClassName):delete'),
-                popConfirm: {
-                  title: '是否确认删除',
-                  placement: 'left',
-                  confirm: handleDelete.bind(null, record),
-                },
-              },
-            ]"
-          />
-        </template>
-      </template>
-    </BasicTable>
-    <@(@Model.ClassName)Modal @@register="registerModal" @@success="handleSuccess" />
-  </div>
-</template>
-<script lang="ts">
-  import { defineComponent } from 'vue';
-  import { usePermission } from '/@@/hooks/web/usePermission';
-  @if(Model.IsUpload){
-  @:import { BasicTable, useTable, TableAction, TableImg } from '/@@/components/Table';
-  }else{
-  @:import { BasicTable, useTable, TableAction } from '/@@/components/Table';
-  }
-  import { useModal } from '/@@/components/Modal';
-  import @(@Model.ClassName)Modal from './dataModal.vue';
-
-  import { columns, searchFormSchema } from './data.data';
-  import { useMessage } from '/@@/hooks/web/useMessage';
-  import { get@(@Model.ClassName)PageList, delete@(@Model.ClassName) } from '/@@/api/main/@(@Model.ClassName)';
-  export default defineComponent({
-  @if(Model.IsUpload){
-    @:components: { BasicTable, @(@Model.ClassName)Modal, TableAction, TableImg },
-  }else{
-     @:components:{ BasicTable, @(@Model.ClassName)Modal, TableAction },
-  }
-    setup() {
-      const { hasPermission } = usePermission();
-      const { createMessage } = useMessage();
-      const [registerModal, { openModal }] = useModal();
-	  const hasPage = hasPermission('@(@Model.ClassName):page');
-      const [registerTable, { reload }] = useTable({
-        title: '@(@Model.BusName)列表',
-        api: get@(@Model.ClassName)PageList,
-        pagination: true,
-        rowKey: 'id',
-        columns,
-        formConfig: {
-          labelWidth: 120,
-          schemas: searchFormSchema,
-          autoSubmitOnEnter: true,
-        },
-        useSearchForm: hasPage,
-        immediate: hasPage,
-        showTableSetting: hasPage,
-        bordered: true,
-        canResize: true,
-        actionColumn: {
-          width: 160,
-          title: '操作',
-          dataIndex: 'action',
-          //slots: { customRender: 'action' },
-        },
-      });
-
-      function handleCreate() {
-        openModal(true, {
-          isUpdate: false,
-        });
-      }
-
-      function handleEdit(record: Recordable) {
-        openModal(true, {
-          record,
-          isUpdate: true,
-        });
-      }
-
-      async function handleDelete(record: Recordable) {
-        await delete@(@Model.ClassName)(record);
-        reload();
-        createMessage.success('删除成功！');
-      }
-      function handleSuccess() {
-        reload();
-      }
-      return {
-        hasPermission,
-        registerTable,
-        registerModal,
-        handleCreate,
-        handleEdit,
-        handleDelete,
-        handleSuccess,
-@if(@Model.IsUpload){
-        @:downUrl: import.meta.env.VITE_GLOB_DOWNLOAD_URL,
-}
-      };
-    },
-  });
-</script>

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm

@@ -4,30 +4,30 @@
 		          
 @if(Model.QueryWhetherList.Count > 0){
      @:<el-form :model="queryParams" ref="queryForm" :inline="true">
-		 @:<a-row>
+		 @:<el-row>
 foreach (var column in Model.QueryWhetherList){
     if(@column.EffectType == "Input" || @column.EffectType == "InputTextArea"){
        @:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
        @:<el-form-item label="@column.ColumnComment">
-       @:<el-input v-model="queryParam.@(@column.ColumnName)" clearable placeholder="请输入@(@column.ColumnComment)"/>
+       @:<el-input v-model="queryParams.@(@column.ColumnName)" clearable placeholder="请输入@(@column.ColumnComment)"/>
        @:</el-form-item>
        @:</el-col>
     }else if(@column.EffectType == "InputTextArea"){
 		@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
         @:<el-form-item label="@column.ColumnComment">
-        @:<el-input-number v-model="queryParam.@(@column.ColumnName)"  clearable placeholder="请输入@(@column.ColumnComment)"/>
+        @:<el-input-number v-model="queryParams.@(@column.ColumnName)"  clearable placeholder="请输入@(@column.ColumnComment)"/>
         @:</el-form-item>
         @:</el-col>
     }else if(@column.EffectType == "InputNumber"){
 		@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
         @:<el-form-item label="@column.ColumnComment">
-        @:<el-input-number v-model="queryParam.@(@column.ColumnName)"  clearable placeholder="请输入@(@column.ColumnComment)"/>
+        @:<el-input-number v-model="queryParams.@(@column.ColumnName)"  clearable placeholder="请输入@(@column.ColumnComment)"/>
         @:</el-form-item>
         @:</el-col>
     }else if(@column.EffectType == "fk"){
         @:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
         @:<el-form-item label="@column.ColumnComment">
-        @:<el-select clearable v-model="queryParam.@(@column.ColumnName)" placeholder="请选择@(@column.ColumnComment)">
+        @:<el-select clearable v-model="queryParams.@(@column.ColumnName)" placeholder="请选择@(@column.ColumnComment)">
         @:<el-select-option v-for="(item,index) in get@(@column.FkEntityName)DropdownList" :key="index" :value="item.vaue">{{ item.label }}</el-select-option>
         @:</el-select>
         @:</el-form-item>
@@ -35,7 +35,7 @@ foreach (var column in Model.QueryWhetherList){
     }else if(@column.EffectType == "Select"){
          @:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
          @:<el-form-item label="@column.ColumnComment">
-         @:<el-select clearable v-model="queryParam.@(@column.ColumnName)" placeholder="请选择@(@column.ColumnComment)">
+         @:<el-select clearable v-model="queryParams.@(@column.ColumnName)" placeholder="请选择@(@column.ColumnComment)">
          @:<el-select-option v-for="(item,index) in getDictDataDropdownList('@(@column.DictTypeCode)')" :key="index" :value="item.code">{{ item.name }}</el-select-option>
          @:</el-select>
          @:</el-form-item>
@@ -43,24 +43,25 @@ foreach (var column in Model.QueryWhetherList){
     }else if(@column.EffectType == "DatePicker"){
         @:<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" >
         @:<el-form-item label="@column.ColumnComment">
-        @:<el-date-picker placeholder="请选择@(@column.ColumnComment)" v-model="queryParam.@(@column.ColumnName)Date" />
+        @:<el-date-picker placeholder="请选择@(@column.ColumnComment)" v-model="queryParams.@(@column.ColumnName)Date" />
         @:</el-form-item>
         @:</el-col>
-    }
-			@:<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" >
-             @: <span class="table-page-search-submitButtons">
-                @: <el-button icon="ele-Refresh" @@click="() => queryParam = {}"> 重置 </el-button>
-              @: <el-button type="primary" icon="ele-Search" @@click="handleQuery" v-auth="'@(@Model.ClassName):page'"> 查询 </el-button>
-				@:  <el-button icon="ele-Plus" @@click="openAdd@(@Model.ClassName)" v-auth="'@(@Model.ClassName):add'"> 新增 </el-button>  
-             @: </span>
-           @: </el-col>
-          @:</a-row>
-        @:</a-form>
-}
+			 }
+
+			 }
+			 @:<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" >
+				 @: <span class="table-page-search-submitButtons">
+					 @: <el-button icon="ele-Refresh" @@click="() => queryParams = {}"> 重置 </el-button>
+					 @: <el-button type="primary" icon="ele-Search" @@click="handleQuery" v-auth="'@(@Model.ClassName):page'"> 查询 </el-button>
+					 @:  <el-button icon="ele-Plus" @@click="openAdd@(@Model.ClassName)" v-auth="'@(@Model.ClassName):add'"> 新增 </el-button>
+					 @:</span>
+				 @:</el-col>
+			 @:</el-row>
+		 @:</el-form>
 }
       
-    </a-card>
-    <a-card :bordered="false">
+    </el-card>
+    <el-card :bordered="false">
 	<el-table 
 		:data="tableData" 
 		style="width: 100%" 
@@ -120,150 +121,150 @@ foreach (var column in Model.QueryWhetherList){
 		layout="total, sizes, prev, pager, next, jumper"
 	/>	 
 <editDialog ref="editDialogRef" :title="edit@(@Model.ClassName)Title"/>
-    </a-card>
+    </el-card>
   </div>
 </template>
 
 <script lang="ts">
 	import { ref, toRefs, reactive, onMounted, defineComponent, getCurrentInstance, onUnmounted } from 'vue';
-    import { ElMessageBox, ElMessage } from 'element-plus';
+	import { ElMessageBox, ElMessage } from 'element-plus';
 	import { auth } from '/@@/utils/authFunction';
 	import { formatDate } from '/@@/utils/formatTime';
-	
+
 	import editDialog from '/@@/views/main/@(@Model.ClassName)/component/editDialog.vue'
-	import { get@(@Model.ClassName)Page, delete@(@Model.ClassName) } from '/@@/api/main/@(@Model.ClassName)';
-@foreach (var column in Model.QueryWhetherList){
+	import { get@(@Model.ClassName)PageList, delete@(@Model.ClassName) } from '/@@/api/main/@(@Model.ClassName)';
+	@foreach (var column in Model.QueryWhetherList){
 	if(@column.EffectType == "fk"){
-  @:import { get@(@column.FkEntityName)Dropdown } from '/@@/api/main/@(@Model.ClassName)';		
+	@:import { get@(@column.FkEntityName)Dropdown } from '/@@/api/main/@(@Model.ClassName)';
 	}
-}
-@foreach (var column in Model.QueryWhetherList){
+	}
+	@foreach (var column in Model.QueryWhetherList){
 	if(@column.EffectType == "Select"){
-  @:import { getDictDataDropdown } from '/@@/api/system/admin';
-  break;
+	@:import { getDictDataDropdown } from '/@@/api/system/admin';
+	break;
+	}
 	}
-}	
 	export default defineComponent({
-	    name: '@(@Model.ClassName)',
-		components: { editDialog },
-		setup() {
-		    const { proxy } = getCurrentInstance() as any;
-			const editDialogRef = ref();
-			const state = reactive({
-			    loading: false,
-			    tableData: [] as any,
-			    queryParams: {} as any,
-			    tableParams: {
-				    page: 1,
-				    pageSize: 10,
-				    total: 0 as any,
-			    },
-			    edit@(@Model.ClassName)Title: '',
-		    });
-			
-			onMounted(async () => {
-			    handleQuery();
+	name: '@(@Model.ClassName)',
+	components: { editDialog },
+	setup() {
+	const { proxy } = getCurrentInstance() as any;
+	const editDialogRef = ref();
+	const state = reactive({
+	loading: false,
+	tableData: [] as any,
+	queryParams: {} as any,
+	tableParams: {
+	page: 1,
+	pageSize: 10,
+	total: 0 as any,
+	},
+	edit@(@Model.ClassName)Title: '',
+	});
+
+	onMounted(async () => {
+	handleQuery();
 
-			    proxy.mittBus.on('submitRefresh', () => {
-				    handleQuery();
-			    });
-		    });
-			
-		    onUnmounted(() => {
-			    proxy.mittBus.off('submitRefresh');
-		    });	
-			
-			// 查询操作
-		    const handleQuery = async () => {
-			    state.loading = true;
-			    var res = await get@(@Model.ClassName)Page(Object.assign(state.queryParams, state.tableParams));
-			    state.tableData = res.data.result?.items ?? [];
-			    state.tableParams.total = res.data.result?.total;
-			    state.loading = false;
-		    };
-			
-			// 打开新增页面
-		    const openAdd@(@Model.ClassName) = () => {
-			    state.edit@(@Model.ClassName)Title = '添加@(@Model.BusName)';
-			    editDialogRef.value.openDialog({});
-		    };
-			
-		    // 打开编辑页面
-		    const openEdit@(@Model.ClassName) = (row: any) => {
-			    state.edit@(@Model.ClassName)Title = '编辑@(@Model.BusName)';
-			    editDialogRef.value.openDialog(row);
-		    };
-			
-		    // 删除
-		    const del@(@Model.ClassName) = (row: any) => {
-			    ElMessageBox.confirm(`确定要删除吗?`, '提示', {
-				    confirmButtonText: '确定',
-				    cancelButtonText: '取消',
-				    type: 'warning',
-			    })
-				    .then(async () => {
-					    await delete@(@Model.ClassName)(row);
-					    handleQuery();
-					    ElMessage.success('删除成功');
-				    })
-				    .catch(() => {});
-		    };
-			
-		    // 改变页面容量
-		    const handleSizeChange = (val: number) => {
-			    state.tableParams.pageSize = val;
-			    handleQuery();
-		    };
-			
-		    // 改变页码序号
-		    const handleCurrentChange = (val: number) => {
-			    state.tableParams.page = val;
-			    handleQuery();
-		    };
-			
-@foreach (var column in Model.QueryWhetherList){
+	proxy.mittBus.on('submitRefresh', () => {
+	handleQuery();
+	});
+	});
+
+	onUnmounted(() => {
+	proxy.mittBus.off('submitRefresh');
+	});
+
+	// 查询操作
+	const handleQuery = async () => {
+	state.loading = true;
+	var res = await get@(@Model.ClassName)PageList(Object.assign(state.queryParams, state.tableParams));
+	state.tableData = res.data.result?.items ?? [];
+	state.tableParams.total = res.data.result?.total;
+	state.loading = false;
+	};
+
+	// 打开新增页面
+	const openAdd@(@Model.ClassName) = () => {
+	state.edit@(@Model.ClassName)Title = '添加@(@Model.BusName)';
+	editDialogRef.value.openDialog({});
+	};
+
+	// 打开编辑页面
+	const openEdit@(@Model.ClassName) = (row: any) => {
+	state.edit@(@Model.ClassName)Title = '编辑@(@Model.BusName)';
+	editDialogRef.value.openDialog(row);
+	};
+
+	// 删除
+	const del@(@Model.ClassName) = (row: any) => {
+	ElMessageBox.confirm(`确定要删除吗?`, '提示', {
+	confirmButtonText: '确定',
+	cancelButtonText: '取消',
+	type: 'warning',
+	})
+	.then(async () => {
+	await delete@(@Model.ClassName)(row);
+	handleQuery();
+	ElMessage.success('删除成功');
+	})
+	.catch(() => {});
+	};
+
+	// 改变页面容量
+	const handleSizeChange = (val: number) => {
+	state.tableParams.pageSize = val;
+	handleQuery();
+	};
+
+	// 改变页码序号
+	const handleCurrentChange = (val: number) => {
+	state.tableParams.page = val;
+	handleQuery();
+	};
+
+	@foreach (var column in Model.QueryWhetherList){
 	if(@column.EffectType == "fk"){
-			@:const get@(@column.FkEntityName)DropdownList = await () => {
-				@:let list = await get@(@column.FkEntityName)Dropdown();
-			    @:return list.data.result ?? [];
-		    @:};
-			break;
+	@:const get@(@column.FkEntityName)DropdownList = await () => {
+	@:let list = await get@(@column.FkEntityName)Dropdown();
+	@:return list.data.result ?? [];
+	@:};
+	break;
+	}
 	}
-}
 
-@foreach (var column in Model.QueryWhetherList){
+	@foreach (var column in Model.QueryWhetherList){
 	if(@column.EffectType == "Select"){
-			@:const getDictDataDropdownList = await (val: any) => {
-				@:let list = await getDictDataDropdownList(val);
-			    @:return list.data.result ?? [];
-		    @:};
-			break;
+	@:const getDictDataDropdownList = await (val: any) => {
+	@:let list = await getDictDataDropdownList(val);
+	@:return list.data.result ?? [];
+	@:};
+	break;
 	}
-}
-            return {
-			    handleQuery,
-			    editDialogRef,
-			    openAdd@(@Model.ClassName),
-			    openEdit@(@Model.ClassName),
-			    del@(@Model.ClassName),
-			    handleSizeChange,
-			    handleCurrentChange,
-			    formatDate,
-@foreach (var column in Model.QueryWhetherList){
+	}
+	return {
+	handleQuery,
+	editDialogRef,
+	openAdd@(@Model.ClassName),
+	openEdit@(@Model.ClassName),
+	del@(@Model.ClassName),
+	handleSizeChange,
+	handleCurrentChange,
+	formatDate,
+	@foreach (var column in Model.QueryWhetherList){
 	if(@column.EffectType == "fk"){
-			@:get@(@column.FkEntityName)DropdownList,
-			break;
+	@:get@(@column.FkEntityName)DropdownList,
+	break;
 	}
-}
-@foreach (var column in Model.QueryWhetherList){
+	}
+	@foreach (var column in Model.QueryWhetherList){
 	if(@column.EffectType == "Select"){
-			@:getDictDataDropdownList,
-			break;
+	@:getDictDataDropdownList,
+	break;
+	}
+	}
+	auth,
+	...toRefs(state),
+	};
 	}
-}				
-			    auth,
-			    ...toRefs(state),
-		   };
-		}
 	})
 </script>

Web/src/views/main/generatetest/component/editDialog.vue

@@ -1,121 +0,0 @@
-<template>
-	<div class="generatetest-container">
-		<el-dialog
-		v-model="isShowDialog"
-		:title="title"
-		:width="700"
-		draggable>
-			<el-form :model="ruleForm" ref="ruleFormRef" size="default" label-width="100px" :rules="rules">
-				<el-row :gutter="35">
-					<el-form-item v-show="false"><el-input v-model="ruleForm.Id" /></el-form-item>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="编码">
-							<el-input v-model="ruleForm.Code" placeholder="ruleForm.Code" clearable/>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="名称">
-							<el-input v-model="ruleForm.Name" placeholder="ruleForm.Name" clearable/>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="价格">
-							<el-input v-model="ruleForm.Price" placeholder="ruleForm.Price" clearable/>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="过期日期">
-							<el-date-picker v-model="ruleForm.ExpireDate" type="datetime" placeholder="过期日期"  />
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="状态">
-							<el-switch v-model="ruleForm.Status" active-text="是" inactive-text="否" />
-						</el-form-item>
-					</el-col>
-						</el-row>
-					</el-form>
-					<template #footer>
-						<span class="dialog-footer">
-							<el-button @click="cancel" size="default">取 消</el-button>
-							<el-button type="primary" @click="submit" size="default">确 定</el-button>
-						</span>
-					</template>
-		</el-dialog>	
-	</div>
-</template>
-
-<script lang="ts">
-	import { ref, toRefs, reactive, onMounted, defineComponent, getCurrentInstance, onUnmounted } from 'vue';
-	import { ElMessageBox, ElMessage } from 'element-plus';
-	import { auth } from '/@/utils/authFunction';
-	import { formatDate } from '/@/utils/formatTime';
-	import type { FormInstance, FormRules } from 'element-plus'
-
-
-	export default defineComponent({
-	name: 'editgeneratetest',
-	props: {
-	title: {
-	type: String,
-	default: '',
-	},
-	},
-	setup() {
-	const { proxy } = getCurrentInstance() as any;
-	const ruleFormRef = ref();
-	const state = reactive({
-	isShowDialog: false,
-	ruleForm: {} as any,
-	});
-
-	const rules = reactive<FormRules>({
-			Code: [{required: true, message: '请输入编码！', trigger: 'blur',},],
-			Name: [{required: true, message: '请输入名称！', trigger: 'blur',},],
-	});
-
-	// 打开弹窗
-	const openDialog = (row: any) => {
-	state.ruleForm = row;
-	state.isShowDialog = true;
-	};
-
-	// 关闭弹窗
-	const closeDialog = () => {
-	proxy.mittBus.emit('submitRefresh');
-	state.isShowDialog = false;
-	};
-
-	// 取消
-	const cancel = () => {
-	state.isShowDialog = false;
-	};
-
-	// 提交
-	const submit = () => {
-	ruleFormRef.value.validate(async (valid: boolean) => {
-	if (!valid) return;
-	if (state.ruleForm.id != undefined && state.ruleForm.id > 0) {
-	await updategeneratetest(values);
-	} else {
-	await addgeneratetest(state.ruleForm);
-	}
-	closeDialog();
-	});
-	};
-
-
-	return {
-	ruleFormRef,
-	openDialog,
-	closeDialog,
-	cancel,
-	submit,
-	...toRefs(state),
-	rules,
-	};
-	}
-	})
-
-	}
-</script>

Web/src/views/main/generatetest/index.vue

@@ -1,180 +0,0 @@
-<template>
-  <div class="generatetest-container">
-    <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
-		          
-     <el-form :model="queryParams" ref="queryForm" :inline="true">
-		 <a-row>
-       <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
-       <el-form-item label="编码">
-       <el-input v-model="queryParam.Code" clearable placeholder="请输入编码"/>
-       </el-form-item>
-       </el-col>
-			<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" >
-              <span class="table-page-search-submitButtons">
-                 <el-button icon="ele-Refresh" @click="() => queryParam = {}"> 重置 </el-button>
-               <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'generatetest:page'"> 查询 </el-button>
-				  <el-button icon="ele-Plus" @click="openAddgeneratetest" v-auth="'generatetest:add'"> 新增 </el-button>  
-              </span>
-            </el-col>
-          </a-row>
-        </a-form>
-       <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" >
-       <el-form-item label="名称">
-       <el-input v-model="queryParam.Name" clearable placeholder="请输入名称"/>
-       </el-form-item>
-       </el-col>
-			<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" >
-              <span class="table-page-search-submitButtons">
-                 <el-button icon="ele-Refresh" @click="() => queryParam = {}"> 重置 </el-button>
-               <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'generatetest:page'"> 查询 </el-button>
-				  <el-button icon="ele-Plus" @click="openAddgeneratetest" v-auth="'generatetest:add'"> 新增 </el-button>  
-              </span>
-            </el-col>
-          </a-row>
-        </a-form>
-      
-    </a-card>
-    <a-card :bordered="false">
-	<el-table 
-		:data="tableData" 
-		style="width: 100%" 
-		v-loading="loading" 
-		tooltip-effect="light"
-		row-key="id"
-		border>
-		<el-table-column type="index" label="序号" width="55" align="center" fixed />
-				     <el-table-column prop="Code" label="编码" fixed show-overflow-tooltip />
-				     <el-table-column prop="Name" label="名称" fixed show-overflow-tooltip />
-				     <el-table-column prop="Price" label="价格" fixed show-overflow-tooltip />
-				     <el-table-column prop="ExpireDate" label="过期日期" fixed show-overflow-tooltip />
-				  <el-table-column prop="Status" label="状态" fixed show-overflow-tooltip>
-					    <template #default="scope">
-								<el-tag v-if="scope.row.status"> 是 </el-tag>
-								<el-tag type="danger" v-else> 否 </el-tag>
-					    </template>
-					</el-table-column>
-			           <el-table-column label="操作" width="110" align="center" fixed="right" show-overflow-tooltip v-if="auth('generatetest:edit') || auth('generatetest:delete')">
-							<template #default="scope">
-								<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditgeneratetest(scope.row)" v-auth="'generatetest:update'"> 编辑 </el-button>
-								<el-button icon="ele-Edit" size="small" text type="primary" @click="delgeneratetest(scope.row)" v-auth="'generatetest:delete'"> 删除 </el-button>								
-							</template>
-		</el-table-column>
-	</el-table>
-	<el-pagination
-		v-model:currentPage="tableParams.page"
-		v-model:page-size="tableParams.pageSize"
-		:total="tableParams.total"
-		:page-sizes="[10, 20, 50, 100]"
-		small
-		background
-		@size-change="handleSizeChange"
-		@current-change="handleCurrentChange"
-		layout="total, sizes, prev, pager, next, jumper"
-	/>	 
-<editDialog ref="editDialogRef" :title="editgeneratetestTitle"/>
-    </a-card>
-  </div>
-</template>
-
-<script lang="ts">
-	import { ref, toRefs, reactive, onMounted, defineComponent, getCurrentInstance, onUnmounted } from 'vue';
-    import { ElMessageBox, ElMessage } from 'element-plus';
-	import { auth } from '/@/utils/authFunction';
-	import { formatDate } from '/@/utils/formatTime';
-	
-	import editDialog from '/@/views/main/generatetest/component/editDialog.vue'
-	import { getgeneratetestPage, deletegeneratetest } from '/@/api/main/generatetest';
-	export default defineComponent({
-	    name: 'generatetest',
-		components: { editDialog },
-		setup() {
-		    const { proxy } = getCurrentInstance() as any;
-			const editDialogRef = ref();
-			const state = reactive({
-			    loading: false,
-			    tableData: [] as any,
-			    queryParams: {} as any,
-			    tableParams: {
-				    page: 1,
-				    pageSize: 10,
-				    total: 0 as any,
-			    },
-			    editgeneratetestTitle: '',
-		    });
-			
-			onMounted(async () => {
-			    handleQuery();
-
-			    proxy.mittBus.on('submitRefresh', () => {
-				    handleQuery();
-			    });
-		    });
-			
-		    onUnmounted(() => {
-			    proxy.mittBus.off('submitRefresh');
-		    });	
-			
-			// 查询操作
-		    const handleQuery = async () => {
-			    state.loading = true;
-			    var res = await getgeneratetestPage(Object.assign(state.queryParams, state.tableParams));
-			    state.tableData = res.data.result?.items ?? [];
-			    state.tableParams.total = res.data.result?.total;
-			    state.loading = false;
-		    };
-			
-			// 打开新增页面
-		    const openAddgeneratetest = () => {
-			    state.editgeneratetestTitle = '添加GenerateTest';
-			    editDialogRef.value.openDialog({});
-		    };
-			
-		    // 打开编辑页面
-		    const openEditgeneratetest = (row: any) => {
-			    state.editgeneratetestTitle = '编辑GenerateTest';
-			    editDialogRef.value.openDialog(row);
-		    };
-			
-		    // 删除
-		    const delgeneratetest = (row: any) => {
-			    ElMessageBox.confirm(`确定要删除吗?`, '提示', {
-				    confirmButtonText: '确定',
-				    cancelButtonText: '取消',
-				    type: 'warning',
-			    })
-				    .then(async () => {
-					    await deletegeneratetest(row);
-					    handleQuery();
-					    ElMessage.success('删除成功');
-				    })
-				    .catch(() => {});
-		    };
-			
-		    // 改变页面容量
-		    const handleSizeChange = (val: number) => {
-			    state.tableParams.pageSize = val;
-			    handleQuery();
-		    };
-			
-		    // 改变页码序号
-		    const handleCurrentChange = (val: number) => {
-			    state.tableParams.page = val;
-			    handleQuery();
-		    };
-			
-
-            return {
-			    handleQuery,
-			    editDialogRef,
-			    openAddgeneratetest,
-			    openEditgeneratetest,
-			    delgeneratetest,
-			    handleSizeChange,
-			    handleCurrentChange,
-			    formatDate,
-			    auth,
-			    ...toRefs(state),
-		   };
-		}
-	})
-</script>