mirror of
				https://github.com/YunaiV/ruoyi-vue-pro.git
				synced 2025-10-31 18:49:06 +08:00 
			
		
		
		
	feat: add search slots
This commit is contained in:
		| @ -8,7 +8,6 @@ spring: | |||||||
|   autoconfigure: |   autoconfigure: | ||||||
|     exclude: |     exclude: | ||||||
|       - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置,使用 dynamic-datasource-spring-boot-starter 配置多数据源 |       - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置,使用 dynamic-datasource-spring-boot-starter 配置多数据源 | ||||||
|       - org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration # 排除积木报表带来的 MongoDB 的自动配置 |  | ||||||
|   datasource: |   datasource: | ||||||
|     druid: # Druid 【监控】相关的全局配置 |     druid: # Druid 【监控】相关的全局配置 | ||||||
|       web-stat-filter: |       web-stat-filter: | ||||||
| @ -45,33 +44,33 @@ spring: | |||||||
|       datasource: |       datasource: | ||||||
|         master: |         master: | ||||||
|           name: ruoyi-vue-pro |           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: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: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: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 连接的示例 |           #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例 | ||||||
|           username: root |           username: dev | ||||||
|           password: 123456 |           password: dev@123! | ||||||
|         #          username: sa |         #          username: sa | ||||||
|         #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W |         #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W | ||||||
|         slave: # 模拟从库,可根据自己需要修改 |         slave: # 模拟从库,可根据自己需要修改 | ||||||
|           name: ruoyi-vue-pro |           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: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: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: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 连接的示例 |           #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例 | ||||||
|           username: root |           username: dev | ||||||
|           password: 123456 |           password: dev@123! | ||||||
|   #          username: sa |   #          username: sa | ||||||
|   #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W |   #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W | ||||||
|  |  | ||||||
|   # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 |   # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 | ||||||
|   redis: |   redis: | ||||||
|     host: 127.0.0.1 # 地址 |     host: 39.107.87.6 # 地址 | ||||||
|     port: 6379 # 端口 |     port: 6379 # 端口 | ||||||
|     database: 0 # 数据库索引 |     database: 13 # 数据库索引 | ||||||
| #    password: 123456 # 密码,建议生产环境开启 |     password: xingyu4j # 密码,建议生产环境开启 | ||||||
|  |  | ||||||
| --- #################### 定时任务相关配置 #################### | --- #################### 定时任务相关配置 #################### | ||||||
|  |  | ||||||
|  | |||||||
| @ -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 等浏览器 | - 开发建议使用 [谷歌浏览器-开发者版](https://www.google.cn/intl/zh-CN/chrome/dev/) 不支持 IE\QQ 等浏览器 | ||||||
|  |  | ||||||
| ### 点击查看[使用说明](./use.md) | ### 点击查看[使用说明](./use.md) | ||||||
|  | |||||||
| @ -108,7 +108,7 @@ | |||||||
|     "windicss": "^3.5.6" |     "windicss": "^3.5.6" | ||||||
|   }, |   }, | ||||||
|   "engines": { |   "engines": { | ||||||
|     "node": "^14.19.0 || >=16.0.0" |     "node": ">=16.0.0" | ||||||
|   }, |   }, | ||||||
|   "license": "MIT", |   "license": "MIT", | ||||||
|   "repository": { |   "repository": { | ||||||
|  | |||||||
| @ -155,6 +155,7 @@ const filterSearchSchema = (crudSchema: VxeCrudSchema): VxeFormItemProps[] => { | |||||||
|         itemRender: schemaItem.itemRender ? schemaItem.itemRender : itemRender, |         itemRender: schemaItem.itemRender ? schemaItem.itemRender : itemRender, | ||||||
|         field: schemaItem.field, |         field: schemaItem.field, | ||||||
|         title: schemaItem.search?.title || schemaItem.title, |         title: schemaItem.search?.title || schemaItem.title, | ||||||
|  |         slots: schemaItem.search?.slots, | ||||||
|         span: span |         span: span | ||||||
|       } |       } | ||||||
|       searchSchema.push(searchSchemaItem) |       searchSchema.push(searchSchemaItem) | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user
	 xingyu4j
					xingyu4j