nhanh-pure-function 1.3.13 → 1.3.14

package/lib/User/User.d.ts

@@ -184,9 +184,9 @@ export class _LocalDrag {
 }
 
 /** 进入全屏模式 */
-export function _EnterFullscreen(content: HTMLElement): void;
+export function _EnterFullscreen(content: HTMLElement): Promise<void>;
 /** 退出全屏模式 */
-export function _ExitFullscreen(): void;
+export function _ExitFullscreen(): Promise<void>;
 /** 判断是否处于全屏模式 */
 export function _IsFullscreen(): HTMLElement | undefined;
 

package/lib/User/User.js

@@ -485,33 +485,34 @@ export class _LocalDrag {
 
 /** 进入全屏模式 */
 export function _EnterFullscreen(content) {
-  if (!content) return console.error("No DOM: ", content);
-  if (content.requestFullscreen) {
-    content.requestFullscreen();
+  if (!content) {
+    return Promise.reject("No DOM: ", content);
+  } else if (content.requestFullscreen) {
+    return content.requestFullscreen();
   } else if (content.mozRequestFullScreen) {
     // Firefox
-    content.mozRequestFullScreen();
+    return content.mozRequestFullScreen();
   } else if (content.webkitRequestFullscreen) {
     // Chrome, Safari and Opera
-    content.webkitRequestFullscreen();
+    return content.webkitRequestFullscreen();
   } else if (content.msRequestFullscreen) {
     // IE/Edge
-    content.msRequestFullscreen();
+    return content.msRequestFullscreen();
   }
 }
 /** 退出全屏模式 */
 export function _ExitFullscreen() {
   if (document.exitFullscreen) {
-    document.exitFullscreen();
+    return document.exitFullscreen();
   } else if (document.mozCancelFullScreen) {
     // Firefox
-    document.mozCancelFullScreen();
+    return document.mozCancelFullScreen();
   } else if (document.webkitExitFullscreen) {
     // Chrome, Safari and Opera
-    document.webkitExitFullscreen();
+    return document.webkitExitFullscreen();
   } else if (document.msExitFullscreen) {
     // IE/Edge
-    document.msExitFullscreen();
+    return document.msExitFullscreen();
   }
 }
 /** 判断是否处于全屏模式 */

package/lib/Utility/Utility.d.ts

@@ -65,7 +65,7 @@ export function _MergeObjects<T, T1>(A: T, B: T1): T & T1;
  */
 export function _TimeTransition(
   time: number | Date,
-  template: string,
+  template?: string,
   pad?: boolean
 ): string;
 
@@ -91,7 +91,7 @@ export function _GetHrefName(href: string, defaultName = "file"): string;
  * @param {string} href 文件路径
  * @param {string} fileName 导出文件名
  */
-export function _DownloadFile(href: string, fileName?: string): void;
+export function _DownloadFile(href: string, fileName?: string): Promise<void>;
 
 /**
  * 获取帧率

package/lib/Utility/Utility.js

@@ -86,34 +86,47 @@ export function _CapitalizeFirstLetter(string) {
  * @param {Object | Array} B
  * @returns A&B || B
  */
-export function _MergeObjects(A, B, visitedObjects = []) {
+export function _MergeObjects(
+  A,
+  B,
+  visitedObjects = [],
+  outTime = +new Date()
+) {
+  /** 疑似死循环 */
+  if (outTime < +new Date() - 2000) {
+    console.error("_MergeObjects 合并异常：疑似死循环");
+    return null;
+  }
+
   const getType = (v) => (Array.isArray(v) ? "array" : typeof v);
   const TA = getType(A);
   const TB = getType(B);
 
   if (TA != TB) return B;
-  if (visitedObjects.some((item) => item == B)) return B;
-
-  if (TA == "object") {
-    visitedObjects.push(A, B);
-    for (const key in B) {
-      if (Object.prototype.hasOwnProperty.call(B, key)) {
-        const BC = B[key];
-        const AC = A[key];
-        const fianlValue = _MergeObjects(AC, BC, visitedObjects);
-        A[key] = fianlValue;
+
+  if (TA == "object" || TA == "array") {
+    if (visitedObjects.some(([a, b]) => a == A && b == B)) return A;
+    visitedObjects.push([A, B]);
+
+    if (TA == "object") {
+      for (const key in B) {
+        if (Object.prototype.hasOwnProperty.call(B, key)) {
+          const BC = B[key];
+          const AC = A[key];
+          const fianlValue = _MergeObjects(AC, BC, visitedObjects, outTime);
+          A[key] = fianlValue;
+        }
       }
+      return A;
+    } else if (TA == "array") {
+      B.forEach((item, index) => {
+        const BC = item;
+        const AC = A[index];
+        const fianlValue = _MergeObjects(AC, BC, visitedObjects, outTime);
+        A[index] = fianlValue;
+      });
+      return A;
     }
-    return A;
-  } else if (TA == "array") {
-    visitedObjects.push(A, B);
-    B.forEach((item, index) => {
-      const BC = item;
-      const AC = A[index];
-      const fianlValue = _MergeObjects(AC, BC, visitedObjects);
-      A[index] = fianlValue;
-    });
-    return A;
   } else return B;
 }
 
@@ -123,7 +136,11 @@ export function _MergeObjects(A, B, visitedObjects = []) {
  * @param {String} template 完整模板 -->  YYYY MM DD hh mm ss ms
  * @param {Boolean} pad 补0
  */
-export function _TimeTransition(time, template, pad = true) {
+export function _TimeTransition(
+  time,
+  template = "YYYY-MM-DD hh:mm:ss",
+  pad = true
+) {
   try {
     time = new Date(time);
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nhanh-pure-function",
-  "version": "1.3.13",
+  "version": "1.3.14",
   "description": "纯函数工具",
   "main": "lib/Index.js",
   "scripts": {