From 6c70291d0a6715c0e0392889fb55de20afc6a49d Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 4 Jan 2022 10:56:25 +0800 Subject: [PATCH 1/8] update README.md --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 17f141e4..838b7349 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,14 @@ +

+ logo +

+

RuoYi v3.3.0

+

基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的微服务快速开发框架

+

+ + + +

+ ## 平台简介 若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。 From f46aa17c7743dcf2a0e271b3702c26c67bc8118b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=A5=E4=BE=9D?= Date: Tue, 4 Jan 2022 19:50:34 +0800 Subject: [PATCH 2/8] Create FUNDING.yml --- .github/FUNDING.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..bcbeb1e3 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,12 @@ +# These are supported funding model platforms + +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +otechie: # Replace with a single Otechie username +custom: http://doc.ruoyi.vip/ruoyi-cloud/other/donate.html # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] From 37597a85d5bbba792cf0261577e541931f5f84af Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 4 Jan 2022 20:13:22 +0800 Subject: [PATCH 3/8] update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 838b7349..827ca5d1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ logo

RuoYi v3.3.0

-

基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的微服务快速开发框架

+

基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构

From 29fac802f37d4d1da2beaa55db6a6330bb5fd580 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 4 Jan 2022 20:19:18 +0800 Subject: [PATCH 4/8] update donate --- .github/FUNDING.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index bcbeb1e3..06edc15f 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,12 +1 @@ -# These are supported funding model platforms - -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] -patreon: # Replace with a single Patreon username -open_collective: # Replace with a single Open Collective username -ko_fi: # Replace with a single Ko-fi username -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -liberapay: # Replace with a single Liberapay username -issuehunt: # Replace with a single IssueHunt username -otechie: # Replace with a single Otechie username -custom: http://doc.ruoyi.vip/ruoyi-cloud/other/donate.html # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] +custom: http://doc.ruoyi.vip/ruoyi-cloud/other/donate.html From 6274bfcd8cf5cbb1d803c9a39e65cd9a87ce7a37 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 4 Jan 2022 20:20:11 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=9B=BE=E7=89=87=E6=94=AF=E6=8C=81=E9=A2=84?= =?UTF-8?q?=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/vm/vue/index-tree.vue.vm | 10 ++++++++-- .../ruoyi-gen/src/main/resources/vm/vue/index.vue.vm | 12 +++++++++--- .../src/main/resources/vm/vue/v3/index-tree.vue.vm | 12 +++++++++--- .../src/main/resources/vm/vue/v3/index.vue.vm | 10 ++++++++-- 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm index 62b12d98..adba807b 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm @@ -105,6 +105,12 @@ {{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }} +#elseif($column.list && $column.htmlType == "imageUpload") + + + #elseif($column.list && "" != $column.dictType) +#elseif($column.list && $column.htmlType == "imageUpload") + + + #elseif($column.list && "" != $column.dictType) +#elseif($column.list && $column.htmlType == "imageUpload") + + + #elseif($column.list && "" != $column.dictType) +#elseif($column.list && $column.htmlType == "imageUpload") + + + #elseif($column.list && "" != $column.dictType)