Merge pull request dcloudio#877 from 18148764734:master

fix: easyinput dialog segmentedcontrol修复

Author: 18148764734

manifest.json

@@ -58,5 +58,5 @@
         "title" : "uni-ui",
         "template" : "template.h5.html"
     },
-    "vueVersion" : "3"
+    "vueVersion" : "2"
 }

uni_modules/uni-easyinput/changelog.md

@@ -1,3 +1,5 @@
+## 1.1.18（2024-04-11）
+- 修复 easyinput组件双向绑定问题
 ## 1.1.17（2024-03-28）
 - 修复 在头条小程序下丢失事件绑定的问题
 ## 1.1.16（2024-03-20）

uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue

@@ -142,7 +142,7 @@
 			// #ifdef MP-TOUTIAO
 			virtualHost: false,
 			// #endif
-			// #ifdef MP-TOUTIAO
+			// #ifndef MP-TOUTIAO
 			virtualHost: true
 			// #endif
 		},

uni_modules/uni-easyinput/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-easyinput",
   "displayName": "uni-easyinput 增强输入框",
-  "version": "1.1.17",
+  "version": "1.1.18",
   "description": "Easyinput 组件是对原生input组件的增强",
   "keywords": [
     "uni-ui",

uni_modules/uni-popup/changelog.md

@@ -1,3 +1,5 @@
+## 1.9.1（2024-04-02）
+- 修复 uni-popup-dialog vue3下使用value无法进行绑定的bug(双向绑定兼容旧写法)
 ## 1.9.0（2024-03-28）
 - 修复 uni-popup-dialog 双向绑定时初始化逻辑修正
 ## 1.8.9（2024-03-20）

uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue

@@ -179,9 +179,7 @@
 			// this.popup.closeMask()
 			if (this.mode === 'input') {
 				this.dialogType = 'info'
-				// #ifdef VUE2
 				this.val = this.value;
-				// #endif
 				// #ifdef VUE3
 				this.val = this.modelValue;
 				// #endif

uni_modules/uni-popup/package.json

@@ -1,7 +1,7 @@
 {
 	"id": "uni-popup",
 	"displayName": "uni-popup 弹出层",
-	"version": "1.9.0",
+	"version": "1.9.1",
 	"description": " Popup 组件，提供常用的弹层",
 	"keywords": [
         "uni-ui",

uni_modules/uni-segmented-control/changelog.md

@@ -1,3 +1,5 @@
+## 1.2.3（2024-04-02）
+- 修复 修复在微信小程序下inactiveColor失效bug
 ## 1.2.2（2024-03-28）
 - 修复 在vue2下:style动态绑定导致编译失败的bug
 ## 1.2.1（2024-03-20）

uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue

@@ -2,12 +2,13 @@
 	<view :class="[styleType === 'text'?'segmented-control--text' : 'segmented-control--button' ]"
 		:style="{ borderColor: styleType === 'text' ? '' : activeColor }" class="segmented-control">
 		<view v-for="(item, index) in values" :class="[styleType === 'text' ? '' : 'segmented-control__item--button',
-					index === currentIndex && styleType === 'button' ? 'segmented-control__item--button--active' : '',
 					index === 0 && styleType === 'button' ? 'segmented-control__item--button--first' : '',
-					index === values.length - 1 && styleType === 'button' ? 'segmented-control__item--button--last':'']" :key="index" :style="{backgroundColor: index === currentIndex && styleType === 'button' ? activeColor : styleType === 'button' ?inActiveColor:'transparent', borderColor: index === currentIndex && styleType === 'text' || styleType === 'button' ? activeColor : inActiveColor}" class="segmented-control__item" @click="_onClick(index)">
+					index === values.length - 1 && styleType === 'button' ? 'segmented-control__item--button--last':'']" :key="index"
+			:style="{backgroundColor: index === currentIndex && styleType === 'button' ? activeColor : styleType === 'button' ?inActiveColor:'transparent', borderColor: index === currentIndex && styleType === 'text' || styleType === 'button' ? activeColor : inActiveColor}"
+			class="segmented-control__item" @click="_onClick(index)">
 			<view>
 				<text
-					:style="index===currentIndex?{color : styleType === 'text' ? activeColor : '#fff'}:{color : styleType === 'text' ?'#000' : activeColor}"
+					:style="{color:index === currentIndex? styleType === 'text'? activeColor: '#fff': styleType === 'text'? '#000': activeColor}"
 					class="segmented-control__text"
 					:class="styleType === 'text' && index === currentIndex ? 'segmented-control__item--text': ''">{{ item }}</text>
 			</view>
@@ -70,38 +71,7 @@
 				}
 			}
 		},
-		computed: {
-			getTextStyle() {
-				return (index) => {
-					let style = {};
-					if (index === this.currentIndex) {
-						style.color = this.styleType === 'text' ? this.activeColor : '#fff';
-					} else {
-						style.color = this.styleType === 'text' ?
-							'#000' : this.activeColor;
-					}
-					return style;
-				}
-			},
-			computedBackgroundClass() {
-				return index => [this.styleType === 'text' ? '' : 'segmented-control__item--button',
-					index === this.currentIndex && this.styleType === 'button' ? 'segmented-control__item--button--active' : '',
-					index === 0 && this.styleType === 'button' ? 'segmented-control__item--button--first' : '',
-					index === this.values.length - 1 && this.styleType === 'button' ? 'segmented-control__item--button--last' :
-					''
-				]
-			},
-			computedBackgroundStyle() {
-				return index => {
-					return {
-						backgroundColor: index === this.currentIndex && this.styleType === 'button' ? this.activeColor : this
-							.styleType === 'button' ? this.inActiveColor : 'transparent',
-						borderColor: index === this.currentIndex && this.styleType === 'text' || this.styleType === 'button' ? this
-							.activeColor : this.inActiveColor
-					}
-				}
-			}
-		},
+		computed: {},
 		created() {
 			this.currentIndex = this.current
 		},

uni_modules/uni-segmented-control/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-segmented-control",
   "displayName": "uni-segmented-control 分段器",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "分段器由至少 2 个分段控件组成，用作不同视图的显示",
   "keywords": [
     "uni-ui",

uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue

@@ -142,7 +142,7 @@
 	 * @property {Boolean} autoClose = [true|false] 	滑动打开当前组件，是否关闭其他组件
 	 * @property {Number}  threshold 					滑动缺省值
 	 * @property {Array} leftOptions 					左侧选项内容及样式
-	 * @property {Array} rgihtOptions 					右侧选项内容及样式
+	 * @property {Array} rightOptions 					右侧选项内容及样式
 	 * @event {Function} click 							点击选项按钮时触发事件，e = {content,index} ，content（点击内容）、index（下标)
 	 * @event {Function} change 						组件打开或关闭时触发，left\right\none
 	 */