From 2f18d0d7094b10e169b77a0ea741bd101dbbf1f8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 18 九月 2021 16:01:52 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm | 117 +++++++++++++++-------------------------------------------
1 files changed, 30 insertions(+), 87 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
index de04567..0d83a3c 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -25,10 +25,10 @@
<el-form-item label="${comment}" prop="${column.javaField}">
<el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable size="small">
<el-option
- v-for="dict in ${column.javaField}Options"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ v-for="dict in dict.type.${dictType}"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
/>
</el-select>
</el-form-item>
@@ -105,8 +105,12 @@
<span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
-#elseif($column.list && "" != $column.dictType)
- <el-table-column label="${comment}" align="center" prop="${javaField}" :formatter="${javaField}Format" />
+#elseif($column.list && $column.dictType && "" != $column.dictType)
+ <el-table-column label="${comment}" align="center" prop="${javaField}">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
+ </template>
+ </el-table-column>
#elseif($column.list && "" != $javaField)
#if(${foreach.index} == 1)
<el-table-column label="${comment}" prop="${javaField}" />
@@ -179,10 +183,10 @@
<el-form-item label="${comment}" prop="${field}">
<el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
<el-option
- v-for="dict in ${field}Options"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.dictValue)"#else:value="dict.dictValue"#end
+ 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
></el-option>
</el-select>
@@ -197,10 +201,10 @@
<el-form-item label="${comment}">
<el-checkbox-group v-model="form.${field}">
<el-checkbox
- v-for="dict in ${field}Options"
- :key="dict.dictValue"
- :label="dict.dictValue">
- {{dict.dictLabel}}
+ v-for="dict in dict.type.${dictType}"
+ :key="dict.value"
+ :label="dict.value">
+ {{dict.label}}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
@@ -214,11 +218,11 @@
<el-form-item label="${comment}">
<el-radio-group v-model="form.${field}">
<el-radio
- v-for="dict in ${field}Options"
- :key="dict.dictValue"
- #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.dictValue)"#else:label="dict.dictValue"#end
+ 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
- >{{dict.dictLabel}}</el-radio>
+ >{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
#elseif($column.htmlType == "radio" && $dictType)
@@ -253,49 +257,16 @@
</template>
<script>
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-#foreach($column in $columns)
-#if($column.insert && !$column.pk && $column.htmlType == "imageUpload")
-import ImageUpload from '@/components/ImageUpload';
-#break
-#end
-#end
-#foreach($column in $columns)
-#if($column.insert && !$column.pk && $column.htmlType == "fileUpload")
-import FileUpload from '@/components/FileUpload';
-#break
-#end
-#end
-#foreach($column in $columns)
-#if($column.insert && !$column.pk && $column.htmlType == "editor")
-import Editor from '@/components/Editor';
-#break
-#end
-#end
export default {
name: "${BusinessName}",
+#if(${dicts} != '')
+ dicts: [${dicts}],
+#end
components: {
-#foreach($column in $columns)
-#if($column.insert && !$column.pk && $column.htmlType == "imageUpload")
- ImageUpload,
-#break
-#end
-#end
-#foreach($column in $columns)
-#if($column.insert && !$column.pk && $column.htmlType == "fileUpload")
- FileUpload,
-#break
-#end
-#end
-#foreach($column in $columns)
-#if($column.insert && !$column.pk && $column.htmlType == "editor")
- Editor,
-#break
-#end
-#end
Treeselect
},
data() {
@@ -315,16 +286,7 @@
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
#foreach ($column in $columns)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if(${column.dictType} != '')
- // $comment瀛楀吀
- ${column.javaField}Options: [],
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
// $comment鏃堕棿鑼冨洿
daterange${AttrName}: [],
@@ -362,13 +324,6 @@
},
created() {
this.getList();
-#foreach ($column in $columns)
-#if(${column.dictType} != '')
- this.getDicts("${column.dictType}").then(response => {
- this.${column.javaField}Options = response.data;
- });
-#end
-#end
},
methods: {
/** 鏌ヨ${functionName}鍒楄〃 */
@@ -414,20 +369,6 @@
this.${businessName}Options.push(data);
});
},
-#foreach ($column in $columns)
-#if(${column.dictType} != '')
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
- // $comment瀛楀吀缈昏瘧
- ${column.javaField}Format(row, column) {
- return this.selectDictLabel#if($column.htmlType == "checkbox")s#end(this.${column.javaField}Options, row.${column.javaField});
- },
-#end
-#end
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
@@ -541,7 +482,9 @@
this.loading = false;
this.getList();
this.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ }).finally(() => {
+ this.loading = false;
+ });
}
}
};
--
Gitblit v1.9.3