@whitesev/pops 1.0.1 → 1.2.0

package/dist/index.amd.js

@@ -1,5 +1,7 @@
 define((function () { 'use strict';
 
+    const SymbolEvents = Symbol("events_" + (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1));
+
     const PopsCoreDefaultEnv = {
         document: document,
         window: window,
@@ -38,8 +40,6 @@ define((function () { 'use strict';
         },
     };
 
-    const SymbolEvents = Symbol("events_" + (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1));
-
     // @ts-nocheck
 
     const AnyTouch = function () {
@@ -1491,6 +1491,12 @@ define((function () { 'use strict';
         }
         assign(target = {}, source = {}, isAdd = false) {
             let UtilsContext = this;
+            if (source == null) {
+                return target;
+            }
+            if (target == null) {
+                target = {};
+            }
             if (Array.isArray(source)) {
                 let canTraverse = source.filter((item) => {
                     return typeof item === "object";
@@ -1504,8 +1510,9 @@ define((function () { 'use strict';
                     const targetKeyName = sourceKeyName;
                     let targetValue = target[targetKeyName];
                     let sourceValue = source[sourceKeyName];
-                    if (sourceKeyName in target &&
-                        typeof sourceValue === "object" &&
+                    if (typeof sourceValue === "object" &&
+                        sourceValue != null &&
+                        sourceKeyName in target &&
                         !UtilsContext.isDOM(sourceValue)) {
                         /* 源端的值是object类型，且不是元素节点 */
                         target[sourceKeyName] = UtilsContext.assign(targetValue, sourceValue, isAdd);
@@ -1520,6 +1527,7 @@ define((function () { 'use strict';
                         let targetValue = target[targetKeyName];
                         let sourceValue = source[targetKeyName];
                         if (typeof sourceValue === "object" &&
+                            sourceValue != null &&
                             !UtilsContext.isDOM(sourceValue) &&
                             Object.keys(sourceValue).length) {
                             /* 源端的值是object类型，且不是元素节点 */
@@ -2291,7 +2299,6 @@ define((function () { 'use strict';
             }
         }
     }
-
     class PopsDOMUtils extends PopsDOMUtilsEvent {
         /** 获取 animationend 在各个浏览器的兼容名 */
         getAnimationEndNameList() {
@@ -2941,7 +2948,7 @@ define((function () { 'use strict';
     }
     const popsDOMUtils = new PopsDOMUtils();
 
-    const PopsUIUtils = {
+    const PopsInstanceUtils = {
         /**
          * 获取所有弹窗中的最大的z-index
          * @param defaultValue
@@ -2980,10 +2987,9 @@ define((function () { 'use strict';
          * 删除配置中对应的对象
          * @param moreLayerConfigList 配置实例列表
          * @param  guid 唯一标识
-         * @param removeAll 是否全部删除
+         * @param isAll 是否全部删除
          */
-        configRemove(moreLayerConfigList, guid, removeAll = false) {
-            /** @param item */
+        removeInstance(moreLayerConfigList, guid, isAll = false) {
             function removeItem(item) {
                 item?.animElement?.remove();
                 item?.popsElement?.remove();
@@ -2994,7 +3000,7 @@ define((function () { 'use strict';
             moreLayerConfigList.forEach((layerConfigList) => {
                 //  layer[]
                 layerConfigList.forEach((layerConfigItem, index) => {
-                    if (removeAll || layerConfigItem["guid"] === guid) {
+                    if (isAll || layerConfigItem["guid"] === guid) {
                         if (pops.config.animation.hasOwnProperty(layerConfigItem.animElement.getAttribute("anim"))) {
                             layerConfigItem.animElement.style.width = "100%";
                             layerConfigItem.animElement.style.height = "100%";
@@ -3161,7 +3167,7 @@ define((function () { 'use strict';
                         return;
                     }
                     popsDOMUtils.off(popsElement, popsDOMUtils.getTransitionEndNameList(), void 0, closeCallBack);
-                    PopsUIUtils.configRemove([layerConfigList], guid);
+                    PopsInstanceUtils.removeInstance([layerConfigList], guid);
                 }
                 /* 监听过渡结束 */
                 popsDOMUtils.on(popsElement, popsDOMUtils.getTransitionEndNameList(), closeCallBack);
@@ -3192,7 +3198,7 @@ define((function () { 'use strict';
                 }, drawerConfig.closeDelay);
             }
             else {
-                PopsUIUtils.configRemove([layerConfigList], guid);
+                PopsInstanceUtils.removeInstance([layerConfigList], guid);
             }
         },
         /**
@@ -3880,11 +3886,11 @@ define((function () { 'use strict';
                 function originalRun() {
                     if (details.config.mask.clickEvent.toClose) {
                         /* 关闭 */
-                        PopsUIUtils.close(details.type, targetLayer, details.guid, details.config, details.animElement);
+                        PopsInstanceUtils.close(details.type, targetLayer, details.guid, details.config, details.animElement);
                     }
                     else if (details.config.mask.clickEvent.toHide) {
                         /* 隐藏 */
-                        PopsUIUtils.hide(details.type, targetLayer, details.guid, details.config, details.animElement, result.maskElement);
+                        PopsInstanceUtils.hide(details.type, targetLayer, details.guid, details.config, details.animElement, result.maskElement);
                     }
                 }
                 if (typeof details.config.mask.clickCallBack === "function") {
@@ -4056,13 +4062,13 @@ define((function () { 'use strict';
                 mode: mode,
                 guid: guid,
                 close() {
-                    PopsUIUtils.close(mode, pops.config.layer[mode], guid, config, animElement);
+                    PopsInstanceUtils.close(mode, pops.config.layer[mode], guid, config, animElement);
                 },
                 hide() {
-                    PopsUIUtils.hide(mode, pops.config.layer[mode], guid, config, animElement, maskElement);
+                    PopsInstanceUtils.hide(mode, pops.config.layer[mode], guid, config, animElement, maskElement);
                 },
                 show() {
-                    PopsUIUtils.show(mode, pops.config.layer[mode], guid, config, animElement, maskElement);
+                    PopsInstanceUtils.show(mode, pops.config.layer[mode], guid, config, animElement, maskElement);
                 },
             };
         },
@@ -4084,13 +4090,13 @@ define((function () { 'use strict';
                 mode: mode,
                 guid: guid,
                 close() {
-                    PopsUIUtils.close(mode, pops.config.layer[mode], guid, config, animElement);
+                    PopsInstanceUtils.close(mode, pops.config.layer[mode], guid, config, animElement);
                 },
                 hide() {
-                    PopsUIUtils.hide(mode, pops.config.layer[mode], guid, config, animElement, maskElement);
+                    PopsInstanceUtils.hide(mode, pops.config.layer[mode], guid, config, animElement, maskElement);
                 },
                 show() {
-                    PopsUIUtils.show(mode, pops.config.layer[mode], guid, config, animElement, maskElement);
+                    PopsInstanceUtils.show(mode, pops.config.layer[mode], guid, config, animElement, maskElement);
                 },
             };
         },
@@ -4190,10 +4196,10 @@ define((function () { 'use strict';
                 if (type === "loading" ||
                     type === "tooltip" ||
                     type === "rightClickMenu") {
-                    PopsUIUtils.configRemove([pops.config.layer[type]], "", true);
+                    PopsInstanceUtils.removeInstance([pops.config.layer[type]], "", true);
                 }
                 else {
-                    PopsUIUtils.configRemove([
+                    PopsInstanceUtils.removeInstance([
                         pops.config.layer.alert,
                         pops.config.layer.confirm,
                         pops.config.layer.prompt,
@@ -4206,7 +4212,7 @@ define((function () { 'use strict';
             }
             else {
                 config.zIndex =
-                    PopsUIUtils.getPopsMaxZIndex(config.zIndex)["zIndex"] * 2;
+                    PopsInstanceUtils.getPopsMaxZIndex(config.zIndex)["zIndex"] * 2;
             }
             return config;
         },
@@ -4363,7 +4369,7 @@ define((function () { 'use strict';
             });
             /* 拖拽 */
             if (config.drag) {
-                PopsUIUtils.drag($pops, {
+                PopsInstanceUtils.drag($pops, {
                     dragElement: $title,
                     limit: config.dragLimit,
                     extraDistance: config.dragExtraDistance,
@@ -4545,7 +4551,7 @@ define((function () { 'use strict';
             });
             /* 拖拽 */
             if (config.drag) {
-                PopsUIUtils.drag($pops, {
+                PopsInstanceUtils.drag($pops, {
                     dragElement: $title,
                     limit: config.dragLimit,
                     extraDistance: config.dragExtraDistance,
@@ -4740,7 +4746,7 @@ define((function () { 'use strict';
             });
             /* 拖拽 */
             if (config.drag) {
-                PopsUIUtils.drag($pops, {
+                PopsInstanceUtils.drag($pops, {
                     dragElement: $title,
                     limit: config.dragLimit,
                     extraDistance: config.dragExtraDistance,
@@ -5002,7 +5008,7 @@ define((function () { 'use strict';
             }
             /* 拖拽 */
             if (config.drag) {
-                PopsUIUtils.drag($pops, {
+                PopsInstanceUtils.drag($pops, {
                     dragElement: $title,
                     limit: config.dragLimit,
                     extraDistance: config.dragExtraDistance,
@@ -5068,7 +5074,7 @@ define((function () { 'use strict';
                         allMinElementList.push(item.popsElement);
                     }
                 });
-                allMinElementList.sort(PopsUIUtils.sortElementListByProperty((obj) => {
+                allMinElementList.sort(PopsInstanceUtils.sortElementListByProperty((obj) => {
                     return parseInt(getComputedStyle(obj).left);
                 }, (obj) => {
                     return parseInt(getComputedStyle(obj).left);
@@ -5084,7 +5090,7 @@ define((function () { 'use strict';
             });
             /* 关闭按钮点击事件 */
             popsDOMUtils.on(headerCloseBtnElement, "click", (event) => {
-                PopsUIUtils.configRemove([pops.config.layer.iframe], guid, false);
+                PopsInstanceUtils.removeInstance([pops.config.layer.iframe], guid, false);
                 setTimeout(() => {
                     let allIsMinElementList = [];
                     pops.config.layer.iframe.forEach((item) => {
@@ -5093,7 +5099,7 @@ define((function () { 'use strict';
                             allIsMinElementList.push(item.popsElement);
                         }
                     });
-                    allIsMinElementList.sort(PopsUIUtils.sortElementListByProperty((obj) => {
+                    allIsMinElementList.sort(PopsInstanceUtils.sortElementListByProperty((obj) => {
                         return parseInt(getComputedStyle(obj).left);
                     }, (obj) => {
                         return parseInt(getComputedStyle(obj).left);
@@ -6528,7 +6534,7 @@ define((function () { 'use strict';
             }
             /* 拖拽 */
             if (config.drag) {
-                PopsUIUtils.drag($pops, {
+                PopsInstanceUtils.drag($pops, {
                     dragElement: $title,
                     limit: config.dragLimit,
                     extraDistance: config.dragExtraDistance,
@@ -8762,7 +8768,7 @@ define((function () { 'use strict';
             });
             /* 拖拽 */
             if (config.drag) {
-                PopsUIUtils.drag($pops, {
+                PopsInstanceUtils.drag($pops, {
                     dragElement: $title,
                     limit: config.dragLimit,
                     extraDistance: config.dragExtraDistance,
@@ -9919,7 +9925,7 @@ define((function () { 'use strict';
         /** 配置 */
         config = {
             /** 版本号 */
-            version: "2024.7.8",
+            version: "2024.7.14",
             cssText: {
                 /** 主CSS */
                 index: indexCSS,
@@ -10009,6 +10015,10 @@ define((function () { 'use strict';
             Utils: popsUtils,
             /** pops使用的DOM工具类 */
             DOMUtils: popsDOMUtils,
+            /** pops创建的实例使用的工具类 */
+            InstanceUtils: PopsInstanceUtils,
+            /** pops处理float类型使用的工具类 */
+            MathFloatUtils: PopsMathFloatUtils,
         };
         constructor() { }
         init() {
@@ -10019,7 +10029,7 @@ define((function () { 'use strict';
                 animationStyle.innerHTML = this.config.cssText.anim;
                 popsDOMUtils.appendHead(animationStyle);
                 this.config.animation = null;
-                this.config.animation = PopsUIUtils.getKeyFrames(animationStyle.sheet);
+                this.config.animation = PopsInstanceUtils.getKeyFrames(animationStyle.sheet);
                 setTimeout(() => {
                     animationStyle.remove();
                 }, 50);