lilei před 7 měsíci
rodič
revize
9ec55188a7

+ 11 - 6
node_modules/uview-ui/components/u-input/u-input.vue

@@ -10,7 +10,7 @@
 			borderColor: borderColor,
 			textAlign: inputAlign
 		}"
-		@tap.stop="inputClick"
+		@click="inputClick"
 	>
 		<textarea
 			v-if="type == 'textarea'"
@@ -34,6 +34,10 @@
 			@focus="onFocus"
 			@confirm="onConfirm"
 		/>
+		<view v-else-if="type === 'select'" class="u-input__input">
+			<view :style="placeholderStyle" v-if="!defaultValue">{{placeholder}}</view>
+			<view v-else style="line-height: normal;padding: 15rpx 0;">{{defaultValue}}</view>
+		</view>
 		<input
 			v-else
 			class="u-input__input"
@@ -43,7 +47,7 @@
 			:password="type == 'password' && !showPassword"
 			:placeholder="placeholder"
 			:placeholderStyle="placeholderStyle"
-			:disabled="disabled || type === 'select'"
+			:disabled="disabled"
 			:maxlength="inputMaxlength"
 			:focus="focus"
 			:confirmType="confirmType"
@@ -58,16 +62,16 @@
 			@confirm="onConfirm"
 		/>
 		<view class="u-input__right-icon u-flex">
-			<view class="u-input__right-icon__clear u-input__right-icon__item" @tap="onClear" v-if="clearable && value != '' && focused">
+			<view class="u-input__right-icon__clear u-input__right-icon__item" @tap.stop="onClear" v-if="clearable && value != '' && (type !== 'select'?focused:true)">
 				<u-icon size="32" name="close-circle-fill" color="#c0c4cc"/>
 			</view>
 			<view class="u-input__right-icon__clear u-input__right-icon__item" v-if="passwordIcon && type == 'password'">
-				<u-icon size="32" :name="!showPassword ? 'eye' : 'eye-fill'" color="#c0c4cc" @click="showPassword = !showPassword"/>
+				<u-icon size="32" :name="!showPassword ? 'eye' : 'eye-fill'" color="#c0c4cc" @click.stop="showPassword = !showPassword"/>
 			</view>
 			<view class="u-input__right-icon--select u-input__right-icon__item" v-if="type == 'select'" :class="{
 				'u-input__right-icon--select--reverse': selectOpen
 			}">
-				<u-icon name="arrow-down-fill" size="26" color="#c0c4cc"></u-icon>
+				<u-icon name="arrow-right" size="26" color="#c0c4cc"></u-icon>
 			</view>
 		</view>
 	</view>
@@ -334,7 +338,8 @@ export default {
 			this.$emit('confirm', e.detail.value);
 		},
 		onClear(event) {
-			this.$emit('input', '');
+			this.handleInput({detail:{value:''}})
+			this.$emit('clear', '');
 		},
 		inputClick() {
 			this.$emit('click');

+ 9 - 12
node_modules/uview-ui/package.json

@@ -1,35 +1,32 @@
 {
-  "_args": [
-    [
-      "uview-ui@1.8.7",
-      "D:\\jianguan\\qpls-md-app"
-    ]
-  ],
-  "_from": "uview-ui@1.8.7",
+  "_from": "uview-ui@^1.8.7",
   "_id": "uview-ui@1.8.7",
   "_inBundle": false,
   "_integrity": "sha512-5oOGf6NHiSTCj6/dklKjm8LCSJ7kov3azWEcloEYTTf2Mv+cbov/aARc/8QR0ce6y1hqEtwK/YkBkP+OVKuaWw==",
   "_location": "/uview-ui",
   "_phantomChildren": {},
   "_requested": {
-    "type": "version",
+    "type": "range",
     "registry": true,
-    "raw": "uview-ui@1.8.7",
+    "raw": "uview-ui@^1.8.7",
     "name": "uview-ui",
     "escapedName": "uview-ui",
-    "rawSpec": "1.8.7",
+    "rawSpec": "^1.8.7",
     "saveSpec": null,
-    "fetchSpec": "1.8.7"
+    "fetchSpec": "^1.8.7"
   },
   "_requiredBy": [
     "/"
   ],
   "_resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.7.tgz",
-  "_spec": "1.8.7",
+  "_shasum": "e5b8868c0bce203ca1ae0300cbf378f8ffeb0793",
+  "_spec": "uview-ui@^1.8.7",
   "_where": "D:\\jianguan\\qpls-md-app",
   "author": {
     "name": "uView"
   },
+  "bundleDependencies": false,
+  "deprecated": false,
   "description": "uView UI,是uni-app生态优秀的UI框架,全面的组件和便捷的工具会让您信手拈来,如鱼得水",
   "devDependencies": {
     "sass": "1.26.2",