From a3d0a2b403dd0cc3b1611a05292c06c1364538ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Fri, 24 Dec 2021 14:14:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CodeGenTemplate/TplControllers.txt | 2 ++
.../wwwroot/CodeGenTemplate/TplVue.txt | 23 ++++++-------------
ZR.CodeGenerator/CodeGenerateTemplate.cs | 14 +++++------
ZR.Vue/src/assets/icons/svg/timing.svg | 1 -
ZR.Vue/src/assets/icons/svg/user1.svg | 1 -
ZR.Vue/src/views/tool/file/index.vue | 2 +-
6 files changed, 17 insertions(+), 26 deletions(-)
delete mode 100644 ZR.Vue/src/assets/icons/svg/timing.svg
delete mode 100644 ZR.Vue/src/assets/icons/svg/user1.svg
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
index 3314bc2..03b1ebc 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
@@ -160,6 +160,7 @@ ${end}
return ToResponse(response);
}
+$if(replaceDto.ShowBtnExport)
///
/// ${genTable.FunctionName}导出
///
@@ -174,5 +175,6 @@ ${end}
string sFileName = ExportExcel(list, "${replaceDto.ModelTypeName}", "${genTable.FunctionName}");
return SUCCESS(new { path = "/export/" + sFileName, fileName = sFileName });
}
+$end
}
}
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index 534bb82..60d5550 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -69,7 +69,9 @@ import {
del${genTable.BusinessName},
update${genTable.BusinessName},
get${genTable.BusinessName},
+$if(replaceDto.ShowBtnExport)
export${genTable.BusinessName},
+$end
$if(genTable.SortField != "" && genTable.SortField != null)
changeSort
$end
@@ -121,6 +123,9 @@ $if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "
$elseif(item.HtmlType == "datetime" && item.IsQuery == true)
//${item.ColumnComment}时间范围
dateRange${item.CsharpField}: [],
+$elseif(item.HtmlType == "customInput")
+ editIndex = -1; //不加editIndex,整个列都会一块变成可编辑
+ showEditSort = false;
$end
$end
$if(genTable.SortField != "" && genTable.SortField != null)
@@ -268,22 +273,6 @@ $end
}
});
},
-$if(genTable.SortField != "" && genTable.SortField != null)
- // 显示编辑排序
- handleShowSort() {
- this.showEditSort = !this.showEditSort;
- },
- // 保存排序
- handleChangeSort(item, orderNum) {
- changeSort({ orderNum: orderNum, id: item.${replaceDto.FistLowerPk} }).then(
- (response) => {
- this.msgSuccess("修改成功");
- this.getList();
- this.showEditSort = false;
- }
- );
- },
-$end
$if(replaceDto.UploadFile == 1)
//图片上传成功方法
handleUploadSuccess(column, filelist) {
@@ -333,6 +322,7 @@ $end
}
});
},
+$if(replaceDto.ShowBtnExport)
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
@@ -348,6 +338,7 @@ $end
this.download(response.data.path);
});
},
+$end
},
};
\ No newline at end of file
diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs
index 1425d04..f5389e8 100644
--- a/ZR.CodeGenerator/CodeGenerateTemplate.cs
+++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs
@@ -231,9 +231,11 @@ namespace ZR.CodeGenerator
}
else if (dbFieldInfo.IsList && dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD))
{
- sb.AppendLine($" ");
+ sb.AppendLine($" ");
sb.AppendLine(" ");
- sb.AppendLine($" ");
+ sb.AppendLine($" ");
+ sb.AppendLine("
");
+ sb.AppendLine(" ");
sb.AppendLine(" ");
sb.AppendLine(" ");
}
@@ -241,14 +243,12 @@ namespace ZR.CodeGenerator
{
sb.AppendLine($@" ");
sb.AppendLine(@" ");
+ string checkboxHtml = string.Empty;
if (dbFieldInfo.HtmlType == GenConstants.HTML_CHECKBOX)
{
- sb.AppendLine($@" ");
- }
- else
- {
- sb.AppendLine($@" ");
+ checkboxHtml = $" ? scope.row.{columnName}.split(',') : []";
}
+ sb.AppendLine($" ");
sb.AppendLine(@" ");
sb.AppendLine(@" ");
}
diff --git a/ZR.Vue/src/assets/icons/svg/timing.svg b/ZR.Vue/src/assets/icons/svg/timing.svg
deleted file mode 100644
index f8fdc6d..0000000
--- a/ZR.Vue/src/assets/icons/svg/timing.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/ZR.Vue/src/assets/icons/svg/user1.svg b/ZR.Vue/src/assets/icons/svg/user1.svg
deleted file mode 100644
index 14ca51e..0000000
--- a/ZR.Vue/src/assets/icons/svg/user1.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/ZR.Vue/src/views/tool/file/index.vue b/ZR.Vue/src/views/tool/file/index.vue
index a8339da..1086ce5 100644
--- a/ZR.Vue/src/views/tool/file/index.vue
+++ b/ZR.Vue/src/views/tool/file/index.vue
@@ -138,7 +138,7 @@
{{formView.create_by}}
- {{formView.fileUrl}}
+ {{formView.fileUrl}}
{{formView.accessUrl}}