meixioacomponent 0.4.74 → 0.4.76

package/package.json

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

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

@@ -15,6 +15,7 @@
       v-model.number="module"
       :disabled="disabled"
       :maxlength="maxlength"
+      @change="onChange"
       style="width: 100%; height: 100%;"
     ></el-input-number>
     <div class="number-unit" v-if="(unit || select) && !controls">
@@ -82,6 +83,10 @@ export default {
     focus() {
       this.$refs.target.focus()
     },
+
+    onChange() {
+      this.$emit('onChange')
+    },
   },
   components: { BaseStoreSelect },
 }
@@ -123,26 +128,29 @@ export default {
   .controls {
     /deep/ .el-input-number__decrease {
       left: 2px;
+      border-right: 1px solid var(--color-gray-d);
     }
-    /deep/ .el-input-number__increase {
-      right: 2px;
-    }
-    /deep/ .el-input-number__decrease,
-    /deep/ .el-input-number__increase {
-      top: 50%;
-      width: 40px;
+  }
+  /deep/ .el-input-number__increase {
+    right: 2px;
+    border-left: 1px solid var(--color-gray-d);
+  }
+  /deep/ .el-input-number__decrease,
+  /deep/ .el-input-number__increase {
+    top: 50%;
+    width: 40px;
 
-      height: calc(100% - 4px) !important;
-      transform: translateY(-50%);
-    }
-    /deep/ .el-input__inner {
-      &:hover,
-      &:focus {
-        border: 2px solid var(--color-primary) !important;
-      }
+    height: calc(100% - 4px) !important;
+    transform: translateY(-50%);
+  }
+  /deep/ .el-input__inner {
+    &:hover,
+    &:focus {
+      border: 2px solid var(--color-primary) !important;
     }
   }
 }
+
 .select {
   .value-input {
     /deep/ input {
@@ -160,6 +168,9 @@ export default {
       border: 0px !important;
       background: inherit !important;
     }
+    // /deep/.el-input.is-disabled .el-input__inner {
+    //   color: var(--font-color-d);
+    // }
   }
 }
 

package/packages/components/base/baseToggle/toggle.vue

@@ -82,7 +82,7 @@ export default {
   methods: {
     handletoggle(item) {
       const { disabled } = this.$props
-      if (disabled) return
+      if (disabled || item.value == this.module) return
       const { beforeHandle } = this.$props
       if (beforeHandle) {
         beforeHandle(() => {

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

@@ -135,10 +135,10 @@
         placeholder="选择日期"
         :disabled="isDisabled"
         v-else-if="isDatePick"
+        :prefix-icon="`el-icon-time`"
         :rangeSeparator="datePickPlace[1]"
         :endPlaceholder="datePickPlace[2]"
         :startPlaceholder="datePickPlace[0]"
-        :prefix-icon="`el-icon-time`"
         value-format="yyyy-MM-dd HH:mm:ss"
         style="width: 100%; height: 100%;"
         :picker-options="config.pickerOptions"

package/packages/components/proForm/proFormWrap/pro_form_wrap.vue

@@ -26,6 +26,7 @@
           :formType="formType"
           :disabled="disabled"
           :rowNumber="rowNumber"
+          :disables="disables"
           :labelWidth="labelWidth"
           :labelPosition="labelPosition"
           :formConfig="formConfig"
@@ -99,6 +100,9 @@ export default {
       type: String,
       default: 'default',
     },
+    disables: {
+      type: Object,
+    },
     formConfig: {},
   },
   computed: {

package/packages/components/proPageTable/oa_pro_footer.vue

@@ -2,9 +2,11 @@
   <div class="oa-pro-footer-content">
     <div class="footer-left">
       <div class="total-item" :key="index" v-for="(item, index) in totalList">
-        <span class="item-name">{{ item.label }} : </span>
+        <span class="item-name">{{ item.label }} :</span>
         <span class="item-number">{{ item.total }}</span>
       </div>
+
+      <slot name="footer-slot"></slot>
     </div>
     <div class="footer-right">
       <basePopoverButton
@@ -29,13 +31,13 @@
 </template>
 
 <script>
-import basePopoverButton from "../base/basePopoverButton/index.vue";
-import oa_pro_handle_table_borderVue from "./oa_pro_handle_table_border.vue";
+import basePopoverButton from '../base/basePopoverButton/index.vue'
+import oa_pro_handle_table_borderVue from './oa_pro_handle_table_border.vue'
 export default {
   data() {
     return {
       popoverFlag: false,
-    };
+    }
   },
   props: {
     totalList: {
@@ -54,15 +56,15 @@ export default {
   },
   methods: {
     sizeChange(e) {
-      this.$emit("pageSizeChange");
-      this.$parent.refreshData();
+      this.$emit('pageSizeChange')
+      this.$parent.refreshData()
     },
     currentChange() {
-      this.$emit("pageCurrentChange");
-      this.$parent.refreshData(false);
+      this.$emit('pageCurrentChange')
+      this.$parent.refreshData(false)
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>
@@ -101,7 +103,7 @@ export default {
     .total-item + .total-item {
       margin-left: var(--margin-5);
       &::before {
-        content: "/";
+        content: '/';
         color: var(--font-color-d);
         margin-right: var(--margin-5);
         font-size: var(--font-size-base);

package/packages/components/proPageTable/oa_pro_table.vue

@@ -181,7 +181,11 @@
         :pageProps="pageProps"
         :totalList="totalList"
         :pageConfig="pageConfig"
-      ></oa_pro_footerVue>
+      >
+        <template slot="footer-slot">
+          <slot name="footer-pre-slot"></slot>
+        </template>
+      </oa_pro_footerVue>
     </div>
 
     <!-- 高级筛选的弹框 -->

package/src/component/test.vue

@@ -855,6 +855,7 @@ export default {
           value: '',
           type: 'numberUnit',
           label: '产品保质期',
+          disabled:true,
           key: 'goodsExpirationDate',
           linkKey: 'goodsExpirationUnit',
           useStore: 'testSelectStore',