@whitesev/pops 2.5.2 → 2.5.4

package/dist/index.esm.js

@@ -1832,17 +1832,28 @@ class PopsDOMUtils extends PopsDOMUtilsEvent {
      * @param className className属性
      */
     addClassName($el, className) {
-        if ($el == null) {
+        if ($el == null)
             return;
-        }
-        if (typeof className !== "string") {
+        if (className == null)
             return;
+        if (typeof className === "function") {
+            className = className();
         }
-        if (className.trim() === "") {
-            return;
+        if (!Array.isArray(className)) {
+            className = [className];
         }
-        const classNameList = className.split(" ").filter((item) => item.trim() !== "");
-        $el.classList.add(...classNameList);
+        className.forEach((classNameStrItem) => {
+            if (typeof classNameStrItem !== "string") {
+                // 不是字符串
+                return;
+            }
+            if (classNameStrItem.trim() === "") {
+                // 空字符串
+                return;
+            }
+            const classNameList = classNameStrItem.split(" ").filter((item) => item.trim() !== "");
+            $el?.classList?.add?.(...classNameList);
+        });
     }
     /**
      * 删除className
@@ -6050,18 +6061,16 @@ const PopsPanelConfig = () => {
                 title: "菜单配置1",
                 headerTitle: "菜单配置1",
                 isDefault: false,
-                attributes: [
-                    {
-                        "data-test": "test",
-                        "data-test-2": "test2",
-                    },
-                ],
+                attributes: {
+                    "data-test": "test",
+                    "data-test-2": "test2",
+                },
                 forms: [
                     {
                         className: "forms-1",
                         text: "区域设置",
                         type: "forms",
-                        attributes: [],
+                        attributes: {},
                         forms: [
                             {
                                 className: "panel-switch",
@@ -6073,7 +6082,7 @@ const PopsPanelConfig = () => {
                                     // TODO
                                 },
                                 props: {},
-                                attributes: [],
+                                attributes: {},
                                 getValue() {
                                     return true;
                                 },
@@ -6096,7 +6105,7 @@ const PopsPanelConfig = () => {
                                 isShowHoverTip: true,
                                 step: 1,
                                 props: {},
-                                attributes: [],
+                                attributes: {},
                                 getValue() {
                                     return 50;
                                 },
@@ -6117,7 +6126,7 @@ const PopsPanelConfig = () => {
                                 afterAddToUListCallBack() {
                                     // TODO
                                 },
-                                attributes: [],
+                                attributes: {},
                                 buttonIcon: "view",
                                 buttonIconIsLoading: true,
                                 buttonType: "default",
@@ -6131,7 +6140,7 @@ const PopsPanelConfig = () => {
                                 text: "button",
                                 type: "button",
                                 props: {},
-                                attributes: [],
+                                attributes: {},
                                 buttonIcon: "eleme",
                                 buttonIconIsLoading: true,
                                 buttonType: "warning",
@@ -6146,7 +6155,7 @@ const PopsPanelConfig = () => {
                                 // @ts-ignore
                                 props: {},
                                 type: "button",
-                                attributes: [],
+                                attributes: {},
                                 buttonIcon: "chromeFilled",
                                 buttonIconIsLoading: true,
                                 buttonType: "danger",
@@ -6159,7 +6168,7 @@ const PopsPanelConfig = () => {
                                 className: "panel-button",
                                 text: "button",
                                 type: "button",
-                                attributes: [],
+                                attributes: {},
                                 // @ts-ignore
                                 props: {},
                                 buttonIcon: "upload",
@@ -6179,12 +6188,10 @@ const PopsPanelConfig = () => {
                 title: "菜单配置2",
                 headerTitle: "菜单配置2",
                 isDefault: true,
-                attributes: [
-                    {
-                        "data-value": "value",
-                        "data-value-2": "value2",
-                    },
-                ],
+                attributes: {
+                    "data-value": "value",
+                    "data-value-2": "value2",
+                },
                 forms: [
                     {
                         className: "panel-input",
@@ -6192,7 +6199,7 @@ const PopsPanelConfig = () => {
                         type: "input",
                         isNumber: false,
                         props: {},
-                        attributes: [],
+                        attributes: {},
                         getValue() {
                             return "50";
                         },
@@ -6208,7 +6215,7 @@ const PopsPanelConfig = () => {
                         type: "input",
                         // @ts-ignore
                         props: {},
-                        attributes: [],
+                        attributes: {},
                         getValue() {
                             return "123456";
                         },
@@ -6225,7 +6232,7 @@ const PopsPanelConfig = () => {
                         type: "textarea",
                         // @ts-ignore
                         props: {},
-                        attributes: [],
+                        attributes: {},
                         getValue() {
                             return "50";
                         },
@@ -6242,7 +6249,7 @@ const PopsPanelConfig = () => {
                         disabled: true,
                         // @ts-ignore
                         props: {},
-                        attributes: [],
+                        attributes: {},
                         getValue() {
                             return 50;
                         },
@@ -6283,7 +6290,7 @@ const PopsPanelConfig = () => {
                         disabled: true,
                         // @ts-ignore
                         props: {},
-                        attributes: [],
+                        attributes: {},
                         placeholder: "请至少选择一个选项",
                         getValue() {
                             return ["select-1", "select-2"];
@@ -6366,7 +6373,8 @@ const PopsPanelConfig = () => {
                                         className: "forms-1",
                                         text: "区域设置",
                                         type: "forms",
-                                        attributes: [],
+                                        attributes: {},
+                                        props: {},
                                         forms: [
                                             {
                                                 className: "panel-switch",
@@ -6374,7 +6382,7 @@ const PopsPanelConfig = () => {
                                                 type: "switch",
                                                 // @ts-ignore
                                                 props: {},
-                                                attributes: [],
+                                                attributes: {},
                                                 getValue() {
                                                     return true;
                                                 },
@@ -6388,7 +6396,7 @@ const PopsPanelConfig = () => {
                                                 // @ts-ignore
                                                 props: {},
                                                 type: "slider",
-                                                attributes: [],
+                                                attributes: {},
                                                 getValue() {
                                                     return 50;
                                                 },
@@ -6404,7 +6412,7 @@ const PopsPanelConfig = () => {
                                                 // @ts-ignore
                                                 props: {},
                                                 type: "button",
-                                                attributes: [],
+                                                attributes: {},
                                                 buttonIcon: "eleme",
                                                 buttonIconIsLoading: true,
                                                 buttonType: "warning",
@@ -6419,7 +6427,7 @@ const PopsPanelConfig = () => {
                                                 type: "button",
                                                 // @ts-ignore
                                                 props: {},
-                                                attributes: [],
+                                                attributes: {},
                                                 buttonIcon: "chromeFilled",
                                                 buttonIconIsLoading: true,
                                                 buttonType: "danger",
@@ -6434,7 +6442,7 @@ const PopsPanelConfig = () => {
                                                 // @ts-ignore
                                                 props: {},
                                                 type: "button",
-                                                attributes: [],
+                                                attributes: {},
                                                 buttonIcon: "upload",
                                                 buttonIconIsLoading: false,
                                                 buttonType: "info",
@@ -6481,7 +6489,7 @@ const PopsPanelConfig = () => {
                                 // @ts-ignore
                                 props: {},
                                 type: "switch",
-                                attributes: [],
+                                attributes: {},
                                 getValue() {
                                     return true;
                                 },
@@ -6500,12 +6508,10 @@ const PopsPanelConfig = () => {
 				`,
                 isBottom: true,
                 disableAsideItemHoverCSS: true,
-                attributes: [
-                    {
-                        "data-value": "value",
-                        "data-value-2": "value2",
-                    },
-                ],
+                attributes: {
+                    "data-value": "value",
+                    "data-value-2": "value2",
+                },
                 // @ts-ignore
                 props: {},
                 forms: [],
@@ -6517,12 +6523,10 @@ const PopsPanelConfig = () => {
                 id: "whitesev-panel-bottom-config-2",
                 title: "版本：xxx.xx.xx",
                 isBottom: true,
-                attributes: [
-                    {
-                        "data-value": "value",
-                        "data-value-2": "value2",
-                    },
-                ],
+                attributes: {
+                    "data-value": "value",
+                    "data-value-2": "value2",
+                },
                 // @ts-ignore
                 props: {},
                 forms: [],
@@ -6531,42 +6535,7 @@ const PopsPanelConfig = () => {
                 },
             },
         ],
-        bottomContentConfig: [
-            {
-                text: "Github",
-                position: "left",
-                className: "user-home",
-                attributes: {
-                    "data-url": "https://github.com/whitesevs",
-                },
-                props: {
-                    "data-test": 1,
-                },
-                disableHoverCSS: false,
-                clickCallback() {
-                    const userHomeUrl = this.attributes["data-url"];
-                    console.log("打开个人主页：" + userHomeUrl);
-                    window.open(userHomeUrl, "_blank");
-                },
-                afterRender(config) {
-                    console.log(config);
-                },
-            },
-            {
-                text: "0.0.1",
-                position: "right",
-                className: "script-version",
-                attributes: {},
-                props: {},
-                disableHoverCSS: true,
-                clickCallback() {
-                    console.log("当前版本：" + this.text);
-                },
-                afterRender(config) {
-                    console.log(config);
-                },
-            },
-        ],
+        bottomContentConfig: [],
         btn: {
             close: {
                 enable: true,
@@ -6774,9 +6743,7 @@ class ToolTip {
         /** 箭头 */
         const $toolTipArrow = $toolTipContainer.querySelector(".pops-tip-arrow");
         // 处理className
-        if (typeof this.$data.config.className === "string" && this.$data.config.className.trim() !== "") {
-            popsDOMUtils.addClassName($toolTipContainer, this.$data.config.className);
-        }
+        popsDOMUtils.addClassName($toolTipContainer, this.$data.config.className);
         // 添加z-index
         $toolTipContainer.style.zIndex = PopsHandler.handleZIndex(this.$data.config.zIndex).toString();
         if (this.$data.config.style != null) {
@@ -7424,10 +7391,12 @@ const PanelHandlerComponents = () => {
          * @param props 属性
          */
         setElementProps($el, props) {
-            if (props == null) {
+            if (props == null)
                 return;
-            }
-            Object.keys(props).forEach((propName) => {
+            if (typeof props !== "object")
+                return;
+            const propsKeys = Object.keys(props);
+            propsKeys.forEach((propName) => {
                 const value = props[propName];
                 if (propName === "innerHTML") {
                     PopsSafeUtils.setSafeHTML($el, value);
@@ -7442,23 +7411,7 @@ const PanelHandlerComponents = () => {
          * @param className
          */
         setElementClassName($el, className) {
-            if (className == null) {
-                return;
-            }
-            if (typeof className === "function") {
-                className = className();
-            }
-            if (typeof className === "string") {
-                const splitClassName = className.split(" ");
-                splitClassName.forEach((classNameStr) => {
-                    $el.classList.add(classNameStr);
-                });
-            }
-            else if (Array.isArray(className)) {
-                className.forEach((classNameStr) => {
-                    this.setElementClassName($el, classNameStr);
-                });
-            }
+            popsDOMUtils.addClassName($el, className);
         },
         /**
          * 创建底部项元素<li>
@@ -10099,8 +10052,19 @@ const PopsPanel = {
         let config = PopsPanelConfig();
         config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
         config = popsUtils.assign(config, details);
-        if (details && Array.isArray(details.content)) {
-            config.content = details.content;
+        if (details) {
+            if (Array.isArray(details.content)) {
+                // 存在内容配置
+                config.content = details.content;
+            }
+            if (Array.isArray(details.bottomContentConfig)) {
+                // 存在底部配置
+                config.bottomContentConfig = details.bottomContentConfig;
+            }
+            else {
+                // 不存在底部配置 清空默认的
+                config.bottomContentConfig = [];
+            }
         }
         config = PopsHandler.handleOnly(popsType, config);
         const { $shadowContainer, $shadowRoot } = PopsHandler.handlerShadow(config);
@@ -11954,7 +11918,7 @@ const PopsSearchSuggestion = {
     },
 };
 
-const version = "2.5.2";
+const version = "2.5.4";
 
 class Pops {
     /** 配置 */