mali-applet-ui 1.0.182 → 1.0.183

package/lib/components/ml-form/ml-form.vue

@@ -101,6 +101,8 @@ export default {
           } else {
             item.errRule = null
           }
+        } else {
+          item.errRule = null
         }
       }
       return errMaps ? Promise.resolve(errMaps) : Promise.resolve()

package/lib/components/ml-list-select-page/ml-list-select-page.vue

@@ -48,6 +48,7 @@ export default {
   },
   data () {
     return {
+      defaulList: [],
       dataList: []
     }
   },
@@ -67,19 +68,16 @@ export default {
       }
       return XEUtils.eqNull(this.value) || this.value === ''
     },
+    selectRows () {
+      return this.getSelectRows(this.value)
+    },
     selectLabel () {
-      let rest = []
-      if (this.type === 'checkbox') {
-        rest = this.dataList.filter(item => this.value.includes(item[this.optValueField]))
-      } else if (this.type === 'radio') {
-        rest = this.dataList.filter(item => this.value === item[this.optValueField])
-      }
-      return rest.map(item => item[this.optLabelField]).join(',')
+      return this.selectRows.map(item => item[this.optLabelField]).join(',')
     }
   },
   watch: {
     defaultOptions () {
-      this.dataList = this.defaultOptions
+      this.defaulList = this.defaultOptions
     },
     options () {
       this.dataList = this.options
@@ -87,13 +85,26 @@ export default {
   },
   created () {
     if (this.defaultOptions) {
-      this.dataList = this.defaultOptions
+      this.defaulList = this.defaultOptions
     }
     if (this.options) {
       this.dataList = this.options
     }
   },
   methods: {
+    getSelectRows (value) {
+      const vals = XEUtils.isArray(value) ? value : [value]
+      return vals.map(val => {
+        let item = this.dataList.find(item => val === item[this.optValueField])
+        if (!item) {
+          item = this.defaulList.find(item => val === item[this.optValueField])
+        }
+        return item || {
+          [this.optLabelField]: val,
+          [this.optValueField]: val
+        }
+      })
+    },
     tapEvent () {
       if (this.disabled) {
         return

package/lib/components/ml-list-select-user-page/ml-list-select-user-page.vue

@@ -56,6 +56,7 @@ export default {
   },
   data () {
     return {
+      defaulList: [],
       dataList: []
     }
   },
@@ -87,7 +88,7 @@ export default {
   },
   watch: {
     defaultOptions () {
-      this.dataList = this.defaultOptions
+      this.defaulList = this.defaultOptions
     },
     options () {
       this.dataList = this.options
@@ -95,7 +96,7 @@ export default {
   },
   created () {
     if (this.defaultOptions) {
-      this.dataList = this.defaultOptions
+      this.defaulList = this.defaultOptions
     }
     if (this.options) {
       this.dataList = this.options
@@ -110,13 +111,17 @@ export default {
       this.$emit('click', {})
     },
     getSelectRows (value) {
-      if (!this.dataList || !this.dataList.length) {
-        return []
-      }
-      if (this.type === 'checkbox') {
-        return this.dataList.filter(item => value.includes(item[this.optValueField]))
-      }
-      return this.dataList.filter(item => value === item[this.optValueField])
+      const vals = XEUtils.isArray(value) ? value : [value]
+      return vals.map(val => {
+        let item = this.dataList.find(item => val === item[this.optValueField])
+        if (!item) {
+          item = this.defaulList.find(item => val === item[this.optValueField])
+        }
+        return item || {
+          [this.optLabelField]: val,
+          [this.optValueField]: val
+        }
+      })
     },
     openUserEvent () {
       if (this.disabled) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.0.182",
+  "version": "1.0.183",
   "description": "vue2 码里云小程序组件库",
   "files": [
     "lib",