gyyg-components 0.2.17 → 0.2.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gyyg-components",
-  "version": "0.2.17",
+  "version": "0.2.19",
   "private": false,
   "main": "lib/gyyg-components.umd.js",
   "scripts": {

package/src/components/MECDescriptions/MECDescriptions.vue

@@ -9,7 +9,7 @@
                 </div>
             </template>
 
-            <el-descriptions-item v-for="(item, index) in detailsData" :key="index" :label="item.label">
+            <el-descriptions-item v-for="(item, index) in detailsData" :key="index" :label="item.label" :span="item.span || 1">
                 <div v-if="item.type === 'img'">
                     <el-image 
                         v-for="(url, index) in item.value"
@@ -93,4 +93,7 @@ export default {
 /deep/ .el-descriptions-item__label {
     white-space: nowrap;
 }
+/deep/ .el-descriptions__body .el-descriptions__table .el-descriptions-item__cell {
+    white-space: pre-wrap;
+}
 </style>

package/src/components/MecCheckbox/MecCheckbox.vue

@@ -76,7 +76,7 @@ export default {
     watch: {
         value: {
             handler (val) {
-                this.checkbox = [].concat(val);
+                this.checkbox = [].concat(val)
             },
             immediate: true
         },
@@ -85,6 +85,10 @@ export default {
 				//判断options是否为promise
 				if (typeof val !== 'function' && val && !val.then) {
 					this.option = this.options;
+                    let nameList = this.getNameListByIds(this.value, this.option)
+                    this.inputDisabled = nameList.filter(item => {
+                        return item.includes(this.checkText)
+                    }).length == 0
 				}
 			},
 			deep: true,
@@ -93,7 +97,9 @@ export default {
         otherValue: {
             handler(val) {
                 this.inputValue = val;
-            }
+                console.log(val, 'otherValue')
+            },
+            immediate: true
         }
     },
     mounted() {
@@ -101,17 +107,26 @@ export default {
             if(this.options instanceof  Promise) {
                 this.options.then(val => {
                     this.option = val.data || val;
+                    let nameList = this.getNameListByIds(this.value, this.option)
+                    this.inputDisabled = nameList.filter(item => {
+                        return item.includes(this.checkText)
+                    }).length == 0
                 });
             }
             if(typeof this.options == 'function') {
                 this.options().then(val => {
                     this.option = val.data || val;
+                    let nameList = this.getNameListByIds(this.value, this.option)
+                    this.inputDisabled = nameList.filter(item => {
+                        return item.includes(this.checkText)
+                    }).length == 0
                 });
             }
 
         } else {
             this.option = this.options;
         }
+        
     },
     computed: {
         checkboxAll () {
@@ -135,6 +150,7 @@ export default {
             this.inputDisabled = nameList.filter(item => {
                 return item.includes(this.checkText)
             }).length == 0
+            console.log(this.inputDisabled, 'this.inputDisabledthis.inputDisabledthis.inputDisabled')
         },
         // 根据 id 数组获取对应的 name 列表
         getNameListByIds(ids, array) {

package/src/components/MecInput/MecInput.vue

@@ -94,11 +94,14 @@
       },
       // 文本域行数（当type为'textarea'时有效）
       rows: {
-        default: 1
+        default: 2
       },
       // 文本域是否自适应大小（当type为'textarea'时有效）
       autosize: {
-        default: false
+        type: [Boolean, Object],
+        default: () => {
+          return { minRows: 2 }
+        }
       },
       prependText: {
         type: String,