uview-plus 3.1.49 → 3.1.50

package/components/u-datetime-picker/props.js

@@ -1,143 +1,131 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
-        // 是否显示input
-        hasInput: {
-            type: Boolean,
-            default: () => false
-        },
-        placeholder: {
-            type: String,
-            default: () => '请选择'
-        },
-        format: {
-            type: String,
-            default: () => 'YYYY-MM-DD HH:mm'
-        },
         // 是否打开组件
         show: {
             type: Boolean,
-            default: () => uni.$u.props.datetimePicker.show
+            default: defprops.datetimePicker.show
         },
 		// 弹出的方向，可选值为 top bottom right left center
         popupMode: {
             type: String,
-            default: () => uni.$u.props.picker.popupMode
+            default: defprops.picker.popupMode
         },
         // 是否展示顶部的操作栏
         showToolbar: {
             type: Boolean,
-            default: () => uni.$u.props.datetimePicker.showToolbar
+            default: defprops.datetimePicker.showToolbar
         },
         // #ifdef VUE2
         // 绑定值
         value: {
             type: [String, Number],
-            default: () => uni.$u.props.datetimePicker.value
+            default: defprops.datetimePicker.value
         },
         // #endif
         // #ifdef VUE3
         // 绑定值
         modelValue: {
             type: [String, Number],
-            default: () => uni.$u.props.datetimePicker.value
+            default: defprops.datetimePicker.value
         },
         // #endif
         // 顶部标题
         title: {
             type: String,
-            default: () => uni.$u.props.datetimePicker.title
+            default: defprops.datetimePicker.title
         },
         // 展示格式，mode=date为日期选择，mode=time为时间选择，mode=year-month为年月选择，mode=datetime为日期时间选择
         mode: {
             type: String,
-            default: () => uni.$u.props.datetimePicker.mode
+            default: defprops.datetimePicker.mode
         },
         // 可选的最大时间
         maxDate: {
             type: Number,
             // 最大默认值为后10年
-            default: () => uni.$u.props.datetimePicker.maxDate
+            default: defprops.datetimePicker.maxDate
         },
         // 可选的最小时间
         minDate: {
             type: Number,
             // 最小默认值为前10年
-            default: () => uni.$u.props.datetimePicker.minDate
+            default: defprops.datetimePicker.minDate
         },
         // 可选的最小小时，仅mode=time有效
         minHour: {
             type: Number,
-            default: () => uni.$u.props.datetimePicker.minHour
+            default: defprops.datetimePicker.minHour
         },
         // 可选的最大小时，仅mode=time有效
         maxHour: {
             type: Number,
-            default: () => uni.$u.props.datetimePicker.maxHour
+            default: defprops.datetimePicker.maxHour
         },
         // 可选的最小分钟，仅mode=time有效
         minMinute: {
             type: Number,
-            default: () => uni.$u.props.datetimePicker.minMinute
+            default: defprops.datetimePicker.minMinute
         },
         // 可选的最大分钟，仅mode=time有效
         maxMinute: {
             type: Number,
-            default: () => uni.$u.props.datetimePicker.maxMinute
+            default: defprops.datetimePicker.maxMinute
         },
         // 选项过滤函数
         filter: {
             type: [Function, null],
-            default: () => uni.$u.props.datetimePicker.filter
+            default: defprops.datetimePicker.filter
         },
         // 选项格式化函数
         formatter: {
             type: [Function, null],
-            default: () => uni.$u.props.datetimePicker.formatter
+            default: defprops.datetimePicker.formatter
         },
         // 是否显示加载中状态
         loading: {
             type: Boolean,
-            default: () => uni.$u.props.datetimePicker.loading
+            default: defprops.datetimePicker.loading
         },
         // 各列中，单个选项的高度
         itemHeight: {
             type: [String, Number],
-            default: () => uni.$u.props.datetimePicker.itemHeight
+            default: defprops.datetimePicker.itemHeight
         },
         // 取消按钮的文字
         cancelText: {
             type: String,
-            default: () => uni.$u.props.datetimePicker.cancelText
+            default: defprops.datetimePicker.cancelText
         },
         // 确认按钮的文字
         confirmText: {
             type: String,
-            default: () => uni.$u.props.datetimePicker.confirmText
+            default: defprops.datetimePicker.confirmText
         },
         // 取消按钮的颜色
         cancelColor: {
             type: String,
-            default: () => uni.$u.props.datetimePicker.cancelColor
+            default: defprops.datetimePicker.cancelColor
         },
         // 确认按钮的颜色
         confirmColor: {
             type: String,
-            default: () => uni.$u.props.datetimePicker.confirmColor
+            default: defprops.datetimePicker.confirmColor
         },
         // 每列中可见选项的数量
         visibleItemCount: {
             type: [String, Number],
-            default: () => uni.$u.props.datetimePicker.visibleItemCount
+            default: defprops.datetimePicker.visibleItemCount
         },
         // 是否允许点击遮罩关闭选择器
         closeOnClickOverlay: {
             type: Boolean,
-            default: () => uni.$u.props.datetimePicker.closeOnClickOverlay
+            default: defprops.datetimePicker.closeOnClickOverlay
         },
         // 各列的默认索引
         defaultIndex: {
             type: Array,
-            default: () => uni.$u.props.datetimePicker.defaultIndex
+            default: defprops.datetimePicker.defaultIndex
         }
     }
 }

package/components/u-datetime-picker/u-datetime-picker.vue

@@ -1,15 +1,7 @@
 <template>
-    <view v-if="hasInput">
-        <u-input
-            :placeholder="placeholder"
-            border="surround"
-            v-model="inputValue"
-            @click="showByClickInput = !showByClickInput"
-        ></u-input>
-    </view>
 	<u-picker
 		ref="picker"
-		:show="show || (hasInput && showByClickInput)"
+		:show="show"
 		:popupMode="popupMode"
 		:closeOnClickOverlay="closeOnClickOverlay"
 		:columns="columns"
@@ -51,7 +43,7 @@
 	 * @tutorial https://ijry.github.io/uview-plus/components/datetimePicker.html
 	 * @property {Boolean}			show				用于控制选择器的弹出与收起 ( 默认 false )
 	 * @property {Boolean}			showToolbar			是否显示顶部的操作栏  ( 默认 true )
-	 * @property {String | Number}	modelValue		    绑定值
+	 * @property {String | Number}	value				绑定值
 	 * @property {String}			title				顶部标题
 	 * @property {String}			mode				展示格式 mode=date为日期选择，mode=time为时间选择，mode=year-month为年月选择，mode=datetime为日期时间选择  ( 默认 ‘datetime )
 	 * @property {Number}			maxDate				可选的最大时间  默认值为后10年
@@ -82,9 +74,6 @@
 		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
-                // 原来的日期选择器不方便，这里增加一个hasInput选项支持类似element的自带输入框的功能。
-                inputValue: '', // 表单显示值
-                showByClickInput: false, // 是否在hasInput模式下显示日期选择弹唱
 				columns: [],
 				innerDefaultIndex: [],
 				innerFormatter: (type, value) => value
@@ -99,7 +88,6 @@
 			// #ifdef VUE3
 			modelValue(newValue) {
 				this.init()
-                this.inputValue = dayjs(newValue).format(this.format || 'YYYY-MM-DD HH:mm')
 			},
 			// #endif
 			// #ifdef VUE2
@@ -145,9 +133,6 @@
 			},
 			// 点击工具栏的取消按钮
 			cancel() {
-                if (this.hasInput) {
-                    this.showByClickInput = false
-                }
 				this.$emit('cancel')
 			},
 			// 点击工具栏的确定按钮
@@ -156,16 +141,12 @@
 					value: this.innerValue,
 					mode: this.mode
 				})
-                this.inputValue = dayjs(this.innerValue).format(this.format || 'YYYY-MM-DD HH:mm')
 				// #ifdef VUE3
 				this.$emit('update:modelValue', this.innerValue)
 				// #endif
 				// #ifdef VUE2
 				this.$emit('input', this.innerValue)
 				// #endif
-                if (this.hasInput) {
-                    this.showByClickInput = false
-                }
 			},
 			//用正则截取输出值,当出现多组数字时,抛出错误
 			intercept(e,type){
@@ -233,7 +214,7 @@
         setTimeout(() => {
           this.updateIndexs(value)
         }, 0);
-
+				
 			},
 			// 更新索引
 			updateIndexs(value) {

package/components/u-divider/props.js

@@ -1,44 +1,45 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 是否虚线
         dashed: {
             type: Boolean,
-            default: () => uni.$u.props.divider.dashed
+            default: defprops.divider.dashed
         },
         // 是否细线
         hairline: {
             type: Boolean,
-            default: () => uni.$u.props.divider.hairline
+            default: defprops.divider.hairline
         },
         // 是否以点替代文字，优先于text字段起作用
         dot: {
             type: Boolean,
-            default: () => uni.$u.props.divider.dot
+            default: defprops.divider.dot
         },
         // 内容文本的位置，left-左边，center-中间，right-右边
         textPosition: {
             type: String,
-            default: () => uni.$u.props.divider.textPosition
+            default: defprops.divider.textPosition
         },
         // 文本内容
         text: {
             type: [String, Number],
-            default: () => uni.$u.props.divider.text
+            default: defprops.divider.text
         },
         // 文本大小
         textSize: {
             type: [String, Number],
-            default: () => uni.$u.props.divider.textSize
+            default: defprops.divider.textSize
         },
         // 文本颜色
         textColor: {
             type: String,
-            default: () => uni.$u.props.divider.textColor
+            default: defprops.divider.textColor
         },
         // 线条颜色
         lineColor: {
             type: String,
-            default: () => uni.$u.props.divider.lineColor
+            default: defprops.divider.lineColor
         }
     }
 }

package/components/u-dropdown/props.js

@@ -1,3 +1,4 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 标题选中时的样式

package/components/u-dropdown-item/props.js

@@ -1,3 +1,4 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 当前选中项的value值

package/components/u-empty/props.js

@@ -1,59 +1,60 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 内置图标名称，或图片路径，建议绝对路径
         icon: {
             type: String,
-            default: () => uni.$u.props.empty.icon
+            default: defprops.empty.icon
         },
         // 提示文字
         text: {
             type: String,
-            default: () => uni.$u.props.empty.text
+            default: defprops.empty.text
         },
         // 文字颜色
         textColor: {
             type: String,
-            default: () => uni.$u.props.empty.textColor
+            default: defprops.empty.textColor
         },
         // 文字大小
         textSize: {
             type: [String, Number],
-            default: () => uni.$u.props.empty.textSize
+            default: defprops.empty.textSize
         },
         // 图标的颜色
         iconColor: {
             type: String,
-            default: () => uni.$u.props.empty.iconColor
+            default: defprops.empty.iconColor
         },
         // 图标的大小
         iconSize: {
             type: [String, Number],
-            default: () => uni.$u.props.empty.iconSize
+            default: defprops.empty.iconSize
         },
         // 选择预置的图标类型
         mode: {
             type: String,
-            default: () => uni.$u.props.empty.mode
+            default: defprops.empty.mode
         },
         //  图标宽度，单位px
         width: {
             type: [String, Number],
-            default: () => uni.$u.props.empty.width
+            default: defprops.empty.width
         },
         // 图标高度，单位px
         height: {
             type: [String, Number],
-            default: () => uni.$u.props.empty.height
+            default: defprops.empty.height
         },
         // 是否显示组件
         show: {
             type: Boolean,
-            default: () => uni.$u.props.empty.show
+            default: defprops.empty.show
         },
         // 组件距离上一个元素之间的距离，默认px单位
         marginTop: {
             type: [String, Number],
-            default: () => uni.$u.props.empty.marginTop
+            default: defprops.empty.marginTop
         }
     }
 }

package/components/u-form/props.js

@@ -1,45 +1,46 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 当前form的需要验证字段的集合
         model: {
             type: Object,
-            default: () => uni.$u.props.form.model
+            default: defprops.form.model
         },
         // 验证规则
         rules: {
             type: [Object, Function, Array],
-            default: () => uni.$u.props.form.rules
+            default: defprops.form.rules
         },
         // 有错误时的提示方式，message-提示信息，toast-进行toast提示
         // border-bottom-下边框呈现红色，none-无提示
         errorType: {
             type: String,
-            default: () => uni.$u.props.form.errorType
+            default: defprops.form.errorType
         },
         // 是否显示表单域的下划线边框
         borderBottom: {
             type: Boolean,
-            default: () => uni.$u.props.form.borderBottom
+            default: defprops.form.borderBottom
         },
         // label的位置，left-左边，top-上边
         labelPosition: {
             type: String,
-            default: () => uni.$u.props.form.labelPosition
+            default: defprops.form.labelPosition
         },
         // label的宽度，单位px
         labelWidth: {
             type: [String, Number],
-            default: () => uni.$u.props.form.labelWidth
+            default: defprops.form.labelWidth
         },
         // lable字体的对齐方式
         labelAlign: {
             type: String,
-            default: () => uni.$u.props.form.labelAlign
+            default: defprops.form.labelAlign
         },
         // lable的样式，对象形式
         labelStyle: {
             type: Object,
-            default: () => uni.$u.props.form.labelStyle
+            default: defprops.form.labelStyle
         }
     }
 }

package/components/u-form/u-form.vue

@@ -146,7 +146,7 @@
 							const propertyName =
 								propertyChain[propertyChain.length - 1];
 
-							const rule = this.formRules[child.rule || child.prop];
+							const rule = this.formRules[child.prop];
 							// 如果不存在对应的规则，直接返回，否则校验器会报错
 							if (!rule) return;
 							// rule规则可为数组形式，也可为对象形式，此处拼接成为数组

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

@@ -1,48 +1,44 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // input的label提示语
         label: {
             type: String,
-            default: () => uni.$u.props.formItem.label
+            default: defprops.formItem.label
         },
         // 绑定的值
         prop: {
             type: String,
-            default: () => uni.$u.props.formItem.prop
-        },
-        // 绑定的规则
-        prop: {
-            type: String,
-            default: () => uni.$u.props.formItem.rule
+            default: defprops.formItem.prop
         },
         // 是否显示表单域的下划线边框
         borderBottom: {
             type: [String, Boolean],
-            default: () => uni.$u.props.formItem.borderBottom
+            default: defprops.formItem.borderBottom
         },
         // label的宽度，单位px
         labelWidth: {
             type: [String, Number],
-            default: () => uni.$u.props.formItem.labelWidth
+            default: defprops.formItem.labelWidth
         },
         // 右侧图标
         rightIcon: {
             type: String,
-            default: () => uni.$u.props.formItem.rightIcon
+            default: defprops.formItem.rightIcon
         },
         // 左侧图标
         leftIcon: {
             type: String,
-            default: () => uni.$u.props.formItem.leftIcon
+            default: defprops.formItem.leftIcon
         },
         // 是否显示左边的必填星号，只作显示用，具体校验必填的逻辑，请在rules中配置
         required: {
             type: Boolean,
-            default: () => uni.$u.props.formItem.required
+            default: defprops.formItem.required
         },
         leftIconStyle: {
             type: [String, Object],
-            default: () => uni.$u.props.formItem.leftIconStyle,
+            default: defprops.formItem.leftIconStyle,
         }
     }
 }

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

@@ -84,7 +84,6 @@
 	 * @tutorial https://ijry.github.io/uview-plus/components/form.html
 	 * @property {String}			label			input的label提示语
 	 * @property {String}			prop			绑定的值
-	 * @property {String}			rule			绑定的规则
 	 * @property {String | Boolean}	borderBottom	是否显示表单域的下划线边框
 	 * @property {String | Number}	labelWidth		label的宽度，单位px
 	 * @property {String}			rightIcon		右侧图标

package/components/u-gap/props.js

@@ -1,24 +1,25 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 背景颜色（默认transparent）
         bgColor: {
             type: String,
-            default: () => uni.$u.props.gap.bgColor
+            default: defprops.gap.bgColor
         },
         // 分割槽高度，单位px（默认30）
         height: {
             type: [String, Number],
-            default: () => uni.$u.props.gap.height
+            default: defprops.gap.height
         },
         // 与上一个组件的距离
         marginTop: {
             type: [String, Number],
-            default: () => uni.$u.props.gap.marginTop
+            default: defprops.gap.marginTop
         },
         // 与下一个组件的距离
         marginBottom: {
             type: [String, Number],
-            default: () => uni.$u.props.gap.marginBottom
+            default: defprops.gap.marginBottom
         }
     }
 }

package/components/u-grid/props.js

@@ -1,19 +1,20 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 分成几列
         col: {
             type: [String, Number],
-            default: () => uni.$u.props.grid.col
+            default: defprops.grid.col
         },
         // 是否显示边框
         border: {
             type: Boolean,
-            default: () => uni.$u.props.grid.border
+            default: defprops.grid.border
         },
         // 宫格对齐方式，表现为数量少的时候，靠左，居中，还是靠右
         align: {
             type: String,
-            default: () => uni.$u.props.grid.align
+            default: defprops.grid.align
         }
     }
 }

package/components/u-grid-item/props.js

@@ -1,14 +1,15 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 宫格的name
         name: {
             type: [String, Number, null],
-            default: () => uni.$u.props.gridItem.name
+            default: defprops.gridItem.name
         },
         // 背景颜色
         bgColor: {
             type: String,
-            default: () => uni.$u.props.gridItem.bgColor
+            default: defprops.gridItem.bgColor
         }
     }
 }

package/components/u-grid-item/u-grid-item.vue

@@ -166,12 +166,7 @@
 				}
 			}
 		},
-		// #ifdef VUE2
 		beforeDestroy() {
-		// #endif
-		// #ifdef VUE3
-		beforeUnmount() {
-		// #endif
 			// 移除事件监听，释放性能
 			uni.$off('$uGridItem')
 		}