meixioacomponent 0.1.83 → 0.1.86

package/package.json

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

package/packages/components/base/baseDialogTable/dialogTable.vue

@@ -11,7 +11,7 @@
       <oa_pro_tableVue
         ref="table"
         :align="`left`"
-        v-model="keyWords"
+        v-model="module"
         :height="dialogHeight"
         :pageProps="pageProps"
         :pageConfig="pageConfig"
@@ -133,8 +133,19 @@ export default {
         };
       },
     },
-  },
 
+    value: {},
+  },
+  computed: {
+    module: {
+      set(val) {
+        this.$emit("input", val);
+      },
+      get() {
+        return this.$props.value;
+      },
+    },
+  },
   components: {
     oa_pro_tableVue,
     baseButtonHandle,

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

@@ -96,6 +96,7 @@ export default {
     },
   },
   methods: {
+    // 初始化
     init() {
       this.$nextTick(() => {
         this.maxLeft =
@@ -104,6 +105,7 @@ export default {
         this.loading = false;
         this.moveX = 0;
         this.moveLeft = 0;
+        this.module = false;
       });
     },
 
@@ -123,9 +125,9 @@ export default {
       }
     },
     mouseleave() {
+      if (!this.moveStatus) return;
       if (this.moveLeft < this.maxLeft) {
         this.moveStatus = 0;
-        this.module = false;
         this.init();
       } else {
         this.setComplate();
@@ -138,9 +140,15 @@ export default {
 
     setComplate() {
       this.moveStatus = 2;
-      this.module = true;
-      this.moveLeft = this.maxLeft;
-      this.$emit("verifiComplate");
+    },
+  },
+  watch: {
+    moveStatus(newVal, oldVal) {
+      if (newVal == 2) {
+        this.module = true;
+        this.moveLeft = this.maxLeft;
+        this.$emit("verifiComplate");
+      }
     },
   },
 };

package/packages/components/proPageTable/oa_pro_table.vue

@@ -72,7 +72,11 @@
           <span></span>
         </template>
 
-        <el-table-column type="selection" width="60px"></el-table-column>
+        <el-table-column
+          type="selection"
+          width="60px"
+          :selectable="selected"
+        ></el-table-column>
         <el-table-column
           :key="index"
           :align="align"
@@ -346,6 +350,9 @@ export default {
         return {
           value: [],
           type: "single",
+          canSelected: () => {
+            return true;
+          },
         };
       },
     },
@@ -687,6 +694,13 @@ export default {
       this.tableCheckboxConfig.value = [];
       this.$refs.elTable?.clearSelection();
     },
+    // 判断表格的行能否点击
+    selected(row, index) {
+      let _tableCheckboxConfig = this.$props.tableCheckboxConfig;
+      if (_tableCheckboxConfig.canSelected) return true;
+
+      return _tableCheckboxConfig.canSelected(row, index);
+    },
   },
   watch: {
     fixedList(newValue, oldValue) {