meixioacomponent 0.3.47 → 0.3.50

package/package.json

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

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

@@ -141,15 +141,22 @@ export default {
 .event {
   cursor: pointer;
   &:hover {
-    // background: var(--hover-gray);
+    background: var(--hover-gray);
     i {
-      color: var(--color-primary);
+      color: var(--color-primary) !important;
     }
   }
 }
 .plain {
   width: auto;
   height: auto;
+  cursor: pointer;
+  &:hover {
+    background: inherit !important;
+    i {
+      color: inherit !important;
+    }
+  }
 }
 .disable {
   cursor: not-allowed;

package/packages/components/base/baseImg/baseImg.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="base-img-wrap" :class="[shape]">
+  <div class="base-img-wrap" :class="[shape]" :style="baseImgWrap">
     <img
       alt=""
       :src="src"
@@ -63,6 +63,14 @@ export default {
       type: String,
       default: 'rect',
     },
+    size: {
+      type: Array,
+      default: () => ['100%', '100%'],
+    },
+    radius: {
+      type: Number,
+      default: 0,
+    },
   },
   computed: {
     imgStyle() {
@@ -79,6 +87,15 @@ export default {
       this.isError = true
       return false
     },
+
+    baseImgWrap() {
+      const { size, radius } = this.$props
+      return {
+        borderRadius: `${radius}px`,
+        width: typeof size[0] == 'number' ? `${size[0]}px` : size[0],
+        height: typeof size[1] == 'number' ? `${size[1]}px` : size[1],
+      }
+    },
   },
   methods: {
     init() {

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

@@ -12,29 +12,30 @@
         <slot name="popoverContent"></slot>
       </div>
     </template>
-    <el-button
-      v-if="!template"
-      slot="reference"
-      :size="buttonSize"
-      :disabled="disabled"
-      class="popover-button"
-      :type="module ? 'selected' : 'info'"
-      @click.stop="iconClick"
-      :class="{ 'is-single': !buttonText && buttonIcon }"
-    >
-      <base-icon
-        :size="`s`"
-        :plain="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>
+    <template v-if="!template" slot="reference">
+      <el-button
+        :size="buttonSize"
+        :disabled="disabled"
+        class="popover-button"
+        :type="module ? 'selected' : 'info'"
+        @click.stop="buttonClick"
+        :class="{ 'is-single': !buttonText && buttonIcon }"
+      >
+        <base-icon
+          :size="`s`"
+          :plain="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>
+    </template>
+
     <template slot="reference" v-else>
       <slot name="popoverReference"></slot>
     </template>
@@ -117,6 +118,7 @@ export default {
     iconClick() {
       this.$refs.popover.doShow()
     },
+    buttonClick() {},
   },
 }
 </script>

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

@@ -4,6 +4,7 @@
       <baseUploadItemVue
         :key="index"
         :type="`img`"
+        :size="outline"
         :isGroup="true"
         :uploadItem="item"
         v-for="(item, index) in module"
@@ -14,13 +15,17 @@
         v-show="!isMax"
         ref="itemUpload"
         :isGroup="true"
+        :size="outline"
+        :fileSize="fileSize"
         :fileType="fileType"
         :uploadType="`multiple`"
         @inputChange="inputChange"
       ></baseUploadItemVue>
     </div>
     <div class="base-upload-footer">
-      <span>{{ textNotic }}(最大{{ max }}张)</span>
+      <span>
+        {{ textNotic }}(最多{{ max }}张)，文件大小限制{{ fileSize }}MB
+      </span>
     </div>
   </div>
 </template>
@@ -65,6 +70,12 @@ export default {
       type: String,
       default: 'img',
     },
+    outline: {
+      type: Array,
+    },
+    fileSize: {
+      default: 99,
+    },
   },
   computed: {
     module: {

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

@@ -1,8 +1,9 @@
 <template>
   <div
-    class="base-upload-item-wrap"
+    :style="wrapStyle"
     :class="[`${shape}`]"
     v-on:paste="onPasteFile"
+    class="base-upload-item-wrap"
   >
     <div class="type-upload" v-if="type == 'upload'">
       <input
@@ -49,7 +50,9 @@
           :size="`l`"
           :color="`d`"
           :event="true"
+          :plain="true"
           v-if="!disabled"
+          style="width: 32px; height: 32px;"
           :name="`meixicomponenticon-close`"
           @iconClick="handleDeleteUploadItem"
         ></base-icon>
@@ -113,6 +116,14 @@ export default {
     isGroup: {
       default: false,
     },
+
+    size: {
+      type: Array,
+    },
+
+    fileSize: {
+      default: 99,
+    },
   },
   computed: {
     module: {
@@ -156,6 +167,39 @@ export default {
         props.uploadType == 'single'
       )
     },
+
+    wrapStyle() {
+      const { size, shape } = this.$props
+      if (size) {
+        return {
+          width: `${size[0]}px`,
+          height: `${size[1]}px`,
+        }
+      } else {
+        switch (shape) {
+          case 'rect':
+            return {
+              width: '140px',
+              height: '80px',
+            }
+          case 'cir':
+            return {
+              width: '80px',
+              height: '80px',
+            }
+          case 'square':
+            return {
+              width: '100px',
+              height: '100px',
+            }
+          case 'pro':
+            return {
+              width: '100%',
+              height: '100%',
+            }
+        }
+      }
+    },
   },
   methods: {
     clickFile() {
@@ -166,13 +210,18 @@ export default {
 
     async returnFiles(files) {
       let list = []
+      const { fileSize } = this.$props
       for (let i = 0; i < files.length; i++) {
-        let obj = {
-          url: null,
-          process: 0,
-          file: files[i],
+        if (files[i].size < fileSize * 1048576) {
+          let obj = {
+            url: null,
+            process: 0,
+            file: files[i],
+          }
+          list.push(obj)
+        } else {
+          this.$message.error('文件大小超过限制')
         }
-        list.push(obj)
       }
       return list
     },
@@ -180,7 +229,10 @@ export default {
     async valueChange(e) {
       let files = e.target.files
       let list = await this.returnFiles(files)
-      this.emitEvent(list)
+      if (list.length > 0) {
+        this.emitEvent(list)
+      }
+
       this.$refs.inputFile.value = ''
     },
 
@@ -315,23 +367,13 @@ export default {
     }
   }
 }
-.rect {
-  width: 140px;
-  height: 80px;
-}
+
 .cir {
-  width: 80px;
-  height: 80px;
   overflow: hidden;
   border-radius: 50%;
 }
-.square {
-  width: 100px;
-  height: 100px;
-}
+
 .pro {
-  width: 100%;
-  height: 100%;
   display: flex;
   align-items: center;
   flex-flow: row nowrap;

package/packages/components/proPageTable/oa_pro_table.vue

@@ -961,5 +961,17 @@ export default {
     box-sizing: border-box;
     padding-top: var(--padding-5);
   }
+
+  /deep/ .el-table__fixed {
+    &::before {
+      background-color: transparent !important;
+    }
+  }
+
+  /deep/ .el-table__cell {
+    .gutter {
+      border-color: transparent !important;
+    }
+  }
 }
 </style>

package/src/App.vue

@@ -2,7 +2,12 @@
   <div id="app">
     <div style="height: 100vh;">
       <test></test>
-      <!-- <base-upload v-model="test"></base-upload> -->
+      <!-- <base-upload v-model="test"></base-upload>
+
+      <base-popover-button
+        :buttonIcon="`meixicomponenticon-diqu`"
+        v-model="flag"
+      ></base-popover-button> -->
     </div>
   </div>
 </template>