uview-plus 3.2.8 → 3.2.10

package/libs/mixin/style.js

@@ -1,3 +1,4 @@
+import { addStyle, deepMerge, addUnit, trim } from '../function/index';
 export default {
     props: {
         // flex排列方式
@@ -213,16 +214,34 @@ export default {
     computed: {
         viewStyle() {
             const style = {}
-            const addStyle = uni.$u.addStyle(this.width || this.w) && (style.width = addStyle(this.width || this.w))(this.height || this.h) && (style.height = addStyle(this.height || this.h))(this.margin || this.m) && (style.margin = addStyle(this.margin || this.m))(this.marginTop || this.mt) && (style.marginTop = addStyle(this.marginTop || this.mt))(this.marginRight || this.mr) && (style.marginRight = addStyle(this.marginRight || this.mr))(this.marginBottom || this.mb) && (style.marginBottom = addStyle(this.marginBottom || this.mb))(this.marginLeft || this.ml) && (style.marginLeft = addStyle(this.marginLeft || this.ml))(this.padding || this.p) && (style.padding = addStyle(this.padding || this.p))(this.paddingTop || this.pt) && (style.paddingTop = addStyle(this.paddingTop || this.pt))(this.paddingRight || this.pr) && (style.paddingRight = addStyle(this.paddingRight || this.pr))(this.paddingBottom || this.pb) && (style.paddingBottom = addStyle(this.paddingBottom || this.pb))(this.paddingLeft || this.pl) && (style.paddingLeft = addStyle(this.paddingLeft || this.pl))(this.color || this.c) && (style.color = this.color || this.c)(this.fontSize || this.fs) && (style.fontSize = this.fontSize || this.fs)(this.borderRadius || this.radius) && (style.borderRadius = this.borderRadius || this.radius)(this.position || this.pos) && (this.position = this.position || this.pos)(this.flexDirection || this.fd) && (this.flexDirection = this.flexDirection || this.fd)(this.justifyContent || jc) && (this.justifyContent = this.justifyContent || jc)(this.alignItems || ai) && (this.alignItems = this.alignItems || ai)
-
-            return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle))
+            const addStyleTmp = addStyle(this.width || this.w)
+                && (style.width = addStyle(this.width || this.w))(this.height || this.h)
+                && (style.height = addStyle(this.height || this.h))(this.margin || this.m)
+                && (style.margin = addStyle(this.margin || this.m))(this.marginTop || this.mt)
+                && (style.marginTop = addStyle(this.marginTop || this.mt))(this.marginRight || this.mr)
+                && (style.marginRight = addStyle(this.marginRight || this.mr))(this.marginBottom || this.mb)
+                && (style.marginBottom = addStyle(this.marginBottom || this.mb))(this.marginLeft || this.ml)
+                && (style.marginLeft = addStyle(this.marginLeft || this.ml))(this.padding || this.p)
+                && (style.padding = addStyle(this.padding || this.p))(this.paddingTop || this.pt)
+                && (style.paddingTop = addStyle(this.paddingTop || this.pt))(this.paddingRight || this.pr)
+                && (style.paddingRight = addStyle(this.paddingRight || this.pr))(this.paddingBottom || this.pb)
+                && (style.paddingBottom = addStyle(this.paddingBottom || this.pb))(this.paddingLeft || this.pl)
+                && (style.paddingLeft = addStyle(this.paddingLeft || this.pl))(this.color || this.c)
+                && (style.color = this.color || this.c)(this.fontSize || this.fs)
+                && (style.fontSize = this.fontSize || this.fs)(this.borderRadius || this.radius)
+                && (style.borderRadius = this.borderRadius || this.radius)(this.position || this.pos)
+                && (this.position = this.position || this.pos)(this.flexDirection || this.fd)
+                && (this.flexDirection = this.flexDirection || this.fd)(this.justifyContent || jc)
+                && (this.justifyContent = this.justifyContent || jc)(this.alignItems || ai)
+                && (this.alignItems = this.alignItems || ai)
+            return deepMerge(style, addStyleTmp(this.customStyle))
         }
     },
     methods: {
         // 获取margin或者padding的单位，比如padding: 0 20转为padding: 0 20px
         getUnit(unit = '') {
             // 取出两端空格，分隔成数组，再对数组的每个元素添加单位，最后再合并成字符串
-            return uni.$u.trim(unit).split(' ').map((item) => uni.$u.addUnit(item)).join(' ')
+            return trim(unit).split(' ').map((item) => addUnit(item)).join(' ')
         }
     }
 }

package/libs/util/route.js

@@ -2,7 +2,7 @@
  * 路由跳转方法，该方法相对于直接使用uni.xxx的好处是使用更加简单快捷
  * 并且带有路由拦截功能
  */
-
+import { queryParams, deepMerge, page } from '../function/index';
 class Router {
     constructor() {
         // 原始属性定义
@@ -34,12 +34,12 @@ class Router {
         let query = ''
         if (/.*\/.*\?.*=.*/.test(url)) {
             // object对象转为get类型的参数
-            query = uni.$u.queryParams(params, false)
+            query = queryParams(params, false)
             // 因为已有get参数,所以后面拼接的参数需要带上"&"隔开
             return url += `&${query}`
         }
         // 直接拼接参数，因为此处url中没有后面的query参数，也就没有"?/&"之类的符号
-        query = uni.$u.queryParams(params)
+        query = queryParams(params)
         return url += query
     }
 
@@ -53,13 +53,13 @@ class Router {
             mergeConfig.url = this.mixinParam(options, params)
             mergeConfig.type = 'navigateTo'
         } else {
-            mergeConfig = uni.$u.deepMerge(this.config, options)
+            mergeConfig = deepMerge(this.config, options)
             // 否则正常使用mergeConfig中的url和params进行拼接
             mergeConfig.url = this.mixinParam(options.url, options.params)
         }
 
         // 如果本次跳转的路径和本页面路径一致，不执行跳转，防止用户快速点击跳转按钮，造成多次跳转同一个页面的问题
-        if (mergeConfig.url === uni.$u.page()) return
+        if (mergeConfig.url === page()) return
 
         if (params.intercept) {
             this.config.intercept = params.intercept
@@ -67,7 +67,7 @@ class Router {
         // params参数也带给拦截器
         mergeConfig.params = params
         // 合并内外部参数
-        mergeConfig = uni.$u.deepMerge(this.config, mergeConfig)
+        mergeConfig = deepMerge(this.config, mergeConfig)
         // 判断用户是否定义了拦截器
         if (typeof uni.$u.routeIntercept === 'function') {
             // 定一个promise，根据用户执行resolve(true)或者resolve(false)来决定是否进行路由跳转

package/package.json

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

package/types/index.d.ts

@@ -1,7 +1,6 @@
 /// <reference path="./comps.d.ts" />
 declare module 'uview-plus' {
     export function install(): void  //必要
-    export function route(): void  //必要
     interface test {
       /** 邮箱格式校验 */
       email(email: string): boolean