From ca657b048275fbac4fd13e3c26808ad20e8ea128 Mon Sep 17 00:00:00 2001
From: fungleo <web@fengcms.com>
Date: 星期日, 26 七月 2020 17:33:42 +0800
Subject: [PATCH] 优化 index-tree.vue.vm 文件，undefined 修改为 null
---
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 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 fb10ed6..80b469a 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
@@ -157,6 +157,23 @@
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+ <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}}
+ </el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+#elseif($column.htmlType == "checkbox" && $dictType)
+ <el-form-item label="${comment}">
+ <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-radio-group v-model="form.${field}">
@@ -236,7 +253,7 @@
queryParams: {
#foreach ($column in $columns)
#if($column.query)
- $column.javaField: undefined#if($velocityCount != $columns.size()),#end
+ $column.javaField: null#if($velocityCount != $columns.size()),#end
#end
#end
@@ -312,7 +329,7 @@
#end
// $comment字典翻译
${column.javaField}Format(row, column) {
- return this.selectDictLabel(this.${column.javaField}Options, row.${column.javaField});
+ return this.selectDictLabel#if($column.htmlType == "checkbox")s#end(this.${column.javaField}Options, row.${column.javaField});
},
#end
#end
@@ -328,8 +345,11 @@
#if($column.htmlType == "radio")
$column.javaField: "0"#if($velocityCount != $columns.size()),#end
+#elseif($column.htmlType == "checkbox")
+ $column.javaField: []#if($velocityCount != $columns.size()),#end
+
#else
- $column.javaField: undefined#if($velocityCount != $columns.size()),#end
+ $column.javaField: null#if($velocityCount != $columns.size()),#end
#end
#end
@@ -356,20 +376,30 @@
handleUpdate(row) {
this.reset();
this.getTreeselect();
- if (row != undefined) {
+ if (row != null) {
this.form.${treeParentCode} = row.${treeCode};
}
get${BusinessName}(row.${pkColumn.javaField}).then(response => {
this.form = response.data;
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+ this.form.$column.javaField = this.form.${column.javaField}.split(",");
+#end
+#end
this.open = true;
this.title = "修改${functionName}";
});
},
/** 提交按钮 */
- submitForm: function() {
+ submitForm() {
this.#[[$]]#refs["form"].validate(valid => {
if (valid) {
- if (this.form.${pkColumn.javaField} != undefined) {
+#foreach ($column in $columns)
+#if($column.htmlType == "checkbox")
+ this.form.$column.javaField = this.form.${column.javaField}.join(",");
+#end
+#end
+ if (this.form.${pkColumn.javaField} != null) {
update${BusinessName}(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("修改成功");
@@ -404,4 +434,4 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.2