uview-plus 3.2.6 → 3.2.7

package/components/u-transition/props.js

@@ -1,24 +1,25 @@
+import defProps from '../../libs/config/props.js';
 export default {
     props: {
         // 是否展示组件
         show: {
             type: Boolean,
-            default: () => uni.$u.props.transition.show
+            default: () => defProps.transition.show
         },
         // 使用的动画模式
         mode: {
             type: String,
-            default: () => uni.$u.props.transition.mode
+            default: () => defProps.transition.mode
         },
         // 动画的执行时间，单位ms
         duration: {
             type: [String, Number],
-            default: () => uni.$u.props.transition.duration
+            default: () => defProps.transition.duration
         },
         // 使用的动画过渡函数
         timingFunction: {
             type: String,
-            default: () => uni.$u.props.transition.timingFunction
+            default: () => defProps.transition.timingFunction
         }
     }
 }

package/components/u-upload/props.js

@@ -1,44 +1,45 @@
+import defProps from '../../libs/config/props.js';
 export default {
     props: {
         // 接受的文件类型, 可选值为all media image file video
         accept: {
             type: String,
-            default: () => uni.$u.props.upload.accept
+            default: () => defProps.upload.accept
         },
         // 	图片或视频拾取模式，当accept为image类型时设置capture可选额外camera可以直接调起摄像头
         capture: {
             type: [String, Array],
-            default: () => uni.$u.props.upload.capture
+            default: () => defProps.upload.capture
         },
         // 当accept为video时生效，是否压缩视频，默认为true
         compressed: {
             type: Boolean,
-            default: () => uni.$u.props.upload.compressed
+            default: () => defProps.upload.compressed
         },
         // 当accept为video时生效，可选值为back或front
         camera: {
             type: String,
-            default: () => uni.$u.props.upload.camera
+            default: () => defProps.upload.camera
         },
         // 当accept为video时生效，拍摄视频最长拍摄时间，单位秒
         maxDuration: {
             type: Number,
-            default: () => uni.$u.props.upload.maxDuration
+            default: () => defProps.upload.maxDuration
         },
         // 上传区域的图标，只能内置图标
         uploadIcon: {
             type: String,
-            default: () => uni.$u.props.upload.uploadIcon
+            default: () => defProps.upload.uploadIcon
         },
         // 上传区域的图标的颜色，默认
         uploadIconColor: {
             type: String,
-            default: () => uni.$u.props.upload.uploadIconColor
+            default: () => defProps.upload.uploadIconColor
         },
         // 是否开启文件读取前事件
         useBeforeRead: {
             type: Boolean,
-            default: () => uni.$u.props.upload.useBeforeRead
+            default: () => defProps.upload.useBeforeRead
         },
         // 读取后的处理函数
         afterRead: {
@@ -53,72 +54,72 @@ export default {
         // 是否显示组件自带的图片预览功能
         previewFullImage: {
             type: Boolean,
-            default: () => uni.$u.props.upload.previewFullImage
+            default: () => defProps.upload.previewFullImage
         },
         // 最大上传数量
         maxCount: {
             type: [String, Number],
-            default: () => uni.$u.props.upload.maxCount
+            default: () => defProps.upload.maxCount
         },
         // 是否启用
         disabled: {
             type: Boolean,
-            default: () => uni.$u.props.upload.disabled
+            default: () => defProps.upload.disabled
         },
         // 预览上传的图片时的裁剪模式，和image组件mode属性一致
         imageMode: {
             type: String,
-            default: () => uni.$u.props.upload.imageMode
+            default: () => defProps.upload.imageMode
         },
         // 标识符，可以在回调函数的第二项参数中获取
         name: {
             type: String,
-            default: () => uni.$u.props.upload.name
+            default: () => defProps.upload.name
         },
         // 所选的图片的尺寸, 可选值为original compressed
         sizeType: {
             type: Array,
-            default: () => uni.$u.props.upload.sizeType
+            default: () => defProps.upload.sizeType
         },
         // 是否开启图片多选，部分安卓机型不支持
         multiple: {
             type: Boolean,
-            default: () => uni.$u.props.upload.multiple
+            default: () => defProps.upload.multiple
         },
         // 是否展示删除按钮
         deletable: {
             type: Boolean,
-            default: () => uni.$u.props.upload.deletable
+            default: () => defProps.upload.deletable
         },
         // 文件大小限制，单位为byte
         maxSize: {
             type: [String, Number],
-            default: () => uni.$u.props.upload.maxSize
+            default: () => defProps.upload.maxSize
         },
         // 显示已上传的文件列表
         fileList: {
             type: Array,
-            default: () => uni.$u.props.upload.fileList
+            default: () => defProps.upload.fileList
         },
         // 上传区域的提示文字
         uploadText: {
             type: String,
-            default: () => uni.$u.props.upload.uploadText
+            default: () => defProps.upload.uploadText
         },
         // 内部预览图片区域和选择图片按钮的区域宽度
         width: {
             type: [String, Number],
-            default: () => uni.$u.props.upload.width
+            default: () => defProps.upload.width
         },
         // 内部预览图片区域和选择图片按钮的区域高度
         height: {
             type: [String, Number],
-            default: () => uni.$u.props.upload.height
+            default: () => defProps.upload.height
         },
         // 是否在上传完成后展示预览图
         previewImage: {
             type: Boolean,
-            default: () => uni.$u.props.upload.previewImage
+            default: () => defProps.upload.previewImage
         }
     }
 }

package/index.js

@@ -1,4 +1,4 @@
-// 看到此报错，是因为没有配置vue.config.js的【transpileDependencies】，详见：https://www.uviewui.com/components/npmSetting.html#_5-cli模式额外配置
+// 看到此报错，是因为没有配置vite.config.js的【transpileDependencies】
 const pleaseSetTranspileDependencies = {}, babelTest = pleaseSetTranspileDependencies?.test
 
 // 引入全局mixin
@@ -40,6 +40,21 @@ export { route, http, debounce, throttle, platform, themeType, mixin, mpMixin, p
 export * from './libs/function/index.js'
 export * from './libs/function/colorGradient.js'
 
+/**
+ * @description 修改uView内置属性值
+ * @param {object} props 修改内置props属性
+ * @param {object} config 修改内置config属性
+ * @param {object} color 修改内置color属性
+ * @param {object} zIndex 修改内置zIndex属性
+ */
+export function setConfig(configs) {
+	index.shallowMerge(config, configs.config || {})
+	index.shallowMerge(props, configs.props || {})
+	index.shallowMerge(color, configs.color || {})
+	index.shallowMerge(zIndex, configs.zIndex || {})
+}
+index.setConfig = setConfig
+
 const $u = {
     route,
     date: index.timeFormat, // 另名date

package/libs/function/index.js

@@ -229,6 +229,34 @@ export function deepMerge(target = {}, source = {}) {
 	}
 	return target
 }
+/**
+ * @description JS对象深度合并
+ * @param {object} target 需要拷贝的对象
+ * @param {object} source 拷贝的来源对象
+ * @returns {object|boolean} 深度合并后的对象或者false（入参有不是对象）
+ */
+export function shallowMerge(target, source = {}) {
+	if (typeof target !== 'object' || typeof source !== 'object') return false
+	for (const prop in source) {
+		if (!source.hasOwnProperty(prop)) continue
+		if (prop in target) {
+			if (source[prop] == null) {
+				target[prop] = source[prop]
+			}else if (typeof target[prop] !== 'object') {
+				target[prop] = source[prop]
+			} else if (typeof source[prop] !== 'object') {
+				target[prop] = source[prop]
+			} else if (target[prop].concat && source[prop].concat) {
+				target[prop] = target[prop].concat(source[prop])
+			} else {
+				target[prop] = shallowMerge(target[prop], source[prop])
+			}
+		} else {
+			target[prop] = source[prop]
+		}
+	}
+	return target
+}
 
 /**
  * @description error提示
@@ -655,28 +683,6 @@ export function pages() {
 	return pages
 }
 
-/**
- * @description 修改uView内置属性值
- * @param {object} props 修改内置props属性
- * @param {object} config 修改内置config属性
- * @param {object} color 修改内置color属性
- * @param {object} zIndex 修改内置zIndex属性
- */
-export function setConfig({
-	props = {},
-	config = {},
-	color = {},
-	zIndex = {}
-}) {
-	const {
-		deepMerge,
-	} = uni.$u
-	uni.$u.config = deepMerge(uni.$u.config, config)
-	uni.$u.props = deepMerge(uni.$u.props, props)
-	uni.$u.color = deepMerge(uni.$u.color, color)
-	uni.$u.zIndex = deepMerge(uni.$u.zIndex, zIndex)
-}
-
 export default {
 	range,
 	getPx,
@@ -690,6 +696,7 @@ export default {
 	addUnit,
 	deepClone,
 	deepMerge,
+    shallowMerge,
 	error,
 	randomArray,
 	timeFormat,
@@ -706,5 +713,5 @@ export default {
 	setProperty,
 	page,
 	pages,
-	setConfig
+	// setConfig
 }

package/package.json

@@ -2,7 +2,7 @@
 	"id": "uview-plus",
 	"name": "uview-plus",
 	"displayName": "uview-plus3.0重磅发布，全面的Vue3移动组件库。",
-	"version": "3.2.6",
+	"version": "3.2.7",
 	"description": "uview-plus已兼容vue3，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
 	"keywords": [
         "uview",