优化组件/更新

uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue

@@ -40,7 +40,7 @@
 	 * @property {String} name 唯一标志符
 	 * @property {Boolean} open = [true|false] 是否展开组件
 	 * @property {Boolean} titleBorder = [true|false] 是否显示标题分隔线
-	 * @property {Boolean} border = [true|false] 是否显示分隔线
+	 * @property {String} border = ['auto'|'show'|'none'] 是否显示分隔线
 	 * @property {Boolean} disabled = [true|false] 是否展开面板
 	 * @property {Boolean} showAnimation = [true|false] 开启动画
 	 * @property {Boolean} showArrow = [true|false] 是否显示右侧箭头

uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue

@@ -51,8 +51,11 @@
 			}
 		},
 		watch: {
-			dataValue(val) {
-				this.setOpen(val)
+			dataValue: {
+				handler(newVal) {
+					this.setOpen(newVal)
+				},
+				deep: true
 			}
 		},
 		created() {
@@ -66,9 +69,9 @@
 		},
 		methods: {
 			setOpen(val) {
-				let str = typeof val === 'string'
-				let arr = Array.isArray(val)
-				this.childrens.forEach((vm, index) => {
+				const str = typeof val === 'string'
+				const arr = Array.isArray(val)
+				this.childrens.forEach((vm) => {
 					if (str) {
 						if (val === vm.nameSync) {
 							if (!this.accordion) {
@@ -79,15 +82,12 @@
 						}
 					}
 					if (arr) {
-						val.forEach(v => {
-							if (v === vm.nameSync) {
-								if (this.accordion) {
-									console.warn('accordion 属性为 true ,v-model 类型应该为 string')
-									return
-								}
-								vm.isOpen = true
-							}
-						})
+						const isOpen = val.findIndex(v => v === vm.nameSync) !== -1
+						if (this.accordion && isOpen) {
+							console.warn('accordion 属性为 true ,v-model 类型应该为 string')
+							return
+						}
+						vm.isOpen = isOpen
 					}
 				})
 				this.emit(val)