From 168d49fe0b21aaf1d06512a2896959120beec312 Mon Sep 17 00:00:00 2001 From: abbfun <819589789@qq.com> Date: 星期一, 08 八月 2022 09:46:08 +0800 Subject: [PATCH] 优化表格上右侧工具条(搜索按钮显隐&右侧样式凸出) 无搜索条件时可通过search隐藏搜索按钮,工具条组右侧样式超出5px(相对于底部表格),其父节点gutter代码生成默认10,此处也默认10,使工具组样式左右一致 --- ruoyi-admin/pom.xml | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 5c895a8..a3d2da6 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>ruoyi-vue-plus</artifactId> <groupId>com.ruoyi</groupId> - <version>2.5.1</version> + <version>4.2.0</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -29,6 +29,21 @@ <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> </dependency> + <!-- Oracle --> + <dependency> + <groupId>com.oracle.database.jdbc</groupId> + <artifactId>ojdbc8</artifactId> + </dependency> + <!-- PostgreSql --> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + </dependency> + <!-- SqlServer --> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>mssql-jdbc</artifactId> + </dependency> <!-- 鏍稿績妯″潡--> <dependency> @@ -36,10 +51,14 @@ <artifactId>ruoyi-framework</artifactId> </dependency> - <!-- 瀹氭椂浠诲姟--> <dependency> <groupId>com.ruoyi</groupId> - <artifactId>ruoyi-quartz</artifactId> + <artifactId>ruoyi-system</artifactId> + </dependency> + + <dependency> + <groupId>com.ruoyi</groupId> + <artifactId>ruoyi-job</artifactId> </dependency> <dependency> @@ -82,7 +101,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>3.1.0</version> + <version>3.2.2</version> <configuration> <failOnMissingWebXml>false</failOnMissingWebXml> <warName>${project.artifactId}</warName> -- Gitblit v1.9.3