uview-pro 0.6.18 → 0.6.19

package/libs/function/parent.ts

@@ -1,21 +1,21 @@
-import { type ComponentInternalInstance, getCurrentInstance } from 'vue';
-
-export function parent(componentName?: string, _instance: ComponentInternalInstance | null | undefined = null) {
-    const instance = _instance || getCurrentInstance();
-
-    let parent = instance && (instance.parent as ComponentInternalInstance | null | undefined);
-
-    while (parent) {
-        const name = (parent.type as any)?.name as string | undefined;
-        if (name === componentName) {
-            return parent;
-        }
-        parent = parent.parent;
-    }
-    return null;
-}
-export function parentData(componentName?: string, _instance: ComponentInternalInstance | null | undefined = null) {
-    const instance = _instance || getCurrentInstance();
-    const findParent = parent(componentName, instance);
-    return findParent ? findParent.exposed : null;
-}
+import { type ComponentInternalInstance, getCurrentInstance } from 'vue';
+
+export function parent(componentName?: string, _instance: ComponentInternalInstance | null | undefined = null) {
+    const instance = _instance || getCurrentInstance();
+
+    let parent = instance && (instance.parent as ComponentInternalInstance | null | undefined);
+
+    while (parent) {
+        const name = (parent.type as any)?.name as string | undefined;
+        if (name === componentName) {
+            return parent;
+        }
+        parent = parent.parent;
+    }
+    return null;
+}
+export function parentData(componentName?: string, _instance: ComponentInternalInstance | null | undefined = null) {
+    const instance = _instance || getCurrentInstance();
+    const findParent = parent(componentName, instance);
+    return findParent ? findParent.exposed : null;
+}

package/libs/function/queryParams.ts

@@ -1,64 +1,64 @@
-/**
- * 对象转url参数
- * @param data 对象参数
- * @param isPrefix 是否自动加上"?"，默认true
- * @param arrayFormat 数组参数格式，indices/brackets/repeat/comma，默认brackets
- * @returns url参数字符串
- */
-function queryParams(
-    data: Record<string, any> = {},
-    isPrefix: boolean = true,
-    arrayFormat: 'indices' | 'brackets' | 'repeat' | 'comma' = 'brackets'
-): string {
-    const prefix = isPrefix ? '?' : '';
-    const _result: string[] = [];
-    if (!['indices', 'brackets', 'repeat', 'comma'].includes(arrayFormat)) arrayFormat = 'brackets';
-    for (const key in data) {
-        const value = data[key];
-        // 去掉为空的参数
-        if (['', undefined, null].includes(value)) {
-            continue;
-        }
-        // 如果值为数组，另行处理
-        if (Array.isArray(value)) {
-            // e.g. {ids: [1, 2, 3]}
-            switch (arrayFormat) {
-                case 'indices':
-                    // 结果: ids[0]=1&ids[1]=2&ids[2]=3
-                    for (let i = 0; i < value.length; i++) {
-                        _result.push(`${key}[${i}]=${value[i]}`);
-                    }
-                    break;
-                case 'brackets':
-                    // 结果: ids[]=1&ids[]=2&ids[]=3
-                    value.forEach((_value: any) => {
-                        _result.push(`${key}[]=${_value}`);
-                    });
-                    break;
-                case 'repeat':
-                    // 结果: ids=1&ids=2&ids=3
-                    value.forEach((_value: any) => {
-                        _result.push(`${key}=${_value}`);
-                    });
-                    break;
-                case 'comma':
-                    // 结果: ids=1,2,3
-                    let commaStr = '';
-                    value.forEach((_value: any) => {
-                        commaStr += (commaStr ? ',' : '') + _value;
-                    });
-                    _result.push(`${key}=${commaStr}`);
-                    break;
-                default:
-                    value.forEach((_value: any) => {
-                        _result.push(`${key}[]=${_value}`);
-                    });
-            }
-        } else {
-            _result.push(`${key}=${value}`);
-        }
-    }
-    return _result.length ? prefix + _result.join('&') : '';
-}
-
-export default queryParams;
+/**
+ * 对象转url参数
+ * @param data 对象参数
+ * @param isPrefix 是否自动加上"?"，默认true
+ * @param arrayFormat 数组参数格式，indices/brackets/repeat/comma，默认brackets
+ * @returns url参数字符串
+ */
+function queryParams(
+    data: Record<string, any> = {},
+    isPrefix: boolean = true,
+    arrayFormat: 'indices' | 'brackets' | 'repeat' | 'comma' = 'brackets'
+): string {
+    const prefix = isPrefix ? '?' : '';
+    const _result: string[] = [];
+    if (!['indices', 'brackets', 'repeat', 'comma'].includes(arrayFormat)) arrayFormat = 'brackets';
+    for (const key in data) {
+        const value = data[key];
+        // 去掉为空的参数
+        if (['', undefined, null].includes(value)) {
+            continue;
+        }
+        // 如果值为数组，另行处理
+        if (Array.isArray(value)) {
+            // e.g. {ids: [1, 2, 3]}
+            switch (arrayFormat) {
+                case 'indices':
+                    // 结果: ids[0]=1&ids[1]=2&ids[2]=3
+                    for (let i = 0; i < value.length; i++) {
+                        _result.push(`${key}[${i}]=${value[i]}`);
+                    }
+                    break;
+                case 'brackets':
+                    // 结果: ids[]=1&ids[]=2&ids[]=3
+                    value.forEach((_value: any) => {
+                        _result.push(`${key}[]=${_value}`);
+                    });
+                    break;
+                case 'repeat':
+                    // 结果: ids=1&ids=2&ids=3
+                    value.forEach((_value: any) => {
+                        _result.push(`${key}=${_value}`);
+                    });
+                    break;
+                case 'comma':
+                    // 结果: ids=1,2,3
+                    let commaStr = '';
+                    value.forEach((_value: any) => {
+                        commaStr += (commaStr ? ',' : '') + _value;
+                    });
+                    _result.push(`${key}=${commaStr}`);
+                    break;
+                default:
+                    value.forEach((_value: any) => {
+                        _result.push(`${key}[]=${_value}`);
+                    });
+            }
+        } else {
+            _result.push(`${key}=${value}`);
+        }
+    }
+    return _result.length ? prefix + _result.join('&') : '';
+}
+
+export default queryParams;

package/libs/function/random.ts

@@ -1,16 +1,16 @@
-/**
- * 生成指定范围的随机整数
- * @param min 最小值（包含）
- * @param max 最大值（包含）
- * @returns 随机整数
- */
-function random(min: number, max: number): number {
-    if (min >= 0 && max > 0 && max >= min) {
-        const gab = max - min + 1;
-        return Math.floor(Math.random() * gab + min);
-    } else {
-        return 0;
-    }
-}
-
-export default random;
+/**
+ * 生成指定范围的随机整数
+ * @param min 最小值（包含）
+ * @param max 最大值（包含）
+ * @returns 随机整数
+ */
+function random(min: number, max: number): number {
+    if (min >= 0 && max > 0 && max >= min) {
+        const gab = max - min + 1;
+        return Math.floor(Math.random() * gab + min);
+    } else {
+        return 0;
+    }
+}
+
+export default random;

package/libs/function/randomArray.ts

@@ -1,11 +1,11 @@
-/**
- * 打乱数组顺序
- * @param array 需要打乱的数组
- * @returns 打乱后的新数组
- */
-function randomArray<T>(array: T[] = []): T[] {
-    // 原理是sort排序,Math.random()产生0<= x < 1之间的数,会导致x-0.5大于或者小于0
-    return array.sort(() => Math.random() - 0.5);
-}
-
-export default randomArray;
+/**
+ * 打乱数组顺序
+ * @param array 需要打乱的数组
+ * @returns 打乱后的新数组
+ */
+function randomArray<T>(array: T[] = []): T[] {
+    // 原理是sort排序,Math.random()产生0<= x < 1之间的数,会导致x-0.5大于或者小于0
+    return array.sort(() => Math.random() - 0.5);
+}
+
+export default randomArray;

package/libs/function/route.ts

@@ -1,118 +1,118 @@
-/**
- * 路由跳转方法，该方法相对于直接使用uni.xxx的好处是使用更加简单快捷
- * 并且带有路由拦截功能
- */
-
-interface RouterConfig {
-    type?: string;
-    url?: string;
-    delta?: number;
-    params?: Record<string, any>;
-    animationType?: string;
-    animationDuration?: number;
-    intercept?: boolean;
-}
-
-declare const uni: any; // 声明uni对象，避免ts报错
-
-class Router {
-    config: RouterConfig;
-    // route: (options?: string | RouterConfig, params?: Record<string, any>) => Promise<void>;
-
-    constructor() {
-        // 原始属性定义
-        this.config = {
-            type: 'navigateTo',
-            url: '',
-            delta: 1, // navigateBack页面后退时,回退的层数
-            params: {}, // 传递的参数
-            animationType: 'pop-in', // 窗口动画,只在APP有效
-            animationDuration: 300, // 窗口动画持续时间,单位毫秒,只在APP有效
-            intercept: false // 是否需要拦截
-        };
-        // 因为route方法是需要对外赋值给另外的对象使用，同时route内部有使用this，会导致route失去上下文
-        // 这里在构造函数中进行this绑定
-        this.route = this.route.bind(this);
-    }
-
-    // 判断url前面是否有"/"，如果没有则加上，否则无法跳转
-    addRootPath(url: string): string {
-        return url[0] === '/' ? url : `/${url}`;
-    }
-
-    // 整合路由参数
-    mixinParam(url: string, params: Record<string, any>): string {
-        url = url && this.addRootPath(url);
-        // 使用正则匹配，主要依据是判断是否有"/","?","="等，如“/page/index/index?name=mary"
-        // 如果有url中有get参数，转换后无需带上"?"
-        let query = '';
-        if (/.*\/.*\?.*=.*/.test(url)) {
-            // object对象转为get类型的参数
-            query = uni.$u.queryParams(params, false);
-            // 因为已有get参数,所以后面拼接的参数需要带上"&"隔开
-            return url + '&' + query;
-        } else {
-            // 直接拼接参数，因为此处url中没有后面的query参数，也就没有"?/&"之类的符号
-            query = uni.$u.queryParams(params);
-            return url + query;
-        }
-    }
-
-    /**
-     * 路由跳转主方法
-     * @param options 跳转配置或url字符串
-     * @param params 跳转参数
-     */
-    async route(options: string | RouterConfig = {}, params: Record<string, any> = {}): Promise<void> {
-        let mergeConfig: RouterConfig = {};
-        if (typeof options === 'string') {
-            // 如果options为字符串，则为route(url, params)的形式
-            mergeConfig.url = this.mixinParam(options, params);
-            mergeConfig.type = 'navigateTo';
-        } else {
-            mergeConfig = uni.$u.deepMerge(this.config, options);
-            // 否则正常使用mergeConfig中的url和params进行拼接
-            mergeConfig.url = this.mixinParam(options.url || '', options.params || {});
-        }
-        if (params.intercept) {
-            this.config.intercept = params.intercept;
-        }
-        // params参数也带给拦截器
-        mergeConfig.params = params;
-        // 合并内外部参数
-        mergeConfig = uni.$u.deepMerge(this.config, mergeConfig);
-        // 判断用户是否定义了拦截器
-        if (uni.$u.routeIntercept && typeof uni.$u.routeIntercept === 'function') {
-            // 定一个promise，根据用户执行resolve(true)或者resolve(false)来决定是否进行路由跳转
-            const isNext = await new Promise<boolean>(resolve => {
-                uni.$u.routeIntercept(mergeConfig, resolve);
-            });
-            // 如果isNext为true，则执行路由跳转
-            isNext && this.openPage(mergeConfig);
-        } else {
-            this.openPage(mergeConfig);
-        }
-    }
-
-    // 执行路由跳转
-    openPage(config: RouterConfig): void {
-        const { url = '', type = '', delta = 1, animationDuration = 300 } = config;
-        if (type == 'navigateTo' || type == 'to') {
-            uni.navigateTo({ url, animationDuration });
-        }
-        if (type == 'redirectTo' || type == 'redirect') {
-            uni.redirectTo({ url });
-        }
-        if (type == 'switchTab' || type == 'tab') {
-            uni.switchTab({ url });
-        }
-        if (type == 'reLaunch' || type == 'launch') {
-            uni.reLaunch({ url });
-        }
-        if (type == 'navigateBack' || type == 'back') {
-            uni.navigateBack({ delta });
-        }
-    }
-}
-
-export default new Router().route;
+/**
+ * 路由跳转方法，该方法相对于直接使用uni.xxx的好处是使用更加简单快捷
+ * 并且带有路由拦截功能
+ */
+
+interface RouterConfig {
+    type?: string;
+    url?: string;
+    delta?: number;
+    params?: Record<string, any>;
+    animationType?: string;
+    animationDuration?: number;
+    intercept?: boolean;
+}
+
+declare const uni: any; // 声明uni对象，避免ts报错
+
+class Router {
+    config: RouterConfig;
+    // route: (options?: string | RouterConfig, params?: Record<string, any>) => Promise<void>;
+
+    constructor() {
+        // 原始属性定义
+        this.config = {
+            type: 'navigateTo',
+            url: '',
+            delta: 1, // navigateBack页面后退时,回退的层数
+            params: {}, // 传递的参数
+            animationType: 'pop-in', // 窗口动画,只在APP有效
+            animationDuration: 300, // 窗口动画持续时间,单位毫秒,只在APP有效
+            intercept: false // 是否需要拦截
+        };
+        // 因为route方法是需要对外赋值给另外的对象使用，同时route内部有使用this，会导致route失去上下文
+        // 这里在构造函数中进行this绑定
+        this.route = this.route.bind(this);
+    }
+
+    // 判断url前面是否有"/"，如果没有则加上，否则无法跳转
+    addRootPath(url: string): string {
+        return url[0] === '/' ? url : `/${url}`;
+    }
+
+    // 整合路由参数
+    mixinParam(url: string, params: Record<string, any>): string {
+        url = url && this.addRootPath(url);
+        // 使用正则匹配，主要依据是判断是否有"/","?","="等，如“/page/index/index?name=mary"
+        // 如果有url中有get参数，转换后无需带上"?"
+        let query = '';
+        if (/.*\/.*\?.*=.*/.test(url)) {
+            // object对象转为get类型的参数
+            query = uni.$u.queryParams(params, false);
+            // 因为已有get参数,所以后面拼接的参数需要带上"&"隔开
+            return url + '&' + query;
+        } else {
+            // 直接拼接参数，因为此处url中没有后面的query参数，也就没有"?/&"之类的符号
+            query = uni.$u.queryParams(params);
+            return url + query;
+        }
+    }
+
+    /**
+     * 路由跳转主方法
+     * @param options 跳转配置或url字符串
+     * @param params 跳转参数
+     */
+    async route(options: string | RouterConfig = {}, params: Record<string, any> = {}): Promise<void> {
+        let mergeConfig: RouterConfig = {};
+        if (typeof options === 'string') {
+            // 如果options为字符串，则为route(url, params)的形式
+            mergeConfig.url = this.mixinParam(options, params);
+            mergeConfig.type = 'navigateTo';
+        } else {
+            mergeConfig = uni.$u.deepMerge(this.config, options);
+            // 否则正常使用mergeConfig中的url和params进行拼接
+            mergeConfig.url = this.mixinParam(options.url || '', options.params || {});
+        }
+        if (params.intercept) {
+            this.config.intercept = params.intercept;
+        }
+        // params参数也带给拦截器
+        mergeConfig.params = params;
+        // 合并内外部参数
+        mergeConfig = uni.$u.deepMerge(this.config, mergeConfig);
+        // 判断用户是否定义了拦截器
+        if (uni.$u.routeIntercept && typeof uni.$u.routeIntercept === 'function') {
+            // 定一个promise，根据用户执行resolve(true)或者resolve(false)来决定是否进行路由跳转
+            const isNext = await new Promise<boolean>(resolve => {
+                uni.$u.routeIntercept(mergeConfig, resolve);
+            });
+            // 如果isNext为true，则执行路由跳转
+            isNext && this.openPage(mergeConfig);
+        } else {
+            this.openPage(mergeConfig);
+        }
+    }
+
+    // 执行路由跳转
+    openPage(config: RouterConfig): void {
+        const { url = '', type = '', delta = 1, animationDuration = 300 } = config;
+        if (type == 'navigateTo' || type == 'to') {
+            uni.navigateTo({ url, animationDuration });
+        }
+        if (type == 'redirectTo' || type == 'redirect') {
+            uni.redirectTo({ url });
+        }
+        if (type == 'switchTab' || type == 'tab') {
+            uni.switchTab({ url });
+        }
+        if (type == 'reLaunch' || type == 'launch') {
+            uni.reLaunch({ url });
+        }
+        if (type == 'navigateBack' || type == 'back') {
+            uni.navigateBack({ delta });
+        }
+    }
+}
+
+export default new Router().route;

package/libs/function/styleUtils.ts

@@ -1,83 +1,83 @@
-import type { CSSProperties } from 'vue';
-import trim from './trim';
-import test from './test';
-
-function isValidValue(value: any): boolean {
-    if (test.isEmpty(value)) return false;
-    if (typeof value === 'string') {
-        const trimmed = trim(value).toLowerCase();
-        return trimmed !== 'null' && trimmed !== 'undefined' && trimmed !== '';
-    }
-    return true;
-}
-
-/**
- * 将 CSS 字符串解析为对象
- */
-function cssStrToObj(str: string): object {
-    const result = {};
-    if (!isValidValue(str)) return result;
-    const styleStr = trim(String(str));
-    if (!isValidValue(styleStr)) return result;
-    const declarations = styleStr.split(';');
-    declarations.forEach(decl => {
-        const [prop, ...values] = decl.split(':').map(s => s.trim());
-        const value = values.join(':');
-        if (prop && value) {
-            const camelProp = prop.replace(/-([a-z])/g, (match, letter) => letter.toUpperCase());
-            (result as Record<string, string>)[camelProp] = value;
-        }
-    });
-    return result;
-}
-
-/**
- * 将 CSS 对象转换为 CSS 字符串
- */
-function cssObjToStr(obj: object): string {
-    if (!isValidValue(obj) || typeof obj !== 'object') return '';
-    return (
-        Object.entries(obj)
-            .map(([key, value]) => {
-                if (!isValidValue(value)) return '';
-                // 驼峰转短横线
-                const kebab = key.replace(/([A-Z])/g, '-$1').toLowerCase();
-                return `${kebab}: ${value}`;
-            })
-            .filter(Boolean)
-            .join('; ') + ';'
-    );
-}
-
-/**
- * 合并多个 CSS 输入（对象或字符串），返回一个 CSS 对象
- */
-export function mergeStyles(...args: (object | string)[]): CSSProperties {
-    const result = {} as Record<string, any>;
-    for (let i = 0; i < args.length; i++) {
-        const arg = args[i];
-        if (!isValidValue(arg)) return result as CSSProperties;
-        if (typeof arg === 'string') {
-            Object.assign(result, cssStrToObj(arg));
-        } else if (test.object(arg)) {
-            const cleanedObj: Record<string, any> = {};
-            Object.keys(arg).forEach(key => {
-                const value = (arg as Record<string, any>)[key];
-                if (isValidValue(value)) {
-                    // 有效
-                    cleanedObj[key] = value;
-                }
-            });
-            Object.assign(result, cleanedObj);
-        }
-    }
-    return result;
-}
-
-/**
- * 合并为 CSS 字符串
- */
-export function mergeCssStrings(...args: (object | string)[]): string {
-    const obj = mergeStyles(...args);
-    return cssObjToStr(obj);
-}
+import type { CSSProperties } from 'vue';
+import trim from './trim';
+import test from './test';
+
+function isValidValue(value: any): boolean {
+    if (test.isEmpty(value)) return false;
+    if (typeof value === 'string') {
+        const trimmed = trim(value).toLowerCase();
+        return trimmed !== 'null' && trimmed !== 'undefined' && trimmed !== '';
+    }
+    return true;
+}
+
+/**
+ * 将 CSS 字符串解析为对象
+ */
+function cssStrToObj(str: string): object {
+    const result = {};
+    if (!isValidValue(str)) return result;
+    const styleStr = trim(String(str));
+    if (!isValidValue(styleStr)) return result;
+    const declarations = styleStr.split(';');
+    declarations.forEach(decl => {
+        const [prop, ...values] = decl.split(':').map(s => s.trim());
+        const value = values.join(':');
+        if (prop && value) {
+            const camelProp = prop.replace(/-([a-z])/g, (match, letter) => letter.toUpperCase());
+            (result as Record<string, string>)[camelProp] = value;
+        }
+    });
+    return result;
+}
+
+/**
+ * 将 CSS 对象转换为 CSS 字符串
+ */
+function cssObjToStr(obj: object): string {
+    if (!isValidValue(obj) || typeof obj !== 'object') return '';
+    return (
+        Object.entries(obj)
+            .map(([key, value]) => {
+                if (!isValidValue(value)) return '';
+                // 驼峰转短横线
+                const kebab = key.replace(/([A-Z])/g, '-$1').toLowerCase();
+                return `${kebab}: ${value}`;
+            })
+            .filter(Boolean)
+            .join('; ') + ';'
+    );
+}
+
+/**
+ * 合并多个 CSS 输入（对象或字符串），返回一个 CSS 对象
+ */
+export function mergeStyles(...args: (object | string)[]): CSSProperties {
+    const result = {} as Record<string, any>;
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        if (!isValidValue(arg)) return result as CSSProperties;
+        if (typeof arg === 'string') {
+            Object.assign(result, cssStrToObj(arg));
+        } else if (test.object(arg)) {
+            const cleanedObj: Record<string, any> = {};
+            Object.keys(arg).forEach(key => {
+                const value = (arg as Record<string, any>)[key];
+                if (isValidValue(value)) {
+                    // 有效
+                    cleanedObj[key] = value;
+                }
+            });
+            Object.assign(result, cleanedObj);
+        }
+    }
+    return result;
+}
+
+/**
+ * 合并为 CSS 字符串
+ */
+export function mergeCssStrings(...args: (object | string)[]): string {
+    const obj = mergeStyles(...args);
+    return cssObjToStr(obj);
+}