meixioacomponent 0.2.84 → 0.2.86

package/lib/style/element/index.css

@@ -1293,7 +1293,7 @@
   color: #8f959e;
 }
 .el-input__inner:hover {
-  border-color:var(--color-primary);
+  border-color: var(--color-primary);
 }
 .el-input__suffix {
   position: absolute;
@@ -4158,7 +4158,6 @@
   color: #8f959e;
 }
 
-
 .el-input__suffix {
   position: absolute;
   height: 100%;
@@ -4494,7 +4493,6 @@
   color: #8f959e;
 }
 
-
 .el-input__suffix {
   position: absolute;
   height: 100%;
@@ -5818,7 +5816,6 @@
   color: #8f959e;
 }
 
-
 .el-input__suffix {
   position: absolute;
   height: 100%;
@@ -6342,7 +6339,7 @@
   display: contents;
 }
 .el-select:hover .el-input__inner {
-  border-color:var(--color-primary);
+  border-color: var(--color-primary);
 }
 .el-select .el-input__inner {
   cursor: pointer;
@@ -6768,11 +6765,7 @@
 .el-button--medium.is-circle {
   padding: 10px;
 }
-.el-button--small {
-  padding: 9px 15px;
-  font-size: 12px;
-  border-radius: 3px;
-}
+
 .el-button--small.is-round {
   padding: 9px 15px;
 }
@@ -9748,7 +9741,6 @@
   color: #8f959e;
 }
 
-
 .el-input__suffix {
   position: absolute;
   height: 100%;
@@ -9797,7 +9789,7 @@
 }
 .el-input.is-disabled .el-input__inner {
   background-color: var(--color-table-header);
-  border-color:var(--color-gray-d);
+  border-color: var(--color-gray-d);
   color: #8f959e;
   cursor: not-allowed;
 }
@@ -11478,7 +11470,6 @@
   color: #8f959e;
 }
 
-
 .el-input__suffix {
   position: absolute;
   height: 100%;
@@ -12366,11 +12357,7 @@
 .el-button--medium.is-circle {
   padding: 10px;
 }
-.el-button--small {
-  padding: 9px 15px;
-  font-size: 12px;
-  border-radius: 3px;
-}
+
 .el-button--small.is-round {
   padding: 9px 15px;
 }
@@ -15051,7 +15038,6 @@
   color: #8f959e;
 }
 
-
 .el-input__suffix {
   position: absolute;
   height: 100%;
@@ -20057,7 +20043,6 @@
   color: #8f959e;
 }
 
-
 .el-input__suffix {
   position: absolute;
   height: 100%;
@@ -22116,6 +22101,7 @@
   box-sizing: border-box;
   outline: 0;
   margin: 0;
+  border: none !important;
   -webkit-transition: 0.1s;
   transition: 0.1s;
   font-weight: 500;
@@ -22373,6 +22359,12 @@
   color: var(--bg-white);
   outline: 0;
 }
+.el-button:focus,
+.el-button:hover {
+  background-color: var(--color-gray-d);
+  border-color: var(--color-gray-d);
+  color: var(--font-color-d);
+}
 .el-button--danger.is-plain.is-disabled,
 .el-button--danger.is-plain.is-disabled:active,
 .el-button--danger.is-plain.is-disabled:focus,
@@ -22440,11 +22432,7 @@
 .el-button--medium.is-circle {
   padding: 10px;
 }
-.el-button--small {
-  padding: 9px 15px;
-  font-size: 12px;
-  border-radius: 3px;
-}
+
 .el-button--small.is-round {
   padding: 9px 15px;
 }
@@ -23651,6 +23639,21 @@
 .el-button [class*="el-icon-"] + span {
   margin-left: 5px;
 }
+
+
+.el-button--bg-icon:focus, .el-button--bg-icon:hover {
+  background: var(--hover-light-primary) !important;
+  color: var(--color-primary) !important;
+}
+.el-button--bg-icon.is-current{
+  background: var(--hover-light-primary) !important;
+  color: var(--color-primary) !important;
+}
+
+
+
+
+
 .el-button.is-plain:focus,
 .el-button.is-plain:hover {
   background: #030d20;
@@ -23995,8 +23998,8 @@
   padding: 10px;
 }
 .el-button--small {
-  padding: 8px 14px;
-  font-size: 12px;
+  padding: var(--padding-4) calc(var(--padding-5) * 1.2);
+  font-size: var(--font-size-base);
   border-radius: 3px;
 }
 .el-button--small.is-round {

package/lib/style/variables.less

@@ -19,8 +19,8 @@
   --font-size-xl: calc(var(--font-size) * 2); // 字号-二级字号 20
   --font-size-xxl: calc(var(--font-size) * 3.6); // 字号-一级字号 36
   // 字号
-  --font-family: TencentSansW7, -apple-system, BlinkMacSystemFont, Segoe UI,
-    Roboto, Oxygen, Ubuntu, Fira Sans, Droid Sans, Helvetica Neue, sans-serif !important;
+  --font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
+    Ubuntu, Fira Sans, Droid Sans, Helvetica Neue, sans-serif !important;
   // 图标尺寸
   --icon-size-s: 12px;
   --icon-size-base: 14px;
@@ -72,6 +72,6 @@
   // hover 主题色颜色
   --hover-light-primary: #e6eefa;
   // 选中色
-  --color-selected: #213f72;
+  --color-selected: #344563;
   --scrollbar-color: #4b4b4be6;
 }

package/package.json

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

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

@@ -229,6 +229,8 @@ export default {
     display: flex;
     align-items: center;
     flex-flow: row nowrap;
+    box-sizing: border-box;
+    padding:0px var(--padding-5);
     justify-content: space-between;
     span {
       color: var(--font-color-d);

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

@@ -136,9 +136,8 @@ export default {
 }
 .event {
   cursor: pointer;
-  transition: all 0.3s var(--ease-out);
   &:hover {
-    background: var(--hover-gray);
+    // background: var(--hover-gray);
     i {
       color: var(--color-primary) !important;
     }

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

@@ -137,8 +137,8 @@ export default {
   }
 }
 .is-single {
-  padding: 7px !important;
-  background: transparent;
   border: none;
+  padding: 7px !important;
+  background: var(--color-gray-m);
 }
 </style>

package/packages/components/proPageTable/oa_pro-table-search.vue

@@ -8,7 +8,7 @@
       @handleScreen="handleScreen"
     >
       <el-button
-        size="medium"
+        size="small"
         :class="{
           'is-plain': !proScreenCardShow,
         }"
@@ -17,7 +17,7 @@
         :type="proScreenCardShow ? 'selected' : 'info'"
         >{{ handleScreenText }} <i :class="handleScreenIcon"></i>
       </el-button>
-      <el-button size="medium" plain type="info" @click="handleOpenProScreen">
+      <el-button size="small" @click="handleOpenProScreen">
         <i class="meixicomponenticonfont meixicomponenticon-shaixuan"></i
         >高级筛选
       </el-button>

package/packages/components/searchHeader/searchHeader.vue

@@ -49,7 +49,7 @@ export default {
     },
     size: {
       type: String,
-      default: "medium",
+      default: "small",
     },
     placeholder: { type: String },
   },

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

@@ -1293,7 +1293,7 @@
   color: #8f959e;
 }
 .el-input__inner:hover {
-  border-color:var(--color-primary);
+  border-color: var(--color-primary);
 }
 .el-input__suffix {
   position: absolute;
@@ -4158,7 +4158,6 @@
   color: #8f959e;
 }
 
-
 .el-input__suffix {
   position: absolute;
   height: 100%;
@@ -4494,7 +4493,6 @@
   color: #8f959e;
 }
 
-
 .el-input__suffix {
   position: absolute;
   height: 100%;
@@ -5818,7 +5816,6 @@
   color: #8f959e;
 }
 
-
 .el-input__suffix {
   position: absolute;
   height: 100%;
@@ -6342,7 +6339,7 @@
   display: contents;
 }
 .el-select:hover .el-input__inner {
-  border-color:var(--color-primary);
+  border-color: var(--color-primary);
 }
 .el-select .el-input__inner {
   cursor: pointer;
@@ -6768,11 +6765,7 @@
 .el-button--medium.is-circle {
   padding: 10px;
 }
-.el-button--small {
-  padding: 9px 15px;
-  font-size: 12px;
-  border-radius: 3px;
-}
+
 .el-button--small.is-round {
   padding: 9px 15px;
 }
@@ -9748,7 +9741,6 @@
   color: #8f959e;
 }
 
-
 .el-input__suffix {
   position: absolute;
   height: 100%;
@@ -9797,7 +9789,7 @@
 }
 .el-input.is-disabled .el-input__inner {
   background-color: var(--color-table-header);
-  border-color:var(--color-gray-d);
+  border-color: var(--color-gray-d);
   color: #8f959e;
   cursor: not-allowed;
 }
@@ -11478,7 +11470,6 @@
   color: #8f959e;
 }
 
-
 .el-input__suffix {
   position: absolute;
   height: 100%;
@@ -12366,11 +12357,7 @@
 .el-button--medium.is-circle {
   padding: 10px;
 }
-.el-button--small {
-  padding: 9px 15px;
-  font-size: 12px;
-  border-radius: 3px;
-}
+
 .el-button--small.is-round {
   padding: 9px 15px;
 }
@@ -15051,7 +15038,6 @@
   color: #8f959e;
 }
 
-
 .el-input__suffix {
   position: absolute;
   height: 100%;
@@ -20057,7 +20043,6 @@
   color: #8f959e;
 }
 
-
 .el-input__suffix {
   position: absolute;
   height: 100%;
@@ -22116,6 +22101,7 @@
   box-sizing: border-box;
   outline: 0;
   margin: 0;
+  border: none !important;
   -webkit-transition: 0.1s;
   transition: 0.1s;
   font-weight: 500;
@@ -22373,6 +22359,12 @@
   color: var(--bg-white);
   outline: 0;
 }
+.el-button:focus,
+.el-button:hover {
+  background-color: var(--color-gray-d);
+  border-color: var(--color-gray-d);
+  color: var(--font-color-d);
+}
 .el-button--danger.is-plain.is-disabled,
 .el-button--danger.is-plain.is-disabled:active,
 .el-button--danger.is-plain.is-disabled:focus,
@@ -22440,11 +22432,7 @@
 .el-button--medium.is-circle {
   padding: 10px;
 }
-.el-button--small {
-  padding: 9px 15px;
-  font-size: 12px;
-  border-radius: 3px;
-}
+
 .el-button--small.is-round {
   padding: 9px 15px;
 }
@@ -23651,6 +23639,21 @@
 .el-button [class*="el-icon-"] + span {
   margin-left: 5px;
 }
+
+
+.el-button--bg-icon:focus, .el-button--bg-icon:hover {
+  background: var(--hover-light-primary) !important;
+  color: var(--color-primary) !important;
+}
+.el-button--bg-icon.is-current{
+  background: var(--hover-light-primary) !important;
+  color: var(--color-primary) !important;
+}
+
+
+
+
+
 .el-button.is-plain:focus,
 .el-button.is-plain:hover {
   background: #030d20;
@@ -23995,8 +23998,8 @@
   padding: 10px;
 }
 .el-button--small {
-  padding: 8px 14px;
-  font-size: 12px;
+  padding: var(--padding-4) calc(var(--padding-5) * 1.2);
+  font-size: var(--font-size-base);
   border-radius: 3px;
 }
 .el-button--small.is-round {

package/packages/components/style/variables.less

@@ -19,8 +19,8 @@
   --font-size-xl: calc(var(--font-size) * 2); // 字号-二级字号 20
   --font-size-xxl: calc(var(--font-size) * 3.6); // 字号-一级字号 36
   // 字号
-  --font-family: TencentSansW7, -apple-system, BlinkMacSystemFont, Segoe UI,
-    Roboto, Oxygen, Ubuntu, Fira Sans, Droid Sans, Helvetica Neue, sans-serif !important;
+  --font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
+    Ubuntu, Fira Sans, Droid Sans, Helvetica Neue, sans-serif !important;
   // 图标尺寸
   --icon-size-s: 12px;
   --icon-size-base: 14px;
@@ -72,6 +72,6 @@
   // hover 主题色颜色
   --hover-light-primary: #e6eefa;
   // 选中色
-  --color-selected: #213f72;
+  --color-selected: #344563;
   --scrollbar-color: #4b4b4be6;
 }