From 8f8e796c777577dcef888b94603ed93bebcc1ee6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 06 十二月 2021 14:36:38 +0800
Subject: [PATCH] update tlog 1.3.4 => 1.3.5 启用 tlog 自动配置
---
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 56 +++++++++++++++++++++++++-------------------------------
1 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index 7e67021..c0a5bf7 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -11,7 +11,7 @@
#else
#set($comment=$column.columnComment)
#end
-#if($column.htmlType == "input")
+#if($column.htmlType == "input" || $column.htmlType == "textarea")
<el-form-item label="${comment}" prop="${column.javaField}">
<el-input
v-model="queryParams.${column.javaField}"
@@ -108,7 +108,6 @@
plain
icon="el-icon-download"
size="mini"
- :loading="exportLoading"
@click="handleExport"
v-hasPermi="['${moduleName}:${businessName}:export']"
>瀵煎嚭</el-button>
@@ -137,7 +136,11 @@
#elseif($column.list && $column.dictType && "" != $column.dictType)
<el-table-column label="${comment}" align="center" prop="${javaField}">
<template slot-scope="scope">
+#if($column.htmlType == "checkbox")
+ <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+#else
<dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
+#end
</template>
</el-table-column>
#elseif($column.list && "" != $javaField)
@@ -163,7 +166,7 @@
</template>
</el-table-column>
</el-table>
-
+
<pagination
v-show="total>0"
:total="total"
@@ -324,8 +327,6 @@
buttonLoading: false,
// 閬僵灞�
loading: true,
- // 瀵煎嚭閬僵灞�
- exportLoading: false,
// 閫変腑鏁扮粍
ids: [],
#if($table.sub)
@@ -363,8 +364,7 @@
pageSize: 10,
#foreach ($column in $columns)
#if($column.query)
- $column.javaField: undefined#if($velocityCount != $columns.size()),#end
-
+ $column.javaField: undefined#if($foreach.count != $columns.size()),#end
#end
#end
},
@@ -382,8 +382,7 @@
#end
$column.javaField: [
{ required: true, message: "$comment涓嶈兘涓虹┖", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
- ]#if($velocityCount != $columns.size()),#end
-
+ ]#if($foreach.count != $columns.size()),#end
#end
#end
}
@@ -427,14 +426,11 @@
this.form = {
#foreach ($column in $columns)
#if($column.htmlType == "radio")
- $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($velocityCount != $columns.size()),#end
-
+ $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
#elseif($column.htmlType == "checkbox")
- $column.javaField: []#if($velocityCount != $columns.size()),#end
-
+ $column.javaField: []#if($foreach.count != $columns.size()),#end
#else
- $column.javaField: undefined#if($velocityCount != $columns.size()),#end
-
+ $column.javaField: undefined#if($foreach.count != $columns.size()),#end
#end
#end
};
@@ -506,7 +502,7 @@
#end
if (this.form.${pkColumn.javaField} != null) {
update${BusinessName}(this.form).then(response => {
- this.msgSuccess("淇敼鎴愬姛");
+ this.#[[$modal]]#.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
}).finally(() => {
@@ -514,7 +510,7 @@
});
} else {
add${BusinessName}(this.form).then(response => {
- this.msgSuccess("鏂板鎴愬姛");
+ this.#[[$modal]]#.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
}).finally(() => {
@@ -527,19 +523,15 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;
- this.$confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + ${pkColumn.javaField}s + '"鐨勬暟鎹」?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- this.loading = true;
- return del${BusinessName}(${pkColumn.javaField}s);
- }).then(() => {
- this.loading = false;
- this.getList();
- this.msgSuccess("鍒犻櫎鎴愬姛");
+ this.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + ${pkColumn.javaField}s + '"鐨勬暟鎹」锛�').then(() => {
+ this.loading = true;
+ return del${BusinessName}(${pkColumn.javaField}s);
+ }).then(() => {
+ this.loading = false;
+ this.getList();
+ this.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛");
}).finally(() => {
- this.loading = false;
+ this.loading = false;
});
},
#if($table.sub)
@@ -561,7 +553,7 @@
/** ${subTable.functionName}鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete${subClassName}() {
if (this.checked${subClassName}.length == 0) {
- this.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑${subTable.functionName}鏁版嵁");
+ this.#[[$modal]]#.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑${subTable.functionName}鏁版嵁");
} else {
const ${subclassName}List = this.${subclassName}List;
const checked${subClassName} = this.checked${subClassName};
@@ -577,7 +569,9 @@
#end
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.downLoadExcel('/${moduleName}/${businessName}/export', this.queryParams);
+ this.download('${moduleName}/${businessName}/export', {
+ ...this.queryParams
+ }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
}
}
};
--
Gitblit v1.9.3