ng update @angular/material

vnobo · Oct 26, 2023 · 2cf2125 · 2cf2125
1 parent 2cda4d3
commit 2cf2125
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1,090 deletions.
diff --git a/boot/platform/src/main/java/com/platform/boot/security/user/UsersService.java b/boot/platform/src/main/java/com/platform/boot/security/user/UsersService.java
@@ -30,7 +30,7 @@ public class UsersService extends AbstractDatabase {
     public Flux<User> search(UserRequest request, Pageable pageable) {
         String cacheKey = ContextUtils.cacheKey(request, pageable);
         ParamSql paramSql = QueryJson.queryJson(request.getQuery());
-        String query = "select * from se_users " + paramSql.whereSql() + CriteriaUtils.applyPage(pageable);
+        String query = "select * from se_users" + paramSql.whereSql() + CriteriaUtils.applyPage(pageable);
         return super.queryWithCache(cacheKey, query, paramSql.params(), User.class)
                 .flatMapSequential(ContextUtils::userAuditorSerializable);
     }
@@ -40,7 +40,7 @@ public Mono<Page<User>> page(UserRequest request, Pageable pageable) {
 
         String cacheKey = ContextUtils.cacheKey(request);
         ParamSql paramSql = QueryJson.queryJson(request.getQuery());
-        String query = "select count(*) from se_users " + paramSql.whereSql();
+        String query = "select count(*) from se_users" + paramSql.whereSql();
         var countMono = super.countWithCache(cacheKey, query, paramSql.params());
 
         return Mono.zip(searchMono, countMono)

diff --git a/ui/web/angular.json b/ui/web/angular.json
@@ -55,9 +55,17 @@
                 "bundleName": "material-module"
               },
               {
-                "input": "src/zorro-antd-theme.less",
+                "input": "node_modules/bootstrap/dist/css/bootstrap.css",
+                "bundleName": "bootstrap-module"
+              },
+              {
+                "input": "node_modules/ng-zorro-antd/ng-zorro-antd.css",
                 "bundleName": "ng-zorro-antd-module"
               },
+              {
+                "input": "node_modules/layui/dist/css/layui.css",
+                "bundleName": "layui-module"
+              },
               "src/styles.scss"
             ],
             "scripts": [

diff --git a/ui/web/src/styles.scss b/ui/web/src/styles.scss
@@ -1,12 +1,3 @@
-// Include any default variable overrides here (though functions won't be available)
-@import "../node_modules/bootstrap/scss/bootstrap";
-// Then add additional custom code here
-@import "../node_modules/layui/dist/css/layui.css";
-
-// Default variable overrides
-$primary: #0074d9;
-$danger: #ff4136;
-
 /*this set custom own styles css.*/
 html, body {
   height: 100%;