uview-plus 3.1.50 → 3.1.52

package/components/u-button/props.js

@@ -7,156 +7,155 @@
  * @lastTime     : 2021-08-16 10:04:24
  * @FilePath     : /u-view2.0/uview-ui/components/u-button/props.js
  */
-import defprops from '../../libs/config/props';
 export default {
     props: {
         // 是否细边框
         hairline: {
             type: Boolean,
-            default: defprops.button.hairline
+            default: () => uni.$u.props.button.hairline
         },
         // 按钮的预置样式，info，primary，error，warning，success
         type: {
             type: String,
-            default: defprops.button.type
+            default: () => uni.$u.props.button.type
         },
         // 按钮尺寸，large，normal，small，mini
         size: {
             type: String,
-            default: defprops.button.size
+            default: () => uni.$u.props.button.size
         },
         // 按钮形状，circle（两边为半圆），square（带圆角）
         shape: {
             type: String,
-            default: defprops.button.shape
+            default: () => uni.$u.props.button.shape
         },
         // 按钮是否镂空
         plain: {
             type: Boolean,
-            default: defprops.button.plain
+            default: () => uni.$u.props.button.plain
         },
         // 是否禁止状态
         disabled: {
             type: Boolean,
-            default: defprops.button.disabled
+            default: () => uni.$u.props.button.disabled
         },
         // 是否加载中
         loading: {
             type: Boolean,
-            default: defprops.button.loading
+            default: () => uni.$u.props.button.loading
         },
         // 加载中提示文字
         loadingText: {
             type: [String, Number],
-            default: defprops.button.loadingText
+            default: () => uni.$u.props.button.loadingText
         },
         // 加载状态图标类型
         loadingMode: {
             type: String,
-            default: defprops.button.loadingMode
+            default: () => uni.$u.props.button.loadingMode
         },
         // 加载图标大小
         loadingSize: {
             type: [String, Number],
-            default: defprops.button.loadingSize
+            default: () => uni.$u.props.button.loadingSize
         },
         // 开放能力，具体请看uniapp稳定关于button组件部分说明
         // https://uniapp.dcloud.io/component/button
         openType: {
             type: String,
-            default: defprops.button.openType
+            default: () => uni.$u.props.button.openType
         },
         // 用于 <form> 组件，点击分别会触发 <form> 组件的 submit/reset 事件
         // 取值为submit（提交表单），reset（重置表单）
         formType: {
             type: String,
-            default: defprops.button.formType
+            default: () => uni.$u.props.button.formType
         },
         // 打开 APP 时，向 APP 传递的参数，open-type=launchApp时有效
         // 只微信小程序、QQ小程序有效
         appParameter: {
             type: String,
-            default: defprops.button.appParameter
+            default: () => uni.$u.props.button.appParameter
         },
         // 指定是否阻止本节点的祖先节点出现点击态，微信小程序有效
         hoverStopPropagation: {
             type: Boolean,
-            default: defprops.button.hoverStopPropagation
+            default: () => uni.$u.props.button.hoverStopPropagation
         },
         // 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文。只微信小程序有效
         lang: {
             type: String,
-            default: defprops.button.lang
+            default: () => uni.$u.props.button.lang
         },
         // 会话来源，open-type="contact"时有效。只微信小程序有效
         sessionFrom: {
             type: String,
-            default: defprops.button.sessionFrom
+            default: () => uni.$u.props.button.sessionFrom
         },
         // 会话内消息卡片标题，open-type="contact"时有效
         // 默认当前标题，只微信小程序有效
         sendMessageTitle: {
             type: String,
-            default: defprops.button.sendMessageTitle
+            default: () => uni.$u.props.button.sendMessageTitle
         },
         // 会话内消息卡片点击跳转小程序路径，open-type="contact"时有效
         // 默认当前分享路径，只微信小程序有效
         sendMessagePath: {
             type: String,
-            default: defprops.button.sendMessagePath
+            default: () => uni.$u.props.button.sendMessagePath
         },
         // 会话内消息卡片图片，open-type="contact"时有效
         // 默认当前页面截图，只微信小程序有效
         sendMessageImg: {
             type: String,
-            default: defprops.button.sendMessageImg
+            default: () => uni.$u.props.button.sendMessageImg
         },
         // 是否显示会话内消息卡片，设置此参数为 true，用户进入客服会话会在右下角显示"可能要发送的小程序"提示，
         // 用户点击后可以快速发送小程序消息，open-type="contact"时有效
         showMessageCard: {
             type: Boolean,
-            default: defprops.button.showMessageCard
+            default: () => uni.$u.props.button.showMessageCard
         },
         // 额外传参参数，用于小程序的data-xxx属性，通过target.dataset.name获取
         dataName: {
             type: String,
-            default: defprops.button.dataName
+            default: () => uni.$u.props.button.dataName
         },
         // 节流，一定时间内只能触发一次
         throttleTime: {
             type: [String, Number],
-            default: defprops.button.throttleTime
+            default: () => uni.$u.props.button.throttleTime
         },
         // 按住后多久出现点击态，单位毫秒
         hoverStartTime: {
             type: [String, Number],
-            default: defprops.button.hoverStartTime
+            default: () => uni.$u.props.button.hoverStartTime
         },
         // 手指松开后点击态保留时间，单位毫秒
         hoverStayTime: {
             type: [String, Number],
-            default: defprops.button.hoverStayTime
+            default: () => uni.$u.props.button.hoverStayTime
         },
         // 按钮文字，之所以通过props传入，是因为slot传入的话
         // nvue中无法控制文字的样式
         text: {
             type: [String, Number],
-            default: defprops.button.text
+            default: () => uni.$u.props.button.text
         },
         // 按钮图标
         icon: {
             type: String,
-            default: defprops.button.icon
+            default: () => uni.$u.props.button.icon
         },
         // 按钮图标
         iconColor: {
             type: String,
-            default: defprops.button.icon
+            default: () => uni.$u.props.button.icon
         },
         // 按钮颜色，支持传入linear-gradient渐变色
         color: {
             type: String,
-            default: defprops.button.color
+            default: () => uni.$u.props.button.color
         }
     }
 }

package/components/u-button/u-button.vue

@@ -108,7 +108,7 @@
     <!-- #endif -->
 </template>
 
-<script>
+<script lang="ts">
 import button from "../../libs/mixin/button.js";
 import openType from "../../libs/mixin/openType.js";
 import mpMixin from '../../libs/mixin/mpMixin.js';
@@ -275,19 +275,19 @@ export default {
             }
         },
         // 下面为对接uniapp官方按钮开放能力事件回调的对接
-        getphonenumber(res) {
+        getphonenumber(res: any) {
             this.$emit("getphonenumber", res);
         },
-        getuserinfo(res) {
+        getuserinfo(res: any) {
             this.$emit("getuserinfo", res);
         },
-        error(res) {
+        error(res: any) {
             this.$emit("error", res);
         },
-        opensetting(res) {
+        opensetting(res: any) {
             this.$emit("opensetting", res);
         },
-        launchapp(res) {
+        launchapp(res: any) {
             this.$emit("launchapp", res);
         },
     },

package/components/u-button/vue.scss

@@ -14,13 +14,14 @@ $u-button-plain-u-button-success-color:$u-success;
 $u-button-plain-u-button-error-color:$u-error;
 $u-button-plain-u-button-warning-color:$u-error;
 
-.u-button {
-	width: 100%;
-	
-	&__text {
-		white-space: nowrap;
-		line-height: 1;
-	}
+.u-button {
+	width: 100%;
+	white-space: nowrap;
+	
+	&__text {
+		white-space: nowrap;
+		line-height: 1;
+	}
 	
 	&:before {
 		position: absolute;

package/components/u-calendar/month.vue

@@ -103,7 +103,7 @@
 			// 是否为只读状态，只读状态下禁止选择日期
 			readonly: {
 				type: Boolean,
-				default: defprops.calendar.readonly
+				default: () => uni.$u.props.calendar.readonly
 			},
 			// 日期区间最多可选天数，默认无限制，mode = range时有效
 			maxRange: {

package/components/u-calendar/props.js

@@ -1,140 +1,139 @@
-import defprops from '../../libs/config/props';
 export default {
     props: {
         // 日历顶部标题
         title: {
             type: String,
-            default: defprops.calendar.title
+            default: () => uni.$u.props.calendar.title
         },
         // 是否显示标题
         showTitle: {
             type: Boolean,
-            default: defprops.calendar.showTitle
+            default: () => uni.$u.props.calendar.showTitle
         },
         // 是否显示副标题
         showSubtitle: {
             type: Boolean,
-            default: defprops.calendar.showSubtitle
+            default: () => uni.$u.props.calendar.showSubtitle
         },
         // 日期类型选择，single-选择单个日期，multiple-可以选择多个日期，range-选择日期范围
         mode: {
             type: String,
-            default: defprops.calendar.mode
+            default: () => uni.$u.props.calendar.mode
         },
         // mode=range时，第一个日期底部的提示文字
         startText: {
             type: String,
-            default: defprops.calendar.startText
+            default: () => uni.$u.props.calendar.startText
         },
         // mode=range时，最后一个日期底部的提示文字
         endText: {
             type: String,
-            default: defprops.calendar.endText
+            default: () => uni.$u.props.calendar.endText
         },
         // 自定义列表
         customList: {
             type: Array,
-            default: defprops.calendar.customList
+            default: () => uni.$u.props.calendar.customList
         },
         // 主题色，对底部按钮和选中日期有效
         color: {
             type: String,
-            default: defprops.calendar.color
+            default: () => uni.$u.props.calendar.color
         },
         // 最小的可选日期
         minDate: {
             type: [String, Number],
-            default: defprops.calendar.minDate
+            default: () => uni.$u.props.calendar.minDate
         },
         // 最大可选日期
         maxDate: {
             type: [String, Number],
-            default: defprops.calendar.maxDate
+            default: () => uni.$u.props.calendar.maxDate
         },
         // 默认选中的日期，mode为multiple或range是必须为数组格式
         defaultDate: {
             type: [Array, String, Date, null],
-            default: defprops.calendar.defaultDate
+            default: () => uni.$u.props.calendar.defaultDate
         },
         // mode=multiple时，最多可选多少个日期
         maxCount: {
             type: [String, Number],
-            default: defprops.calendar.maxCount
+            default: () => uni.$u.props.calendar.maxCount
         },
         // 日期行高
         rowHeight: {
             type: [String, Number],
-            default: defprops.calendar.rowHeight
+            default: () => uni.$u.props.calendar.rowHeight
         },
         // 日期格式化函数
         formatter: {
             type: [Function, null],
-            default: defprops.calendar.formatter
+            default: () => uni.$u.props.calendar.formatter
         },
         // 是否显示农历
         showLunar: {
             type: Boolean,
-            default: defprops.calendar.showLunar
+            default: () => uni.$u.props.calendar.showLunar
         },
         // 是否显示月份背景色
         showMark: {
             type: Boolean,
-            default: defprops.calendar.showMark
+            default: () => uni.$u.props.calendar.showMark
         },
         // 确定按钮的文字
         confirmText: {
             type: String,
-            default: defprops.calendar.confirmText
+            default: () => uni.$u.props.calendar.confirmText
         },
         // 确认按钮处于禁用状态时的文字
         confirmDisabledText: {
             type: String,
-            default: defprops.calendar.confirmDisabledText
+            default: () => uni.$u.props.calendar.confirmDisabledText
         },
         // 是否显示日历弹窗
         show: {
             type: Boolean,
-            default: defprops.calendar.show
+            default: () => uni.$u.props.calendar.show
         },
         // 是否允许点击遮罩关闭日历
         closeOnClickOverlay: {
             type: Boolean,
-            default: defprops.calendar.closeOnClickOverlay
+            default: () => uni.$u.props.calendar.closeOnClickOverlay
         },
         // 是否为只读状态，只读状态下禁止选择日期
         readonly: {
             type: Boolean,
-            default: defprops.calendar.readonly
+            default: () => uni.$u.props.calendar.readonly
         },
         // 	是否展示确认按钮
         showConfirm: {
             type: Boolean,
-            default: defprops.calendar.showConfirm
+            default: () => uni.$u.props.calendar.showConfirm
         },
         // 日期区间最多可选天数，默认无限制，mode = range时有效
         maxRange: {
             type: [Number, String],
-            default: defprops.calendar.maxRange
+            default: () => uni.$u.props.calendar.maxRange
         },
         // 范围选择超过最多可选天数时的提示文案，mode = range时有效
         rangePrompt: {
             type: String,
-            default: defprops.calendar.rangePrompt
+            default: () => uni.$u.props.calendar.rangePrompt
         },
         // 范围选择超过最多可选天数时，是否展示提示文案，mode = range时有效
         showRangePrompt: {
             type: Boolean,
-            default: defprops.calendar.showRangePrompt
+            default: () => uni.$u.props.calendar.showRangePrompt
         },
         // 是否允许日期范围的起止时间为同一天，mode = range时有效
         allowSameDay: {
             type: Boolean,
-            default: defprops.calendar.allowSameDay
+            default: () => uni.$u.props.calendar.allowSameDay
         },
 		// 圆角值
 		round: {
 		    type: [Boolean, String, Number],
-		    default: defprops.calendar.round
+		    default: () => uni.$u.props.calendar.round
 		},
 		// 最多展示月份数量
 		monthNum: {

package/components/u-car-keyboard/props.js

@@ -1,4 +1,3 @@
-import defprops from '../../libs/config/props';
 export default {
     props: {
         // 是否打乱键盘按键的顺序

package/components/u-car-keyboard/u-car-keyboard.vue

@@ -74,7 +74,7 @@
 	/**
 	 * keyboard 键盘组件
 	 * @description 此为uView自定义的键盘面板，内含了数字键盘，车牌号键，身份证号键盘3种模式，都有可以打乱按键顺序的选项。
-	 * @tutorial https://uiadmin.net/uview-plus/components/keyboard.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/keyboard.html
 	 * @property {Boolean} random 是否打乱键盘的顺序
 	 * @event {Function} change 点击键盘触发
 	 * @event {Function} backspace 点击退格键触发

package/components/u-cell/props.js

@@ -1,75 +1,74 @@
-import defprops from '../../libs/config/props';
 export default {
     props: {
         // 标题
         title: {
             type: [String, Number],
-            default: defprops.cell.title
+            default: () => uni.$u.props.cell.title
         },
         // 标题下方的描述信息
         label: {
             type: [String, Number],
-            default: defprops.cell.label
+            default: () => uni.$u.props.cell.label
         },
         // 右侧的内容
         value: {
             type: [String, Number],
-            default: defprops.cell.value
+            default: () => uni.$u.props.cell.value
         },
         // 左侧图标名称，或者图片链接(本地文件建议使用绝对地址)
         icon: {
             type: String,
-            default: defprops.cell.icon
+            default: () => uni.$u.props.cell.icon
         },
         // 是否禁用cell
         disabled: {
             type: Boolean,
-            default: defprops.cell.disabled
+            default: () => uni.$u.props.cell.disabled
         },
         // 是否显示下边框
         border: {
             type: Boolean,
-            default: defprops.cell.border
+            default: () => uni.$u.props.cell.border
         },
         // 内容是否垂直居中(主要是针对右侧的value部分)
         center: {
             type: Boolean,
-            default: defprops.cell.center
+            default: () => uni.$u.props.cell.center
         },
         // 点击后跳转的URL地址
         url: {
             type: String,
-            default: defprops.cell.url
+            default: () => uni.$u.props.cell.url
         },
         // 链接跳转的方式，内部使用的是uView封装的route方法，可能会进行拦截操作
         linkType: {
             type: String,
-            default: defprops.cell.linkType
+            default: () => uni.$u.props.cell.linkType
         },
         // 是否开启点击反馈(表现为点击时加上灰色背景)
         clickable: {
             type: Boolean,
-            default: defprops.cell.clickable
+            default: () => uni.$u.props.cell.clickable
         },
         // 是否展示右侧箭头并开启点击反馈
         isLink: {
             type: Boolean,
-            default: defprops.cell.isLink
+            default: () => uni.$u.props.cell.isLink
         },
         // 是否显示表单状态下的必填星号(此组件可能会内嵌入input组件)
         required: {
             type: Boolean,
-            default: defprops.cell.required
+            default: () => uni.$u.props.cell.required
         },
         // 右侧的图标箭头
         rightIcon: {
             type: String,
-            default: defprops.cell.rightIcon
+            default: () => uni.$u.props.cell.rightIcon
         },
         // 右侧箭头的方向，可选值为：left，up，down
         arrowDirection: {
             type: String,
-            default: defprops.cell.arrowDirection
+            default: () => uni.$u.props.cell.arrowDirection
         },
         // 左侧图标样式
         iconStyle: {
@@ -95,17 +94,17 @@ export default {
         // 单位元的大小，可选值为large
         size: {
             type: String,
-            default: defprops.cell.size
+            default: () => uni.$u.props.cell.size
         },
         // 点击cell是否阻止事件传播
         stop: {
             type: Boolean,
-            default: defprops.cell.stop
+            default: () => uni.$u.props.cell.stop
         },
         // 标识符，cell被点击时返回
         name: {
             type: [Number, String],
-            default: defprops.cell.name
+            default: () => uni.$u.props.cell.name
         }
     }
 }

package/components/u-cell/u-cell.vue

@@ -11,7 +11,9 @@
 						:custom-style="iconStyle"
 						:size="size === 'large' ? 22 : 18"></u-icon>
 				</view>
-				<view class="u-cell__title">
+				<view class="u-cell__title">
+					<slot name="title" v-if="$slots.title || !title">
+					</slot>
 						<text v-else class="u-cell__title-text" :style="[titleTextStyle]"
 							:class="[disabled && 'u-cell--disabled', size === 'large' && 'u-cell__title-text--large']">{{ title }}</text>
 					<slot name="label">
@@ -28,7 +30,14 @@
 			<view class="u-cell__right-icon-wrap" v-if="$slots['right-icon'] || isLink"
 				:class="[`u-cell__right-icon-wrap--${arrowDirection}`]">
 				<slot name="right-icon">
-					<u-icon v-if="rightIcon" :name="rightIcon" :custom-style="rightIconStyle" :color="disabled ? '#c8c9cc' : 'info'"
+					<u-icon v-if="rightIcon" :name="rightIcon" :custom-style="rightIconStyle" :color="disabled ? '#c8c9cc' : 'info'"
+						:size="size === 'large' ? 18 : 16"></u-icon>
+				</slot>
+			</view>
+			<view class="u-cell__right-icon-wrap" v-if="$slots['righticon']"
+				:class="[`u-cell__right-icon-wrap--${arrowDirection}`]">
+				<slot name="righticon">
+				</slot>
 			</view>
 		</view>
 		<u-line v-if="border"></u-line>
@@ -39,10 +48,11 @@
 	import props from './props.js';
 	import mpMixin from '../../libs/mixin/mpMixin.js';
 	import mixin from '../../libs/mixin/mixin.js';
+	import { addStyle } from '../../libs/function/index.js';
 	/**
 	 * cell  单元格
 	 * @description cell单元格一般用于一组列表的情况，比如个人中心页，设置页等。
-	 * @tutorial https://uiadmin.net/uview-plus/components/cell.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/cell.html
 	 * @property {String | Number}	title			标题
 	 * @property {String | Number}	label			标题下方的描述信息
 	 * @property {String | Number}	value			右侧的内容
@@ -77,7 +87,7 @@
 		mixins: [mpMixin, mixin, props],
 		computed: {
 			titleTextStyle() {
-				return uni.$u.addStyle(this.titleStyle)
+				return addStyle(this.titleStyle)
 			}
 		},
 		emits: ['click'],

package/components/u-cell-group/props.js

@@ -1,15 +1,14 @@
-import defprops from '../../libs/config/props';
 export default {
     props: {
         // 分组标题
         title: {
             type: String,
-            default: defprops.cellGroup.title
+            default: () => uni.$u.props.cellGroup.title
         },
         // 是否显示外边框
         border: {
             type: Boolean,
-            default: defprops.cellGroup.border
+            default: () => uni.$u.props.cellGroup.border
         }
     }
 }

package/components/u-cell-group/u-cell-group.vue

@@ -19,7 +19,7 @@
 	/**
 	 * cellGroup  单元格
 	 * @description cell单元格一般用于一组列表的情况，比如个人中心页，设置页等。
-	 * @tutorial https://uiadmin.net/uview-plus/components/cell.html
+	 * @tutorial https://uview-plus.jiangruyi.com/components/cell.html
 	 * 
 	 * @property {String}	title		分组标题
 	 * @property {Boolean}	border		是否显示外边框 (默认 true )