Commit 9315ac0becb7778adb77024d5d44f8b20c37df2e

Authored by xingyu4j
1 parent 07824967

Revert "feat: add search slots"

This reverts commit 078249677bbaf042d83df5ed61195400fce1b1ca.
yudao-server/src/main/resources/application-local.yaml
@@ -8,6 +8,7 @@ spring: @@ -8,6 +8,7 @@ spring:
8 autoconfigure: 8 autoconfigure:
9 exclude: 9 exclude:
10 - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置,使用 dynamic-datasource-spring-boot-starter 配置多数据源 10 - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置,使用 dynamic-datasource-spring-boot-starter 配置多数据源
  11 + - org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration # 排除积木报表带来的 MongoDB 的自动配置
11 datasource: 12 datasource:
12 druid: # Druid 【监控】相关的全局配置 13 druid: # Druid 【监控】相关的全局配置
13 web-stat-filter: 14 web-stat-filter:
@@ -44,33 +45,33 @@ spring: @@ -44,33 +45,33 @@ spring:
44 datasource: 45 datasource:
45 master: 46 master:
46 name: ruoyi-vue-pro 47 name: ruoyi-vue-pro
47 - 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 连接的示例 48 + 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 连接的示例
48 # 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 连接的示例 49 # 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 连接的示例
49 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 50 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
50 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 51 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
51 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例 52 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
52 - username: dev  
53 - password: dev@123! 53 + username: root
  54 + password: 123456
54 # username: sa 55 # username: sa
55 # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W 56 # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
56 slave: # 模拟从库,可根据自己需要修改 57 slave: # 模拟从库,可根据自己需要修改
57 name: ruoyi-vue-pro 58 name: ruoyi-vue-pro
58 - 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 连接的示例 59 + 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 连接的示例
59 # 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 连接的示例 60 # 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 连接的示例
60 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 61 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
61 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 62 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
62 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例 63 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例
63 - username: dev  
64 - password: dev@123! 64 + username: root
  65 + password: 123456
65 # username: sa 66 # username: sa
66 # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W 67 # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
67 68
68 # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 69 # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
69 redis: 70 redis:
70 - host: 39.107.87.6 # 地址 71 + host: 127.0.0.1 # 地址
71 port: 6379 # 端口 72 port: 6379 # 端口
72 - database: 13 # 数据库索引  
73 - password: xingyu4j # 密码,建议生产环境开启 73 + database: 0 # 数据库索引
  74 +# password: 123456 # 密码,建议生产环境开启
74 75
75 --- #################### 定时任务相关配置 #################### 76 --- #################### 定时任务相关配置 ####################
76 77
yudao-ui-admin-vue3/README.md
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 ## 注意事项 20 ## 注意事项
21 21
22 - 项目路径请不要使用中文命名!!!会造成解析乱码!!!请使用全英文路径!!! 22 - 项目路径请不要使用中文命名!!!会造成解析乱码!!!请使用全英文路径!!!
23 -- node >=16 ,pnpm >=7.1 23 +- node >=14.19.0(后续升级版本,对应 node 最低版本也会升级,建议直接使用 16 版本) ,pnpm >=7
24 - 开发建议使用 [谷歌浏览器-开发者版](https://www.google.cn/intl/zh-CN/chrome/dev/) 不支持 IE\QQ 等浏览器 24 - 开发建议使用 [谷歌浏览器-开发者版](https://www.google.cn/intl/zh-CN/chrome/dev/) 不支持 IE\QQ 等浏览器
25 25
26 ### 点击查看[使用说明](./use.md) 26 ### 点击查看[使用说明](./use.md)
yudao-ui-admin-vue3/package.json
@@ -108,7 +108,7 @@ @@ -108,7 +108,7 @@
108 "windicss": "^3.5.6" 108 "windicss": "^3.5.6"
109 }, 109 },
110 "engines": { 110 "engines": {
111 - "node": ">=16.0.0" 111 + "node": "^14.19.0 || >=16.0.0"
112 }, 112 },
113 "license": "MIT", 113 "license": "MIT",
114 "repository": { 114 "repository": {
yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts
@@ -155,7 +155,6 @@ const filterSearchSchema = (crudSchema: VxeCrudSchema): VxeFormItemProps[] => { @@ -155,7 +155,6 @@ const filterSearchSchema = (crudSchema: VxeCrudSchema): VxeFormItemProps[] => {
155 itemRender: schemaItem.itemRender ? schemaItem.itemRender : itemRender, 155 itemRender: schemaItem.itemRender ? schemaItem.itemRender : itemRender,
156 field: schemaItem.field, 156 field: schemaItem.field,
157 title: schemaItem.search?.title || schemaItem.title, 157 title: schemaItem.search?.title || schemaItem.title,
158 - slots: schemaItem.search?.slots,  
159 span: span 158 span: span
160 } 159 }
161 searchSchema.push(searchSchemaItem) 160 searchSchema.push(searchSchemaItem)