@whitesev/pops 1.5.9 → 1.6.0

package/dist/index.system.js

@@ -8330,6 +8330,10 @@ System.register('pops', [], (function (exports) {
                                     panelSelect: liElement.querySelector(".pops-panel-select"),
                                     select: liElement.querySelector(".pops-panel-select select"),
                                 },
+                                $eleKey: {
+                                    disable: "__disable__",
+                                    value: "__value__",
+                                },
                                 $data: {
                                     defaultValue: formConfig.getValue(),
                                 },
@@ -8341,6 +8345,24 @@ System.register('pops', [], (function (exports) {
                                         this.disable();
                                     }
                                 },
+                                /**
+                                 * 给option元素设置属性
+                                 * @param $ele
+                                 * @param key
+                                 * @param value
+                                 */
+                                setNodeValue($ele, key, value) {
+                                    Reflect.set($ele, key, value);
+                                },
+                                /**
+                                 * 获取option元素上设置的属性
+                                 * @param $ele
+                                 * @param value
+                                 * @param key
+                                 */
+                                getNodeValue($ele, key) {
+                                    return Reflect.get($ele, key);
+                                },
                                 disable() {
                                     this.$ele.select.setAttribute("disabled", "true");
                                     this.$ele.panelSelect.classList.add("pops-panel-select-disable");
@@ -8355,9 +8377,10 @@ System.register('pops', [], (function (exports) {
                                 },
                                 initOption() {
                                     formConfig.data.forEach((dataItem) => {
+                                        // 初始化默认选中
                                         let optionElement = document.createElement("option");
-                                        optionElement["__value__"] = dataItem.value;
-                                        optionElement["__disable__"] = dataItem.disable;
+                                        this.setNodeValue(optionElement, this.$eleKey.value, dataItem.value);
+                                        this.setNodeValue(optionElement, this.$eleKey.disable, dataItem.disable);
                                         if (dataItem.value === this.$data.defaultValue) {
                                             optionElement.setAttribute("selected", "true");
                                         }
@@ -8365,6 +8388,7 @@ System.register('pops', [], (function (exports) {
                                         this.$ele.select.appendChild(optionElement);
                                     });
                                 },
+                                /** 检测所有option并设置禁用状态 */
                                 setSelectOptionsDisableStatus() {
                                     if (this.$ele.select.options && this.$ele.select.options.length) {
                                         Array.from(this.$ele.select.options).forEach((optionItem) => {
@@ -8372,16 +8396,30 @@ System.register('pops', [], (function (exports) {
                                         });
                                     }
                                 },
+                                /** 设置禁用状态 */
                                 setOptionDisableStatus(optionElement) {
-                                    if (typeof optionElement["__disable__"] === "function") {
-                                        let disableStatus = optionElement["__disable__"](optionElement["__value__"]);
-                                        if (disableStatus) {
-                                            optionElement.setAttribute("disabled", "true");
-                                        }
-                                        else {
-                                            optionElement.removeAttribute("disabled");
-                                        }
+                                    let disable = false;
+                                    let optionDisableAttr = this.getNodeValue(optionElement, this.$eleKey.disable);
+                                    if (optionDisableAttr === "function") {
+                                        let value = this.getNodeValue(optionElement, this.$eleKey.value);
+                                        disable = Boolean(optionDisableAttr(value));
+                                    }
+                                    if (disable) {
+                                        optionElement.setAttribute("disabled", "true");
                                     }
+                                    else {
+                                        optionElement.removeAttribute("disabled");
+                                    }
+                                },
+                                /** 获取option上的信息 */
+                                getSelectOptionInfo($option) {
+                                    let optionValue = this.getNodeValue($option, this.$eleKey.value);
+                                    let optionText = $option.innerText || $option.textContent;
+                                    return {
+                                        value: optionValue,
+                                        text: optionText,
+                                        $option: $option,
+                                    };
                                 },
                                 /**
                                  * 监听选择内容改变
@@ -8390,10 +8428,9 @@ System.register('pops', [], (function (exports) {
                                     popsDOMUtils.on(this.$ele.select, "change", void 0, (event) => {
                                         this.setSelectOptionsDisableStatus();
                                         if (typeof formConfig.callback === "function") {
-                                            let isSelectedElement = event.target[event.target.selectedIndex];
-                                            let isSelectedValue = isSelectedElement["__value__"];
-                                            let isSelectedText = isSelectedElement.innerText || isSelectedElement.textContent;
-                                            formConfig.callback(event, isSelectedValue, isSelectedText);
+                                            let $isSelectedElement = event.target[event.target.selectedIndex];
+                                            let selectInfo = this.getSelectOptionInfo($isSelectedElement);
+                                            formConfig.callback(event, selectInfo.value, selectInfo.text);
                                         }
                                     });
                                 },
@@ -8461,6 +8498,24 @@ System.register('pops', [], (function (exports) {
                                         this.disable();
                                     }
                                 },
+                                /**
+                                 * 给option元素设置属性
+                                 * @param $ele
+                                 * @param key
+                                 * @param value
+                                 */
+                                setNodeValue($ele, key, value) {
+                                    Reflect.set($ele, key, value);
+                                },
+                                /**
+                                 * 获取option元素上设置的属性
+                                 * @param $ele
+                                 * @param value
+                                 * @param key
+                                 */
+                                getNodeValue($ele, key) {
+                                    return Reflect.get($ele, key);
+                                },
                                 /** 禁用 */
                                 disable() {
                                     this.$ele.select.setAttribute("disabled", "true");
@@ -8483,31 +8538,13 @@ System.register('pops', [], (function (exports) {
                                         let optionElement = document.createElement("option");
                                         this.setNodeValue(optionElement, this.$eleKey.value, dataItem.value);
                                         this.setNodeValue(optionElement, this.$eleKey.disable, dataItem.disable);
-                                        if (dataItem.value === this.$data.defaultValue) {
+                                        if (this.$data.defaultValue.includes(dataItem.value)) {
                                             optionElement.setAttribute("selected", "true");
                                         }
                                         optionElement.innerText = dataItem.text;
                                         this.$ele.select.appendChild(optionElement);
                                     });
                                 },
-                                /**
-                                 * 给option元素设置属性
-                                 * @param $ele
-                                 * @param key
-                                 * @param value
-                                 */
-                                setNodeValue($ele, key, value) {
-                                    Reflect.set($ele, key, value);
-                                },
-                                /**
-                                 * 获取option元素上设置的属性
-                                 * @param $ele
-                                 * @param value
-                                 * @param key
-                                 */
-                                getNodeValue($ele, key) {
-                                    return Reflect.get($ele, key);
-                                },
                                 /** 检测所有option并设置禁用状态 */
                                 setSelectOptionsDisableStatus() {
                                     if (this.$ele.select.options && this.$ele.select.options.length) {