chore: merge branch 'master' into issues-2271

.github/workflows/deploy-site.yml

@@ -8,16 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     environment: prod
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: 16.15.0
-
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - uses: borales/[email protected]
-        with:
-          cmd: install
+          node-version: 18.10.0
+      - run: yarn install
 
       - name: build
         run: |

.github/workflows/docker-build-doc-site.yml

@@ -11,12 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: prod
     steps:
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16.15.0
-
-      - name: checkout
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2

.prettierignore

@@ -4,7 +4,7 @@
 **/test.ts
 src/index.html
 
-.stylelintrc
+.stylelintrc.js
 .prettierrc
 
 _nginx/

.stylelintignore

@@ -4,3 +4,6 @@ src/assets/**/*
 packages/theme/system/utils/_border.less
 packages/theme/system/utils/_color.less
 packages/theme/system/utils/_spacing.less
+
+dist/**/*
+ng-alain/**/*

.stylelintrc.js

@@ -0,0 +1,88 @@
+const { propertyGroups } = require('stylelint-config-clean-order');
+
+const propertiesOrder = propertyGroups.map(properties => ({
+  noEmptyLineBetween: true,
+  emptyLineBefore: 'never',
+  properties
+}));
+
+module.exports = {
+  extends: ['stylelint-config-standard'],
+  customSyntax: 'postcss-less',
+  plugins: ['stylelint-order', 'stylelint-declaration-block-no-ignored-properties'],
+  rules: {
+    'function-name-case': ['lower', { ignoreFunctions: ['/colorPalette/'] }],
+    'function-no-unknown': [
+      true,
+      {
+        ignoreFunctions: [
+          'fade',
+          'tint',
+          'darken',
+          'ceil',
+          'fadein',
+          'floor',
+          'unit',
+          'shade',
+          'lighten',
+          'percentage',
+          '-',
+          '~`colorPalette',
+          'snaplist',
+          'fade-out'
+        ]
+      }
+    ],
+    'no-descending-specificity': null,
+    'no-invalid-position-at-import-rule': null,
+    'declaration-empty-line-before': null,
+    'keyframes-name-pattern': null,
+    'custom-property-pattern': null,
+    'number-max-precision': 8,
+    'alpha-value-notation': 'number',
+    'color-function-notation': 'legacy',
+    'selector-class-pattern': null,
+    'selector-id-pattern': null,
+    'plugin/declaration-block-no-ignored-properties': true,
+    'selector-type-no-unknown': null,
+    'selector-pseudo-element-no-unknown': [
+      true,
+      {
+        ignorePseudoElements: ['ng-deep']
+      }
+    ],
+    'no-invalid-double-slash-comments': null,
+    'import-notation': 'string',
+    'media-feature-range-notation': 'prefix',
+    'media-query-no-invalid': null,
+    'order/order': [
+      [
+        'dollar-variables',
+        'at-variables',
+        "custom-properties",
+        { type: 'at-rule', name: 'custom-media' },
+        { type: 'at-rule', name: 'function' },
+        { type: 'at-rule', name: 'mixin' },
+        { type: 'at-rule', name: 'extend' },
+        { type: 'at-rule', name: 'include' },
+        'declarations',
+        'less-mixins',
+        {
+          type: 'rule',
+          selector: /^&::[\w-]+/,
+          hasBlock: true
+        },
+        'rules',
+        { type: 'at-rule', name: 'media', hasBlock: true }
+      ],
+      { severity: 'warning' }
+    ],
+    'order/properties-order': [
+      propertiesOrder,
+      {
+        severity: 'warning',
+        unspecified: 'bottomAlphabetical'
+      }
+    ]
+  }
+};

.vscode/settings.json

@@ -33,8 +33,7 @@
   },
   "files.associations": {
     "*.json": "jsonc",
-    ".prettierrc": "json",
-    ".stylelintrc": "json"
+    ".prettierrc": "json"
   },
   "angular.enable-strict-mode-prompt": false
 }

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [16.4.2](https://github.com/ng-alain/delon/compare/16.4.1...16.4.2) (2023-10-26)
+
+
+### Features
+
+* **abc:qr:** will be removed in 18.0.0 ([#1667](https://github.com/ng-alain/delon/issues/1667)) ([5a7bdd4](https://github.com/ng-alain/delon/commit/5a7bdd42226960c8140397b1a1a377fb87ca725e))
+
+
+### Performance Improvements
+
+* **theme:modal:** perf code ([#1671](https://github.com/ng-alain/delon/issues/1671)) ([341ff56](https://github.com/ng-alain/delon/commit/341ff56dc67d65d5a545f124a51938366c7722dc))
+
+
+
 ## [16.4.1](https://github.com/ng-alain/delon/compare/16.4.0...16.4.1) (2023-10-20)
 
 

azure-pipelines.yml

@@ -126,4 +126,4 @@ stages:
           - script: yarn install
             displayName: 'Install'
           - script: yarn run lint
-    dependsOn: env
+    dependsOn: env

docs/changelog.en-US.md

@@ -14,6 +14,14 @@ NG-ALAIN strictly follows [Semantic Versioning 2.0.0](http://semver.org/lang/zh-
 
 ---
 
+## [16.4.2](https://github.com/ng-alain/delon/compare/16.4.1...16.4.2) (2023-10-26)
+
+### Performance Improvements
+
+* **theme:modal:** perf code ([#1671](https://github.com/ng-alain/delon/issues/1671)) ([341ff56](https://github.com/ng-alain/delon/commit/341ff56dc67d65d5a545f124a51938366c7722dc))
+* **abc:qr:** will be removed in 18.0.0 ([#1667](https://github.com/ng-alain/delon/issues/1667)) ([5a7bdd4](https://github.com/ng-alain/delon/commit/5a7bdd42226960c8140397b1a1a377fb87ca725e))
+
+
 ## [16.4.1](https://github.com/ng-alain/delon/compare/16.4.0...16.4.1) (2023-10-20)
 
 ### Bug Fixes

docs/changelog.zh-CN.md

@@ -14,6 +14,14 @@ NG-ALAIN 严格遵循 [Semantic Versioning 2.0.0](http://semver.org/lang/zh-CN/)
 
 ---
 
+## [16.4.2](https://github.com/ng-alain/delon/compare/16.4.1...16.4.2) (2023-10-26)
+
+### Performance Improvements
+
+* **theme:modal:** perf code ([#1671](https://github.com/ng-alain/delon/issues/1671)) ([341ff56](https://github.com/ng-alain/delon/commit/341ff56dc67d65d5a545f124a51938366c7722dc))
+* **abc:qr:** will be removed in 18.0.0 ([#1667](https://github.com/ng-alain/delon/issues/1667)) ([5a7bdd4](https://github.com/ng-alain/delon/commit/5a7bdd42226960c8140397b1a1a377fb87ca725e))
+
+
 ## [16.4.1](https://github.com/ng-alain/delon/compare/16.4.0...16.4.1) (2023-10-20)
 
 ### Bug Fixes

docs/server.en-US.md

@@ -96,8 +96,12 @@ Abort more detail please refer to [Proxying to a backend server](https://angular
 
 ## Common problem
 
-**Q:** The request may be rejected or returned directly to `401`?
+**The request may be rejected or returned directly to `401`?**
 
 Scaffolding uses the `SimpleInterceptor` interceptor of `@delon/auth` by default, which causes an error to be returned directly if a token cannot be obtained during the request.
 
 [User Authentication](/auth) This process is a must for the middle office.
+
+**Unable to display request log**
+
+Starting from Angular 13, the debugging log of remote requests will no longer be displayed in the terminal. If you need to display the log, you can fix from refer to [How to fix logging for proxy in angular](https://medium.com/@gagandeep.sidhu88/how-to-fix-logging-for-proxy-in-angular-834cf46d437d).

docs/server.zh-CN.md

@@ -97,8 +97,12 @@ module.exports = {
 
 ## 常见问题
 
-**Q：** 请求可能被拒绝或直接返回 `401` ?
+**请求可能被拒绝或直接返回 `401` ?**
 
 脚手架默认情况下使用了 `@delon/auth` 的 `SimpleInterceptor` 拦截器，导致在请求过程中若发现无法获取 Token 时会直接返回错误。
 
 [用户认证](/auth)这个过程是中台必备的。
+
+**关于无法显示请求日志**
+
+从 Angular13 开始远程请求的调试日志将不再终端中显示，若有显示日期需求，可自行参考 [How to fix logging for proxy in angular](https://medium.com/@gagandeep.sidhu88/how-to-fix-logging-for-proxy-in-angular-834cf46d437d) 解决。

package.json

@@ -1,6 +1,6 @@
 {
   "name": "delon",
-  "version": "16.4.1",
+  "version": "16.4.2",
   "description": "Delon is a set of essential modules for NG-ALAIN.",
   "keywords": [
     "delon",
@@ -81,7 +81,7 @@
     "extend": "^3.0.2",
     "file-saver": "^2.0.5",
     "ng-github-button": "^16.0.0",
-    "ng-zorro-antd": "16.2.0",
+    "ng-zorro-antd": "^16.2.2",
     "ngx-color": "~9.0.0",
     "ngx-countdown": "^16.0.0",
     "ngx-highlight-js": "^16.1.0",
@@ -144,10 +144,9 @@
     "readline-sync": "^1.4.10",
     "stream": "0.0.2",
     "stylelint": "^15.10.3",
-    "stylelint-config-rational-order": "^0.1.2",
     "stylelint-config-standard": "^34.0.0",
     "stylelint-declaration-block-no-ignored-properties": "^2.7.0",
-    "stylelint-order": "^6.0.3",
+    "stylelint-config-clean-order": "^5.2.0",
     "source-map-explorer": "^2.5.3",
     "xlsx": "^0.18.5",
     "jszip": "^3.10.1",

packages/abc/avatar-list/style/index.less

@@ -17,9 +17,10 @@
     height: @avatar-size-base;
     margin-left: -8px;
     font-size: @font-size-base;
+
     .@{ant-prefix}-avatar {
-      border: 1px solid #fff;
       cursor: pointer;
+      border: 1px solid #fff;
     }
   }
 
@@ -36,6 +37,7 @@
   &__mini {
     width: @avatar-list-mini-wh;
     height: @avatar-list-mini-wh;
+
     .@{ant-prefix}-avatar {
       width: @avatar-list-mini-wh;
       height: @avatar-list-mini-wh;

packages/abc/cell/style/index.less

@@ -47,8 +47,8 @@
 
   .unit {
     margin-left: 2px;
-    color: @cell-unit-color;
     font-size: @cell-unit-font-size;
+    color: @cell-unit-color;
   }
 
   &__disabled {

packages/abc/down-file/style/index.less

@@ -10,6 +10,7 @@
     .down-file-not-support-behavior-mixin(@value) when (@value = 'hidden') {
       display: none;
     }
+    /* stylelint-disable-next-line order/order */
     .down-file-not-support-behavior-mixin(@down-file-not-support-behavior);
   }
 }

packages/abc/ellipsis/style/index.less

@@ -6,9 +6,9 @@ ellipsis {
 }
 
 @{ellipsis-prefix} {
+  overflow: hidden;
   display: inline-block;
   width: 100%;
-  overflow: hidden;
   word-break: break-all;
 
   &__lines {
@@ -17,9 +17,9 @@ ellipsis {
 
   &__line-clamp {
     position: relative;
+    overflow: hidden;
     /* stylelint-disable-next-line value-no-vendor-prefix */
     display: -webkit-box;
-    overflow: hidden;
     text-overflow: ellipsis;
   }
 

packages/abc/error-collect/style/index.less

@@ -2,9 +2,9 @@
 @error-collect-prefix: ~'.error-collect';
 
 @{error-collect-prefix} {
+  cursor: pointer;
   padding-right: 24px;
   color: @error-collect-color;
-  cursor: pointer;
 
   &__count {
     padding-left: 8px;