meixioacomponent 0.4.76 → 0.4.77

package/package.json

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

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="pro-number-wrap" :class="{ select: select }">
+  <div class="pro-number-wrap" :class="{ select: select, disabled: disabled }">
     <el-input-number
       :min="min"
       :max="max"
@@ -173,7 +173,13 @@ export default {
     // }
   }
 }
-
+.disabled {
+  .number-unit {
+    span {
+      color: #8f959e;
+    }
+  }
+}
 /deep/ input {
   font-weight: var(--font-weight-kg);
 }

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

@@ -131,7 +131,7 @@
         v-model="module"
         :size="size"
         ref="target"
-        :type="config.type"
+        :type="datePickType"
         placeholder="选择日期"
         :disabled="isDisabled"
         v-else-if="isDatePick"
@@ -371,12 +371,23 @@ export default {
       return min < 0 || min == undefined || min == null ? 0 : min
     },
     isDatePick() {
-      return (
-        this.type == 'time' ||
-        this.type == 'datetime' ||
-        this.type == 'daterange'
-      )
+      const type = this.type
+      return type == 'time' || type == 'datetime' || type == 'daterange'
     },
+    datePickType() {
+      const type = this.type
+      switch (type) {
+        case 'time':
+          return 'date'
+        case 'datetime':
+          return 'datetime'
+        case 'daterange':
+          return 'daterange'
+        default:
+          break
+      }
+    },
+
     module: {
       get() {
         return this.$props.value

package/packages/components/proPageTable/oa_pro_table.vue

@@ -23,7 +23,7 @@
     <div class="oa-pro-table-search">
       <oa_pro_table_searchVue
         v-model="module"
-        v-show="!isCheckTableRow"
+        v-show="!isCheckTableRow || !isHasHandlePlugin"
         ref="oaProTableSearch"
         :screenList="screenList"
         :placeholder="placeholder"
@@ -39,7 +39,7 @@
       <oa_pro_table_check_handle_barVue
         :del-fn="delFn"
         :export-fn="exportFn"
-        v-if="isCheckTableRow"
+        v-if="isCheckTableRow && isHasHandlePlugin"
         :checked-value="tableCheckboxConfig.value"
       >
         <template slot="check-handle">
@@ -277,6 +277,7 @@ export default {
   },
   created() {
     this.init()
+
     componentConfig.eventBus.$on('handleTableBorder', this.handleTableBorder)
   },
   mounted() {
@@ -468,6 +469,11 @@ export default {
     exportFn() {
       return this._linkViewClassSubs.exportFn || null
     },
+
+    // 是否存在delFn,exportFn以及check-handle-plugin slot
+    isHasHandlePlugin() {
+      return this.delFn || this.exportFn || this.$slots[`check-handle-plugin`]
+    },
   },
   components: {
     oaProHeader,

package/src/component/test.vue

@@ -312,7 +312,7 @@ export default {
 }
 </style> -->
 
-<!-- <template>
+<template>
   <div class="page-table-wrap" ref="pageTableWrap" v-if="show">
     <base-pro-table
       ref="table"
@@ -362,6 +362,8 @@ export default {
         </el-dropdown>
       </template>
 
+      <el-button slot="check-handle-plugin">sdads</el-button>
+
       <template v-slot:gmtCreate="data">
         <el-button type="text" :disabled="false">222</el-button>
       </template>
@@ -544,7 +546,7 @@ export default {
   height: 100%;
   background: inherit;
 }
-</style> -->
+</style>
 
 <!-- 普通表单 -->
 
@@ -807,7 +809,7 @@ export default {
 
 <style></style> -->
 
-<template>
+<!-- <template>
   <div>
     <base-form-wrap
       :rowNumber="2"
@@ -841,9 +843,9 @@ export default {
     return {
       formList: [
         {
-          value: '2',
+          value: '',
           key: 'inds',
-          type: 'radio',
+          type: 'time',
           label: '营业执照号',
           list: [
             { label: 'aa', value: '1' },
@@ -853,12 +855,11 @@ export default {
 
         {
           value: '',
-          type: 'numberUnit',
+          type: 'number',
+          unit: '天',
           label: '产品保质期',
-          disabled:true,
+          disabled: true,
           key: 'goodsExpirationDate',
-          linkKey: 'goodsExpirationUnit',
-          useStore: 'testSelectStore',
         },
 
         {
@@ -928,4 +929,4 @@ export default {
 }
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped></style> -->