uview-pro 0.2.2 → 0.2.4

package/components/u-tabs/u-tabs.vue

@@ -4,7 +4,14 @@
         <view>
             <scroll-view scroll-x class="u-scroll-view" :scroll-left="scrollLeft" scroll-with-animation>
                 <view class="u-scroll-box" :id="id" :class="{ 'u-tabs-scroll-flex': !isScroll }">
-                    <view class="u-tab-item u-line-1" :id="'u-tab-item-' + index" v-for="(item, index) in list" :key="index" @tap="clickTab(index)" :style="tabItemStyle(index)">
+                    <view
+                        class="u-tab-item u-line-1"
+                        :id="'u-tab-item-' + index"
+                        v-for="(item, index) in list"
+                        :key="index"
+                        @tap="clickTab(index)"
+                        :style="tabItemStyle(index)"
+                    >
                         <u-badge :count="item[count] || item['count'] || 0" :offset="offset" size="mini"></u-badge>
                         {{ item[name] || item['name'] }}
                     </view>

package/components/u-tabs-swiper/u-tabs-swiper.vue

@@ -1,8 +1,21 @@
 <template>
     <view class="u-tabs" :style="{ zIndex: zIndex, background: bgColor }">
-        <scroll-view scroll-x class="u-scroll-view" :scroll-left="scrollLeft" scroll-with-animation :style="{ zIndex: Number(zIndex) + 1 }">
+        <scroll-view
+            scroll-x
+            class="u-scroll-view"
+            :scroll-left="scrollLeft"
+            scroll-with-animation
+            :style="{ zIndex: Number(zIndex) + 1 }"
+        >
             <view class="u-tabs-scroll-box" :class="{ 'u-tabs-scroll-flex': !isScroll }">
-                <view class="u-tabs-item" :style="tabItemStyle(index)" v-for="(item, index) in getTabs" :key="index" :class="[preId + index]" @tap="emitTabChange(index)">
+                <view
+                    class="u-tabs-item"
+                    :style="tabItemStyle(index)"
+                    v-for="(item, index) in getTabs"
+                    :key="index"
+                    :class="[preId + index]"
+                    @tap="emitTabChange(index)"
+                >
                     <u-badge :count="item[count] || item['count'] || 0" :offset="offset" size="mini"></u-badge>
                     {{ item[name] || item['name'] }}
                 </view>
@@ -96,7 +109,12 @@ function tabItemStyle(index: number) {
         height: props.height + 'rpx',
         lineHeight: props.height + 'rpx',
         padding: `0 ${Number(props.gutter) / 2}rpx`,
-        color: tabsInfo.value.length > 0 ? (tabsInfo.value[index] ? tabsInfo.value[index].color : props.activeColor) : props.inactiveColor,
+        color:
+            tabsInfo.value.length > 0
+                ? tabsInfo.value[index]
+                    ? tabsInfo.value[index].color
+                    : props.activeColor
+                : props.inactiveColor,
         fontSize: props.fontSize + 'rpx',
         zIndex: Number(props.zIndex) + 2,
         fontWeight: index == getCurrent.value && props.bold ? 'bold' : 'normal'

package/components/u-tag/u-tag.vue

@@ -8,7 +8,15 @@
     >
         {{ text }}
         <view class="u-icon-wrap" @tap.stop>
-            <u-icon @click="close" size="22" v-if="closeable" :color="closeIconColor" name="close" class="u-close-icon" :style="[iconStyle]"></u-icon>
+            <u-icon
+                @click="close"
+                size="22"
+                v-if="closeable"
+                :color="closeIconColor"
+                name="close"
+                class="u-close-icon"
+                :style="[iconStyle]"
+            ></u-icon>
         </view>
     </view>
 </template>

package/components/u-text/types.ts

@@ -35,7 +35,10 @@ export const TextProps = {
     /** 字体大小 */
     size: { type: [String, Number] as PropType<string | number>, default: 28 },
     /** 图标样式 */
-    iconStyle: { type: [Object, String] as PropType<Record<string, any> | string>, default: () => ({ fontSize: '15px' }) },
+    iconStyle: {
+        type: [Object, String] as PropType<Record<string, any> | string>,
+        default: () => ({ fontSize: '15px' })
+    },
     /** 文字样式 */
     textStyle: { type: [Object, String] as PropType<Record<string, any> | string>, default: () => ({}) },
     /** 文字装饰 */

package/components/u-text/u-text.vue

@@ -17,7 +17,13 @@
             <u-icon :name="props.prefixIcon" :custom-style="$u.toStyle(props.iconStyle)"></u-icon>
         </view>
         <!-- 价格模式 -->
-        <text v-if="props.mode === 'price'" :class="['u-text__price', props.type && `u-text__value--${props.type}`]" :style="textValueStyle"> ￥{{ displayValue }} </text>
+        <text
+            v-if="props.mode === 'price'"
+            :class="['u-text__price', props.type && `u-text__value--${props.type}`]"
+            :style="textValueStyle"
+        >
+            ￥{{ displayValue }}
+        </text>
         <!-- link 模式 -->
         <u-link v-else-if="props.mode === 'link'" :href="props.href" underLine>{{ displayValue }}</u-link>
         <template v-else-if="props.openType && isMp">
@@ -44,7 +50,12 @@
             </button>
         </template>
         <!-- 默认模式 -->
-        <text v-else class="u-text__value" :style="textValueStyle" :class="[props.type && `u-text__value--${props.type}`, props.lines ? `u-line-${props.lines}` : '']">
+        <text
+            v-else
+            class="u-text__value"
+            :style="textValueStyle"
+            :class="[props.type && `u-text__value--${props.type}`, props.lines ? `u-line-${props.lines}` : '']"
+        >
             {{ displayValue }}
         </text>
         <!-- 后缀图标 -->
@@ -184,7 +195,11 @@ const textValueStyle = computed(() => {
         fontWeight: props.bold ? 'bold' : 'normal',
         wordWrap: props.wordWrap,
         fontSize: $u.addUnit(props.size),
-        lineHeight: props.lineHeight ? (typeof props.lineHeight === 'number' ? `${props.lineHeight}px` : props.lineHeight) : undefined
+        lineHeight: props.lineHeight
+            ? typeof props.lineHeight === 'number'
+                ? `${props.lineHeight}px`
+                : props.lineHeight
+            : undefined
     };
     if (props.lines) {
         style['display'] = '-webkit-box';

package/components/u-upload/types.ts

@@ -64,9 +64,15 @@ export const UploadProps = {
     /** 是否显示提示 */
     showTips: { type: Boolean, default: true },
     /** 上传前钩子，返回true或Promise */
-    beforeUpload: { type: Function as PropType<((index: number, files: any[]) => boolean | Promise<any>) | null>, default: null },
+    beforeUpload: {
+        type: Function as PropType<((index: number, files: any[]) => boolean | Promise<any>) | null>,
+        default: null
+    },
     /** 删除前钩子，返回true或Promise */
-    beforeRemove: { type: Function as PropType<((index: number, files: any[]) => boolean | Promise<any>) | null>, default: null },
+    beforeRemove: {
+        type: Function as PropType<((index: number, files: any[]) => boolean | Promise<any>) | null>,
+        default: null
+    },
     /** 如果上传后的返回值为json字符串，是否转为json格式 */
     toJson: { type: Boolean, default: true }
 };

package/components/u-upload/u-upload.vue

@@ -28,7 +28,13 @@
                 :percent="item.progress"
             ></u-line-progress>
             <view @tap.stop="retry(index)" v-if="item.error" class="u-error-btn">点击重试</view>
-            <image @tap.stop="doPreviewImage(item.url || item.path, index)" class="u-preview-image" v-if="!item.isImage" :src="item.url || item.path" :mode="imageMode"></image>
+            <image
+                @tap.stop="doPreviewImage(item.url || item.path, index)"
+                class="u-preview-image"
+                v-if="!item.isImage"
+                :src="item.url || item.path"
+                :mode="imageMode"
+            ></image>
         </view>
         <slot name="file" :file="lists"></slot>
         <view style="display: inline-block" @tap="selectFile" v-if="Number(maxCount) > lists.length">
@@ -259,7 +265,11 @@ async function uploadFile(index = 0) {
         // 明白意思即可，无需纠结this.$u.$parent.call(this)的细节
         let beforeResponse = props.beforeUpload(index, lists.value);
         // 判断是否返回了promise
-        if (typeof beforeResponse === 'object' && beforeResponse !== null && typeof (beforeResponse as Promise<any>).then === 'function') {
+        if (
+            typeof beforeResponse === 'object' &&
+            beforeResponse !== null &&
+            typeof (beforeResponse as Promise<any>).then === 'function'
+        ) {
             await (beforeResponse as Promise<any>)
                 .then(() => {
                     // promise返回成功，不进行动作，继续上传
@@ -349,7 +359,11 @@ function deleteItem(index: number) {
                     // 此处钩子执行 原理同before-remove参数，见上方注释
                     let beforeResponse = props.beforeRemove(index, lists.value);
                     // 判断是否返回了promise
-                    if (typeof beforeResponse === 'object' && beforeResponse !== null && typeof (beforeResponse as Promise<any>).then === 'function') {
+                    if (
+                        typeof beforeResponse === 'object' &&
+                        beforeResponse !== null &&
+                        typeof (beforeResponse as Promise<any>).then === 'function'
+                    ) {
                         await (beforeResponse as Promise<any>)
                             .then(() => {
                                 // promise返回成功，不进行动作，继续上传

package/iconfont.css

@@ -23,7 +23,8 @@
             format('woff2'),
         url('//at.alicdn.com/t/font_1529455_k4s6di1d1.woff?t=1596960292384') format('woff'),
         url('//at.alicdn.com/t/font_1529455_k4s6di1d1.ttf?t=1596960292384') format('truetype'),
-        /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ url('//at.alicdn.com/t/font_1529455_k4s6di1d1.svg?t=1596960292384#iconfont') format('svg');
+        /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+            url('//at.alicdn.com/t/font_1529455_k4s6di1d1.svg?t=1596960292384#iconfont') format('svg');
 }
 
 /* #endif */

package/index.ts

@@ -1,5 +1,6 @@
 import { $u, type RequestOptions } from './libs';
 import type { UViewProOptions } from './types/global';
+import { logger } from './libs/util/logger';
 
 declare const uni: {
     [key: string]: any;
@@ -13,8 +14,16 @@ declare const uni: {
 // $u挂载到uni对象上
 const install = (app: any, options?: UViewProOptions): void => {
     uni.$u = $u;
-    if (options && options.theme) {
-        $u.color = $u.deepMerge($u.color, options.theme);
+    if (options) {
+        // 配置主题
+        if (options.theme) {
+            $u.color = $u.deepMerge($u.color, options.theme);
+        }
+        // 设置调试模式
+        logger
+            .setDebugMode(options?.log?.debug ?? true)
+            .setPrefix(options?.log?.prefix)
+            .setShowCallerInfo(options?.log?.showCallerInfo ?? true);
     }
     // 可扩展更多配置项
     app.config.globalProperties.$u = $u;

package/libs/css/style.vue.scss

@@ -52,7 +52,7 @@ page {
 
         /* #ifndef APP-NVUE */
         // vue下，单行和多行显示省略号需要单独处理
-        @if $i == '1' {
+        @if $i == 1 {
             overflow: hidden;
             white-space: nowrap;
             text-overflow: ellipsis;

package/libs/function/$parent.ts

@@ -4,7 +4,10 @@
 // 值(默认为undefined)，就是查找最顶层的$parent
 import { type ComponentInternalInstance, getCurrentInstance } from 'vue';
 
-export default function $parent(componentName?: string, _instance: ComponentInternalInstance | null | undefined = null) {
+export default function $parent(
+    componentName?: string,
+    _instance: ComponentInternalInstance | null | undefined = null
+) {
     const instance: ComponentInternalInstance | null | undefined = _instance || getCurrentInstance();
     let parent = instance && (instance.parent as ComponentInternalInstance | null | undefined);
 

package/libs/function/colorGradient.ts

@@ -5,7 +5,11 @@
  * @param step 颜色等分的份额
  * @returns 渐变色数组
  */
-function colorGradient(startColor: string = 'rgb(0, 0, 0)', endColor: string = 'rgb(255, 255, 255)', step: number = 10): string[] {
+function colorGradient(
+    startColor: string = 'rgb(0, 0, 0)',
+    endColor: string = 'rgb(255, 255, 255)',
+    step: number = 10
+): string[] {
     const startRGB = hexToRgb(startColor, false) as [number, number, number]; // 转换为rgb数组模式
     const [startR, startG, startB] = startRGB;
     const endRGB = hexToRgb(endColor, false) as [number, number, number];
@@ -17,7 +21,9 @@ function colorGradient(startColor: string = 'rgb(0, 0, 0)', endColor: string = '
     const colorArr: string[] = [];
     for (let i = 0; i < step; i++) {
         // 计算每一步的hex值
-        const hex = rgbToHex(`rgb(${Math.round(sR * i + startR)},${Math.round(sG * i + startG)},${Math.round(sB * i + startB)})`);
+        const hex = rgbToHex(
+            `rgb(${Math.round(sR * i + startR)},${Math.round(sG * i + startG)},${Math.round(sB * i + startB)})`
+        );
         colorArr.push(hex as string);
     }
     return colorArr;
@@ -41,7 +47,11 @@ function hexToRgb(sColor: string, str: boolean = true): [number, number, number]
             sColor = sColorNew;
         }
         // 处理六位的颜色值
-        const sColorChange: [number, number, number] = [parseInt('0x' + sColor.slice(1, 3)), parseInt('0x' + sColor.slice(3, 5)), parseInt('0x' + sColor.slice(5, 7))];
+        const sColorChange: [number, number, number] = [
+            parseInt('0x' + sColor.slice(1, 3)),
+            parseInt('0x' + sColor.slice(3, 5)),
+            parseInt('0x' + sColor.slice(5, 7))
+        ];
         if (!str) {
             return sColorChange;
         } else {
@@ -110,7 +120,11 @@ function colorToRgba(color: string, alpha: number = 0.3): string {
             }
             sColor = sColorNew;
         }
-        const sColorChange: [number, number, number] = [parseInt('0x' + sColor.slice(1, 3)), parseInt('0x' + sColor.slice(3, 5)), parseInt('0x' + sColor.slice(5, 7))];
+        const sColorChange: [number, number, number] = [
+            parseInt('0x' + sColor.slice(1, 3)),
+            parseInt('0x' + sColor.slice(3, 5)),
+            parseInt('0x' + sColor.slice(5, 7))
+        ];
         return `rgba(${sColorChange.join(',')},${alpha})`;
     } else {
         return sColor;

package/libs/function/deepMerge.ts

@@ -8,7 +8,8 @@ import deepClone from './deepClone';
  */
 function deepMerge<T extends object, S extends object>(target: T = {} as T, source: S = {} as S): T & S {
     target = deepClone(target);
-    if (typeof target !== 'object' || target === null || typeof source !== 'object' || source === null) return target as T & S;
+    if (typeof target !== 'object' || target === null || typeof source !== 'object' || source === null)
+        return target as T & S;
     const merged: any = Array.isArray(target) ? target.slice() : Object.assign({}, target);
     for (const prop in source) {
         if (!Object.prototype.hasOwnProperty.call(source, prop)) continue;

package/libs/function/getParent.ts

@@ -13,7 +13,11 @@ interface VueInstance {
  * @param keys 需要获取的参数名数组或对象
  * @returns 父组件参数对象
  */
-export default function getParent(this: VueInstance, name: string, keys: string[] | Record<string, any>): Record<string, any> {
+export default function getParent(
+    this: VueInstance,
+    name: string,
+    keys: string[] | Record<string, any>
+): Record<string, any> {
     let parent = this.$parent;
     // 通过while历遍，这里主要是为了H5需要多层解析的问题
     while (parent) {

package/libs/function/md5.ts

@@ -112,7 +112,10 @@ function rstr2b64(input: string): string {
     let output = '';
     const len: number = input.length;
     for (let i = 0; i < len; i += 3) {
-        const triplet: number = (input.charCodeAt(i) << 16) | (i + 1 < len ? input.charCodeAt(i + 1) << 8 : 0) | (i + 2 < len ? input.charCodeAt(i + 2) : 0);
+        const triplet: number =
+            (input.charCodeAt(i) << 16) |
+            (i + 1 < len ? input.charCodeAt(i + 1) << 8 : 0) |
+            (i + 2 < len ? input.charCodeAt(i + 2) : 0);
         for (let j = 0; j < 4; j++) {
             if (i * 8 + j * 6 > input.length * 8) output += b64pad;
             else output += tab.charAt((triplet >>> (6 * (3 - j))) & 0x3f);
@@ -187,8 +190,15 @@ function str2rstr_utf8(input: string): string {
         /* Encode output as utf-8 */
         if (x <= 0x7f) output += String.fromCharCode(x);
         else if (x <= 0x7ff) output += String.fromCharCode(0xc0 | ((x >>> 6) & 0x1f), 0x80 | (x & 0x3f));
-        else if (x <= 0xffff) output += String.fromCharCode(0xe0 | ((x >>> 12) & 0x0f), 0x80 | ((x >>> 6) & 0x3f), 0x80 | (x & 0x3f));
-        else if (x <= 0x1fffff) output += String.fromCharCode(0xf0 | ((x >>> 18) & 0x07), 0x80 | ((x >>> 12) & 0x3f), 0x80 | ((x >>> 6) & 0x3f), 0x80 | (x & 0x3f));
+        else if (x <= 0xffff)
+            output += String.fromCharCode(0xe0 | ((x >>> 12) & 0x0f), 0x80 | ((x >>> 6) & 0x3f), 0x80 | (x & 0x3f));
+        else if (x <= 0x1fffff)
+            output += String.fromCharCode(
+                0xf0 | ((x >>> 18) & 0x07),
+                0x80 | ((x >>> 12) & 0x3f),
+                0x80 | ((x >>> 6) & 0x3f),
+                0x80 | (x & 0x3f)
+            );
     }
     return output;
 }
@@ -200,7 +210,8 @@ function str2rstr_utf8(input: string): string {
  */
 function str2rstr_utf16le(input: string): string {
     let output = '';
-    for (let i = 0; i < input.length; i++) output += String.fromCharCode(input.charCodeAt(i) & 0xff, (input.charCodeAt(i) >>> 8) & 0xff);
+    for (let i = 0; i < input.length; i++)
+        output += String.fromCharCode(input.charCodeAt(i) & 0xff, (input.charCodeAt(i) >>> 8) & 0xff);
     return output;
 }
 
@@ -211,7 +222,8 @@ function str2rstr_utf16le(input: string): string {
  */
 function str2rstr_utf16be(input: string): string {
     let output = '';
-    for (let i = 0; i < input.length; i++) output += String.fromCharCode((input.charCodeAt(i) >>> 8) & 0xff, input.charCodeAt(i) & 0xff);
+    for (let i = 0; i < input.length; i++)
+        output += String.fromCharCode((input.charCodeAt(i) >>> 8) & 0xff, input.charCodeAt(i) & 0xff);
     return output;
 }
 

package/libs/function/queryParams.ts

@@ -5,7 +5,11 @@
  * @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 {
+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';

package/libs/function/test.ts

@@ -2,7 +2,9 @@
  * 验证电子邮箱格式
  */
 function email(value: string): boolean {
-    return /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/.test(value);
+    return /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/.test(
+        value
+    );
 }
 
 /**
@@ -59,9 +61,11 @@ function idCard(value: string): boolean {
  */
 function carNo(value: string): boolean {
     // 新能源车牌
-    const xreg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/;
+    const xreg =
+        /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/;
     // 旧车牌
-    const creg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/;
+    const creg =
+        /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/;
     if (value.length === 7) {
         return creg.test(value);
     } else if (value.length === 8) {

package/libs/function/timeFormat.ts

@@ -3,7 +3,8 @@
 if (!String.prototype.padStart) {
     // 为了方便表示这里 fillString 用了ES6 的默认参数，不影响理解
     String.prototype.padStart = function (this: string, maxLength: number, fillString: string = ' '): string {
-        if (Object.prototype.toString.call(fillString) !== '[object String]') throw new TypeError('fillString must be String');
+        if (Object.prototype.toString.call(fillString) !== '[object String]')
+            throw new TypeError('fillString must be String');
         let str = this;
         if (str.length >= maxLength) return String(str);
         let fillLength = maxLength - str.length,

package/libs/function/type2icon.ts

@@ -4,7 +4,10 @@
  * @param fill 是否使用fill填充实体的图标，默认false
  * @returns 图标名称字符串
  */
-function type2icon(type: 'primary' | 'info' | 'error' | 'warning' | 'success' = 'success', fill: boolean = false): string {
+function type2icon(
+    type: 'primary' | 'info' | 'error' | 'warning' | 'success' = 'success',
+    fill: boolean = false
+): string {
     // 如果非预置值,默认为success
     if (!['primary', 'info', 'error', 'warning', 'success'].includes(type)) type = 'success';
     let iconName = '';

package/libs/hooks/index.ts

@@ -1,3 +1,3 @@
+export * from './useComponent';
 export * from './useEmitter';
-export * from './useParent';
 export * from './useRect';