meixioacomponent 0.3.41 → 0.3.45

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

@@ -8,7 +8,7 @@
         :size="`l`"
         :event="event"
         @iconClick="iconClick"
-        style="margin-right: var(--margin-5)"
+        style="margin-right: var(--margin-5);"
       ></base-icon>
       <span>{{ label }}</span>
     </div>
@@ -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"
@@ -29,8 +29,8 @@
             textAlign: valueAlign,
           }"
         >
-          {{ value }}</span
-        >
+          {{ value }}
+        </span>
       </el-tooltip>
 
       <div
@@ -48,15 +48,15 @@
 
 <script>
 export default {
-  name: "baseLineInfoItem",
+  name: 'baseLineInfoItem',
   data() {
     return {
       isChildren: false,
-    };
+    }
   },
   created() {
-    if (this.$parent.$options.name == "baseLineInfoGroup") {
-      this.isChildren = true;
+    if (this.$parent.$options.name == 'baseLineInfoGroup') {
+      this.isChildren = true
     }
   },
   props: {
@@ -81,7 +81,7 @@ export default {
     },
     valueAlign: {
       type: String,
-      default: "left",
+      default: 'left',
     },
     labelWidth: {
       type: Number,
@@ -89,45 +89,65 @@ export default {
   },
   computed: {
     _labelWidth() {
-      let width = null;
+      let width = null
       if (this.isChildren) {
-        width = this.$parent.labelWidth;
+        width = this.$parent.labelWidth
       } else {
-        width = this.$props.labelWidth;
+        width = this.$props.labelWidth
       }
-      return width;
+      return width
     },
 
     slotAlignStyle() {
-      let value = "";
-      let align = this.$props.valueAlign;
+      let value = ''
+      let align = this.$props.valueAlign
       switch (align) {
-        case "left":
-          value = `flex-start`;
-          break;
-        case "center":
-          value = `center`;
-          break;
-        case "right":
-          value = "flex-end";
-          break;
+        case 'left':
+          value = `flex-start`
+          break
+        case 'center':
+          value = `center`
+          break
+        case 'right':
+          value = 'flex-end'
+          break
 
         default:
-          break;
+          break
       }
-      return value;
+      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() {
       if (this.isChildren) {
-        this.$emit("infoclickicon");
+        this.$emit('infoclickicon')
       } else {
-        this.$emit("infoclickicon", this.$props);
+        this.$emit('infoclickicon', this.$props)
       }
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>
@@ -137,7 +157,12 @@ export default {
   display: flex;
   align-items: center;
   flex-flow: row nowrap;
+  margin-bottom: var(--margin-4);
   justify-content: space-between;
+
+  &:last-of-type {
+    margin-bottom: 0px;
+  }
   .infor-label {
     display: flex;
     align-items: center;
@@ -148,8 +173,6 @@ export default {
   }
   .infor-value {
     box-sizing: border-box;
-    padding: var(--padding-5) 0px;
-    padding-left: var(--padding-5);
     .infor-value_text {
       vertical-align: middle;
       color: var(--font-color-d);

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

@@ -19,6 +19,7 @@
       :disabled="disabled"
       class="popover-button"
       :type="module ? 'selected' : 'info'"
+      @click.stop="iconClick"
       :class="{ 'is-single': !buttonText && buttonIcon }"
     >
       <base-icon
@@ -32,7 +33,7 @@
         @iconClick="iconClick"
         :color="module ? 'text-white' : 'd'"
       ></base-icon>
-      <span class="inner-span" v-if="buttonText"> {{ buttonText }}</span>
+      <span class="inner-span" v-if="buttonText">{{ buttonText }}</span>
     </el-button>
     <template slot="reference" v-else>
       <slot name="popoverReference"></slot>
@@ -42,9 +43,9 @@
 
 <script>
 export default {
-  name: "basePopoverButton",
+  name: 'basePopoverButton',
   data() {
-    return {};
+    return {}
   },
 
   props: {
@@ -57,17 +58,17 @@ export default {
     // 	click/focus/hover/manual
     trigger: {
       type: String,
-      default: "click",
+      default: 'click',
     },
     // 位置
     // top/top-start/top-end/bottom/bottom-start/bottom-end/left/left-start/left-end/right/right-start/right-end
     placement: {
-      default: "bottom",
+      default: 'bottom',
       type: String,
     },
     // button 按钮的大小
     buttonSize: {
-      default: "small",
+      default: 'small',
     },
     // 控制显影的参数
     value: {
@@ -77,7 +78,7 @@ export default {
     // button文字内容
     buttonText: {
       type: String,
-      default: "",
+      default: '',
     },
 
     // icon的类名
@@ -88,7 +89,7 @@ export default {
 
     iconClass: {
       type: String,
-      default: "meixi",
+      default: 'meixi',
     },
 
     template: {
@@ -99,33 +100,29 @@ export default {
   computed: {
     module: {
       set(val) {
-        this.$emit("input", val);
+        this.$emit('input', val)
       },
       get() {
-        return this.$props.value;
+        return this.$props.value
       },
     },
   },
   methods: {
     popoverShow() {
-      this.$emit("popoverShow");
+      this.$emit('popoverShow')
     },
     popoverHide() {
-      this.$emit("poporverHide");
+      this.$emit('poporverHide')
     },
     iconClick() {
-      this.module = !this.module;
+      this.$refs.popover.doShow()
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>
-.popover-content {
-}
 .popover-button {
-  .button-icon {
-  }
   /deep/ span {
     display: flex;
     align-items: center;
@@ -139,6 +136,5 @@ export default {
 .is-single {
   border: none;
   padding: 7px !important;
-  background: var(--color-gray-m);
 }
 </style>

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>