meixioacomponent 0.3.59 → 0.3.60

package/lib/style/element/index.css

@@ -3613,15 +3613,7 @@
   border-color: #004ac3;
 }
 
-.el-button.is-disabled,
-.el-button.is-disabled:focus,
-.el-button.is-disabled:hover {
-  color: #8f959e;
-  cursor: not-allowed;
-  background-image: none;
-  background-color: var(--bg-white);
-  border-color: #dee0e3;
-}
+
 
 .el-button.is-disabled.el-button--text {
   background-color: transparent;
@@ -7833,15 +7825,7 @@
   border-color: #004ac3;
 }
 
-.el-button.is-disabled,
-.el-button.is-disabled:focus,
-.el-button.is-disabled:hover {
-  color: #8f959e;
-  cursor: not-allowed;
-  background-image: none;
-  background-color: var(--bg-white);
-  border-color: #dee0e3;
-}
+
 
 .el-button.is-disabled.el-button--text {
   background-color: transparent;
@@ -9193,6 +9177,8 @@
   border-right-width: 0;
   border-bottom-width: 0;
   padding: 0;
+  border-right: 1px solid var(--color-table-border) !important;
+  border-bottom: 1px solid var(--color-table-border) !important;
 }
 
 .el-table .el-table__cell.is-hidden>* {
@@ -9347,8 +9333,9 @@
 .el-table--border th.el-table__cell.gutter:last-of-type {
   border-right: 1px solid var(--color-table-border);
   border-bottom: 1px solid var(--color-table-border);
-
   border-bottom-width: 1px;
+  border-right: var(--color-table-border) !important;
+  border-bottom: 1px solid var(--color-table-border) !important;
 
 }
 
@@ -9369,6 +9356,7 @@
   overflow-y: hidden;
   -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.12);
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.12);
+  
 }
 
 .el-table__fixed-right::before,
@@ -9381,6 +9369,11 @@
   height: 1px;
   background-color: #dee0e3;
   z-index: 4;
+
+  /*  */
+  border-color: var(--color-table-border) !important;
+  background: transparent !important;
+  border-bottom: 0px solid var(--color-table-border) !important;
 }
 
 .el-table__fixed-right-patch {
@@ -9389,6 +9382,7 @@
   right: 0;
   background-color: var(--bg-white);
   border-right: 1px solid var(--color-table-border);
+  border-bottom: 1px solid var(--color-table-border) !important ;
 }
 
 .el-table__fixed-right {
@@ -14488,7 +14482,7 @@
   color: #8f959e;
   cursor: not-allowed;
   background-image: none;
-  background-color: var(--bg-white);
+  background-color: transparent;
   border-color: #dee0e3;
 }
 
@@ -14499,7 +14493,7 @@
 .el-button.is-disabled.is-plain,
 .el-button.is-disabled.is-plain:focus,
 .el-button.is-disabled.is-plain:hover {
-  background-color: var(--bg-white);
+  background-color: transparent;
   border-color: #dee0e3;
   color: #8f959e;
 }
@@ -26518,15 +26512,7 @@
   border-color: #004ac3;
 }
 
-.el-button.is-disabled,
-.el-button.is-disabled:focus,
-.el-button.is-disabled:hover {
-  color: #8f959e;
-  cursor: not-allowed;
-  background-image: none;
-  background-color: var(--bg-white);
-  border-color: #dee0e3;
-}
+
 
 .el-button.is-disabled.el-button--text {
   background-color: transparent;
@@ -28310,15 +28296,7 @@
   border-color: #1f5b6c;
 }
 
-.el-button.is-disabled,
-.el-button.is-disabled:focus,
-.el-button.is-disabled:hover {
-  color: #8f959e;
-  cursor: not-allowed;
-  background-image: none;
-  background-color: var(--bg-white);
-  border-color: #dee0e3;
-}
+
 
 .el-button.is-disabled.el-button--text {
   background-color: transparent;

package/package.json

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

package/packages/components/index.js

@@ -46,6 +46,7 @@ import useImg from '../config/use/UseImg'
 import UseDrag from '../config/use/useDrag'
 import useUpload from '../config/use/UseUpload'
 import useFixedHeader from '../config/use/useFixedHeader'
+import useCropper from '../config/use/useCropper'
 
 const meixicomponents = [
   baseAnchor,
@@ -91,7 +92,7 @@ const install = (Vue) => {
     Vue.component(component.name, component)
   })
   Vue.use(DynamicMount)
-  Vue.use(VueCropper);
+  Vue.use(VueCropper)
 }
 
 if (typeof window !== 'undefined' && window.Vue) {
@@ -144,5 +145,6 @@ export default {
   UseDrag,
   useUpload,
   useFixedHeader,
+  useCropper,
   DynamicMountClass,
 }

package/packages/components/proPageTable/oa_pro_table.vue

@@ -978,36 +978,6 @@ export default {
     box-sizing: border-box;
     padding-top: var(--padding-5);
   }
-
-  /deep/ .el-table__fixed,
-  /deep/ .el-table__fixed-right {
-    &::before {
-      border-color: var(--color-table-border) !important;
-      background: var(--color-table-border) !important;
-      border-bottom: 0px solid var(--color-table-border) !important ;
-    }
-  }
-  /deep/ .el-table__fixed {
-    border-right: 1px solid var(--color-table-border) !important ;
-  }
-
-  /deep/ .el-table__fixed-right {
-    border-left: 1px solid var(--color-table-border) !important ;
-  }
-
-  /deep/.el-table__fixed-right-patch {
-    border-bottom: 1px solid var(--color-table-border) !important ;
-  }
-  /deep/ .el-table__cell {
-    .gutter {
-      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;

package/packages/components/style/element/index.css

@@ -3613,15 +3613,7 @@
   border-color: #004ac3;
 }
 
-.el-button.is-disabled,
-.el-button.is-disabled:focus,
-.el-button.is-disabled:hover {
-  color: #8f959e;
-  cursor: not-allowed;
-  background-image: none;
-  background-color: var(--bg-white);
-  border-color: #dee0e3;
-}
+
 
 .el-button.is-disabled.el-button--text {
   background-color: transparent;
@@ -7833,15 +7825,7 @@
   border-color: #004ac3;
 }
 
-.el-button.is-disabled,
-.el-button.is-disabled:focus,
-.el-button.is-disabled:hover {
-  color: #8f959e;
-  cursor: not-allowed;
-  background-image: none;
-  background-color: var(--bg-white);
-  border-color: #dee0e3;
-}
+
 
 .el-button.is-disabled.el-button--text {
   background-color: transparent;
@@ -9193,6 +9177,8 @@
   border-right-width: 0;
   border-bottom-width: 0;
   padding: 0;
+  border-right: 1px solid var(--color-table-border) !important;
+  border-bottom: 1px solid var(--color-table-border) !important;
 }
 
 .el-table .el-table__cell.is-hidden>* {
@@ -9347,8 +9333,9 @@
 .el-table--border th.el-table__cell.gutter:last-of-type {
   border-right: 1px solid var(--color-table-border);
   border-bottom: 1px solid var(--color-table-border);
-
   border-bottom-width: 1px;
+  border-right: var(--color-table-border) !important;
+  border-bottom: 1px solid var(--color-table-border) !important;
 
 }
 
@@ -9369,6 +9356,7 @@
   overflow-y: hidden;
   -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.12);
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.12);
+  
 }
 
 .el-table__fixed-right::before,
@@ -9381,6 +9369,11 @@
   height: 1px;
   background-color: #dee0e3;
   z-index: 4;
+
+  /*  */
+  border-color: var(--color-table-border) !important;
+  background: transparent !important;
+  border-bottom: 0px solid var(--color-table-border) !important;
 }
 
 .el-table__fixed-right-patch {
@@ -9389,6 +9382,7 @@
   right: 0;
   background-color: var(--bg-white);
   border-right: 1px solid var(--color-table-border);
+  border-bottom: 1px solid var(--color-table-border) !important ;
 }
 
 .el-table__fixed-right {
@@ -14488,7 +14482,7 @@
   color: #8f959e;
   cursor: not-allowed;
   background-image: none;
-  background-color: var(--bg-white);
+  background-color: transparent;
   border-color: #dee0e3;
 }
 
@@ -14499,7 +14493,7 @@
 .el-button.is-disabled.is-plain,
 .el-button.is-disabled.is-plain:focus,
 .el-button.is-disabled.is-plain:hover {
-  background-color: var(--bg-white);
+  background-color: transparent;
   border-color: #dee0e3;
   color: #8f959e;
 }
@@ -26518,15 +26512,7 @@
   border-color: #004ac3;
 }
 
-.el-button.is-disabled,
-.el-button.is-disabled:focus,
-.el-button.is-disabled:hover {
-  color: #8f959e;
-  cursor: not-allowed;
-  background-image: none;
-  background-color: var(--bg-white);
-  border-color: #dee0e3;
-}
+
 
 .el-button.is-disabled.el-button--text {
   background-color: transparent;
@@ -28310,15 +28296,7 @@
   border-color: #1f5b6c;
 }
 
-.el-button.is-disabled,
-.el-button.is-disabled:focus,
-.el-button.is-disabled:hover {
-  color: #8f959e;
-  cursor: not-allowed;
-  background-image: none;
-  background-color: var(--bg-white);
-  border-color: #dee0e3;
-}
+
 
 .el-button.is-disabled.el-button--text {
   background-color: transparent;

package/src/component/test.vue

@@ -360,7 +360,9 @@ export default {
       </template>
 
       <!-- 自定义模板列 -->
-      <template v-slot:name="data">template-{{ data.scope }}</template>
+      <template v-slot:gmtCreate="data">
+        <el-button type="text" :disabled="false">222</el-button>
+      </template>
       <template v-slot:address="data">template-{{ data.scope }}</template>
     </base-pro-table>
   </div>
@@ -506,7 +508,7 @@ export default {
         lock: 'right',
         // lock: false,
         width: 280,
-        template: false,
+        template: true,
       },
     ]
   },