From 70d1b353fe4c20237e083a382c12e258a3e2a933 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 23 May 2024 01:48:52 +0800
Subject: [PATCH] uu

---
 .../tpx-select/default-select-input.vue       | 24 ++++++++++++------
 components/tpx-select/tpx-select.vue          |  1 +
 components/tpx-text-dic/tpx-text-dic.vue      | 16 +++++++-----
 components/tpx-text-item/tpx-text-item.vue    | 25 ++++---------------
 4 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/components/tpx-select/default-select-input.vue b/components/tpx-select/default-select-input.vue
index 16fe97a..11c5291 100644
--- a/components/tpx-select/default-select-input.vue
+++ b/components/tpx-select/default-select-input.vue
@@ -2,7 +2,7 @@
 	<view :class="contClass" :style="styles">
 		<u-row custom-style="width: 100%;">
 			<view style="flex: 1;">
-				<u-text :text="leftText" size="28" :lines="1"></u-text>
+				<tpx-text-dic :value="value" :list="list" :checkedList="checkedList" :text="text" :placeholder="placeholder"></tpx-text-dic>
 			</view>
 			<u-row>
 				<u-icon size="22" :name="`${show?'arrow-up':'arrow-down'}`" color="#333"></u-icon>
@@ -14,13 +14,6 @@
 <script>
 	export default {
 		computed: {
-			leftText() {
-				let str = this.text || ''
-				if(!str) {
-					str = this.placeholder
-				}
-				return str
-			},
 			contClass() {
 				let pre = ['radius-10']
 				if (this.isWhite) {
@@ -55,6 +48,21 @@
 					return false
 				}
 			},
+			list: {
+				default () {
+					return []
+				}
+			},
+			checkedList: {
+				default () {
+					return []
+				}
+			},
+			value: {
+				default () {
+					return ""
+				}
+			},
 			text: {
 				default () {
 					return ''
diff --git a/components/tpx-select/tpx-select.vue b/components/tpx-select/tpx-select.vue
index 67b5332..2bb7c8f 100644
--- a/components/tpx-select/tpx-select.vue
+++ b/components/tpx-select/tpx-select.vue
@@ -4,6 +4,7 @@
 			<slot v-if="$slots.default"></slot>
 			<template v-else>
 				<default-select-input v-if="selectTextType == 'input'" :placeholder="placeholder" :show="show"  
+					:value="value" :list="filDataList" :checkedList="filDatacheckedList"
 					:isWhite="isWhite" :text="text" :customStyle="customStyle"
 				></default-select-input>
 				<DefaultSelectText v-if="selectTextType == 'text'"></DefaultSelectText>
diff --git a/components/tpx-text-dic/tpx-text-dic.vue b/components/tpx-text-dic/tpx-text-dic.vue
index 67193a8..49479a7 100644
--- a/components/tpx-text-dic/tpx-text-dic.vue
+++ b/components/tpx-text-dic/tpx-text-dic.vue
@@ -6,30 +6,34 @@
 	export default {
 		computed: {
 			title() {
-				let title = this.value
 				let val = this.value
 				if(val && this.list) {
 					if(!Array.isArray(val) && val.split) {
 						val = val.split(",")
 					}
-					title = this.list.filter(t=> t.val == val || (val.indexOf && val.indexOf(t.val) > -1)).map(t=> t.title).join(",")
+					val = this.list.filter(t=> t.val == val || (val.indexOf && val.indexOf(t.val) > -1)).map(t=> t.title).join(",")
 				}
 				if(Array.isArray(this.checkedList)) {
 					val = this.checkedList.map(t=> t.title).join(',')
 				}
-				if((!title || title?.length == 0) && (this.list || this.checkedList?.length == 0)) {
-					title = '-'
-				}
-				return title
+				val = val || this.text || this.placeholder
+				return val
 			}
 		},
 		props: {
 			value: {
 			},
+			text: {
+			},
 			list: {
 			},
 			checkedList: {
 			},
+			placeholder: {
+				default () {
+					return '-'
+				}
+			},
 		},
 		data() {
 			return {
diff --git a/components/tpx-text-item/tpx-text-item.vue b/components/tpx-text-item/tpx-text-item.vue
index c5f5cf1..3b7a04a 100644
--- a/components/tpx-text-item/tpx-text-item.vue
+++ b/components/tpx-text-item/tpx-text-item.vue
@@ -8,10 +8,11 @@
 		</view>
 		<u-row :custom-style="`min-width: ${rightWidth}rpx;`" justify="end" align="center">
 			<template v-if="!$slots.right">
-				<u-text align="right" margin="0 12rpx 0 0" size="26"
-					:text="title"></u-text>
+				<view style="margin-right: 12rpx; flex:1; text-align: right;">
+					<tpx-text-dic :value="value" :list="list" :checkedList="checkedList" :placeholder="placeholder"></tpx-text-dic>
+				</view>
 				<template v-if="!$slots.rightRcon">
-					<u-icon v-if="list || checkedList" size="26" name="arrow-right" color="#333"></u-icon>
+					<u-icon size="26" name="arrow-right" color="#333"></u-icon>
 				</template>
 				<slot name="rightRcon"></slot>
 			</template>
@@ -23,23 +24,7 @@
 <script>
 	export default {
 		computed: {
-			title() {
-				let title = this.value
-				let val = this.value
-				if(val && this.list) {
-					if(!Array.isArray(val) && val.split) {
-						val = val.split(",")
-					}
-					title = this.list.filter(t=> t.val == val || (val.indexOf && val.indexOf(t.val) > -1)).map(t=> t.title).join(",")
-				}
-				if(Array.isArray(this.checkedList)) {
-					title = this.checkedList.map(t=> t.title).join(',')
-				}
-				if((!title || title?.length == 0) && (this.list || this.checkedList?.length == 0)) {
-					title = this.placeholder
-				}
-				return title
-			}
+			
 		},
 		props: {
 			rightWidth:{