From a118738d0f9e8e466aa2b908ca139372eead5194 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 5 Jan 2021 16:13:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=9B=BE=E4=B8=8A=E4=BC=A0=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/vm/vue/index-tree.vue.vm | 12 +++---- .../src/main/resources/vm/vue/index.vue.vm | 12 +++---- .../{UploadImage => ImageUpload}/index.vue | 34 +++++++++++++++++-- ruoyi-ui/src/views/tool/gen/editTable.vue | 2 +- 4 files changed, 45 insertions(+), 15 deletions(-) rename ruoyi-ui/src/components/{UploadImage => ImageUpload}/index.vue (61%) 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 f12eb2f3..d9b6f4d3 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 @@ -153,9 +153,9 @@ -#elseif($column.htmlType == "uploadImage") +#elseif($column.htmlType == "imageUpload") - + #elseif($column.htmlType == "editor") @@ -244,8 +244,8 @@ import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${Busin import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; #foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "uploadImage") -import UploadImage from '@/components/UploadImage'; +#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload") +import ImageUpload from '@/components/ImageUpload'; #break #end #end @@ -260,8 +260,8 @@ export default { name: "${BusinessName}", components: { #foreach($column in $columns) -#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "uploadImage") - UploadImage, +#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload") + ImageUpload, #break #end #end 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 534012ce..ded7e2d7 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -185,9 +185,9 @@ -#elseif($column.htmlType == "uploadImage") +#elseif($column.htmlType == "imageUpload") - + #elseif($column.htmlType == "editor") @@ -274,8 +274,8 @@