From 7d1c53f92738166c1ced1a796e2bc95d26d35fa0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 18 一月 2023 11:59:32 +0800
Subject: [PATCH] update 优化 修改 oss 配置页面开关说明 避免造成误解
---
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 137 +++++++++------------------------------------
1 files changed, 29 insertions(+), 108 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 02fe3ed..9f0131b 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
#foreach($column in $columns)
#if($column.query)
#set($dictType=$column.dictType)
@@ -17,13 +17,12 @@
v-model="queryParams.${column.javaField}"
placeholder="璇疯緭鍏�${comment}"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
<el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable size="small">
+ <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
<el-option
v-for="dict in dict.type.${dictType}"
:key="dict.value"
@@ -34,24 +33,23 @@
</el-form-item>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
<el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable size="small">
+ <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
<el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
</el-select>
</el-form-item>
#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
<el-form-item label="${comment}" prop="${column.javaField}">
- <el-date-picker clearable size="small"
+ <el-date-picker clearable
v-model="queryParams.${column.javaField}"
type="date"
value-format="yyyy-MM-dd"
- placeholder="閫夋嫨${comment}">
+ placeholder="璇烽�夋嫨${comment}">
</el-date-picker>
</el-form-item>
#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
<el-form-item label="${comment}">
<el-date-picker
v-model="daterange${AttrName}"
- size="small"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
@@ -135,9 +133,9 @@
</el-table-column>
#elseif($column.list && $column.htmlType == "imageUpload")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
- <template slot-scope="scope">
- <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
- </template>
+ <template slot-scope="scope">
+ <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+ </template>
</el-table-column>
#elseif($column.list && $column.dictType && "" != $column.dictType)
<el-table-column label="${comment}" align="center" prop="${javaField}">
@@ -199,11 +197,11 @@
<el-input v-model="form.${field}" placeholder="璇疯緭鍏�${comment}" />
</el-form-item>
#elseif($column.htmlType == "imageUpload")
- <el-form-item label="${comment}">
+ <el-form-item label="${comment}" prop="${field}">
<image-upload v-model="form.${field}"/>
</el-form-item>
#elseif($column.htmlType == "fileUpload")
- <el-form-item label="${comment}">
+ <el-form-item label="${comment}" prop="${field}">
<file-upload v-model="form.${field}"/>
</el-form-item>
#elseif($column.htmlType == "editor")
@@ -217,8 +215,11 @@
v-for="dict in dict.type.${dictType}"
:key="dict.value"
:label="dict.label"
- #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
-
+#if($column.javaType == "Integer" || $column.javaType == "Long")
+ :value="parseInt(dict.value)"
+#else
+ :value="dict.value"
+#end
></el-option>
</el-select>
</el-form-item>
@@ -229,7 +230,7 @@
</el-select>
</el-form-item>
#elseif($column.htmlType == "checkbox" && "" != $dictType)
- <el-form-item label="${comment}">
+ <el-form-item label="${comment}" prop="${field}">
<el-checkbox-group v-model="form.${field}">
<el-checkbox
v-for="dict in dict.type.${dictType}"
@@ -240,35 +241,38 @@
</el-checkbox-group>
</el-form-item>
#elseif($column.htmlType == "checkbox" && $dictType)
- <el-form-item label="${comment}">
+ <el-form-item label="${comment}" prop="${field}">
<el-checkbox-group v-model="form.${field}">
<el-checkbox>璇烽�夋嫨瀛楀吀鐢熸垚</el-checkbox>
</el-checkbox-group>
</el-form-item>
#elseif($column.htmlType == "radio" && "" != $dictType)
- <el-form-item label="${comment}">
+ <el-form-item label="${comment}" prop="${field}">
<el-radio-group v-model="form.${field}">
<el-radio
v-for="dict in dict.type.${dictType}"
:key="dict.value"
- #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
-
+#if($column.javaType == "Integer" || $column.javaType == "Long")
+ :label="parseInt(dict.value)"
+#else
+ :label="dict.value"
+#end
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
#elseif($column.htmlType == "radio" && $dictType)
- <el-form-item label="${comment}">
+ <el-form-item label="${comment}" prop="${field}">
<el-radio-group v-model="form.${field}">
<el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
</el-radio-group>
</el-form-item>
#elseif($column.htmlType == "datetime")
<el-form-item label="${comment}" prop="${field}">
- <el-date-picker clearable size="small"
+ <el-date-picker clearable
v-model="form.${field}"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨${comment}">
+ placeholder="璇烽�夋嫨${comment}">
</el-date-picker>
</el-form-item>
#elseif($column.htmlType == "textarea")
@@ -277,38 +281,6 @@
</el-form-item>
#end
#end
-#end
-#if($table.sub)
- <el-divider content-position="center">${subTable.functionName}淇℃伅</el-divider>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">娣诲姞</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete${subClassName}">鍒犻櫎</el-button>
- </el-col>
- </el-row>
- <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
- <el-table-column type="selection" width="50" align="center" />
- <el-table-column label="搴忓彿" align="center" prop="index" width="50"/>
-#foreach($column in $subTable.columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk || $javaField == ${subTableFkclassName})
-#elseif($column.list && "" != $javaField)
- <el-table-column label="$comment" prop="${javaField}">
- <template slot-scope="scope">
- <el-input v-model="scope.row.$javaField" placeholder="璇疯緭鍏�$comment" />
- </template>
- </el-table-column>
-#end
-#end
- </el-table>
#end
</el-form>
<div slot="footer" class="dialog-footer">
@@ -335,10 +307,6 @@
loading: true,
// 閫変腑鏁扮粍
ids: [],
-#if($table.sub)
- // 瀛愯〃閫変腑鏁版嵁
- checked${subClassName}: [],
-#end
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -349,10 +317,6 @@
total: 0,
// ${functionName}琛ㄦ牸鏁版嵁
${businessName}List: [],
-#if($table.sub)
- // ${subTable.functionName}琛ㄦ牸鏁版嵁
- ${subclassName}List: [],
-#end
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -387,7 +351,7 @@
#set($comment=$column.columnComment)
#end
$column.javaField: [
- { required: true, message: "$comment涓嶈兘涓虹┖", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+ { required: true, message: "$comment涓嶈兘涓虹┖", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
]#if($foreach.count != $columns.size()),#end
#end
#end
@@ -431,18 +395,13 @@
reset() {
this.form = {
#foreach ($column in $columns)
-#if($column.htmlType == "radio")
- $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
-#elseif($column.htmlType == "checkbox")
+#if($column.htmlType == "checkbox")
$column.javaField: []#if($foreach.count != $columns.size()),#end
#else
$column.javaField: undefined#if($foreach.count != $columns.size()),#end
#end
#end
};
-#if($table.sub)
- this.${subclassName}List = [];
-#end
this.resetForm("form");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -486,9 +445,6 @@
this.form.$column.javaField = this.form.${column.javaField}.split(",");
#end
#end
-#if($table.sub)
- this.${subclassName}List = response.data.${subclassName}List;
-#end
this.open = true;
this.title = "淇敼${functionName}";
});
@@ -502,9 +458,6 @@
#if($column.htmlType == "checkbox")
this.form.$column.javaField = this.form.${column.javaField}.join(",");
#end
-#end
-#if($table.sub)
- this.form.${subclassName}List = this.${subclassName}List;
#end
if (this.form.${pkColumn.javaField} != null) {
update${BusinessName}(this.form).then(response => {
@@ -536,43 +489,11 @@
this.loading = false;
this.getList();
this.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {
}).finally(() => {
this.loading = false;
});
},
-#if($table.sub)
- /** ${subTable.functionName}搴忓彿 */
- row${subClassName}Index({ row, rowIndex }) {
- row.index = rowIndex + 1;
- },
- /** ${subTable.functionName}娣诲姞鎸夐挳鎿嶄綔 */
- handleAdd${subClassName}() {
- let obj = {};
-#foreach($column in $subTable.columns)
-#if($column.pk || $column.javaField == ${subTableFkclassName})
-#elseif($column.list && "" != $javaField)
- obj.$column.javaField = "";
-#end
-#end
- this.${subclassName}List.push(obj);
- },
- /** ${subTable.functionName}鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete${subClassName}() {
- if (this.checked${subClassName}.length == 0) {
- this.#[[$modal]]#.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑${subTable.functionName}鏁版嵁");
- } else {
- const ${subclassName}List = this.${subclassName}List;
- const checked${subClassName} = this.checked${subClassName};
- this.${subclassName}List = ${subclassName}List.filter(function(item) {
- return checked${subClassName}.indexOf(item.index) == -1
- });
- }
- },
- /** 澶嶉�夋閫変腑鏁版嵁 */
- handle${subClassName}SelectionChange(selection) {
- this.checked${subClassName} = selection.map(item => item.index)
- },
-#end
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
this.download('${moduleName}/${businessName}/export', {
--
Gitblit v1.9.3