meixioacomponent 0.2.88 → 0.2.91

package/package.json

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

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

@@ -412,12 +412,11 @@ export default {
   }
   /deep/ .el-input__inner {
     font-weight: var(--font-weight-kg);
-    border-color:var(--color-gray-d);
+    border-color: var(--color-gray-d);
   }
   .is-open {
     background: var(--color-primary);
     /deep/ .el-input__inner {
-      color: white !important;
       &::placeholder {
         color: var(--color-error) !important;
       }

package/packages/components/base/baseMoverVerifiBar/baseMoverVerifiBar.vue

@@ -89,7 +89,7 @@ export default {
 
     iconClass() {
       if (this.statusComplate) {
-        return "icon-zhengque";
+        return "meixicomponenticon-zhengque";
       } else {
         return "meixicomponenticon-icon-arrow-right";
       }
@@ -161,9 +161,12 @@ export default {
   overflow: hidden;
   user-select: none;
   position: relative;
-  border-radius: var(--radius);
   background: var(--color-gray-m);
-  border: 1px solid var(--color-gray-d);
+  border: 2px solid var(--color-gray-d);
+  border-radius: calc(var(--radius) * 2);
+  &:hover {
+    border-color: var(--color-primary);
+  }
   .mover-box {
     z-index: 3;
     width: 40px;

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

@@ -61,6 +61,11 @@ export default {
     height: auto;
     display: flex;
     min-height: 50px;
+    &:last-of-type {
+      /deep/ .point-line {
+        display: none;
+      }
+    }
   }
   .base-time-line-right {
     width: 100%;

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

@@ -18,6 +18,7 @@
           :size="`s`"
           :plain="true"
           :event="false"
+          :iconClass="`element`"
           v-if="timeLineItem.icon"
           :name="timeLineItem.icon"
         ></base-icon>
@@ -80,12 +81,15 @@ export default {
 
 <style lang="less" scoped>
 .base-time-line-left-wrap {
-  width: 50px;
+  width: auto;
   height: 100%;
   display: flex;
   flex-flow: row nowrap;
   align-items: flex-start;
   justify-content: flex-end;
+  .hasTimeWeek {
+    width: 50px;
+  }
   .time-week-wrap {
     padding: 0px var(--padding-5);
     span {

package/packages/components/proForm/proForm/pro_form.vue

@@ -229,7 +229,7 @@ export default {
     },
     setChunkLength() {
       const { formConfig } = this.$props;
-      if (formConfig.rowNumber) {
+      if (formConfig?.rowNumber) {
         this.chunkLength = formConfig.rowNumber;
         return;
       } else if (this.$props.rowNumber) {

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

@@ -224,7 +224,7 @@ export default {
   mounted() {
     this.$nextTick(() => {
       if (this.$props.disableWatcher) {
-        this.triggerDisable();
+        this.triggerDisable(this.$props.value);
       }
     });
   },
@@ -351,9 +351,7 @@ export default {
         return this.$props.value;
       },
       set(val) {
-        console.log(val);
         this.$emit("input", val);
-        console.log(this.$props.disableWatcher);
         if (this.$props.disableWatcher) {
           this.triggerDisable(val);
         }
@@ -424,8 +422,8 @@ export default {
           type: item.type,
           result: item.fn(val),
         };
-        console.log(obj);
 
+        console.log(val);
         this.$emit("disableWatcherResult", obj);
       });
     },

package/packages/components/proPageTable/oa_pro_table-header.vue

@@ -16,6 +16,7 @@
         :name="lockClass"
         class="lock-icons"
         :active="config.lock"
+        v-if="!isAverageWidth"
         @iconClick="handleClick('lock')"
       ></base-icon>
 
@@ -63,6 +64,7 @@ export default {
       require: true,
     },
     index: {},
+    isAverageWidth: {},
   },
   methods: {
     handleClick(type) {

package/packages/components/proPageTable/oa_pro_table.vue

@@ -80,8 +80,9 @@
         </template>
 
         <el-table-column
-          type="selection"
+          fixed="left"
           width="60px"
+          type="selection"
           :selectable="selected"
         ></el-table-column>
         <el-table-column
@@ -100,6 +101,7 @@
               :scope="scope"
               :config="item"
               :index="index"
+              :isAverageWidth="isAverageWidth"
               @headerItemLock="headerItemLock"
               @headerItemUnlock="headerItemUnlock"
               @handleScreenItem="handleScreenItem"