From b46ac885d42caeb7a42fc5a8248a0417de1b2855 Mon Sep 17 00:00:00 2001 From: xingyu Date: Wed, 7 Dec 2022 22:14:13 +0800 Subject: [PATCH 01/21] =?UTF-8?q?fix:=20=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/codegen/vue3/views/data.ts.vm | 2 +- yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm index 623345830..0aabf8d86 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm @@ -48,7 +48,7 @@ const crudSchemas = reactive({ component: 'DatePicker', componentProps: { type: 'datetime', - valueFormat: 'YYYY-MM-DD HH:mm:ss' + valueFormat: 'x' } }, #elseif($column.htmlType == "editor")## 文本编辑器 diff --git a/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts b/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts index 96d62e261..01eafc924 100644 --- a/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts @@ -104,7 +104,8 @@ const crudSchemas = reactive({ form: { component: 'DatePicker', componentProps: { - type: 'datetime' + type: 'datetime', + valueFormat: 'x' } } }, From c2a3d1240f2a7a6486f2c3d94226f1c0c5bcf901 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Thu, 8 Dec 2022 12:36:28 +0800 Subject: [PATCH 02/21] fix: role menus --- yudao-ui-admin-vue3/src/views/system/role/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yudao-ui-admin-vue3/src/views/system/role/index.vue b/yudao-ui-admin-vue3/src/views/system/role/index.vue index 5ff8543f5..550c4af04 100644 --- a/yudao-ui-admin-vue3/src/views/system/role/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/role/index.vue @@ -314,7 +314,10 @@ const submitScope = async () => { } else if ('menu' === actionScopeType.value) { const data = ref({ roleId: dataScopeForm.id, - menuIds: treeRef.value!.getCheckedKeys(false) as unknown as Array + menuIds: [ + ...(treeRef.value!.getCheckedKeys(false) as unknown as Array), + ...(treeRef.value!.getHalfCheckedKeys() as unknown as Array) + ] }) await PermissionApi.assignRoleMenuApi(data.value) } From 078249677bbaf042d83df5ed61195400fce1b1ca Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Thu, 8 Dec 2022 12:36:40 +0800 Subject: [PATCH 03/21] feat: add search slots --- .../src/main/resources/application-local.yaml | 19 +++++++++---------- yudao-ui-admin-vue3/README.md | 2 +- yudao-ui-admin-vue3/package.json | 2 +- .../src/hooks/web/useVxeCrudSchemas.ts | 1 + 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index 7c8ac0b02..a774b0ccb 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -8,7 +8,6 @@ spring: autoconfigure: exclude: - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源 - - org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration # 排除积木报表带来的 MongoDB 的自动配置 datasource: druid: # Druid 【监控】相关的全局配置 web-stat-filter: @@ -45,33 +44,33 @@ spring: datasource: master: name: ruoyi-vue-pro - url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://192.168.0.93:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例 - username: root - password: 123456 + username: dev + password: dev@123! # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W slave: # 模拟从库，可根据自己需要修改 name: ruoyi-vue-pro - url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://192.168.0.93:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例 - username: root - password: 123456 + username: dev + password: dev@123! # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 127.0.0.1 # 地址 + host: 39.107.87.6 # 地址 port: 6379 # 端口 - database: 0 # 数据库索引 -# password: 123456 # 密码，建议生产环境开启 + database: 13 # 数据库索引 + password: xingyu4j # 密码，建议生产环境开启 --- #################### 定时任务相关配置 #################### diff --git a/yudao-ui-admin-vue3/README.md b/yudao-ui-admin-vue3/README.md index d4642f977..6bad0e272 100644 --- a/yudao-ui-admin-vue3/README.md +++ b/yudao-ui-admin-vue3/README.md @@ -20,7 +20,7 @@ ## 注意事项 - 项目路径请不要使用中文命名！！！会造成解析乱码！！！请使用全英文路径！！！ -- node >=14.19.0(后续升级版本，对应 node 最低版本也会升级，建议直接使用 16 版本) ,pnpm >=7 +- node >=16 ,pnpm >=7.1 - 开发建议使用 [谷歌浏览器-开发者版](https://www.google.cn/intl/zh-CN/chrome/dev/) 不支持 IE\QQ 等浏览器 ### 点击查看[使用说明](./use.md) diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json index 480bf5380..3d0d354c1 100644 --- a/yudao-ui-admin-vue3/package.json +++ b/yudao-ui-admin-vue3/package.json @@ -108,7 +108,7 @@ "windicss": "^3.5.6" }, "engines": { - "node": "^14.19.0 || >=16.0.0" + "node": ">=16.0.0" }, "license": "MIT", "repository": { diff --git a/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts b/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts index 45bf85b7d..cfd4775c4 100644 --- a/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts +++ b/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts @@ -155,6 +155,7 @@ const filterSearchSchema = (crudSchema: VxeCrudSchema): VxeFormItemProps[] => { itemRender: schemaItem.itemRender ? schemaItem.itemRender : itemRender, field: schemaItem.field, title: schemaItem.search?.title || schemaItem.title, + slots: schemaItem.search?.slots, span: span } searchSchema.push(searchSchemaItem) From 9315ac0becb7778adb77024d5d44f8b20c37df2e Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Thu, 8 Dec 2022 12:37:16 +0800 Subject: [PATCH 04/21] Revert "feat: add search slots" This reverts commit 078249677bbaf042d83df5ed61195400fce1b1ca. --- .../src/main/resources/application-local.yaml | 19 ++++++++++--------- yudao-ui-admin-vue3/README.md | 2 +- yudao-ui-admin-vue3/package.json | 2 +- .../src/hooks/web/useVxeCrudSchemas.ts | 1 - 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index a774b0ccb..7c8ac0b02 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -8,6 +8,7 @@ spring: autoconfigure: exclude: - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源 + - org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration # 排除积木报表带来的 MongoDB 的自动配置 datasource: druid: # Druid 【监控】相关的全局配置 web-stat-filter: @@ -44,33 +45,33 @@ spring: datasource: master: name: ruoyi-vue-pro - url: jdbc:mysql://192.168.0.93:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例 - username: dev - password: dev@123! + username: root + password: 123456 # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W slave: # 模拟从库，可根据自己需要修改 name: ruoyi-vue-pro - url: jdbc:mysql://192.168.0.93:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例 - username: dev - password: dev@123! + username: root + password: 123456 # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: - host: 39.107.87.6 # 地址 + host: 127.0.0.1 # 地址 port: 6379 # 端口 - database: 13 # 数据库索引 - password: xingyu4j # 密码，建议生产环境开启 + database: 0 # 数据库索引 +# password: 123456 # 密码，建议生产环境开启 --- #################### 定时任务相关配置 #################### diff --git a/yudao-ui-admin-vue3/README.md b/yudao-ui-admin-vue3/README.md index 6bad0e272..d4642f977 100644 --- a/yudao-ui-admin-vue3/README.md +++ b/yudao-ui-admin-vue3/README.md @@ -20,7 +20,7 @@ ## 注意事项 - 项目路径请不要使用中文命名！！！会造成解析乱码！！！请使用全英文路径！！！ -- node >=16 ,pnpm >=7.1 +- node >=14.19.0(后续升级版本，对应 node 最低版本也会升级，建议直接使用 16 版本) ,pnpm >=7 - 开发建议使用 [谷歌浏览器-开发者版](https://www.google.cn/intl/zh-CN/chrome/dev/) 不支持 IE\QQ 等浏览器 ### 点击查看[使用说明](./use.md) diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json index 3d0d354c1..480bf5380 100644 --- a/yudao-ui-admin-vue3/package.json +++ b/yudao-ui-admin-vue3/package.json @@ -108,7 +108,7 @@ "windicss": "^3.5.6" }, "engines": { - "node": ">=16.0.0" + "node": "^14.19.0 || >=16.0.0" }, "license": "MIT", "repository": { diff --git a/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts b/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts index cfd4775c4..45bf85b7d 100644 --- a/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts +++ b/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts @@ -155,7 +155,6 @@ const filterSearchSchema = (crudSchema: VxeCrudSchema): VxeFormItemProps[] => { itemRender: schemaItem.itemRender ? schemaItem.itemRender : itemRender, field: schemaItem.field, title: schemaItem.search?.title || schemaItem.title, - slots: schemaItem.search?.slots, span: span } searchSchema.push(searchSchemaItem) From e25d9a8981f78eb6cf13547c44ef08200f288e71 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Thu, 8 Dec 2022 12:39:23 +0800 Subject: [PATCH 05/21] feat: add search slots --- yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts b/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts index 45bf85b7d..cfd4775c4 100644 --- a/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts +++ b/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts @@ -155,6 +155,7 @@ const filterSearchSchema = (crudSchema: VxeCrudSchema): VxeFormItemProps[] => { itemRender: schemaItem.itemRender ? schemaItem.itemRender : itemRender, field: schemaItem.field, title: schemaItem.search?.title || schemaItem.title, + slots: schemaItem.search?.slots, span: span } searchSchema.push(searchSchemaItem) From 21d8ded00b32c4be03ea23e961cd2d2eb3ba00ef Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Thu, 8 Dec 2022 12:39:35 +0800 Subject: [PATCH 06/21] chore: node >= 16 --- yudao-ui-admin-vue3/README.md | 2 +- yudao-ui-admin-vue3/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-ui-admin-vue3/README.md b/yudao-ui-admin-vue3/README.md index d4642f977..3667307d2 100644 --- a/yudao-ui-admin-vue3/README.md +++ b/yudao-ui-admin-vue3/README.md @@ -20,7 +20,7 @@ ## 注意事项 - 项目路径请不要使用中文命名！！！会造成解析乱码！！！请使用全英文路径！！！ -- node >=14.19.0(后续升级版本，对应 node 最低版本也会升级，建议直接使用 16 版本) ,pnpm >=7 +- node >=16 ,pnpm >=7.1 - 开发建议使用 [谷歌浏览器-开发者版](https://www.google.cn/intl/zh-CN/chrome/dev/) 不支持 IE\QQ 等浏览器 ### 点击查看[使用说明](./use.md) diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json index 480bf5380..3d0d354c1 100644 --- a/yudao-ui-admin-vue3/package.json +++ b/yudao-ui-admin-vue3/package.json @@ -108,7 +108,7 @@ "windicss": "^3.5.6" }, "engines": { - "node": "^14.19.0 || >=16.0.0" + "node": ">=16.0.0" }, "license": "MIT", "repository": { From 232c325608fb7afde7f787be7947ad2df6eac8b2 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Thu, 8 Dec 2022 13:52:01 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E4=BF=9D=E8=AF=81=E7=BB=9F=E4=B8=80=E7=9A=84=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-framework/yudao-spring-boot-starter-file/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-framework/yudao-spring-boot-starter-file/pom.xml b/yudao-framework/yudao-spring-boot-starter-file/pom.xml index 63f70fadb..a99a93ee8 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-file/pom.xml @@ -46,7 +46,7 @@ com.fasterxml.jackson.core jackson-databind - 2.13.4 + 2.13.4.2 com.fasterxml.jackson.core From 262ff34160833469514459289465729d8bcdfa87 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Thu, 8 Dec 2022 13:58:48 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E4=BF=9D=E8=AF=81=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-framework/yudao-spring-boot-starter-file/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-framework/yudao-spring-boot-starter-file/pom.xml b/yudao-framework/yudao-spring-boot-starter-file/pom.xml index a99a93ee8..63f70fadb 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-file/pom.xml @@ -46,7 +46,7 @@ com.fasterxml.jackson.core jackson-databind - 2.13.4.2 + 2.13.4 com.fasterxml.jackson.core From aa3b4bf1fa3f1e088d7482c63c6b10db68d58429 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Thu, 8 Dec 2022 14:26:28 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B2=BE=E7=AE=80?= =?UTF-8?q?=E7=89=88=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 641afbb29..f6c56f349 100644 --- a/README.md +++ b/README.md @@ -38,11 +38,12 @@ * 集成阿里云、腾讯云等短信渠道，集成 MinIO、阿里云、腾讯云、七牛云等云存储服务 * 集成报表设计器，支持数据报表、图形报表、打印设计等 -| 项目名 | 说明 | 传送门 | -|--------------------|------------------------|-------------------------------------------------------------------------------------------------------------------------------------| -| `ruoyi-vue-pro` | Spring Boot 多模块 | **[Gitee](https://gitee.com/zhijiantianya/ruoyi-vue-pro)**     [Github](https://github.com/YunaiV/ruoyi-vue-pro) | -| `yudao-cloud` | Spring Cloud 微服务 | **[Gitee](https://gitee.com/zhijiantianya/yudao-cloud)**     [Github](https://github.com/YunaiV/yudao-cloud) | +| 项目名 | 说明 | 传送门 | +|--------------------|------------------------|-----------------------------------------------------------------------------------------------------------------------------------| +| `ruoyi-vue-pro` | Spring Boot 多模块 | **[Gitee](https://gitee.com/zhijiantianya/ruoyi-vue-pro)**     [Github](https://github.com/YunaiV/ruoyi-vue-pro) | +| `yudao-cloud` | Spring Cloud 微服务 | **[Gitee](https://gitee.com/zhijiantianya/yudao-cloud)**     [Github](https://github.com/YunaiV/yudao-cloud) | | `Spring-Boot-Labs` | Spring Boot & Cloud 入门 | **[Gitee](https://gitee.com/zhijiantianya/SpringBoot-Labs)**     [Github](https://github.com/YunaiV/SpringBoot-Labs) | + | `ruoyi-vue-pro-mini` | 精简版 移除工作流 支付等模块| **[Gitee](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/mini)** | ## 😎 开源协议 From 623f7124c63cc8d2499e385d5f1b962c326c493d Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Thu, 8 Dec 2022 17:03:58 +0800 Subject: [PATCH 10/21] =?UTF-8?q?fix:=20vue3=20=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/codegen/vue3/api/api.ts.vm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm index 560fb58c2..df49a002b 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm @@ -3,7 +3,7 @@ import request from '@/config/axios' export interface ${simpleClassName}VO { #foreach ($column in $columns) #if ($column.createOperation || $column.updateOperation) -#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double") +#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal") ${column.javaField}: number #elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime") ${column.javaField}: Date @@ -17,7 +17,7 @@ export interface ${simpleClassName}VO { export interface ${simpleClassName}PageReqVO extends PageParam { #foreach ($column in $columns) #if (${column.listOperation})##查询操作 -#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double") +#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal") ${column.javaField}?: number #elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime") ${column.javaField}?: Date[] @@ -31,7 +31,7 @@ export interface ${simpleClassName}PageReqVO extends PageParam { export interface ${simpleClassName}ExcelReqVO { #foreach ($column in $columns) #if (${column.listOperation})##查询操作 -#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double") +#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double" || ${column.javaType.toLowerCase()} == "bigdecimal") ${column.javaField}?: number #elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime") ${column.javaField}?: Date[] From 0a805483a998815493c5a65df684eade32552b2c Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Thu, 8 Dec 2022 17:07:04 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=20lo?= =?UTF-8?q?calDateTime=20=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/codegen/java/controller/vo/createReqVO.vm | 2 +- .../src/main/resources/codegen/java/controller/vo/respVO.vm | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/createReqVO.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/createReqVO.vm index dc6cee6b6..bf6408c9c 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/createReqVO.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/createReqVO.vm @@ -9,7 +9,7 @@ import javax.validation.constraints.*; #if (${column.createOperation} && (!${column.updateOperation} || !${column.listOperationResult}) && ${column.javaType} == "LocalDateTime")## 时间类型 import org.springframework.format.annotation.DateTimeFormat; - +import java.time.LocalDateTime; import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; #break #end diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm index 4034b6f63..dd6e16e10 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/respVO.vm @@ -1,7 +1,11 @@ package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo; import lombok.*; -import java.util.*; +#foreach ($column in $columns) +#if (${column.javaType} == "LocalDateTime") +import java.time.LocalDateTime; +#end +#end import io.swagger.annotations.*; @ApiModel("${sceneEnum.name} - ${table.classComment} Response VO") From 19c193cc1a8791ef4e4e3afe4b4debbaa6faaeca Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Thu, 8 Dec 2022 17:26:06 +0800 Subject: [PATCH 12/21] =?UTF-8?q?fix:=20vue3=20=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/codegen/vue3/views/data.ts.vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm index 0aabf8d86..fb45c0815 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm @@ -43,7 +43,6 @@ const crudSchemas = reactive({ isForm: false, #elseif(!("" != $column.dictType)) #if (${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime") - formatter: 'formatDate', form: { component: 'DatePicker', componentProps: { @@ -96,6 +95,7 @@ const crudSchemas = reactive({ #elseif("" != $dictType) isSearch: true, #elseif($column.htmlType == "datetime") + formatter: 'formatDate', search: { show: true, itemRender: { @@ -104,8 +104,8 @@ const crudSchemas = reactive({ }, #end #end - #end }, + #end #end #end ] From eee5e62843031615d631d7981606c01b6478ef7f Mon Sep 17 00:00:00 2001 From: xingyu Date: Thu, 8 Dec 2022 19:57:05 +0800 Subject: [PATCH 13/21] =?UTF-8?q?fix:=20=E8=B7=AF=E5=BE=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/layout/components/ContextMenu/src/ContextMenu.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-ui-admin-vue3/src/layout/components/ContextMenu/src/ContextMenu.vue b/yudao-ui-admin-vue3/src/layout/components/ContextMenu/src/ContextMenu.vue index fc86c1ddb..ed986162f 100644 --- a/yudao-ui-admin-vue3/src/layout/components/ContextMenu/src/ContextMenu.vue +++ b/yudao-ui-admin-vue3/src/layout/components/ContextMenu/src/ContextMenu.vue @@ -4,7 +4,7 @@ import { PropType, ref } from 'vue' import { useI18n } from '@/hooks/web/useI18n' import { useDesign } from '@/hooks/web/useDesign' import type { RouteLocationNormalizedLoaded } from 'vue-router' -import { contextMenuSchema } from '../../../types/contextMenu' +import { contextMenuSchema } from '@/types/contextMenu' const { getPrefixCls } = useDesign() From c48a9217be19f69aa4a031a3a698f7f972ccce57 Mon Sep 17 00:00:00 2001 From: xingyu Date: Thu, 8 Dec 2022 22:04:15 +0800 Subject: [PATCH 14/21] =?UTF-8?q?style:=20=E6=A0=87=E7=AD=BE=E6=A0=8F=20?= =?UTF-8?q?=E5=9C=86=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/layout/components/TagsView/src/TagsView.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/yudao-ui-admin-vue3/src/layout/components/TagsView/src/TagsView.vue b/yudao-ui-admin-vue3/src/layout/components/TagsView/src/TagsView.vue index eeff97c9a..4af4970fa 100644 --- a/yudao-ui-admin-vue3/src/layout/components/TagsView/src/TagsView.vue +++ b/yudao-ui-admin-vue3/src/layout/components/TagsView/src/TagsView.vue @@ -495,16 +495,17 @@ $prefix-cls: #{$namespace}-tags-view; position: relative; top: 2px; height: calc(100% - 4px); - padding-right: 25px; + padding-right: 20px; margin-left: 4px; font-size: 12px; + border-radius: 3px 3px 3px 3px; cursor: pointer; border: 1px solid #d9d9d9; &--close { position: absolute; top: 50%; - right: 5px; + right: 4px; display: none; transform: translate(0, -50%); } @@ -552,8 +553,9 @@ $prefix-cls: #{$namespace}-tags-view; position: relative; top: 2px; height: calc(100% - 4px); - padding-right: 25px; + padding-right: 20px; font-size: 12px; + border-radius: 3px 3px 3px 3px; cursor: pointer; border: 1px solid var(--el-border-color); } From 705cdb47cf6e66489a3b16ea2e5d9ee633c18b5d Mon Sep 17 00:00:00 2001 From: xingyu Date: Thu, 8 Dec 2022 22:59:58 +0800 Subject: [PATCH 15/21] =?UTF-8?q?style:=20=E7=A7=BB=E9=99=A4vxe-grid=20?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E6=8C=89=E9=92=AE=E5=A4=96=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-admin-vue3/src/styles/vxe.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yudao-ui-admin-vue3/src/styles/vxe.css b/yudao-ui-admin-vue3/src/styles/vxe.css index bf9a35d9c..30bdd58dc 100644 --- a/yudao-ui-admin-vue3/src/styles/vxe.css +++ b/yudao-ui-admin-vue3/src/styles/vxe.css @@ -24,3 +24,7 @@ .xtable-scrollbar ::-webkit-scrollbar-corner { background-color: #ffffff; } +/*移除 vxe-grid 右侧外框*/ +.vxe-button.size--medium.type--button.is--circle { + border: 0; +} From 1fca6b460a0c6405b1ed72b7374ef5c1bf37e451 Mon Sep 17 00:00:00 2001 From: xingyu Date: Thu, 8 Dec 2022 23:02:47 +0800 Subject: [PATCH 16/21] =?UTF-8?q?fix:=20codegen=20=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/infra/codegen/EditTable.vue | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue index 00daa5f0c..7c4349df5 100644 --- a/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue +++ b/yudao-ui-admin-vue3/src/views/infra/codegen/EditTable.vue @@ -1,20 +1,27 @@