meixioacomponent 0.3.49 → 0.3.53

package/package.json

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

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

@@ -152,9 +152,9 @@ export default {
   height: auto;
   cursor: pointer;
   &:hover {
-    background: transparent !important;
+    background: inherit !important;
     i {
-      color: var(--icon-color-d) !important;
+      color: inherit !important;
     }
   }
 }

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/baseUploadItem.vue

@@ -50,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>

package/packages/components/proPageTable/oa_pro_table.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="oa-pro-table-wrap" :style="{ height: height }">
+  <div class="oa-pro-table-wrap" :style="{ height: height }" v-if="isAuth">
     <!-- 表格的头部 -->
     <div
       class="oa-pro-header-wrap"
@@ -20,7 +20,6 @@
       </oaProHeader>
     </div>
     <!-- 表格搜索 -->
-
     <div class="oa-pro-table-search">
       <oa_pro_table_searchVue
         v-model="module"
@@ -199,6 +198,15 @@
       ></baseButtonHandle>
     </base-dialog>
   </div>
+
+  <div class="oa-pro-table-wrap no-auth" v-else>
+    <baseDefaultSvgVue
+      :width="440"
+      :height="440"
+      :svgName="`404`"
+      :text="`无权限查看该表格`"
+    ></baseDefaultSvgVue>
+  </div>
 </template>
 
 <script>
@@ -415,6 +423,12 @@ export default {
       type: Boolean,
       default: true,
     },
+
+    // 是否有查看表格的权限
+    isAuth: {
+      default: true,
+      type: Boolean,
+    },
   },
   components: {
     oaProHeader,
@@ -964,14 +978,25 @@ export default {
 
   /deep/ .el-table__fixed {
     &::before {
-      background-color: transparent !important;
+      border-color: var(--color-table-border) !important;
     }
   }
 
   /deep/ .el-table__cell {
     .gutter {
-      border-color: transparent !important;
+      border-right: 1px solid var(--color-table-border) !important;
+      border-bottom: 1px solid var(--color-table-border) !important;
+      &:last-of-type {
+        border-right: var(--color-table-border) !important;
+        border-bottom: 1px solid var(--color-table-border) !important;
+      }
     }
   }
 }
+.no-auth {
+  display: flex;
+  align-items: center;
+  flex-flow: column nowrap;
+  justify-content: center;
+}
 </style>

package/src/App.vue

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

package/src/component/test.vue

@@ -315,6 +315,7 @@ export default {
   <div class="page-table-wrap" ref="pageTableWrap" v-if="show">
     <base-pro-table
       :align="`left`"
+      :isAuth="false"
       v-model="keyWords"
       :height="pageHeight"
       :isAverageWidth="false"