Merge branch 'v18'

EnochGao · Dec 25, 2024 · c2f2d54 · c2f2d54
2 parents 8e9d453 + 936f684
commit c2f2d54
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 30 deletions.
diff --git a/components/package.json b/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-zorro-antd-extension",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "license": "MIT",
   "description": "An extension based on ng-zorro-antd",
   "keywords": [

diff --git a/components/util/doc/zh-cn.md b/components/util/doc/zh-cn.md
@@ -26,7 +26,7 @@ import { cloneDeep,xxxx.. } from "ng-zorro-antd-extension/util";
 ```typescript
 class Demo {
   form: FormGroup = inject(FormBuilder).group({
-    name: [{ value: "EnochGao", disabled: true }],
+    name: [{ value: 'EnochGao', disabled: true }],
   });
 
   constructor() {
@@ -36,18 +36,19 @@ class Demo {
 }
 ```
 
-| 函数                | 说明                                                                     | 版本                                   |
-| ------------------- | ------------------------------------------------------------------------ | -------------------------------------- |
-| cloneDeep           | 深克隆                                                                   | -                                      |
-| isArray             | 判断是否为数组                                                           | -                                      |
-| isDate              | 判断是否为 Date                                                          | -                                      |
-| isNumber            | 判断是否为 Number                                                        | -                                      |
-| isEmpty             | 判断一个值是否为空，包括 undefined、null、空字符串、空数组、空对象等情况 | -                                      |
-| isObject            | 判断是否为 Object                                                        | -                                      |
-| isString            | 判断是否为 String                                                        | -                                      |
-| toNumber            | 转换为数字                                                               | -                                      |
-| toString            | 转换为字符串                                                             | -                                      |
-| trimObject          | 去空对象                                                                 | -                                      |
-| updateControlStatus | 更新表单控件状态                                                         | <label type="success">v15.5.0+</label> |
-| selectFile          | 选择文件                                                                 | <label type="success">v15.5.0+</label> |
-| downloadFile        | 下载文件                                                                 | <label type="success">v15.5.0+</label> |
+| 函数                | 说明                                                                     | 版本                                           |
+| ------------------- | ------------------------------------------------------------------------ | ---------------------------------------------- |
+| cloneDeep           | 深克隆                                                                   | -                                              |
+| isArray             | 判断是否为数组                                                           | -                                              |
+| isDate              | 判断是否为 Date                                                          | -                                              |
+| isNumber            | 判断是否为 Number                                                        | -                                              |
+| isEmpty             | 判断一个值是否为空，包括 undefined、null、空字符串、空数组、空对象等情况 | -                                              |
+| isObject            | 判断是否为 Object                                                        | -                                              |
+| isString            | 判断是否为 String                                                        | -                                              |
+| toNumber            | 转换为数字                                                               | -                                              |
+| toString            | 转换为字符串                                                             | -                                              |
+| trimObject          | 去空对象                                                                 | -                                              |
+| updateControlStatus | 更新表单控件状态                                                         | <label type="success">v15.5.0+</label>         |
+| selectFile          | 选择文件                                                                 | <label type="success">v15.5.0+</label>         |
+| downloadFile        | 下载文件                                                                 | <label type="success">v15.5.0+</label>         |
+| getElementByTag     | 获取当前 document 下所有指定标签                                         | 具体哪个版本有的忘了，反正 14 以上最新版本会有 |
diff --git a/components/util/lib/getElementByTag.ts b/components/util/lib/getElementByTag.ts
@@ -1,3 +1,5 @@
+import { isString } from './isString';
+
 /**
  * 获取当前document下所有指定标签
  * @param tagName 标签名
@@ -13,23 +15,31 @@ export function getElementByTag(
   if (identifier) {
     if (Array.isArray(identifier)) {
       identifiers = [...identifier];
-    } else {
+    } else if (isString(identifier)) {
       identifiers = [identifier];
     }
   }
   const html: string[] = [];
   const elements = document.getElementsByTagName(tagName);
   const length = elements.length;
   for (let index = 0; index < length; index++) {
-    identifiers.forEach((s) => {
-      if (elements[index].outerHTML.includes(s)) {
-        const formateStr = elements[index].outerHTML.replace(
-          /\/\*[\s\S]*?\*\//g,
-          ''
-        );
-        html.push(formateStr);
-      }
-    });
+    if (identifiers.length) {
+      identifiers.forEach((s) => {
+        if (elements[index].outerHTML.includes(s)) {
+          const formateStr = elements[index].outerHTML.replace(
+            /\/\*[\s\S]*?\*\//g,
+            ''
+          );
+          html.push(formateStr);
+        }
+      });
+    } else {
+      const formateStr = elements[index].outerHTML.replace(
+        /\/\*[\s\S]*?\*\//g,
+        ''
+      );
+      html.push(formateStr);
+    }
   }
   return html.join('\r\n');
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-zorro-antd-extension",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "license": "MIT",
   "description": "An extension based on ng-zorro-antd",
   "keywords": [