meixioacomponent 0.2.24 → 0.2.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "0.2.24",
+  "version": "0.2.27",
   "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/basePlainTable/basePlainTable.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="table-wrap">
-    <el-table ref="elTable" :data="tableData">
+    <el-table ref="elTable" :data="tableData" :id="id" :height="height">
       <!-- 表格暂无数据 -->
       <template slot="empty">
         <baseDefaultSvgVue
@@ -44,7 +44,14 @@ import baseDefaultSvgVue from "../baseDefaultSvg/baseDefaultSvg.vue";
 export default {
   name: "basePlainTable",
   data() {
-    return {};
+    return {
+      id: null,
+    };
+  },
+  created() {
+    if (this.$props.tableId) {
+      this.id = this.$props.tableId;
+    }
   },
   components: {
     baseDefaultSvgVue,
@@ -59,6 +66,13 @@ export default {
       type: Array,
       require: true,
     },
+
+    tableId: {
+      type: String,
+    },
+    heigth: {
+      default: "auto",
+    },
   },
 };
 </script>

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

@@ -20,14 +20,14 @@
     >
       <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>
@@ -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

@@ -70,14 +70,16 @@
     <div class="item-handle-wrap" :class="[`${config.type}`]" v-else>
       <!-- input输入框 -->
       <el-input
-        v-if="config.type == 'input'"
+        ref="target"
         :size="size"
         v-model="module"
+        v-if="config.type == 'input'"
         style="width: 100%; height: 100%"
       >
       </el-input>
       <!-- 数字类型无小数 -->
       <el-input-number
+        ref="target"
         :size="size"
         v-else-if="config.type == 'number'"
         v-model.number="module"
@@ -86,6 +88,7 @@
       <!--数字类型两位小数  -->
       <el-input-number
         :size="size"
+        ref="target"
         :precision="2"
         v-model.number="module"
         :controls="false"
@@ -94,6 +97,7 @@
       <!-- select选择器 -->
       <el-select
         :size="size"
+        ref="target"
         v-model="module"
         placeholder="请选择"
         :multiple="multiple"
@@ -107,8 +111,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>
@@ -118,6 +122,7 @@
         align="right"
         v-model="module"
         :size="size"
+        ref="target"
         placeholder="选择日期"
         value-format="timestamp"
         :prefix-icon="`el-icon-time`"
@@ -158,6 +163,7 @@
       <!-- 文本输入框 -->
       <el-input
         autosize
+        ref="target"
         :size="size"
         type="textarea"
         v-model="module"
@@ -236,27 +242,10 @@ export default {
       return this.selectStore.getData();
     },
 
-    selectLabelKey() {
-      let config = this.$props.config?.config;
-
-      if (config) {
-        return config.label.key;
-      } else {
-        return `label`;
-      }
-    },
-    selectValueKey() {
-      let config = this.$props.config?.config;
-
-      if (config) {
-        return config.value.key;
-      } else {
-        return `value`;
-      }
+    selectConfig() {
+      return this.selectStore.getConfig();
     },
 
-    selectValue() {},
-
     spContentType() {
       let configType = this.$props.config.type;
       if (
@@ -361,6 +350,9 @@ export default {
       switch (type) {
         case "edit":
           this.isEdit = !this.isEdit;
+          this.$nextTick(() => {
+            this.targetFocus();
+          });
           if (this.isEdit) {
             this.oldValue = this.value;
           } else {
@@ -381,11 +373,17 @@ export default {
           break;
       }
     },
+    targetFocus() {
+      let ref = this.$refs.target;
+      console.log(ref);
+      if (ref) {
+        ref.focus();
+      }
+    },
     handleConfirm() {
       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;
   }