@kaiyinchem/ky-uniui 1.0.11 → 1.0.13

package/components/ky-picker.vue

@@ -24,14 +24,14 @@
 
 <script>
 	export default {
-		emits: ['update:value', 'change'],
+		emits: ['update:value', 'update:label', 'change'],
 		props: {
-			/**
-			 * 回显对象
-			 */
 			value: {
 				type: [Object, String, Number, Array],
 			},
+			label: {
+				type: [Object, String, Number, Array],
+			},
 			/**
 			 * 格式，[{ name: 'xx': id: 'xxx' }]
 			 */
@@ -97,10 +97,14 @@
 				this.index = index
 				currVal.index = index
 				this.$emit('update:value', this.checked)
+				this.$emit('update:label', this.names[index])
 				this.$emit('change', currVal)
 			},
 			mapVal(v) {
 				if (typeof v === 'undefined') {
+					this.index = 0
+					this.multiIndex = [0, 0]
+					this.checked = ''
 					return
 				}
         this.$nextTick(function() {
@@ -115,9 +119,6 @@
 			},
 			mapList(v) {
 				if (typeof v === 'undefined') {
-					this.index = 0
-					this.multiIndex = [0, 0]
-					this.checked = ''
 					return
 				}
         if (this.mode === 'multiSelector') {
@@ -199,13 +200,20 @@
       },
 
       // 多列完成的时候触发
-      onMultichange(val, noEmit) {
+      onMultichange(val, noEmit) {
+				const data1 = this.names[0][val[0]]
+				const data2 = this.names[1][val[1]]
+				const emitValue = [data1[this.valueName], data2[this.valueName]]
+				const emitName = [data1[this.keyName], data2[this.keyName]]
         this.checked = {
           index: val,
-          data: [this.names[0][val[0]], this.names[1][val[1]]]
-        }
+          data: [data1, data2]
+        }
+				console.log(emitValue, emitName)
         if (!noEmit) {
-          this.$emit('update:value', this.checked)
+          this.$emit('update:value', emitValue)
+					this.$emit('update:label', emitName)
+					this.$emit('change', this.checked)
         }
       }
 		}

package/components/ky-search-history.vue

@@ -43,7 +43,7 @@
 
 <script>
 	export default {
-		emits: ['select', 'search'],
+		emits: ['select', 'search', 'update:keyword', 'update:visible'],
 		props: {
 			keyword: {
 				type: String,
@@ -96,9 +96,11 @@
 		methods: {
 			show() {
 				this.state = true
+				this.$emit('update:visible', true)
 			},
 			hide() {
 				this.state = false
+				this.$emit('update:visible', false)
 			},
 			save() {
 				const hasSame = this.historyList.some(e => e === this.str)
@@ -106,12 +108,12 @@
 				  this.historyList.push(this.str)
 				  this.$db.set(this.keyStr, this.historyList)
 				}
-			  this.state = false
+			  this.hide()
 			  uni.hideKeyboard()
 			},
 			handleClear() {
 			  this.str = undefined
-				this.state = false
+				this.hide()
 			},
 			handleSearch() {
 				this.$emit('search', this.str)
@@ -121,7 +123,7 @@
 			},
 			handleFocus() {
 				if (!this.str) {
-					this.state = true
+					this.show()
 				}
 			},
 			selectKeyword(str) {
@@ -131,6 +133,9 @@
 			clearSignle(index) {
 			  this.historyList.splice(index, 1)
 			  this.$db.set(this.keyStr, this.historyList)
+				if (!this.historyList.length) {
+					this.hide()
+				}
 			},
 			clearHistory() {
 			  this.$confirm({ content: '确定清除全部历史吗？' }, (res) => {

package/package.json

@@ -7,7 +7,7 @@
     "style"
   ],
   "description": "an uniapp ui",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/yezipi/ky-uniui.git"