fusions-ui 1.2.3 → 1.2.4

package/components/fu-button/fu-button.vue

@@ -124,6 +124,7 @@
 	 * @property {String} lang = [zh_CN|zh_TW|en] 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文（默认 en ）
 	 * @property {String} customClass 自定义外部class样式
 	 * @property {Object,String} customStyle 自定义外部样式
+	 * @property {Object,String} customTextStyle 自定义按钮文本样式
 	 * @event {Function} click 非禁止并且非加载中，才能点击
 	 * @event {Function} tap 非禁止并且非加载中，才能点击
 	 * @event {Function} getphonenumber	open-type="getPhoneNumber"时有效

package/components/fu-form-item/fu-form-item.vue

@@ -1,26 +1,26 @@
 <template>
-	<view class="fu-forms-item"
-		:class="['is-direction-' + localLabelPos , border?'fu-forms-item--border': '' , border && isFirstBorder? 'is-first-border': '']">
+	<view class="fu-form-item"
+		:class="['is-direction-' + localLabelPos , border?'fu-form-item--border': '' , border && isFirstBorder? 'is-first-border': '']">
 		<slot name="label">
-			<view class="fu-forms-item__label" :class="{'no-label': !label && !required}" :style="{width: localLabelWidth, justifyContent: localLabelAlign}">
+			<view class="fu-form-item__label" :class="{'no-label': !label && !required}" :style="{width: localLabelWidth, justifyContent: localLabelAlign}">
 				<text v-if="required" class="is-required">*</text>
 				<text>{{ label }}</text>
 			</view>
 		</slot>
 		<!-- #ifndef APP-NVUE -->
-		<view class="fu-forms-item__content">
+		<view class="fu-form-item__content">
 			<slot></slot>
-			<view class="fu-forms-item__error" :class="{'msg--active': msg}">
+			<view class="fu-form-item__error" :class="{'msg--active': msg}">
 				<text>{{ msg }}</text>
 			</view>
 		</view>
 		<!-- #endif -->
 		<!-- #ifdef APP-NVUE -->
-		<view class="fu-forms-item__nuve-content">
-			<view class="fu-forms-item__content">
+		<view class="fu-form-item__nuve-content">
+			<view class="fu-form-item__content">
 				<slot></slot>
 			</view>
-			<view class="fu-forms-item__error" :class="{'msg--active': msg}">
+			<view class="fu-form-item__error" :class="{'msg--active': msg}">
 				<text class="error-text">{{ msg }}</text>
 			</view>
 		</view>
@@ -43,7 +43,7 @@
 	 * 	@value right	label 右侧对齐
 	 * @property {String } message 显示的错误提示内容，如果为空字符串或者false，则不显示错误信息
 	 * @property {String } prop 表单域的属性名，在使用校验规则时必填
-	 * @property {String } 	labelPosition = [top|left] label的文字的位置（默认left）
+	 * @property {String } labelPosition = [top|left] label的文字的位置，优先级高于fu-form组件中的labelPosition
 	 * 	@value top	顶部显示 label
 	 * 	@value left	左侧显示 label
 	 */
@@ -222,7 +222,7 @@
 				// 宽度
 				this.localLabelWidth = this._labelWidthUnit(labelWidth);
 				// 标签位置
-				this.localLabelPos = this._labelPosition();
+				this.localLabelPos = this.labelPosition || this._labelPosition();
 				// 将需要校验的子组件加入form 队列
 				this.form && type && childrens.push(this)
 		
@@ -367,17 +367,18 @@
 			},
 			'form.labelPosition'(val) {
 				// 标签位置
-				this.localLabelPos = this._labelPosition()
+				this.localLabelPos = this.labelPosition || this._labelPosition()
 			},
 			'form.labelAlign'(val) {
-		
+				// 标签对齐方式
+				this.localLabelAlign = this._justifyContent();
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.fu-forms-item {
+	.fu-form-item {
 		position: relative;
 		display: flex;
 		/* #ifdef APP-NVUE */
@@ -434,7 +435,7 @@
 			/* #endif */
 		}
 	
-		& .fu-forms-item__nuve-content {
+		& .fu-form-item__nuve-content {
 			display: flex;
 			flex-direction: column;
 			flex: 1;
@@ -478,7 +479,7 @@
 		&.is-direction-top {
 			flex-direction: column;
 	
-			.fu-forms-item__label {
+			.fu-form-item__label {
 				padding: 0 0 8px;
 				line-height: 1.5715;
 				text-align: left;
@@ -489,40 +490,37 @@
 		}
 	
 		.is-required {
-			// color: $fu-color-error;
 			color: #dd524d;
 			font-weight: bold;
 		}
 	}
 	
 	
-	.fu-forms-item--border {
+	.fu-form-item--border {
 		margin-bottom: 0;
 		padding: 10px 0;
-		// padding-bottom: 0;
 		border-top: 1px #eee solid;
 	
 		/* #ifndef APP-NVUE */
-		.fu-forms-item__content {
+		.fu-form-item__content {
 			flex-direction: column;
 			justify-content: flex-start;
 			align-items: flex-start;
 	
-			.fu-forms-item__error {
+			.fu-form-item__error {
 				position: relative;
 				top: 5px;
 				left: 0;
 				padding-top: 0;
 			}
 		}
-	
 		/* #endif */
 	
 		/* #ifdef APP-NVUE */
 		display: flex;
 		flex-direction: column;
 	
-		.fu-forms-item__error {
+		.fu-form-item__error {
 			position: relative;
 			top: 0px;
 			left: 0;
@@ -531,7 +529,6 @@
 		}
 	
 		/* #endif */
-	
 	}
 	
 	.is-first-border {

package/components/fu-form-item/props.js

@@ -34,6 +34,11 @@ export default {
 		message: {
 			type: [String, Boolean],
 			default: ''
+		},
+		// label的文字的位置，优先级高于fu-form组件中的labelPosition
+		labelPosition: {
+			type: String,
+			default: ''
 		}
 	},
 }

package/components/fu-popup/fu-popup.vue

@@ -149,7 +149,7 @@
 		  this.setH5Visible(true);
 		},
 		created() {
-			this.mkclick = this.isMaskClick || true;
+			this.mkclick = this.isMaskClick || false;
 			if (this.animation) {
 				this.duration = this.duration
 			} else {

package/components/fu-swiper/fu-swiper.vue

@@ -102,7 +102,7 @@
 	 * @property {Number} current 初始化时，默认显示第几项
 	 * @property {String,Number} height 高度 (默认 125)
 	 * @property {String} bgColor 背景色 (默认 #f2f3f4)
-	 * @property {String} keyName 图片的属性名 (默认 image)
+	 * @property {String} nameKey 图片的属性名 (默认 image)
 	 * @property {Boolean} showTitle = [true|false] 是否显示标题（默认 false）
 	 * @property {String} keyTitle 标题的属性名
 	 * @property {Object} titleStyle 自定义标题样式
@@ -180,7 +180,7 @@
 		methods: {
 			getItemType(e) {
 				if (typeof e === 'string') return this.$fu.isVideo(this.getSource(e)) ? 'video' : 'image'
-				if (typeof e === 'object' && this.keyName) {
+				if (typeof e === 'object' && this.nameKey) {
 					if (!e.type) return this.$fu.isVideo(this.getSource(e)) ? 'video' : 'image'
 					if (e.type === 'image') return 'image'
 					if (e.type === 'video') return 'video'
@@ -190,7 +190,7 @@
 
 			getSource(e) {
 				if (typeof e === 'string') return e
-				if (typeof e === 'object' && this.keyName) return e[this.keyName]
+				if (typeof e === 'object' && this.nameKey) return e[this.nameKey]
 				else this.$fu.error('请按格式传递列表参数')
 				return ''
 			},

package/components/fu-swiper/props.js

@@ -27,7 +27,7 @@ export default {
 			default: '#f2f3f4'
 		},
 		// 图片的属性名
-		keyName: {
+		nameKey: {
 			type: String,
 			default: 'image'
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "fusions-ui",
-	"version": "1.2.3",
+	"version": "1.2.4",
 	"description": "FusionsUI Component library",
 	"main": "index.js",
 	"scripts": {