Merge branch 'next' of gitee.com:KaneLeung/Admin.NET into next

Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm

@@ -23,9 +23,11 @@ namespace @Model.NameSpace;
 /// @(@Model.BusName)服务
 /// </summary>
 [ApiDescriptionSettings(@(@Model.ProjectLastName)Const.GroupName, Order = 100)]
+[DisplayName("@(@Model.BusName)服务")]
 public class @(@Model.ClassName)Service : IDynamicApiController, ITransient
 {
     private SqlSugarRepository<@(@Model.ClassName)> @(@Model.LowerClassName)Rep = null;
+
     public @(@Model.ClassName)Service()
     {
     }
@@ -44,8 +46,8 @@ public class @(@Model.ClassName)Service : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    [HttpPost]
-    [ApiDescriptionSettings(Name = "Page")]
+    [ApiDescriptionSettings(Name = "Page"), HttpPost]
+    [DisplayName("分页查询@(@Model.BusName)")]
     public async Task<SqlSugarPagedList<@(@Model.ClassName)Output>> Page(@(@Model.ClassName)Input input)
     {
 @if (haveLikeCdt) {
@@ -126,8 +128,8 @@ if (@column.QueryWhether == "Y"){
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    [HttpPost]
-    [ApiDescriptionSettings(Name = "Add")]
+    [ApiDescriptionSettings(Name = "Add"), HttpPost]
+    [DisplayName("增加@(@Model.BusName)")]
     public async Task<long> Add(Add@(@Model.ClassName)Input input)
     {
         var entity = input.Adapt<@(@Model.ClassName)>();
@@ -140,8 +142,8 @@ if (@column.QueryWhether == "Y"){
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    [HttpPost]
-    [ApiDescriptionSettings(Name = "Delete")]
+    [ApiDescriptionSettings(Name = "Delete"), HttpPost]
+    [DisplayName("删除@(@Model.BusName)")]
     public async Task Delete(Delete@(@Model.ClassName)Input input)
     {
 @foreach (var column in Model.TableField){
@@ -158,8 +160,8 @@ if (@column.ColumnKey == "True"){
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    [HttpPost]
-    [ApiDescriptionSettings(Name = "Update")]
+    [ApiDescriptionSettings(Name = "Update"), HttpPost]
+    [DisplayName("更新@(@Model.BusName)")]
     public async Task Update(Update@(@Model.ClassName)Input input)
     {
         var entity = input.Adapt<@(@Model.ClassName)>();
@@ -171,8 +173,8 @@ if (@column.ColumnKey == "True"){
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    [HttpGet]
-    [ApiDescriptionSettings(Name = "Detail")]
+    [ApiDescriptionSettings(Name = "Detail"), HttpGet]
+    [DisplayName("获取@(@Model.BusName)")]
     public async Task<@(@Model.ClassName)> Detail([FromQuery] QueryById@(@Model.ClassName)Input input)
     {
 @foreach (var column in Model.TableField){
@@ -187,8 +189,8 @@ if (@column.ColumnKey == "True"){
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    [HttpGet]
-    [ApiDescriptionSettings(Name = "List")]
+    [ApiDescriptionSettings(Name = "List"), HttpGet]
+    [DisplayName("获取@(@Model.BusName)列表")]
     public async Task<List<@(@Model.ClassName)Output>> List([FromQuery] @(@Model.ClassName)Input input)
     {
         return await @(@Model.ClassName)Rep.AsQueryable().Select<@(@Model.ClassName)Output>().ToListAsync();
@@ -202,6 +204,7 @@ if(@column.EffectType == "fk" && (@column.WhetherAddUpdate == "Y" || column.Quer
     @:/// <param name="input"></param>
     @:/// <returns></returns>
     @:[ApiDescriptionSettings(Name = "@(@column.FkEntityName)@(@column.PropertyName)Dropdown"), HttpGet]
+    @:[DisplayName("获取@(@column.ColumnComment)列表")]
     @:public async Task<dynamic> @(@column.FkEntityName)@(@column.PropertyName)Dropdown()
     @:{
         @:return await @(@Model.ClassName)Rep.Context.Queryable<@(@column.FkEntityName)>()
@@ -223,6 +226,7 @@ if(@column.EffectType == "Upload"){
     @:/// <param name="file"></param>
     @:/// <returns></returns>
     @:[ApiDescriptionSettings(Name = "Upload@(@column.PropertyName)"), HttpPost]
+    @:[DisplayName("上传@(@column.ColumnComment)")]
     @:public async Task<SysFile> Upload@(@column.PropertyName)([Required] IFormFile file)
     @:{
             @:var service = App.GetRequiredService<SysFileService>();

Web/src/views/approvalFlow/component/detailDialog.vue

@@ -1,9 +1,9 @@
 <template lang="">
 	<div class="flow-container">
-		<el-dialog v-model="state.isShowDialog" :width="800" draggable="" :close-on-click-modal="false">
+		<el-dialog v-model="state.isShowDialog" :width="800" draggable :close-on-click-modal="false">
 			<template #header>
 				<div style="color: #fff">
-					<!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->
+					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span>{{ props.title }}</span>
 				</div>
 			</template>
@@ -19,7 +19,7 @@
 					:timestamp="activity.timestamp"
 					placement="top"
 				>
-					<el-card>
+					<el-card shadow="hover">
 						<h4>{{ activity.content }}</h4>
 						<br />
 						<div class="demo-type">
@@ -28,11 +28,11 @@
 					</el-card>
 				</el-timeline-item>
 			</el-timeline>
-			<template #footer>
+			<!-- <template #footer>
 				<span class="dialog-footer">
 					<el-button @click="cancel">取 消</el-button>
 				</span>
-			</template>
+			</template> -->
 		</el-dialog>
 	</div>
 </template>

Web/src/views/approvalFlow/component/editDialog.vue

@@ -1,9 +1,9 @@
 <template>
 	<div class="labApprovalFlow-container">
-		<el-dialog v-model="state.isShowDialog" :width="800" draggable="">
+		<el-dialog v-model="state.isShowDialog" :width="800" draggable>
 			<template #header>
 				<div style="color: #fff">
-					<!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->
+					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span>{{ props.title }}</span>
 				</div>
 			</template>

Web/src/views/approvalFlow/component/editFormDialog.vue

@@ -1,16 +1,16 @@
 <template lang="">
 	<div class="flow-container">
-		<el-dialog v-model="state.isShowDialog" :width="800" draggable="" :close-on-click-modal="false">
+		<el-dialog v-model="state.isShowDialog" :width="800" draggable :close-on-click-modal="false">
 			<template #header>
 				<div style="color: #fff">
-					<!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->
+					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span>{{ props.title }}</span>
 				</div>
 			</template>
 			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="库定位器" prop="configId">
+						<el-form-item label="库定位器" prop="configId" :rules="[{ required: true, message: '库定位器不能为空', trigger: 'blur' }]">
 							<el-select v-model="state.ruleForm.configId" placeholder="库名" filterable @change="dbChanged()" class="w100">
 								<el-option v-for="item in state.dbData" :key="item.configId" :label="item.configId" :value="item.configId" />
 							</el-select>
@@ -18,15 +18,15 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="表定位器" prop="tableName" :rules="[{ required: true, message: '表定位器不能为空', trigger: 'blur' }]">
-							<el-select v-model="state.ruleForm.tableName" @change="tableChanged" value-key="value" filterable clearable class="w100">
-								<el-option v-for="item in state.tableData" :key="item.name" :label="item.name + ' [ ' + item.description + ' ]'" :value="item" />
+							<el-select v-model="state.ruleForm.tableName" value-key="value" filterable clearable class="w100">
+								<el-option v-for="item in state.tableData" :key="item.name" :label="item.name + ' [ ' + item.description + ' ]'" :value="item.name" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="操作" prop="typeName" :rules="[{ required: true, message: '操作不能为空', trigger: 'blur' }]">
-							<el-select v-model="state.ruleForm.typeName" @change="typeChanged" value-key="value" filterable clearable class="w100">
-								<el-option v-for="item in state.typeData" :key="item.name" :label="item.name + ' [ ' + item.description + ' ]'" :value="item" />
+							<el-select v-model="state.ruleForm.typeName" value-key="value" filterable clearable class="w100">
+								<el-option v-for="item in state.typeData" :key="item.name" :label="item.name + ' ( ' + item.value + ' )' + ' [ ' + item.description + ' ]'" :value="item.value" />
 							</el-select>
 						</el-form-item>
 					</el-col>
@@ -71,27 +71,27 @@ const state = reactive({
 	tableData: [] as Array<DbTableInfo>,
 	typeData: [
 		{
-			name: 'add',
+			name: 'Add',
 			value: 'add',
 			description: '新增',
 		},
 		{
-			name: 'update',
+			name: 'Update',
 			value: 'update',
 			description: '更新',
 		},
 		{
-			name: 'delete',
+			name: 'Delete',
 			value: 'delete',
 			description: '删除',
 		},
 		{
-			name: 'select',
+			name: 'Select',
 			value: 'select',
 			description: '查询',
 		},
 		{
-			name: 'export',
+			name: 'Export',
 			value: 'export',
 			description: '导出',
 		},
@@ -109,6 +109,8 @@ const openDialog = (row: ApprovalFlowOutput) => {
 	state.ruleSource = row as UpdateApprovalFlowInput;
 	state.ruleForm = row.formJson ? JSON.parse(row.formJson) : {};
 	state.isShowDialog = true;
+
+	dbChanged();
 };
 
 const closeDialog = () => {
@@ -120,8 +122,9 @@ const cancel = () => {
 	state.isShowDialog = false;
 };
 
-const submit = () => {
+const submit = async () => {
 	state.ruleSource.formJson = JSON.stringify(state.ruleForm);
+	await getAPI(ApprovalFlowApi).apiApprovalFlowUpdatePost(state.ruleSource);
 	closeDialog();
 };
 
@@ -133,16 +136,6 @@ const dbChanged = async () => {
 	state.tableData = res.data.result ?? [];
 };
 
-// table改变
-const tableChanged = (item: any) => {
-	state.ruleForm.tableName = item.name;
-};
-
-// type改变
-const typeChanged = (item: any) => {
-	state.ruleForm.typeName = item.name;
-};
-
 defineExpose({ openDialog });
 </script>