v-uni-app-ui 1.1.7 → 1.1.9

package/components/config/interface/basic-type.ts

@@ -9,9 +9,18 @@ export type BasicPosition = 'left' | 'right' | 'top' | 'bottom' | 'center'
 
 // 交互类型
 export type InteractionMode = 'hover' | 'active' | 'focus' | 'disabled'
+export type validateTriggerType = 'input' | 'blur' | 'change'
 
 //组件类型定义
+//按钮形状
 export type ButtonShape = 'default' | 'none' | 'circle'
+
+//文本框类型
 export type InputType = 'text' | 'id' | 'safe-password' | 'password' | 'number' | 'digit' | 'numeric' | 'decimal' |
 	'email' | 'phone' | 'url' | 'textarea' | 'name' | 'search' | 'none'
-export type validateTriggerType = 'input' | 'blur' | 'change'
+//文本框键盘按钮文字
+export type confirmType = 'done' | 'send' | 'search' | 'next' | 'go'
+//文本框键盘触发类型
+export type inputKeyboardModel = 'none' | 'text' | 'decimal' | 'numeric' | 'tel' | 'search' | 'email' | 'url'
+//文本框形状
+export type InputShape = 'default' | 'none' | 'circle' | 'line'

package/components/config/interface/props/components/input-props.ts

@@ -1,97 +1,112 @@
-import { extendWithBasicProps, ExtractPropTypes } from '../../../../config/interface/props/basic-props';
-import {
-	InputType,
-	BasicSize,
-	BasicHorizontallyPosition,
-	validateTriggerType
-} from '../../../../config/interface/basic-type';
-import { Validators } from '../../../../utils/validator';
-import { PropTools } from '../../../../config/interface/props/props-tools';
-
-/**
- * 文本框组件 props 定义
- */
-const inputProps = extendWithBasicProps(
-	{
-		value: PropTools.string(),
-		size: PropTools.enum<BasicSize>(['small', 'medium', 'large'], 'medium', 'inputSize'),
-		placeholder: PropTools.array(),
-		placeholderStyle: PropTools.object(),
-		placeholderTimeNumber: {
-			type: Number,
-			default: 0,
-			validator: Validators.numberRange(
-				0,
-				1_000_000,
-				'The prompt switching time must be between 0 and 1,000,000 milliseconds.'
-			)
-		},
-		maxlength: {
-			type: Number,
-			default: 150,
-			validator: Validators.numberRange(-1, 1_0000_0000, 'maxlength must be between -1 and 100,000,000.')
-		},
-		disabled: PropTools.boolean(false),
-		type: PropTools.enum<InputType>(
-			[
-				'text',
-				'id',
-				'safe-password',
-				'password',
-				'number',
-				'digit',
-				'numeric',
-				'decimal',
-				'email',
-				'phone',
-				'url',
-				'textarea',
-				'name',
-				'search',
-				'none'
-			],
-			'text',
-			'inputType'
-		),
-		isWordCounter: PropTools.boolean(false),
-		textPosition: PropTools.enum<BasicHorizontallyPosition>(
-			['left', 'right', 'center'],
-			'left',
-			'inputTextPosition'
-		),
-		focus: PropTools.boolean(false),
-		validators: PropTools.string(),
-		validateTrigger: PropTools.enum<validateTriggerType>(['input', 'blur', 'change'], 'input', 'validateTrigger'),
-		selectionStart: {
-			type: Number,
-			default: -1,
-			validator: Validators.numberRange(-1, 10_000, 'selection start must be between -1 and 10,000 milliseconds.')
-		},
-		isIcon: PropTools.boolean(false),
-		selectionEnd: {
-			type: Number,
-			default: -1,
-			validator: Validators.numberRange(-1, 10_000, 'selection end must be between -1 and 10,000 milliseconds.')
-		},
-		randomNumber: PropTools.boolean(false),
-		cursorColor: PropTools.string(),
-		autoBlur: PropTools.boolean(false),
-		cursorSpacing: PropTools.number(0),
-		autocomplete: PropTools.boolean(true),
-	},
-	{
-		override: {
-			id: {
-				default: 'VInput'
-			},
-			className: {
-				default: 'v-input'
-			},
-			boxStyle: {
-				default: {}
-			}
-		}
-	}
-);
-export default inputProps;
-export type inputProps = ExtractPropTypes<typeof inputProps>;
+import { extendWithBasicProps, ExtractPropTypes } from '../../../../config/interface/props/basic-props';
+import {
+	InputType,
+	BasicSize,
+	BasicHorizontallyPosition,
+	validateTriggerType,
+	inputKeyboardModel,
+	InputShape
+} from '../../../../config/interface/basic-type';
+import { Validators } from '../../../../utils/validator';
+import { PropTools } from '../../../../config/interface/props/props-tools';
+
+/**
+ * 文本框组件 props 定义
+ */
+const inputProps = extendWithBasicProps(
+	{
+		value: PropTools.string(),
+		size: PropTools.enum<BasicSize>(['small', 'medium', 'large'], 'medium', 'inputSize'),
+		placeholder: PropTools.array([]),
+		placeholderStyle: PropTools.object({}),
+		placeholderTimeNumber: {
+			type: Number,
+			default: 0,
+			validator: Validators.numberRange(
+				0,
+				1_000_000,
+				'The prompt switching time must be between 0 and 1,000,000 milliseconds.'
+			)
+		},
+		maxlength: {
+			type: Number,
+			default: 150,
+			validator: Validators.numberRange(-1, 100_0000, 'maxlength must be between -1 and 100,0000.')
+		},
+		disabled: PropTools.boolean(false),
+		type: PropTools.enum<InputType>(
+			[
+				'text',
+				'id',
+				'password',
+				'safe-password',
+				'number',
+				'digit',
+				'numeric',
+				'decimal',
+				'email',
+				'phone',
+				'url',
+				'textarea',
+				'name',
+				'search',
+				'none'
+			],
+			'text',
+			'inputType'
+		),
+		isWordCounter: PropTools.boolean(false),
+		textPosition: PropTools.enum<BasicHorizontallyPosition>(
+			['left', 'right', 'center'],
+			'left',
+			'inputTextPosition'
+		),
+		focus: PropTools.boolean(false),
+		validators: PropTools.string(),
+		validateTrigger: PropTools.enum<validateTriggerType>(['input', 'blur', 'change'], 'input', 'validateTrigger'),
+		selectionStart: PropTools.number(-1),
+		selectionEnd: PropTools.number(-1),
+		isIcon: PropTools.boolean(false),
+		iconName: PropTools.string(),
+		randomNumber: PropTools.boolean(false),
+		cursorColor: PropTools.string(),
+		autoBlur: PropTools.boolean(false),
+		cursorSpacing: PropTools.number(0),
+		autocomplete: PropTools.boolean(true),
+		confirmHold: PropTools.boolean(false),
+		cursor: PropTools.number(),
+		adjustPosition: PropTools.boolean(true),
+		ignoreComposition: PropTools.boolean(false),
+		alwaysEmbed: PropTools.boolean(false),
+		holdKeyboard: PropTools.boolean(false),
+		safePasswordCertPath: PropTools.string(),
+		safePasswordTimeStamp: PropTools.number(),
+		safePasswordNonce: PropTools.string(),
+		safePasswordSalt: PropTools.string(),
+		safePasswordCustomHash: PropTools.string(),
+		controlled: PropTools.boolean(false),
+		alwaysSystem: PropTools.boolean(false),
+		inputModel: PropTools.enum<inputKeyboardModel>(
+			['none', 'text', 'decimal', 'numeric', 'tel', 'search', 'email', 'url'],
+			'text',
+			'inputModel'
+		),
+		shape: PropTools.enum<InputShape>(['default', 'none', 'circle', 'line'], 'default', 'inputShape'),
+		isTrim:PropTools.boolean(false),
+	},
+	{
+		override: {
+			id: {
+				default: 'VInput'
+			},
+			className: {
+				default: 'v-input'
+			},
+			boxStyle: {
+				default: {}
+			}
+		}
+	}
+);
+export default inputProps;
+export type inputProps = ExtractPropTypes<typeof inputProps>;

package/components/config/interface/props/components/uni-input-props.ts

@@ -1,30 +1,81 @@
-import { ExtractPropTypes } from '../../../../config/interface/props/basic-props';
-import { PropTools } from '../../../../config/interface/props/props-tools';
-import { Validators } from '../../../../utils/validator';
-import { BasicSize, BasicHorizontallyPosition } from '../../../../config/interface/basic-type';
-
-/**
- * uni-input 包装组件 props 定义
- */
-const uniInputProps = {
-	value: PropTools.string(),
-	type: PropTools.string('text'),
-	size: PropTools.enum<BasicSize>(['small', 'medium', 'large'], 'medium', 'inputSize'),
-	placeholder: PropTools.string(),
-	fontStyle: PropTools.object(),
-	placeholderStyle: PropTools.object(),
-	placeholderClass: PropTools.string(),
-	disabled: PropTools.boolean(false),
-	maxlength: {
-		type: Number,
-		default: -1,
-		validator: Validators.numberRange(-1, 1_0000_0000, 'maxlength must be between -1 and 100,000,000.')
-	},
-	autocomplete: PropTools.boolean(false),
-	focus: PropTools.boolean(false),
-	textPosition: PropTools.enum<BasicHorizontallyPosition>(['left', 'right', 'center'], 'left', 'inputTextPosition'),
-	isAppPlus: PropTools.boolean(false)
-};
+import { extendWithBasicProps, ExtractPropTypes } from '../../../../config/interface/props/basic-props';
+import { PropTools } from '../../../../config/interface/props/props-tools';
+import { Validators } from '../../../../utils/validator';
+import {
+	BasicSize,
+	BasicHorizontallyPosition,
+	confirmType,
+	inputKeyboardModel
+} from '../../../../config/interface/basic-type';
+
+/**
+ * uni-input 包装组件 props 定义
+ */
+const uniInputProps = extendWithBasicProps(
+	{
+		value: PropTools.string(),
+		type: PropTools.string('text'),
+		size: PropTools.enum<BasicSize>(['small', 'medium', 'large'], 'medium', 'inputSize'),
+		placeholder: PropTools.string(),
+		fontStyle: PropTools.object(),
+		placeholderStyle: PropTools.object({}),
+		placeholderClass: PropTools.string(),
+		disabled: PropTools.boolean(false),
+		maxlength: {
+			type: Number,
+			default: -1,
+			validator: Validators.numberRange(-1, 1_0000_0000, 'maxlength must be between -1 and 100,000,000.')
+		},
+		autocomplete: PropTools.boolean(false),
+		focus: PropTools.boolean(false),
+		textPosition: PropTools.enum<BasicHorizontallyPosition>(
+			['left', 'right', 'center'],
+			'left',
+			'inputTextPosition'
+		),
+		cursorSpacing: PropTools.number(0),
+		confirmType: PropTools.enum<confirmType>(['done', 'send', 'search', 'next', 'go'], 'done', 'confirmType'),
+		confirmHold: PropTools.boolean(false),
+		cursor: PropTools.number(),
+		cursorColor: PropTools.string(),
+		selectionStart: PropTools.number(-1),
+		selectionEnd: PropTools.number(-1),
+		adjustPosition: PropTools.boolean(true),
+		autoBlur: PropTools.boolean(false),
+		ignoreComposition: PropTools.boolean(false),
+		alwaysEmbed: PropTools.boolean(false),
+		holdKeyboard: PropTools.boolean(false),
+		safePasswordCertPath: PropTools.string(),
+		safePasswordTimeStamp: PropTools.number(),
+		safePasswordNonce: PropTools.string(),
+		safePasswordSalt: PropTools.string(),
+		safePasswordCustomHash: PropTools.string(),
+		randomNumber: PropTools.boolean(false),
+		controlled: PropTools.boolean(false),
+		alwaysSystem: PropTools.boolean(false),
+		inputMode: PropTools.enum<inputKeyboardModel>(
+			['none', 'text', 'decimal', 'numeric', 'tel', 'search', 'email', 'url'],
+			'text',
+			'inputModel'
+		),
+		isTrim:PropTools.boolean(false),
+		filterRegex: PropTools.string()
+	},
+	{
+		override: {
+			id: {
+				default: 'VUniInput'
+			},
+			className: {
+				default: 'v-uni-input'
+			},
+			boxStyle: {
+				default: {
+				}
+			},
+		}
+	}
+);
 
 export default uniInputProps;
-export type UniInputProps = ExtractPropTypes<typeof uniInputProps>;
+export type UniInputProps = ExtractPropTypes<typeof uniInputProps>;

package/components/config/style/basic.js

@@ -120,7 +120,8 @@ export const styleConfig = {
 				primary: '1rpx', //主要宽度
 				secondary: '2rpx', //次要宽度
 				medium: '3rpx', //中等
-				thick: '7.5rpx' //粗
+				thick: '7.5rpx' ,//粗
+				none:'0'//无边框
 			},
 
 			// 边框样式

package/components/config/style/components/input-style.js

@@ -13,10 +13,28 @@ export default {
 			height: styleConfig.components.VInput.height.large
 		}
 	},
+	shape: {
+		'default': {
+			borderRadius: styleConfig.basic.borderRadius.default,
+			borderWidth: styleConfig.basic.border.width.primary,
+		},
+		'circle': {
+			borderRadius: styleConfig.basic.borderRadius.circle,
+			borderWidth: styleConfig.basic.border.width.primary,
+		},
+		'none': {
+			borderWidth: styleConfig.basic.border.width.none,
+		},
+		'line': {
+			borderRadius: styleConfig.basic.borderRadius.none,
+			borderTopWidth: styleConfig.basic.border.width.none,
+			borderLeftWidth: styleConfig.basic.border.width.none,
+			borderRightWidth: styleConfig.basic.border.width.none,
+			borderBottomWidth: styleConfig.basic.border.width.primary,
+		}
+	},
 	default: {
 		borderColor: styleConfig.basic.border.color.primary,
-		borderRadius: styleConfig.basic.borderRadius.default,
-		borderWidth: styleConfig.basic.border.width.primary,
 		borderStyle: styleConfig.basic.border.style.solid,
 		transition: styleConfig.basic.animation.transition.default,
 		display: 'flex',
@@ -24,7 +42,14 @@ export default {
 		_pseudo: {
 			'--focus': {
 				borderColor: styleConfig.basic.border.color.default,
-				boxShadow: styleConfig.basic.shadow.default
+				boxShadow: {
+					shape: {
+						default: styleConfig.basic.shadow.default,
+						circle: styleConfig.basic.shadow.default,
+						none: styleConfig.basic.shadow.none,
+						line: styleConfig.basic.shadow.none,
+					}
+				}
 			},
 		},
 		son: {
@@ -41,8 +66,8 @@ export default {
 					maxWidth: '95%',
 					width: '-webkit-fill-available',
 					height: '85%',
-					margin: 'auto 10rpx',
-					color: styleConfig.basic.fontColor.primary
+					margin: 'auto 15rpx',
+					color: styleConfig.basic.fontColor.primary,
 				}
 			},
 			rightSlot: {
@@ -53,11 +78,6 @@ export default {
 					alignItems: 'center',
 				}
 			},
-			placeholder: {
-				default: {
-					color: styleConfig.basic.fontColor.placeholder
-				}
-			},
 			icon: {
 				default: {
 					width: '100%',
@@ -90,7 +110,6 @@ export default {
 					'align-items': 'self-end',
 					'white-space': 'nowrap',
 					'padding-right': '20rpx',
-					'padding-left':'10rpx',
 					height: '100%',
 				}
 			}

package/components/config/style/components/uni-input-style.js

@@ -12,54 +12,6 @@ export default {
 		margin: '0',
 		boxSizing: 'border-box',
 		son: {
-			h5PlaceholderInput: {
-				size: {
-					'small': {
-						fontSize: styleConfig.basic.fontSize.smallText
-					},
-					'medium': {
-						fontSize: styleConfig.basic.fontSize.mediumText
-					},
-					'large': {
-						fontSize: styleConfig.basic.fontSize.largeText
-					}
-				},
-				textPosition: {
-					'left': {
-						textAlign: "left"
-					},
-					'right': {
-						textAlign: "right"
-					},
-					'center': {
-						textAlign: "center"
-					}
-				},
-			},
-			h5Input: {
-				size: {
-					'small': {
-						fontSize: styleConfig.basic.fontSize.smallText
-					},
-					'medium': {
-						fontSize: styleConfig.basic.fontSize.mediumText
-					},
-					'large': {
-						fontSize: styleConfig.basic.fontSize.largeText
-					}
-				},
-				textPosition: {
-					'left': {
-						textAlign: "left"
-					},
-					'right': {
-						textAlign: "right"
-					},
-					'center': {
-						textAlign: "center"
-					}
-				},
-			},
 			uniInput: {
 				size: {
 					'small': {

package/components/config/style/property-mapper.js

@@ -1,6 +1,6 @@
 import {
 	styleConfig
-} from '../basic.js'
+} from './basic.js'
 import {
 	INPUT_COMPONENT_SKIP_PROPS
 } from './skip-props.js';