meixioacomponent 0.2.80 → 0.2.83

package/lib/style/element/index.css

@@ -1169,23 +1169,7 @@
   vertical-align: bottom;
   font-size: 14px;
 }
-.el-textarea__inner {
-  display: block;
-  resize: vertical;
-  padding: var(--padding-1) 0px;
-  line-height: 1.5;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 100%;
-  font-size: inherit;
-  color: var(--font-color-d);
-  background-color: transparent;
-  background-image: none;
-  border-radius: 4px;
-  -webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  border: none !important;
-}
+
 .el-textarea__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -1309,7 +1293,7 @@
   color: #8f959e;
 }
 .el-input__inner:hover {
-  border-color: #8f959e;
+  border-color:var(--color-primary);
 }
 .el-input__suffix {
   position: absolute;
@@ -1357,12 +1341,7 @@
   outline: 0;
   border-color: var(--color-primary);
 }
-.el-input.is-disabled .el-input__inner {
-  background-color: var(--hover-gray);
-  border-color: #bbbfc4;
-  color: #8f959e;
-  cursor: not-allowed;
-}
+
 .el-input.is-disabled .el-input__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -1867,9 +1846,7 @@
 .el-select .el-select__tags > span {
   display: contents;
 }
-.el-select:hover .el-input__inner {
-  border-color: #8f959e;
-}
+
 .el-select .el-input__inner {
   cursor: pointer;
   padding-right: 35px;
@@ -1968,7 +1945,6 @@
   text-overflow: ellipsis;
 }
 
-
 .el-select .el-tag__close.el-icon-close:hover {
   background-color: var(--color-error);
   color: var(--text-white);
@@ -2413,23 +2389,7 @@
   vertical-align: bottom;
   font-size: 14px;
 }
-.el-textarea__inner {
-  display: block;
-  resize: vertical;
-  padding: var(--padding-1) 0px;
-  line-height: 1.5;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 100%;
-  font-size: inherit;
-  color: var(--font-color-d);
-  background-color: transparent;
-  background-image: none;
-  border-radius: 4px;
-  -webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  border: none !important;
-}
+
 .el-textarea__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -2552,9 +2512,6 @@
 .el-input__inner::placeholder {
   color: #8f959e;
 }
-.el-input__inner:hover {
-  border-color: #8f959e;
-}
 
 .el-input__suffix {
   position: absolute;
@@ -2602,12 +2559,7 @@
   outline: 0;
   border-color: var(--color-primary);
 }
-.el-input.is-disabled .el-input__inner {
-  background-color: var(--hover-gray);
-  border-color: #bbbfc4;
-  color: #8f959e;
-  cursor: not-allowed;
-}
+
 .el-input.is-disabled .el-input__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -3977,7 +3929,7 @@
 }
 .el-menu-item.is-active {
   color: var(--color-primary);
-  background-color: var(--hover-gray);
+  background-color: var(--color-gray-d);
 }
 .el-menu-item.is-active i {
   color: inherit;
@@ -4082,23 +4034,7 @@
   vertical-align: bottom;
   font-size: 14px;
 }
-.el-textarea__inner {
-  display: block;
-  resize: vertical;
-  padding: var(--padding-1) 0px;
-  line-height: 1.5;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 100%;
-  font-size: inherit;
-  color: var(--font-color-d);
-  background-color: transparent;
-  background-image: none;
-  border-radius: 4px;
-  -webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  border: none !important;
-}
+
 .el-textarea__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -4221,9 +4157,7 @@
 .el-input__inner::placeholder {
   color: #8f959e;
 }
-.el-input__inner:hover {
-  border-color: #8f959e;
-}
+
 
 .el-input__suffix {
   position: absolute;
@@ -4271,12 +4205,7 @@
   outline: 0;
   border-color: var(--color-primary);
 }
-.el-input.is-disabled .el-input__inner {
-  background-color: var(--hover-gray);
-  border-color: #bbbfc4;
-  color: #8f959e;
-  cursor: not-allowed;
-}
+
 .el-input.is-disabled .el-input__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -4423,23 +4352,7 @@
   vertical-align: bottom;
   font-size: 14px;
 }
-.el-textarea__inner {
-  display: block;
-  resize: vertical;
-  padding: var(--padding-1) 0px;
-  line-height: 1.5;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 100%;
-  font-size: inherit;
-  color: var(--font-color-d);
-  background-color: transparent;
-  background-image: none;
-  border-radius: 4px;
-  -webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  border: none !important;
-}
+
 .el-textarea__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -4580,9 +4493,7 @@
 .el-input__inner::placeholder {
   color: #8f959e;
 }
-.el-input__inner:hover {
-  border-color: #8f959e;
-}
+
 
 .el-input__suffix {
   position: absolute;
@@ -4630,12 +4541,7 @@
   outline: 0;
   border-color: var(--color-primary);
 }
-.el-input.is-disabled .el-input__inner {
-  background-color: var(--hover-gray);
-  border-color: #bbbfc4;
-  color: #8f959e;
-  cursor: not-allowed;
-}
+
 .el-input.is-disabled .el-input__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -5770,23 +5676,7 @@
   vertical-align: bottom;
   font-size: 14px;
 }
-.el-textarea__inner {
-  display: block;
-  resize: vertical;
-  padding: var(--padding-1) 0px;
-  line-height: 1.5;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 100%;
-  font-size: inherit;
-  color: var(--font-color-d);
-  background-color: transparent;
-  background-image: none;
-  border-radius: 4px;
-  -webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  border: none !important;
-}
+
 .el-textarea__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -5895,10 +5785,10 @@
 }
 .el-input__inner {
   -webkit-appearance: none;
-  background-color: transparent;
+  background-color: var(--color-gray-s);
   background-image: none;
   border-radius: 4px;
-  border: 2px solid var(--font-color-ds);
+  border: 2px solid var(--color-gray-d);
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   color: var(--font-color-d);
@@ -5927,9 +5817,7 @@
 .el-input__inner::placeholder {
   color: #8f959e;
 }
-.el-input__inner:hover {
-  border-color: #8f959e;
-}
+
 
 .el-input__suffix {
   position: absolute;
@@ -5977,12 +5865,7 @@
   outline: 0;
   border-color: var(--color-primary);
 }
-.el-input.is-disabled .el-input__inner {
-  background-color: var(--hover-gray);
-  border-color: #bbbfc4;
-  color: #8f959e;
-  cursor: not-allowed;
-}
+
 .el-input.is-disabled .el-input__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -6459,7 +6342,7 @@
   display: contents;
 }
 .el-select:hover .el-input__inner {
-  border-color: #8f959e;
+  border-color:var(--color-primary);
 }
 .el-select .el-input__inner {
   cursor: pointer;
@@ -9727,15 +9610,16 @@
 .el-textarea__inner {
   display: block;
   resize: vertical;
-  padding: 5px 15px;
+  padding: 5px 0px;
   line-height: 1.5;
+  border: 0px !important;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   width: 100%;
   font-size: inherit;
+  font-weight: var(--font-weight-kg);
   color: var(--font-color-d);
   background-image: none;
-  border: 1px solid #bbbfc4;
   background-color: transparent;
   border-radius: 4px;
   -webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
@@ -9863,9 +9747,7 @@
 .el-input__inner::placeholder {
   color: #8f959e;
 }
-.el-input__inner:hover {
-  border-color: #8f959e;
-}
+
 
 .el-input__suffix {
   position: absolute;
@@ -9914,8 +9796,8 @@
   border-color: var(--color-primary);
 }
 .el-input.is-disabled .el-input__inner {
-  background-color: var(--hover-gray);
-  border-color: #bbbfc4;
+  background-color: var(--color-table-header);
+  border-color:var(--color-gray-d);
   color: #8f959e;
   cursor: not-allowed;
 }
@@ -11472,23 +11354,7 @@
   vertical-align: bottom;
   font-size: 14px;
 }
-.el-textarea__inner {
-  display: block;
-  resize: vertical;
-  padding: var(--padding-1) 0px;
-  line-height: 1.5;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 100%;
-  font-size: inherit;
-  color: var(--font-color-d);
-  background-color: transparent;
-  background-image: none;
-  border-radius: 4px;
-  -webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  border: none !important;
-}
+
 .el-textarea__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -11611,9 +11477,7 @@
 .el-input__inner::placeholder {
   color: #8f959e;
 }
-.el-input__inner:hover {
-  border-color: #8f959e;
-}
+
 
 .el-input__suffix {
   position: absolute;
@@ -11661,12 +11525,6 @@
   outline: 0;
   border-color: var(--color-primary);
 }
-.el-input.is-disabled .el-input__inner {
-  background-color: var(--hover-gray);
-  border-color: #bbbfc4;
-  color: #8f959e;
-  cursor: not-allowed;
-}
 .el-input.is-disabled .el-input__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -12665,23 +12523,7 @@
   vertical-align: bottom;
   font-size: 14px;
 }
-.el-textarea__inner {
-  display: block;
-  resize: vertical;
-  padding: var(--padding-1) 0px;
-  line-height: 1.5;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 100%;
-  font-size: inherit;
-  color: var(--font-color-d);
-  background-color: transparent;
-  background-image: none;
-  border-radius: 4px;
-  -webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  border: none !important;
-}
+
 .el-textarea__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -12804,10 +12646,6 @@
 .el-input__inner::placeholder {
   color: #8f959e;
 }
-.el-input__inner:hover {
-  border-color: #8f959e;
-}
-
 .el-input__suffix {
   position: absolute;
   height: 100%;
@@ -12854,12 +12692,7 @@
   outline: 0;
   border-color: var(--color-primary);
 }
-.el-input.is-disabled .el-input__inner {
-  background-color: var(--hover-gray);
-  border-color: #bbbfc4;
-  color: #8f959e;
-  cursor: not-allowed;
-}
+
 .el-input.is-disabled .el-input__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -13280,7 +13113,7 @@
   float: none;
   display: inline-block;
   text-align: left;
-  padding: 0 0 10px 0;
+  padding: 0 0 0px 0;
 }
 .el-form--inline .el-form-item {
   display: inline-block;
@@ -13299,7 +13132,7 @@
   display: block;
 }
 .el-form-item {
-  margin-bottom: 22px;
+  margin-bottom: calc(var(--margin-5) * 1.2);
 }
 .el-form-item::after,
 .el-form-item::before {
@@ -15094,23 +14927,7 @@
   vertical-align: bottom;
   font-size: 14px;
 }
-.el-textarea__inner {
-  display: block;
-  resize: vertical;
-  padding: var(--padding-1) 0px;
-  line-height: 1.5;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 100%;
-  font-size: inherit;
-  color: var(--font-color-d);
-  background-color: transparent;
-  background-image: none;
-  border-radius: 4px;
-  -webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  border: none !important;
-}
+
 .el-textarea__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -15233,9 +15050,7 @@
 .el-input__inner::placeholder {
   color: #8f959e;
 }
-.el-input__inner:hover {
-  border-color: #8f959e;
-}
+
 
 .el-input__suffix {
   position: absolute;
@@ -15283,12 +15098,7 @@
   outline: 0;
   border-color: var(--color-primary);
 }
-.el-input.is-disabled .el-input__inner {
-  background-color: var(--hover-gray);
-  border-color: #bbbfc4;
-  color: #8f959e;
-  cursor: not-allowed;
-}
+
 .el-input.is-disabled .el-input__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -20123,23 +19933,7 @@
   vertical-align: bottom;
   font-size: 14px;
 }
-.el-textarea__inner {
-  display: block;
-  resize: vertical;
-  padding: var(--padding-1) 0px;
-  line-height: 1.5;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 100%;
-  font-size: inherit;
-  color: var(--font-color-d);
-  background-color: transparent;
-  background-image: none;
-  border-radius: 4px;
-  -webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  border: none !important;
-}
+
 .el-textarea__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -20262,9 +20056,7 @@
 .el-input__inner::placeholder {
   color: #8f959e;
 }
-.el-input__inner:hover {
-  border-color: #8f959e;
-}
+
 
 .el-input__suffix {
   position: absolute;
@@ -20312,12 +20104,7 @@
   outline: 0;
   border-color: var(--color-primary);
 }
-.el-input.is-disabled .el-input__inner {
-  background-color: var(--hover-gray);
-  border-color: #bbbfc4;
-  color: #8f959e;
-  cursor: not-allowed;
-}
+
 .el-input.is-disabled .el-input__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -22002,22 +21789,7 @@
   vertical-align: bottom;
   font-size: 14px;
 }
-.el-textarea__inner {
-  display: block;
-  resize: vertical;
-  padding: var(--padding-1) 0px !important;
-  line-height: 1.5;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 100%;
-  font-size: inherit;
-  color: var(--font-color-d);
-  background-color: transparent;
-  background-image: none;
-  border-radius: 4px;
-  -webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-}
+
 .el-textarea__inner::-webkit-input-placeholder {
   color: #8f959e;
 }
@@ -22140,9 +21912,7 @@
 .el-input__inner::placeholder {
   color: #8f959e;
 }
-.el-input__inner:hover {
-  border-color: #8f959e;
-}
+
 .el-input__inner:focus {
   outline: 3px solid var(--hover-light-primary);
   border-color: var(--color-primary);
@@ -22193,12 +21963,7 @@
   outline: 0;
   border-color: var(--color-primary);
 }
-.el-input.is-disabled .el-input__inner {
-  background-color: var(--hover-gray);
-  border-color: #bbbfc4;
-  color: #8f959e;
-  cursor: not-allowed;
-}
+
 .el-input.is-disabled .el-input__inner::-webkit-input-placeholder {
   color: #8f959e;
 }

package/lib/style/theme/light.less

@@ -14,7 +14,7 @@
   // 灰色类型
   --color-gray-d: #dfe1e6;
   --color-gray-m: #f4f5f7;
-  --color-gray-s: #f7f7f7;
+  --color-gray-s: #fafbfc;
   // 字体颜色
   --font-color-d: #172b4d;
   --font-color-m: #344563;

package/lib/style/variables.less

@@ -1,6 +1,6 @@
 :root {
   //
-  --hover-gray: var(--color-gray-m);
+  --hover-gray: var(--color-gray-s);
   --hover-primary: var(--color-active-primary);
   // 阴影
   --shadow: 0px 2px 4px #0000001f, 0 0 6px #0000001f;

package/package.json

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

package/packages/components/base/baseArea/baseArea.vue

@@ -412,7 +412,7 @@ export default {
   }
   /deep/ .el-input__inner {
     font-weight: var(--font-weight-kg);
-    border-color: transparent;
+    border-color:var(--color-gray-d);
   }
   .is-open {
     background: var(--color-primary);

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

@@ -67,6 +67,7 @@ export default {
     //   大小
     size: {
       type: Number,
+      require: true,
     },
     //   标题栏
     title: {
@@ -176,8 +177,13 @@ export default {
     moveing(e) {
       let ref = this.$refs.drawer;
       this.drawerSize = e;
+      console.log(this.drawerSize);
       ref.$el.style.cssText += `width:${e}px`;
     },
+
+    getDrawerWidth() {
+      return this.drawerSize;
+    },
   },
   computed: {
     handleShow() {

package/packages/components/base/baseLineInfoItem/baseLineInfoItem.vue

@@ -151,6 +151,7 @@ export default {
     padding: var(--padding-5) 0px;
     padding-left: var(--padding-5);
     .infor-value_text {
+      vertical-align: middle;
       color: var(--font-color-d);
       font-size: var(--font-size-base);
       font-weight: var(--font-weight-g);

package/packages/components/base/baseTimeLine/baseTimeLine.vue

@@ -62,5 +62,8 @@ export default {
     display: flex;
     min-height: 50px;
   }
+  .base-time-line-right {
+    width: 100%;
+  }
 }
 </style>

package/packages/components/proForm/dialogForm/baseDialogForm.vue

@@ -137,6 +137,10 @@ export default {
       type: String,
       default: "50vh",
     },
+    labelPosition: {
+      type: String,
+      default: `right`,
+    },
   },
   components: {
     pro_formVue,
@@ -192,7 +196,7 @@ export default {
     },
     setLabelPosition(type) {
       if (!type) {
-        return "right";
+        return this.$props.labelPosition;
       } else if (type == "upload") {
         return "top";
       }

package/packages/components/proForm/proForm/pro_form_item.vue

@@ -503,8 +503,12 @@ export default {
   .textarea {
     box-sizing: border-box;
     background: var(--color-gray-s);
-    border: 2px solid var(--color-border);
+    border: 2px solid var(--color-gray-d);
     padding: var(--padding-1) var(--padding-3);
+
+    &:hover{
+      border-color: var(--color-primary);
+    }
   }
 
   .bottom-handle-wrap {