meixioacomponent 0.2.23 → 0.2.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "0.2.23",
+  "version": "0.2.26",
   "private": false,
   "author": "YuRi",
   "main": "lib/meixioacomponent.umd.min.js",

package/packages/components/base/baseIcon/index.vue

@@ -101,6 +101,8 @@ export default {
         return `meixicomponenticonfont ${this.$props.name}`;
       } else if (_iconClass == "element") {
         return `${this.$props.name}`;
+      } else if (_iconClass == "other") {
+        return `${this.$props.name}`;
       }
     },
   },

package/packages/components/base/basePopoverButton/index.vue

@@ -14,19 +14,20 @@
     <el-button
       slot="reference"
       :size="buttonSize"
+      :disabled="disabled"
       class="popover-button"
       :type="module ? 'selected' : 'info'"
     >
       <base-icon
         :size="`s`"
-        :color="module ? 'text-white' : 'd'"
         :plain="true"
-        :event="true"
         v-if="buttonIcon"
+        :event="!disabled"
         :name="buttonIcon"
         class="button-icon"
         :iconClass="iconClass"
         @iconClick="iconClick"
+        :color="module ? 'text-white' : 'd'"
       ></base-icon>
       <span class="inner-span" v-if="buttonText"> {{ buttonText }}</span>
     </el-button>
@@ -76,7 +77,6 @@ export default {
     // icon的类名
     buttonIcon: {
       type: String,
-
       require: false,
     },
 
@@ -120,9 +120,9 @@ export default {
     align-items: center;
     flex-flow: row nowrap;
     justify-content: flex-start;
-  }
-  .inner-span {
-    margin-left: var(--margin-3);
+    :nth-child(2) {
+      margin-left: var(--margin-3);
+    }
   }
 }
 </style>

package/packages/components/proForm/proForm/pro_form_item.vue

@@ -107,8 +107,8 @@
         <el-option
           v-for="item in selectData"
           :key="item.value"
-          :label="item[`${selectLabelKey}`]"
-          :value="item[`${selectValueKey}`]"
+          :label="item[`${selectConfig.label}`]"
+          :value="item[`${selectConfig.value}`]"
         >
         </el-option>
       </el-select>
@@ -236,26 +236,9 @@ export default {
       return this.selectStore.getData();
     },
 
-    selectLabelKey() {
-      let config = this.$props.config?.config;
-
-      if (config) {
-        return config.label.key;
-      } else {
-        return `label`;
-      }
+    selectConfig() {
+      return this.selectStore.getConfig();
     },
-    selectValueKey() {
-      let config = this.$props.config?.config;
-
-      if (config) {
-        return config.value.key;
-      } else {
-        return `value`;
-      }
-    },
-
-    selectValue() {},
 
     spContentType() {
       let configType = this.$props.config.type;
@@ -385,7 +368,6 @@ export default {
       this.isEdit = false;
     },
     loadSelectData() {
-
       this.selectStore.loadData();
     },
     visibleChange(visible) {

package/packages/config/selectStore/SelectStore.js

@@ -4,6 +4,10 @@ class SelectStore {
     this.loading = false;
     this.name = params.name;
     this.request = params.request;
+    this.config = {
+      label: "label",
+      value: "value",
+    };
   }
 
   async loadData() {
@@ -20,6 +24,10 @@ class SelectStore {
   getData() {
     return this.data;
   }
+
+  getConfig() {
+    return this.config;
+  }
   getLoading() {
     return this.loading;
   }