@whitesev/pops 1.1.0 → 1.2.1

package/dist/index.system.js

@@ -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类型，且不是元素节点 */
@@ -8959,11 +8967,13 @@ System.register('pops', [], (function (exports) {
                             popsDOMUtils.on(globalThis, "click touchstart", void 0, PopsContextMenu.windowCheckClickEvent, {
                                 capture: true,
                             });
-                            const $shadowRoot = config.target.getRootNode();
-                            if ($shadowRoot instanceof ShadowRoot) {
-                                popsDOMUtils.on($shadowRoot, "click touchstart", void 0, PopsContextMenu.shadowRootCheckClickEvent, {
-                                    capture: true,
-                                });
+                            if (config.target instanceof Node) {
+                                const $shadowRoot = config.target.getRootNode();
+                                if ($shadowRoot instanceof ShadowRoot) {
+                                    popsDOMUtils.on($shadowRoot, "click touchstart", void 0, PopsContextMenu.shadowRootCheckClickEvent, {
+                                        capture: true,
+                                    });
+                                }
                             }
                         },
                         /**
@@ -8973,11 +8983,13 @@ System.register('pops', [], (function (exports) {
                             popsDOMUtils.off(globalThis, "click touchstart", void 0, PopsContextMenu.windowCheckClickEvent, {
                                 capture: true,
                             });
-                            const $shadowRoot = config.target.getRootNode();
-                            if ($shadowRoot instanceof ShadowRoot) {
-                                popsDOMUtils.off($shadowRoot, "click touchstart", void 0, PopsContextMenu.windowCheckClickEvent, {
-                                    capture: true,
-                                });
+                            if (config.target instanceof Node) {
+                                const $shadowRoot = config.target.getRootNode();
+                                if ($shadowRoot instanceof ShadowRoot) {
+                                    popsDOMUtils.off($shadowRoot, "click touchstart", void 0, PopsContextMenu.windowCheckClickEvent, {
+                                        capture: true,
+                                    });
+                                }
                             }
                         },
                         /**
@@ -9920,7 +9932,7 @@ System.register('pops', [], (function (exports) {
                 /** 配置 */
                 config = {
                     /** 版本号 */
-                    version: "2024.7.8",
+                    version: "2024.7.14",
                     cssText: {
                         /** 主CSS */
                         index: indexCSS,