@zfqh/uview-x 0.0.6 → 0.0.7

package/utils/merge.ts

@@ -0,0 +1,74 @@
+/**
+ * 通用对象深拷贝 / 深合并工具。
+ *
+ * 独立成模块，避免 `utils/config.ts` 与 `utils/function.ts` 之间产生循环依赖。
+ */
+
+/**
+ * @description 深度克隆
+ * @param {object} obj 需要深度克隆的对象
+ * @param cache 缓存
+ * @returns {*} 克隆后的对象或者原值（不是对象）
+ */
+export function deepClone<T>(obj: T, cache: WeakMap<object, any> = new WeakMap()): T {
+  if (obj === null || typeof obj !== 'object') return obj;
+  if (cache.has(obj)) return cache.get(obj);
+  let clone;
+  if (obj instanceof Date) {
+    clone = new Date(obj.getTime());
+  } else if (obj instanceof RegExp) {
+    clone = new RegExp(obj);
+  } else if (obj instanceof Map) {
+    clone = new Map(Array.from(obj, ([key, value]) => [key, deepClone(value, cache)]));
+  } else if (obj instanceof Set) {
+    clone = new Set(Array.from(obj, (value) => deepClone(value, cache)));
+  } else if (Array.isArray(obj)) {
+    clone = obj.map((value) => deepClone(value, cache));
+  } else if (Object.prototype.toString.call(obj) === '[object Object]') {
+    clone = Object.create(Object.getPrototypeOf(obj));
+    cache.set(obj, clone);
+    for (const [key, value] of Object.entries(obj)) {
+      clone[key] = deepClone(value, cache);
+    }
+  } else {
+    clone = Object.assign({}, obj);
+  }
+  cache.set(obj, clone);
+  return clone;
+}
+
+/**
+ * @description JS对象深度合并
+ * @param {object} target 需要拷贝的对象
+ * @param {object} source 拷贝的来源对象
+ * @returns {object|boolean} 深度合并后的对象或者false（入参有不是对象）
+ */
+export function deepMerge<T extends object>(target: T = {} as T, source: Partial<T> = {}): T {
+  target = deepClone(target);
+  if (typeof target !== 'object' || target === null || typeof source !== 'object' || source === null) return target;
+  const merged: Record<string, any> = Array.isArray(target)
+    ? (target.slice() as unknown as Record<string, any>)
+    : Object.assign({}, target);
+  const sourceRecord = source as Record<string, any>;
+  for (const prop in sourceRecord) {
+    if (!Object.prototype.hasOwnProperty.call(sourceRecord, prop)) continue;
+    const sourceValue = sourceRecord[prop];
+    const targetValue = merged[prop];
+    if (sourceValue instanceof Date) {
+      merged[prop] = new Date(sourceValue);
+    } else if (sourceValue instanceof RegExp) {
+      merged[prop] = new RegExp(sourceValue);
+    } else if (sourceValue instanceof Map) {
+      merged[prop] = new Map(sourceValue);
+    } else if (sourceValue instanceof Set) {
+      merged[prop] = new Set(sourceValue);
+    } else if (typeof sourceValue === 'object' && sourceValue !== null) {
+      // 目标是原始值 / null 时，用对象源替换；避免 `false`、`undefined` 等无法被深合并
+      const mergedTarget = typeof targetValue === 'object' && targetValue !== null ? targetValue : {};
+      merged[prop] = deepMerge(mergedTarget, sourceValue);
+    } else {
+      merged[prop] = sourceValue;
+    }
+  }
+  return merged as T;
+}

package/utils/platform.ts

@@ -3,69 +3,69 @@
  *
  * 仅保留 x 支持的平台条件；旧版 VUE2、APP-PLUS、APP-NVUE、H5 宏不再使用。
  */
-export type UviewXPlatform =
-	| 'none'
-	| 'vue3'
-	| 'app'
-	| 'app-nvue'
-	| 'h5'
-	| 'mp'
-	| 'weixin'
-	| 'alipay'
-	| 'baidu'
-	| 'toutiao'
-	| 'qq'
-	| 'kuaishou'
-	| '360'
+export type Platform =
+  | 'none'
+  | 'vue3'
+  | 'app'
+  | 'app-nvue'
+  | 'h5'
+  | 'mp'
+  | 'weixin'
+  | 'alipay'
+  | 'baidu'
+  | 'toutiao'
+  | 'qq'
+  | 'kuaishou'
+  | '360';
 
-let platform: UviewXPlatform = 'none'
+let platform: Platform = 'none';
 
 // #ifdef VUE3
-platform = 'vue3'
+platform = 'vue3';
 // #endif
 
 // #ifdef APP
-platform = 'app'
+platform = 'app';
 // #endif
 
 // #ifdef APP-NVUE
-platform = 'app-nvue'
+platform = 'app-nvue';
 // #endif
 
 // #ifdef WEB || H5
-platform = 'h5'
+platform = 'h5';
 // #endif
 
 // #ifdef MP
-platform = 'mp'
+platform = 'mp';
 // #endif
 
 // #ifdef MP-WEIXIN
-platform = 'weixin'
+platform = 'weixin';
 // #endif
 
 // #ifdef MP-ALIPAY
-platform = 'alipay'
+platform = 'alipay';
 // #endif
 
 // #ifdef MP-BAIDU
-platform = 'baidu'
+platform = 'baidu';
 // #endif
 
 // #ifdef MP-TOUTIAO
-platform = 'toutiao'
+platform = 'toutiao';
 // #endif
 
 // #ifdef MP-QQ
-platform = 'qq'
+platform = 'qq';
 // #endif
 
 // #ifdef MP-KUAISHOU
-platform = 'kuaishou'
+platform = 'kuaishou';
 // #endif
 
 // #ifdef MP-360
-platform = '360'
+platform = '360';
 // #endif
 
-export default platform
+export default platform;

package/utils/route.ts

@@ -2,141 +2,135 @@
  * 路由跳转方法，该方法相对于直接使用 uni.xxx 更简单快捷，
  * 并支持路由拦截。
  */
-import { queryParams, deepMerge, page } from './function'
-
-export type RouteType =
-	| 'navigateTo'
-	| 'to'
-	| 'redirectTo'
-	| 'redirect'
-	| 'switchTab'
-	| 'tab'
-	| 'reLaunch'
-	| 'launch'
-	| 'navigateBack'
-	| 'back'
-
-export interface RouteParams {
-	[key: string]: any
-	intercept?: boolean | ((config: RouteOptions, resolve: (next: boolean) => void) => void)
+import { queryParams, deepMerge, page } from './function';
+
+export type UViewRouteType =
+  | 'navigateTo'
+  | 'to'
+  | 'redirectTo'
+  | 'redirect'
+  | 'switchTab'
+  | 'tab'
+  | 'reLaunch'
+  | 'launch'
+  | 'navigateBack'
+  | 'back';
+
+export interface UViewRouteParams {
+  [key: string]: any;
+  intercept?: boolean | ((config: UViewRouteOptions, resolve: (next: boolean) => void) => void);
 }
 
-export interface RouteOptions {
-	type?: RouteType
-	url?: string
-	delta?: number
-	params?: RouteParams
-	animationType?: string
-	animationDuration?: number
-	intercept?: boolean | ((config: RouteOptions, resolve: (next: boolean) => void) => void)
-	events?: Record<string, (...args: any[]) => void>
+export interface UViewRouteOptions {
+  type?: UViewRouteType;
+  url?: string;
+  delta?: number;
+  params?: UViewRouteParams;
+  animationType?: string;
+  animationDuration?: number;
+  intercept?: boolean | ((config: UViewRouteOptions, resolve: (next: boolean) => void) => void);
+  events?: Record<string, (...args: any[]) => void>;
 }
 
-export type RouteFunction = (
-	options?: string | RouteOptions,
-	params?: RouteParams
-) => Promise<void>
+export type UViewRouteFunction = (options?: string | UViewRouteOptions, params?: UViewRouteParams) => Promise<void>;
 
-type RouterConfig = Required<Pick<RouteOptions,
-	'type' | 'url' | 'delta' | 'params' | 'animationType' | 'animationDuration' | 'intercept' | 'events'>>
+type RouterConfig = Required<
+  Pick<
+    UViewRouteOptions,
+    'type' | 'url' | 'delta' | 'params' | 'animationType' | 'animationDuration' | 'intercept' | 'events'
+  >
+>;
 
 class Router {
-	config: RouterConfig
-
-	constructor() {
-		this.config = {
-			type: 'navigateTo',
-			url: '',
-			delta: 1,
-			params: {},
-			animationType: 'pop-in',
-			animationDuration: 300,
-			intercept: false,
-			events: {}
-		}
-		// route 需要作为独立方法传递，先绑定 this
-		this.route = this.route.bind(this)
-	}
-
-	// 判断 url 前面是否有 "/"，如果没有则加上，否则无法跳转
-	addRootPath(url: string): string {
-		return url[0] === '/' ? url : `/${url}`
-	}
-
-	// 整合路由参数
-	mixinParam(url: string, params: RouteParams): string {
-		url = url && this.addRootPath(url)
-
-		let query = ''
-		if (/.*\/.*\?.*=.*/.test(url)) {
-			query = queryParams(params, false)
-			return url += `&${query}`
-		}
-		query = queryParams(params)
-		return url += query
-	}
-
-	// 对外的方法名称
-	async route(options: string | RouteOptions = {}, params: RouteParams = {}): Promise<void> {
-		let mergeConfig: RouteOptions = {}
-
-		if (typeof options === 'string') {
-			mergeConfig.url = this.mixinParam(options, params)
-			mergeConfig.type = 'navigateTo'
-		} else {
-			mergeConfig = deepMerge(this.config as RouteOptions, options)
-			mergeConfig.url = this.mixinParam(options.url as string, options.params as RouteParams)
-		}
-		if (mergeConfig.url === page()) return
-
-		if (params.intercept) {
-			mergeConfig.intercept = params.intercept
-		}
-		mergeConfig.params = params
-		mergeConfig = deepMerge(this.config as RouteOptions, mergeConfig)
-
-		if (typeof mergeConfig.intercept === 'function') {
-			const interceptor = mergeConfig.intercept
-			const isNext = await new Promise<boolean>((resolve) => {
-				interceptor(mergeConfig, resolve)
-			})
-			isNext && this.openPage(mergeConfig)
-		} else {
-			this.openPage(mergeConfig)
-		}
-	}
-
-	// 执行路由跳转
-	openPage(config: RouteOptions): void {
-		const {
-			url = '',
-			type,
-			delta,
-			animationType,
-			animationDuration,
-			events
-		} = config
-		if (type == 'navigateTo' || type == 'to') {
-			uni.navigateTo({
-				url,
-				animationType: animationType as any,
-				animationDuration,
-				events: events as any
-			})
-		}
-		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 })
-		}
-	}
+  config: RouterConfig;
+
+  constructor() {
+    this.config = {
+      type: 'navigateTo',
+      url: '',
+      delta: 1,
+      params: {},
+      animationType: 'pop-in',
+      animationDuration: 300,
+      intercept: false,
+      events: {},
+    };
+    // route 需要作为独立方法传递，先绑定 this
+    this.route = this.route.bind(this);
+  }
+
+  // 判断 url 前面是否有 "/"，如果没有则加上，否则无法跳转
+  addRootPath(url: string): string {
+    return url[0] === '/' ? url : `/${url}`;
+  }
+
+  // 整合路由参数
+  mixinParam(url: string, params: UViewRouteParams): string {
+    url = url && this.addRootPath(url);
+
+    let query = '';
+    if (/.*\/.*\?.*=.*/.test(url)) {
+      query = queryParams(params, false);
+      return (url += `&${query}`);
+    }
+    query = queryParams(params);
+    return (url += query);
+  }
+
+  // 对外的方法名称
+  async route(options: string | UViewRouteOptions = {}, params: UViewRouteParams = {}): Promise<void> {
+    let mergeConfig: UViewRouteOptions = {};
+
+    if (typeof options === 'string') {
+      mergeConfig.url = this.mixinParam(options, params);
+      mergeConfig.type = 'navigateTo';
+    } else {
+      mergeConfig = deepMerge(this.config as UViewRouteOptions, options);
+      mergeConfig.url = this.mixinParam(options.url as string, options.params as UViewRouteParams);
+    }
+    if (mergeConfig.url === page()) return;
+
+    if (params.intercept) {
+      mergeConfig.intercept = params.intercept;
+    }
+    mergeConfig.params = params;
+    mergeConfig = deepMerge(this.config as UViewRouteOptions, mergeConfig);
+
+    if (typeof mergeConfig.intercept === 'function') {
+      const interceptor = mergeConfig.intercept;
+      const isNext = await new Promise<boolean>((resolve) => {
+        interceptor(mergeConfig, resolve);
+      });
+      isNext && this.openPage(mergeConfig);
+    } else {
+      this.openPage(mergeConfig);
+    }
+  }
+
+  // 执行路由跳转
+  openPage(config: UViewRouteOptions): void {
+    const { url = '', type, delta, animationType, animationDuration, events } = config;
+    if (type == 'navigateTo' || type == 'to') {
+      uni.navigateTo({
+        url,
+        animationType: animationType as any,
+        animationDuration,
+        events: events as any,
+      });
+    }
+    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 const route: RouteFunction = (new Router()).route
+export const route: UViewRouteFunction = new Router().route;

package/utils/scrollbar.ts

@@ -9,25 +9,25 @@
  */
 
 /** 单组滚动条 CSS 样式：camelCase / kebab-case 均可；number 默认按 px 处理（无单位属性除外） */
-export type UviewXScrollbarStyle = Record<string, string | number>;
+export type ScrollbarStyle = Record<string, string | number>;
 
 /** 滚动条自定义样式：默认合并 / 扩展 ::-webkit-scrollbar 及其 thumb / track */
-export interface UviewXScrollbarOptions {
+export interface ScrollbarOptions {
   /** ::-webkit-scrollbar-thumb 样式，覆盖默认 thumb 样式 */
-  thumb?: UviewXScrollbarStyle;
+  thumb?: ScrollbarStyle;
   /** ::-webkit-scrollbar-track 样式，覆盖默认 track 样式 */
-  track?: UviewXScrollbarStyle;
+  track?: ScrollbarStyle;
   /** 其余键作为 ::-webkit-scrollbar 样式，覆盖默认宽高 */
-  [property: string]: string | number | UviewXScrollbarStyle | undefined;
+  [property: string]: string | number | ScrollbarStyle | undefined;
 }
 
-export type UviewXScrollbar = boolean | UviewXScrollbarOptions;
+export type Scrollbar = boolean | ScrollbarOptions;
 
 /** 注入到 `<style>` 的元素 id；重复设置时替换同一节点 */
 const SCROLLBAR_STYLE_ID = 'uv-scrollbar-style';
 
 /** `false`：隐藏滚动条 */
-const HIDDEN_SCROLLBAR_STYLE: UviewXScrollbarStyle = {
+const HIDDEN_SCROLLBAR_STYLE: ScrollbarStyle = {
   display: 'none',
   width: '0 !important',
   height: '0 !important',
@@ -36,17 +36,17 @@ const HIDDEN_SCROLLBAR_STYLE: UviewXScrollbarStyle = {
 };
 
 /** `true` / 对象的默认基础样式 */
-const DEFAULT_SCROLLBAR_STYLE: UviewXScrollbarStyle = {
+const DEFAULT_SCROLLBAR_STYLE: ScrollbarStyle = {
   width: 6,
   height: 6,
 };
 
-const DEFAULT_SCROLLBAR_THUMB_STYLE: UviewXScrollbarStyle = {
+const DEFAULT_SCROLLBAR_THUMB_STYLE: ScrollbarStyle = {
   background: '#c0c4cc',
   borderRadius: 3,
 };
 
-const DEFAULT_SCROLLBAR_TRACK_STYLE: UviewXScrollbarStyle = {
+const DEFAULT_SCROLLBAR_TRACK_STYLE: ScrollbarStyle = {
   background: 'transparent',
 };
 
@@ -79,7 +79,7 @@ function formatStyleValue(property: string, value: string | number): string {
 }
 
 /** 把样式对象转换为 CSS 声明串 */
-function styleToDeclarations(style: UviewXScrollbarStyle): string {
+function styleToDeclarations(style: ScrollbarStyle): string {
   const declarations: string[] = [];
   for (const property of Object.keys(style)) {
     const value = style[property];
@@ -91,16 +91,16 @@ function styleToDeclarations(style: UviewXScrollbarStyle): string {
   return declarations.join(' ');
 }
 
-function toRule(selector: string, style: UviewXScrollbarStyle): string {
+function toRule(selector: string, style: ScrollbarStyle): string {
   const declarations = styleToDeclarations(style);
   return declarations ? `${selector} { ${declarations} }` : '';
 }
 
-function isScrollbarStyle(value: unknown): value is UviewXScrollbarStyle {
+function isScrollbarStyle(value: unknown): value is ScrollbarStyle {
   return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
 
-function mergeScrollbarStyle(base: UviewXScrollbarStyle, override?: UviewXScrollbarStyle): UviewXScrollbarStyle {
+function mergeScrollbarStyle(base: ScrollbarStyle, override?: ScrollbarStyle): ScrollbarStyle {
   return override ? { ...base, ...override } : { ...base };
 }
 
@@ -111,7 +111,7 @@ function mergeScrollbarStyle(base: UviewXScrollbarStyle, override?: UviewXScroll
  * - `true`：默认滚动条样式；
  * - 对象：默认样式 + 用户覆盖；空对象等价 `true`。
  */
-export function buildScrollbarCss(scrollbar: UviewXScrollbar): string {
+export function buildScrollbarCss(scrollbar: Scrollbar): string {
   if (!scrollbar) {
     return toRule('::-webkit-scrollbar', HIDDEN_SCROLLBAR_STYLE);
   }
@@ -126,9 +126,9 @@ export function buildScrollbarCss(scrollbar: UviewXScrollbar): string {
   }
 
   // 自定义样式：`thumb` / `track` 之外的键作为基础样式
-  const baseOverride: UviewXScrollbarStyle = {};
-  let thumbOverride: UviewXScrollbarStyle | undefined;
-  let trackOverride: UviewXScrollbarStyle | undefined;
+  const baseOverride: ScrollbarStyle = {};
+  let thumbOverride: ScrollbarStyle | undefined;
+  let trackOverride: ScrollbarStyle | undefined;
   for (const property of Object.keys(scrollbar)) {
     const value = scrollbar[property];
     if (property === 'thumb' || property === 'track') {
@@ -160,7 +160,7 @@ export function buildScrollbarCss(scrollbar: UviewXScrollbar): string {
  *
  * `document` 不存在（SSR / Node 单测）时静默返回。
  */
-export function applyScrollbar(scrollbar: UviewXScrollbar): void {
+export function applyScrollbar(scrollbar: Scrollbar): void {
   // #ifdef WEB || H5
   if (typeof document === 'undefined' || !document.head) {
     return;

package/utils/throttle.ts

@@ -1,7 +1,7 @@
-import { useThrottle } from '../hooks/useThrottle'
-import type { ThrottleFunction } from '../hooks/useThrottle'
+import useThrottle from '../hooks/useThrottle';
+import type { UViewThrottleFunction } from '../hooks/useThrottle';
 
 // 兼容旧用法：模块级共享实例，复用 useThrottle 实现
-const throttle: ThrottleFunction = useThrottle()
+const throttle: UViewThrottleFunction = useThrottle();
 
-export default throttle
+export default throttle;

package/locales/en-US.ts

@@ -1,79 +0,0 @@
-/**
- * uview-x 可选组件语言包：英文（en-US）。
- *
- * 不参与内部聚合、不会被 `createI18n` 自动合并；需要英文时由使用方显式引入并合并：
- * `import enUS from '@zfqh/uview-x/locales/en-US'`，再在 `createI18n({ messages: { 'en-US': enUS } })` 中使用。
- * 键空间固定为 `uv.*`，`uv.form.*` 与 async-validator 默认 messages 完全对齐，`%s` 占位符由校验器替换。
- */
-const enUS = {
-  uv: {
-    dialog: {
-      title: 'Tips',
-      cancel: 'Cancel',
-      confirm: 'OK',
-    },
-    code: {
-      start: 'Get code',
-      // 组件会把 x / X 替换为剩余秒数
-      change: 'X seconds to resend',
-      end: 'Resend',
-    },
-    time: {
-      justNow: 'Just now',
-      minutesAgo: '{n} minutes ago',
-      hoursAgo: '{n} hours ago',
-      daysAgo: '{n} days ago',
-      monthsAgo: '{n} months ago',
-      yearsAgo: '{n} years ago',
-    },
-    form: {
-      default: 'Validation error on field %s',
-      required: '%s is required',
-      enum: '%s must be one of %s',
-      whitespace: '%s cannot be empty',
-      date: {
-        format: '%s date %s is invalid for format %s',
-        parse: '%s date could not be parsed, %s is invalid ',
-        invalid: '%s date %s is invalid',
-      },
-      types: {
-        string: '%s is not a %s',
-        method: '%s is not a %s (function)',
-        array: '%s is not an %s',
-        object: '%s is not an %s',
-        number: '%s is not a %s',
-        date: '%s is not a %s',
-        boolean: '%s is not a %s',
-        integer: '%s is not an %s',
-        float: '%s is not a %s',
-        regexp: '%s is not a valid %s',
-        email: '%s is not a valid %s',
-        url: '%s is not a valid %s',
-        hex: '%s is not a valid %s',
-      },
-      string: {
-        len: '%s must be exactly %s characters',
-        min: '%s must be at least %s characters',
-        max: '%s cannot be longer than %s characters',
-        range: '%s must be between %s and %s characters',
-      },
-      number: {
-        len: '%s must equal %s',
-        min: '%s cannot be less than %s',
-        max: '%s cannot be greater than %s',
-        range: '%s must be between %s and %s',
-      },
-      array: {
-        len: '%s must be exactly %s in length',
-        min: '%s cannot be less than %s in length',
-        max: '%s cannot be greater than %s in length',
-        range: '%s must be between %s and %s in length',
-      },
-      pattern: {
-        mismatch: '%s value %s does not match pattern %s',
-      },
-    },
-  },
-};
-
-export default enUS;