@whitesev/pops 1.0.1 → 1.2.0

package/dist/index.system.js

@@ -3,6 +3,8 @@ System.register('pops', [], (function (exports) {
     return {
         execute: (function () {
 
+            const SymbolEvents = Symbol("events_" + (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1));
+
             const PopsCoreDefaultEnv = {
                 document: document,
                 window: window,
@@ -41,8 +43,6 @@ System.register('pops', [], (function (exports) {
                 },
             };
 
-            const SymbolEvents = Symbol("events_" + (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1));
-
             // @ts-nocheck
 
             const AnyTouch = function () {
@@ -1494,6 +1494,12 @@ System.register('pops', [], (function (exports) {
                 }
                 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";
@@ -1507,8 +1513,9 @@ System.register('pops', [], (function (exports) {
                             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);
@@ -1523,6 +1530,7 @@ System.register('pops', [], (function (exports) {
                                 let targetValue = target[targetKeyName];
                                 let sourceValue = source[targetKeyName];
                                 if (typeof sourceValue === "object" &&
+                                    sourceValue != null &&
                                     !UtilsContext.isDOM(sourceValue) &&
                                     Object.keys(sourceValue).length) {
                                     /* 源端的值是object类型，且不是元素节点 */
@@ -2294,7 +2302,6 @@ System.register('pops', [], (function (exports) {
                     }
                 }
             }
-
             class PopsDOMUtils extends PopsDOMUtilsEvent {
                 /** 获取 animationend 在各个浏览器的兼容名 */
                 getAnimationEndNameList() {
@@ -2944,7 +2951,7 @@ System.register('pops', [], (function (exports) {
             }
             const popsDOMUtils = new PopsDOMUtils();
 
-            const PopsUIUtils = {
+            const PopsInstanceUtils = {
                 /**
                  * 获取所有弹窗中的最大的z-index
                  * @param defaultValue
@@ -2983,10 +2990,9 @@ System.register('pops', [], (function (exports) {
                  * 删除配置中对应的对象
                  * @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();
@@ -2997,7 +3003,7 @@ System.register('pops', [], (function (exports) {
                     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%";
@@ -3164,7 +3170,7 @@ System.register('pops', [], (function (exports) {
                                 return;
                             }
                             popsDOMUtils.off(popsElement, popsDOMUtils.getTransitionEndNameList(), void 0, closeCallBack);
-                            PopsUIUtils.configRemove([layerConfigList], guid);
+                            PopsInstanceUtils.removeInstance([layerConfigList], guid);
                         }
                         /* 监听过渡结束 */
                         popsDOMUtils.on(popsElement, popsDOMUtils.getTransitionEndNameList(), closeCallBack);
@@ -3195,7 +3201,7 @@ System.register('pops', [], (function (exports) {
                         }, drawerConfig.closeDelay);
                     }
                     else {
-                        PopsUIUtils.configRemove([layerConfigList], guid);
+                        PopsInstanceUtils.removeInstance([layerConfigList], guid);
                     }
                 },
                 /**
@@ -3883,11 +3889,11 @@ System.register('pops', [], (function (exports) {
                         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") {
@@ -4059,13 +4065,13 @@ System.register('pops', [], (function (exports) {
                         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);
                         },
                     };
                 },
@@ -4087,13 +4093,13 @@ System.register('pops', [], (function (exports) {
                         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);
                         },
                     };
                 },
@@ -4193,10 +4199,10 @@ System.register('pops', [], (function (exports) {
                         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,
@@ -4209,7 +4215,7 @@ System.register('pops', [], (function (exports) {
                     }
                     else {
                         config.zIndex =
-                            PopsUIUtils.getPopsMaxZIndex(config.zIndex)["zIndex"] * 2;
+                            PopsInstanceUtils.getPopsMaxZIndex(config.zIndex)["zIndex"] * 2;
                     }
                     return config;
                 },
@@ -4366,7 +4372,7 @@ System.register('pops', [], (function (exports) {
                     });
                     /* 拖拽 */
                     if (config.drag) {
-                        PopsUIUtils.drag($pops, {
+                        PopsInstanceUtils.drag($pops, {
                             dragElement: $title,
                             limit: config.dragLimit,
                             extraDistance: config.dragExtraDistance,
@@ -4548,7 +4554,7 @@ System.register('pops', [], (function (exports) {
                     });
                     /* 拖拽 */
                     if (config.drag) {
-                        PopsUIUtils.drag($pops, {
+                        PopsInstanceUtils.drag($pops, {
                             dragElement: $title,
                             limit: config.dragLimit,
                             extraDistance: config.dragExtraDistance,
@@ -4743,7 +4749,7 @@ System.register('pops', [], (function (exports) {
                     });
                     /* 拖拽 */
                     if (config.drag) {
-                        PopsUIUtils.drag($pops, {
+                        PopsInstanceUtils.drag($pops, {
                             dragElement: $title,
                             limit: config.dragLimit,
                             extraDistance: config.dragExtraDistance,
@@ -5005,7 +5011,7 @@ System.register('pops', [], (function (exports) {
                     }
                     /* 拖拽 */
                     if (config.drag) {
-                        PopsUIUtils.drag($pops, {
+                        PopsInstanceUtils.drag($pops, {
                             dragElement: $title,
                             limit: config.dragLimit,
                             extraDistance: config.dragExtraDistance,
@@ -5071,7 +5077,7 @@ System.register('pops', [], (function (exports) {
                                 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);
@@ -5087,7 +5093,7 @@ System.register('pops', [], (function (exports) {
                     });
                     /* 关闭按钮点击事件 */
                     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) => {
@@ -5096,7 +5102,7 @@ System.register('pops', [], (function (exports) {
                                     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);
@@ -6531,7 +6537,7 @@ System.register('pops', [], (function (exports) {
                     }
                     /* 拖拽 */
                     if (config.drag) {
-                        PopsUIUtils.drag($pops, {
+                        PopsInstanceUtils.drag($pops, {
                             dragElement: $title,
                             limit: config.dragLimit,
                             extraDistance: config.dragExtraDistance,
@@ -8765,7 +8771,7 @@ System.register('pops', [], (function (exports) {
                     });
                     /* 拖拽 */
                     if (config.drag) {
-                        PopsUIUtils.drag($pops, {
+                        PopsInstanceUtils.drag($pops, {
                             dragElement: $title,
                             limit: config.dragLimit,
                             extraDistance: config.dragExtraDistance,
@@ -9922,7 +9928,7 @@ System.register('pops', [], (function (exports) {
                 /** 配置 */
                 config = {
                     /** 版本号 */
-                    version: "2024.7.8",
+                    version: "2024.7.14",
                     cssText: {
                         /** 主CSS */
                         index: indexCSS,
@@ -10012,6 +10018,10 @@ System.register('pops', [], (function (exports) {
                     Utils: popsUtils,
                     /** pops使用的DOM工具类 */
                     DOMUtils: popsDOMUtils,
+                    /** pops创建的实例使用的工具类 */
+                    InstanceUtils: PopsInstanceUtils,
+                    /** pops处理float类型使用的工具类 */
+                    MathFloatUtils: PopsMathFloatUtils,
                 };
                 constructor() { }
                 init() {
@@ -10022,7 +10032,7 @@ System.register('pops', [], (function (exports) {
                         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);