meixioacomponent 0.3.42 → 0.3.44

package/lib/style/element/index.css

@@ -11513,7 +11513,7 @@
   resize: vertical;
   padding: var(--padding-2) var(--padding-3);
   line-height: 1.5;
-  border: 0px !important;
+  border: 2px solid var(--color-gray-d) !important;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   width: 100%;
@@ -11527,6 +11527,10 @@
   transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
 }
 
+.el-textarea__inner:hover {
+  border-color: var(--color-primary) !important;
+}
+
 .el-textarea__inner::-webkit-input-placeholder {
   color: #8f959e;
 }

package/package.json

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

package/packages/components/base/baseArea/baseArea.vue

@@ -84,21 +84,20 @@
           v-model="showModule"
           placeholder="请选择地区"
           :suffix-icon="suffixIcon"
-        >
-        </el-input>
+        ></el-input>
       </div>
     </el-popover>
   </div>
 </template>
 
 <script>
-import { json } from "body-parser";
-import baseButtonHandleVue from "../baseButtonHandle/baseButtonHandle.vue";
+import { json } from 'body-parser'
+import baseButtonHandleVue from '../baseButtonHandle/baseButtonHandle.vue'
 //
-import areaJson from "./area";
-import areaConfig from "./areaConfig";
+import areaJson from './area'
+import areaConfig from './areaConfig'
 export default {
-  name: "baseArea",
+  name: 'baseArea',
   data() {
     return {
       //  是否打开了选择器
@@ -113,10 +112,10 @@ export default {
       activeIndex: 0,
       // 是否回显过数据
       isReview: false,
-    };
+    }
   },
   created() {
-    this.init();
+    this.init()
   },
 
   props: {
@@ -135,103 +134,103 @@ export default {
   computed: {
     module: {
       set(val) {
-        this.$emit("input", val);
+        this.$emit('input', val)
       },
       get() {
-        return this.$props.value;
+        return this.$props.value
       },
     },
 
     suffixIcon() {
       if (this.isOpen) {
-        return "el-icon-arrow-up";
+        return 'el-icon-arrow-up'
       } else {
-        return "el-icon-arrow-down";
+        return 'el-icon-arrow-down'
       }
     },
     baseTimeTypeConfig() {
-      return baseTimeTypeConfig;
+      return baseTimeTypeConfig
     },
     showModule() {
       if (this.areaValue.length > 0) {
-        let text = "";
+        let text = ''
         this.areaValue.forEach((item) => {
           if (item.label) {
-            let value = text ? ` / ${item.label}` : item.label;
-            text += `${value}`;
+            let value = text ? ` / ${item.label}` : item.label
+            text += `${value}`
           }
-        });
-        return text;
+        })
+        return text
       }
-      return null;
+      return null
     },
     areaJson() {
-      return areaJson;
+      return areaJson
     },
     activeProvince() {
       if (this.areaValue.length > 0) {
-        return this.areaValue[0].label;
+        return this.areaValue[0].label
       }
-      return null;
+      return null
     },
     activeArea() {
       if (this.areaValue.length > 1) {
-        return this.areaValue[this.activeIndex]?.label;
+        return this.areaValue[this.activeIndex]?.label
       }
-      return null;
+      return null
     },
     areaList() {
       if (this.activeObj && this.activeObj.children.length > 0) {
-        return this.activeObj.children;
+        return this.activeObj.children
       }
-      return [];
+      return []
     },
   },
   methods: {
     init() {
       if (this.module && this.module instanceof Object) {
         for (let i = 0; i < areaConfig.length; i++) {
-          let item = areaConfig[i];
-          let value = this.module[`${item.value}`];
+          let item = areaConfig[i]
+          let value = this.module[`${item.value}`]
           this.$set(this.areaValue, i, {
             label: value,
             pre: null,
-          });
+          })
         }
       }
     },
     eventShow() {
-      this.isOpen = true;
+      this.isOpen = true
       if (!this.isReview) {
-        this.review();
+        this.review()
       }
-      this.setHandleConfig();
-      this.scrollToProvince();
+      this.setHandleConfig()
+      this.scrollToProvince()
     },
     setHandleConfig() {
-      console.log(this.$props.value);
+      console.log(this.$props.value)
       this.handleConfig = [
         {
-          type: "info",
-          text: this.module ? "清空" : "取消",
+          type: 'info',
+          text: this.module ? '清空' : '取消',
           plain: false,
           click: () => {
             if (!this.module) {
-              this.cancelValue();
+              this.cancelValue()
             } else {
-              this.cancelValue();
-              this.module = null;
+              this.cancelValue()
+              this.module = null
             }
           },
         },
         {
-          type: "primary",
-          text: "确定",
+          type: 'primary',
+          text: '确定',
           click: () => {
-            this.confirmValue();
+            this.confirmValue()
           },
         },
-      ];
+      ]
     },
 
     review() {
@@ -240,165 +239,165 @@ export default {
       this.areaValue.forEach((item, index) => {
         if (index == 0) {
           let cindex = areaJson.findIndex((citem) => {
-            return citem.label == item.label;
-          });
+            return citem.label == item.label
+          })
 
-          this.checkProvince(areaJson[cindex]);
+          this.checkProvince(areaJson[cindex])
         } else {
           //console.log("else");
           //console.log(this.activeObj);
           if (this.activeObj && this.activeObj.children.length > 0) {
             let cindex = this.activeObj.children.findIndex((citem) => {
-              return item.label == citem.label;
-            });
+              return item.label == citem.label
+            })
 
-            this.checkArea(this.activeObj.children[cindex]);
+            this.checkArea(this.activeObj.children[cindex])
           }
         }
-      });
+      })
 
-      this.isReview = true;
+      this.isReview = true
     },
 
     eventHide() {
-      this.isOpen = false;
-      this.cancelValue();
+      this.isOpen = false
+      this.cancelValue()
     },
 
     openSelectWrap() {
-      if (this.$props.disable) return;
-      this.isOpen = !this.isOpen;
+      if (this.$props.disable) return
+      this.isOpen = !this.isOpen
     },
     // 选择省份
     checkProvince(province) {
-      this.activeIndex = 0;
-      this.areaValue = [];
+      this.activeIndex = 0
+      this.areaValue = []
       this.$set(this.areaValue, 0, {
         label: province.label,
         pre: null,
         value: province.value,
-      });
+      })
 
       if (province.children.length > 0) {
-        this.activeObj = province;
-        this.activeIndex += 1;
+        this.activeObj = province
+        this.activeIndex += 1
       }
-      this.isReview = true;
+      this.isReview = true
     },
     // 选择地区
     checkArea(area) {
       if (!area) {
-        this.isReview = true;
-        return;
+        this.isReview = true
+        return
       }
 
-      let pre = this.areaValue[this.activeIndex];
+      let pre = this.areaValue[this.activeIndex]
       if (!pre) {
         this.$set(this.areaValue, this.activeIndex, {
           label: area.label,
           pre: this.activeObj,
           value: area.value,
-        });
+        })
       } else {
-        pre.label = area.label;
+        pre.label = area.label
       }
 
       if (area.children) {
-        this.activeObj = area;
-        this.activeIndex += 1;
+        this.activeObj = area
+        this.activeIndex += 1
       }
-      this.isReview = true;
+      this.isReview = true
     },
 
     // 返回
     backArea() {
       //console.log(this.activeIndex);
       //console.log(this.areaValue);
-      let currentArea = this.areaValue[this.activeIndex - 1];
-      this.areaValue.splice(this.activeIndex, 1);
-      this.activeIndex -= 1;
+      let currentArea = this.areaValue[this.activeIndex - 1]
+      this.areaValue.splice(this.activeIndex, 1)
+      this.activeIndex -= 1
       if (currentArea.pre) {
-        this.activeObj = currentArea.pre;
+        this.activeObj = currentArea.pre
       }
     },
 
     deleteCheck() {
       if (this.activeIndex == 1) {
-        this.areaValue.splice(this.activeIndex, 1);
+        this.areaValue.splice(this.activeIndex, 1)
       } else {
-        this.backArea();
+        this.backArea()
       }
     },
 
     cancelValue() {
       if (!this.module) {
-        this.areaValue = [];
+        this.areaValue = []
       } else {
-        this.init();
+        this.init()
         // this.module = null;
-        this.isReview = false;
+        this.isReview = false
       }
-      this.doClose();
+      this.doClose()
     },
 
     confirmValue() {
-      let value = {};
-      let valueId = [];
+      let value = {}
+      let valueId = []
       for (let i = 0; i < this.areaValue.length; i++) {
-        const item = this.areaValue[i];
-        const flag = i == this.areaValue.length - 1;
-        value[`${areaConfig[i].value}`] = item.label;
-        valueId.push(item.value);
+        const item = this.areaValue[i]
+        const flag = i == this.areaValue.length - 1
+        value[`${areaConfig[i].value}`] = item.label
+        valueId.push(item.value)
       }
-      value.idList = valueId;
-      if (JSON.stringify(value) != "{}") {
-        this.module = value;
+      value.idList = valueId
+      if (JSON.stringify(value) != '{}') {
+        this.module = value
       }
       this.$nextTick(() => {
-        if (this.$parent.$options._componentTag == "el-form-item") {
-          this.$emit("confirmAreaValue");
+        if (this.$parent.$options._componentTag == 'el-form-item') {
+          this.$emit('confirmAreaValue')
         } else {
-          this.$emit("confirmAreaValue", value);
-          this.doClose();
+          this.$emit('confirmAreaValue', value)
+          this.doClose()
         }
-      });
+      })
     },
 
     doClose() {
-      this.$refs.popover.doClose();
+      this.$refs.popover.doClose()
     },
 
     // 滚动到指定位置
     scrollToProvince() {
       if (this.areaValue.length > 0) {
-        let index = 0;
-        let label = this.areaValue[0].label;
+        let index = 0
+        let label = this.areaValue[0].label
         for (let i = 0; i < areaJson.length; i++) {
-          let item = areaJson[i];
+          let item = areaJson[i]
           if (item.label == label) {
-            index = i;
-            break;
+            index = i
+            break
           }
         }
-        let refs = this.$refs.middleLeft;
+        let refs = this.$refs.middleLeft
         this.$nextTick(() => {
-          refs.scrollTop = refs.childNodes[index].offsetTop - refs.clientHeight;
-        });
+          refs.scrollTop = refs.childNodes[index].offsetTop - refs.clientHeight
+        })
       }
     },
   },
   watch: {
     module(newVal, oldVal) {
       if (!newVal) {
-        this.areaValue = [];
-        return;
+        this.areaValue = []
+        return
       }
-      if (this.$parent.$options._componentTag == "el-form-item") {
-        this.init();
+      if (this.$parent.$options._componentTag == 'el-form-item') {
+        this.init()
       }
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>
@@ -429,7 +428,9 @@ export default {
 .area-select-content {
   width: 400px;
   height: 300px;
+  box-sizing: border-box;
   background: var(--bg-white);
+  padding: 0px var(--padding-4);
   .content-title {
     width: 100%;
     height: 40px;

package/packages/components/base/baseLineInfoGroup/baseLineInfoGroup.vue

@@ -26,18 +26,18 @@
 </template>
 
 <script>
-import baseLineInfoItemVue from "../baseLineInfoItem/baseLineInfoItem.vue";
+import baseLineInfoItemVue from '../baseLineInfoItem/baseLineInfoItem.vue'
 //
-import { ArrayChunk } from "../../../utils/utils";
+import { ArrayChunk } from '../../../utils/utils'
 export default {
-  name: "baseLineInfoGroup",
+  name: 'baseLineInfoGroup',
   data() {
     return {
       labelWidth: null,
-    };
+    }
   },
   created() {
-    this.init();
+    this.init()
   },
   components: {
     baseLineInfoItemVue,
@@ -45,7 +45,7 @@ export default {
   props: {
     valueAlign: {
       type: String,
-      default: "left",
+      default: 'left',
     },
     lineNumber: {
       type: Number,
@@ -58,25 +58,24 @@ export default {
   },
   computed: {
     mountedList() {
-      return ArrayChunk(this.$props.infoList, this.$props.lineNumber);
+      return ArrayChunk(this.$props.infoList, this.$props.lineNumber)
     },
   },
   methods: {
     init() {
-      let _inforList = this.$props.infoList;
+      let _inforList = this.$props.infoList
       _inforList.forEach((item, index) => {
-        let width = item.label.length * 14 + (item.icon ? 42 : 0);
+        let width = item.label.length * 14 + (item.icon ? 42 : 0)
         if (this.labelWidth < width) {
-          this.labelWidth = width;
+          this.labelWidth = width
         }
-      });
-      //console.log(this.labelWidth);
+      })
     },
     infoclickicon(item) {
-      this.$emit("infoclickicon", item);
+      this.$emit('infoclickicon', item)
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>
@@ -88,6 +87,10 @@ export default {
     align-items: center;
     flex-flow: row nowrap;
     justify-content: flex-start;
+    margin-bottom: calc(var(--margin-4) * 2);
+    &:last-of-type {
+      margin-bottom: 0px;
+    }
   }
 }
 </style>

package/packages/components/base/baseLineInfoItem/baseLineInfoItem.vue

@@ -18,10 +18,10 @@
     >
       <el-tooltip
         effect="dark"
-        placement="top"
         v-if="!useSlot"
         :content="`${value}`"
         :visible-arrow="false"
+        :placement="tooltipPlacement"
       >
         <span
           class="infor-value_text"
@@ -117,6 +117,26 @@ export default {
       }
       return value
     },
+
+    tooltipPlacement() {
+      let value = ''
+      let align = this.$props.valueAlign
+      switch (align) {
+        case 'left':
+          value = `top-start`
+          break
+        case 'center':
+          value = `top`
+          break
+        case 'right':
+          value = 'top-end'
+          break
+
+        default:
+          break
+      }
+      return value
+    },
   },
   methods: {
     iconClick() {

package/packages/components/base/baseUpload/baseUpload.vue

@@ -4,6 +4,7 @@
       <baseUploadItemVue
         :key="index"
         :type="`img`"
+        :isGroup="true"
         :uploadItem="item"
         v-for="(item, index) in module"
         @handleDeleteUploadItem="handleDeleteUploadItem(index)"
@@ -12,6 +13,7 @@
         :type="`upload`"
         v-show="!isMax"
         ref="itemUpload"
+        :isGroup="true"
         :fileType="fileType"
         :uploadType="`multiple`"
         @inputChange="inputChange"
@@ -24,20 +26,21 @@
 </template>
 
 <script>
-import baseSkeletonVue from "../baseSkeleton/baseSkeleton.vue";
-import baseUploadItemVue from "./baseUploadItem.vue";
+import baseSkeletonVue from '../baseSkeleton/baseSkeleton.vue'
+import baseUploadItemVue from './baseUploadItem.vue'
 //
-import { baseUploadMixins } from "./mixins";
+import { baseUploadMixins } from './mixins'
 export default {
-  name: "baseUpload",
+  name: 'baseUpload',
   data() {
     return {
+      isGroup: true,
       uploadLoading: false,
-    };
+    }
   },
   beforeDestroy() {
     if (this.dynamicmount) {
-      this.uploadEd();
+      this.uploadEd()
     }
   },
   mixins: [baseUploadMixins],
@@ -48,7 +51,7 @@ export default {
   props: {
     textNotic: {
       type: String,
-      default: "点击+上传图片",
+      default: '点击+上传图片',
     },
     max: {
       type: Number,
@@ -60,25 +63,25 @@ export default {
     },
     fileType: {
       type: String,
-      default: "img",
+      default: 'img',
     },
   },
   computed: {
     module: {
       set(val) {
-        this.$emit("input", val);
+        this.$emit('input', val)
       },
       get() {
-        return this.$props.value;
+        return this.$props.value
       },
     },
   },
   methods: {
     handleDeleteUploadItem(index) {
-      this.module.splice(index, 1);
+      this.module.splice(index, 1)
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>