halo-fe 1.0.25 → 1.0.27

package/esm/drivers/sockets/ISocket.d.ts

@@ -16,11 +16,15 @@ interface ISocket extends IDriver, IOpen {
      */
     connect(): Promise<void>;
     /**
-     * 订阅并替换Socket事件处理程序
+     * 订阅多个消息类型，并缓存到订阅池
      */
-    subscribe(win: string, kind: string, type: string): Promise<any>;
+    subscribe(win: string, kind: string, type: string | string[]): Promise<any>;
     /**
-     * 取消订阅Socket事件处理程序，防止内存泄漏
+     * 重连时，重新订阅
+     */
+    resubscribe(): Promise<void>;
+    /**
+     * 取消订阅该窗口 所有Socket事件处理程序，防止内存泄漏
      */
     unsubscribe(win: string): Promise<any>;
     /**

package/esm/drivers/sockets/Socket.d.ts

@@ -1,8 +1,17 @@
 import ISocket from "./ISocket";
+import { SubscribedWindow } from "./@types";
 /**
  * Socket基类
  */
 declare class Socket implements ISocket {
-    open(conn?: string): Promise<void>;
+    /**
+     * 已订阅的消息类型列表
+     */
+    subscribed: SubscribedWindow;
+    openAsync(conn?: string): Promise<void>;
+    subscribe(win: string, kind: string, type: string | string[]): Promise<any>;
+    resubscribe(): Promise<void>;
+    unsubscribe(win: string): Promise<any>;
+    abstract send(data: any): void;
 }
 export default Socket;

package/esm/drivers/sockets/SocketFactory.d.ts

@@ -1,4 +1,4 @@
-import { Factory } from "../../factorying";
+import Factory from "../../factory/Factory";
 import ISocket from "./ISocket";
 /**
  * Socket工厂

package/esm/drivers/sockets/entities/SocketProgress.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Socket进度消息
+ */
+declare class SocketProgress<T> {
+    /**
+     * 成功数量
+     */
+    succeed: number;
+    /**
+     * 异常数量
+     */
+    errored: number;
+    /**
+     * 已处理数量
+     */
+    handled: number;
+    /**
+     * 总数量
+     */
+    total: number;
+    /**
+     * 当前消息体
+     */
+    current: T;
+    /**
+     * 增加成功进度
+     */
+    success(current: T): void;
+    /**
+     * 增加异常进度
+     */
+    error(current: T, message: string): void;
+}
+export default SocketProgress;

package/esm/drivers/sockets/entities/SocketResponse.d.ts

@@ -0,0 +1,42 @@
+/**
+ * Socket响应消息
+ */
+declare class SocketResponse<T> {
+    /**
+     * 是否执行成功
+     */
+    ok: boolean;
+    /**
+     * 异常消息
+     */
+    message: string;
+    /**
+     * 耗时
+     */
+    elapsed: number;
+    /**
+     * 消息类别
+     */
+    kind: string;
+    /**
+     * 消息类型
+     */
+    type: string;
+    /**
+     * 数据体
+     */
+    data: T;
+    /**
+     * 初始化并设置数据
+     */
+    constructor(kind: string, type: string, data: T);
+    /**
+     * 成功输出
+     */
+    onOk(message?: string): void;
+    /**
+     * 异常输出
+     */
+    onError(message: string): void;
+}
+export default SocketResponse;

package/esm/drivers/sockets/entities/index.d.ts

@@ -0,0 +1,3 @@
+import SocketProgress from "./SocketProgress";
+import SocketResponse from "./SocketResponse";
+export { SocketProgress, SocketResponse, };

package/esm/drivers/sockets/implement/DefaultSocket.d.ts

@@ -25,8 +25,6 @@ declare class DefaultSocket extends Socket {
      */
     handler: (event: MessageEvent) => void;
     connect(): Promise<void>;
-    subscribe(win: string, kind: string, type: string): Promise<any>;
-    unsubscribe(win: string): Promise<any>;
     /**
      * 发送消息
      */

package/esm/drivers/sockets/index.d.ts

@@ -1,2 +1,4 @@
+import ISocket from "./ISocket";
 import SocketFactory from "./SocketFactory";
-export { SocketFactory };
+export * from "./entities";
+export { type ISocket, SocketFactory };

package/esm/drivers/ssos/ISso.d.ts

@@ -7,7 +7,7 @@ interface ISso extends IDriver {
     /**
      * 开启连接
      */
-    open(auth: {
+    openAsync(auth: {
         url: string;
         app_id: string;
     }): Promise<void>;

package/esm/drivers/ssos/Sso.d.ts

@@ -5,7 +5,7 @@ import SsoUser from "./entities/SsoUser";
  */
 declare abstract class Sso implements ISso {
     type: string;
-    abstract open(auth: {
+    abstract openAsync(auth: {
         url: string;
         app_id: string;
     }): Promise<void>;

package/esm/drivers/ssos/SsoFactory.d.ts

@@ -1,5 +1,5 @@
 import ISso from "./ISso";
-import Factory from "../../factorying/Factory";
+import Factory from "../../factory/Factory";
 /**
  * SSO工厂类
  */
@@ -7,7 +7,7 @@ declare class SsoFactory extends Factory<ISso> {
     /**
      * 获取实例
      */
-    get instances(): ISso[];
+    open(): void;
     /**
      * 获取指定SSO实例
      */

package/esm/drivers/ssos/implements/AnonymousSso.d.ts

@@ -7,7 +7,7 @@ declare class AnonymousSso extends Sso {
      * 数据库提供程序
      */
     provider: IProvider;
-    open(auth: {
+    openAsync(auth: {
         url: string;
         app_id: string;
     }): Promise<void>;

package/esm/drivers/ssos/implements/BearerSso.d.ts

@@ -10,7 +10,7 @@ declare class BearerSso implements Sso {
      * 数据库提供程序
      */
     provider: IProvider;
-    open(auth: {
+    openAsync(auth: {
         url: string;
         app_id: string;
     }): Promise<void>;

package/esm/drivers/ssos/implements/NioSso.d.ts

@@ -12,7 +12,7 @@ declare class NioSso implements ISso {
      * 数据库提供程序
      */
     provider: IProvider;
-    open(auth: {
+    openAsync(auth: {
         url: string;
         app_id: string;
     }): Promise<void>;

package/esm/drivers/ssos/implements/SecretSso.d.ts

@@ -7,7 +7,7 @@ declare class SecretSso implements ISso {
      * 数据库提供程序
      */
     provider: IProvider;
-    open(auth: {
+    openAsync(auth: {
         url: string;
         app_id: string;
     }): Promise<void>;

package/esm/drivers/ssos/implements/WeiXinSso.d.ts

@@ -5,7 +5,7 @@ import SsoUser from "../entities/SsoUser";
  */
 declare class WeiXinSso implements ISso {
     type: string;
-    open(auth: {
+    openAsync(auth: {
         url: string;
     }): Promise<void>;
     login(form: any): Promise<any>;

package/esm/drivers/tasks/ITask.d.ts

@@ -14,14 +14,18 @@ interface ITask extends IDriver, IDispose {
     /**
      * 按照频控去执行任务
      */
-    executeFrequency<T>(entities: T[], frequency: number, threads: number, handler: (chunk: T[], index: number) => Promise<void>): Promise<void>;
+    frequency<T>(entities: T[], frequency: number, threads: number, handler: (chunk: T[], index: number) => Promise<void>): Promise<void>;
     /**
      * 按照并发数量控制多个任务执行
      * handler不能直接放置promise，因为promise被传递前的实例化过程就会执行内部方法
-     * 场景：通过并发数为1，来控制不通类库，在并发加载时，define函数冲突问题
+     * 场景：通过并发数为1，控制不通类库在并发加载时，define函数冲突问题
      * 注意：是相同时间的并发数控制，不是1s内的并发数控制
      */
-    concurrent<T>(handler: () => Promise<T>): Promise<T>;
+    concurrent<T>(handler: () => Promise<T>, limit?: number): Promise<T>;
+    /**
+     * 事件防抖: time ms没重复触发才执行指定操作
+     */
+    debounce(fn: (args: any) => Promise<void>, time: number, args?: any): void;
     /**
      * 每间隔指定时间执行指定任务
      */

package/esm/drivers/tasks/Task.d.ts

@@ -6,8 +6,9 @@ declare abstract class Task implements ITask {
     type: string;
     taskLimit: number;
     abstract execute<T>(entities: T[], threads: number, handler: (chunk: T[], index: number) => Promise<void>): Promise<void>;
-    abstract executeFrequency<T>(entities: T[], frequency: number, threads: number, handler: (chunk: T[], index: number) => Promise<void>): Promise<void>;
+    abstract frequency<T>(entities: T[], frequency: number, threads: number, handler: (chunk: T[], index: number) => Promise<void>): Promise<void>;
     abstract concurrent<T>(handler: () => Promise<T>): Promise<T>;
+    abstract debounce(fn: (args: any) => Promise<void>, time: number, args?: any): void;
     abstract interval(ms: number, task: () => void): void;
     abstract dispose(): void;
 }

package/esm/drivers/tasks/TaskFactory.d.ts

@@ -1,9 +1,9 @@
-import Factory from "../../factorying/Factory";
+import Factory from "../../factory/Factory";
 import ITask from "./ITask";
 /**
  * 任务工厂类
  */
 declare class TaskFactory extends Factory<ITask> {
-    get instances(): ITask[];
+    open(): void;
 }
 export default TaskFactory;

package/esm/drivers/tasks/implement/MemoryTask.d.ts

@@ -6,22 +6,24 @@ declare class MemoryTask extends Task {
     type: string;
     intervalTimeout: any;
     execute<T>(entities: T[], threads: number, handler: (chunk: T[], index: number) => Promise<void>): Promise<void>;
-    executeFrequency<T>(entities: T[], frequency: number, threads: number, handler: (chunk: T[], index: number) => Promise<void>): Promise<void>;
+    frequency<T>(entities: T[], frequency: number, threads: number, handler: (chunk: T[], index: number) => Promise<void>): Promise<void>;
     /**
      * 待执行的任务队列
      */
     tasks: (() => Promise<any>)[];
-    taskLimit: number;
     taskExecuting: number;
     taskResolves: ((value: any) => void)[];
     /**
      * 相同时间的并发数控制，不是1s内的并发数控制
      */
-    concurrent<T>(handler: () => Promise<T>): Promise<T>;
+    concurrent<T>(handler: () => Promise<T>, limit?: number): Promise<T>;
     /**
      * 按照并发执行
      */
     private run;
+    lastDebounceTime: number;
+    lastDebounceTimeout: any;
+    debounce: (fn: (args: any) => Promise<void>, time: number, args?: any) => void;
     interval(ms: number, task: () => void): void;
     dispose(): void;
 }

package/esm/drivers/templates/ITemplate.d.ts

@@ -6,6 +6,6 @@ interface ITemplate extends IDriver {
     /**
      * 模板渲染
      */
-    render(template: string, model: any): Promise<string>;
+    renderAsync(template: string, model: any): Promise<string>;
 }
 export default ITemplate;

package/esm/drivers/templates/Template.d.ts

@@ -1,6 +1,6 @@
 import ITemplate from "./ITemplate";
 declare abstract class Template implements ITemplate {
     type: string;
-    abstract render(template: string, model: any): Promise<string>;
+    abstract renderAsync(template: string, model: any): Promise<string>;
 }
 export default Template;

package/esm/drivers/templates/TemplateFactory.d.ts

@@ -1,9 +1,9 @@
-import Factory from "../../factorying/Factory";
+import Factory from "../../factory/Factory";
 import ITemplate from "./ITemplate";
 /**
  * 模板工厂
  */
 declare class TemplateFactory extends Factory<ITemplate> {
-    get instances(): ITemplate[];
+    open(): void;
 }
 export default TemplateFactory;

package/esm/drivers/templates/implement/LiquidTemplate.d.ts

@@ -1,6 +1,6 @@
 import Template from "../Template";
 declare class LiquidTemplate extends Template {
     type: string;
-    render(template: string, model: any): Promise<string>;
+    renderAsync(template: string, model: any): Promise<string>;
 }
 export default LiquidTemplate;

package/esm/drivers/util/UtilFactory.d.ts

@@ -1,4 +1,4 @@
-import { Factory } from "../../factorying";
+import Factory from "../../factory/Factory";
 import IUtil from "./IUtil";
 import { ArrayUtil, BrowserUtil, ComponentUtil, DictionaryUtil, DomUtil, EventUtil, FileUtil, HtmlUtil, ImageUtil, JsonUtil, MathUtil, MicroUtil, MountUtil, ObjectUtil, ScrollUtil, SignUtil, StringUtil, TaskUtil, TimeUtil, TreeUtil, TypeUtil, UrlUtil } from "./";
 /**

package/esm/drivers/util/implements/ArrayUtil.d.ts

@@ -31,19 +31,19 @@ declare class ArrayUtil extends Util {
     /**
      * 求最大值，数据类型的比较函数要自己转换为数值类型
      */
-    max: (entities: any[], func: Function) => any;
+    max: (entities: any[], fn: Function) => any;
     /**
      * 求最小值，数据类型的比较函数要自己转换为数值类型
      */
-    min: (entities: any[], func: Function) => any;
+    min: (entities: any[], fn: Function) => any;
     /**
      * 求平均值
      */
-    avg: (entities: any[], func: Function, digits?: number) => number;
+    avg: (entities: any[], fn: Function, digits?: number) => number;
     /**
      * 求和
      */
-    sum: (entities: any[], func: Function, digits?: number) => number;
+    sum: (entities: any[], fn: Function, digits?: number) => number;
     /**
      * 是否包含
      */
@@ -114,7 +114,7 @@ declare class ArrayUtil extends Util {
     /**
      * 分组
      */
-    groupByArray: (entities: any[], keyFunc: (item: any) => any) => any[];
+    groupByArray: (entities: any[], keyFn: (item: any) => any) => any[];
     /**
      * 替换指定元素为新元素，不存在则添加
      */

package/esm/drivers/util/implements/EventUtil.d.ts

@@ -7,26 +7,26 @@ declare class EventUtil extends Util {
     /**
      * 批量绑定事件，执行指定处理函数
      */
-    bind: (events: any[], dom: any, func: Function) => void;
+    bind: (events: any[], dom: any, fn: Function) => void;
     /**
      * 批量绑定事件，执行指定处理函数
      */
-    unbind: (events: any[], dom: any, func: Function) => void;
+    unbind: (events: any[], dom: any, fn: Function) => void;
     /**
      * 绑定点击处理函数
      */
-    click: (dom: any, func: Function) => void;
+    click: (dom: any, fn: Function) => void;
     /**
      * 解除点击监听
      */
-    unclick: (dom: any, func: Function) => void;
+    unclick: (dom: any, fn: Function) => void;
     /**
      * 绑定滚动处理函数
      */
-    scroll: (dom: any, func: Function) => void;
+    scroll: (dom: any, fn: Function) => void;
     /**
      * 移除滚动处理函数，防止内存泄漏
      */
-    unscroll: (dom: any, func: Function) => void;
+    unscroll: (dom: any, fn: Function) => void;
 }
 export default EventUtil;

package/esm/drivers/util/implements/JsonUtil.d.ts

@@ -13,6 +13,11 @@ declare class JsonUtil extends Util {
      * 把对象格式化为Json字符串
      */
     serialize(value: any, config?: boolean | JsonConfig): string;
+    /**
+     * 自动移除注释，并反序列化
+     * 支持自动去除// 和 \/**\/注释
+     */
+    autoDeserialize(value: string): any;
     /**
      * 反序列化成json对象
      */

package/esm/drivers/util/implements/ObjectUtil.d.ts

@@ -5,7 +5,7 @@ import Util from "../Util";
 declare class ObjectUtil extends Util {
     type: string;
     /**
-     * 净化对象，返回不带默认属性的对象
+     * 净化对象，只清除默认值属性
      */
     pure(input: object): {};
     /**

package/esm/drivers/util/implements/SignUtil.d.ts

@@ -11,6 +11,6 @@ declare class SignUtil extends Util {
     /**
      * 签名字典
      */
-    signDictionary(dictionary: object, encoding?: boolean): any;
+    signDictionary(dictionary: object, encoding?: boolean): string;
 }
 export default SignUtil;

package/esm/drivers/util/implements/StringUtil.d.ts

@@ -55,7 +55,7 @@ declare class StringUtil extends Util {
     /**
      * 判断是否是json
      */
-    isJson: (value: string) => any;
+    isJson: (value: string) => boolean;
     /**
      * 判断是否是isJsonp
      */

package/esm/drivers/util/implements/TimeUtil.d.ts

@@ -35,7 +35,7 @@ declare class TimeUtil extends Util {
     /**
      * 格式化时间
      */
-    formatDateTime: (value: number) => string;
+    formatDateTime: (value: any) => string;
     /**
      * 获取当前日期时间的字符串
      */

package/esm/drivers/utilities/IUtility.d.ts

@@ -1,4 +1,7 @@
 import { IDriver } from "../@types";
+/**
+ * 工具类接口
+ */
 interface IUtility extends IDriver {
 }
 export default IUtility;

package/esm/drivers/utilities/Utility.d.ts

@@ -1,4 +1,7 @@
 import IUtility from "./IUtility";
+/**
+ * 工具类基类
+ */
 declare abstract class Utility implements IUtility {
     type: string;
 }

package/esm/drivers/utilities/UtilityFactory.d.ts

@@ -1,4 +1,4 @@
-import { Factory } from "../../factorying";
+import Factory from "../../factory/Factory";
 import IUtility from "./IUtility";
 import AffixUtility from "./implement/AffixUtility";
 import DeltaUtility from "./implement/DeltaUtility";
@@ -20,23 +20,23 @@ declare class UtilityFactory extends Factory<IUtility> {
      */
     delta(): DeltaUtility;
     /**
-     * 创建固定工具
+     * 创建事件工具
      */
     event(): EventUtility;
     /**
-     * 键盘工具
+     * 创建键盘工具
      */
     keyboard(): KeyboardUtility;
     /**
-     * 鼠标工具
+     * 创建鼠标工具
      */
     mouse(container: HTMLElement, closeTriggers?: any[]): MouseUtility;
     /**
-     * 随机工具
+     * 创建随机工具
      */
     random(): RandomUtility;
     /**
-     * 随机工具
+     * 创建保存工具
      */
     save(): SaveUtility;
 }

package/esm/drivers/utilities/implement/EventUtility.d.ts

@@ -1,9 +1,12 @@
 import { DragOptions } from "../@types";
+import { ITask } from "../../tasks";
 import Utility from "../Utility";
 /**
  * 事件工具类
  */
 declare class EventUtility extends Utility {
+    constructor();
+    resizeTask: ITask;
     resizeObserver: ResizeObserver;
     element: Element;
     resizeHandler: any;
@@ -44,12 +47,6 @@ declare class EventUtility extends Utility {
      * 鼠标按下
      */
     mouseDown(element: Element, mouseDown: (event: MouseEvent) => void, mouseUp: (event: MouseEvent) => void): void;
-    lastDebounceTime: number;
-    lastDebounceTimeout: any;
-    /**
-     * 事件防抖: time ms没重复触发才执行指定操作
-     */
-    debounce: (func: (args: any) => void, time: number, args?: any) => void;
     dispatchElement: HTMLElement;
     /**
      * 创建分发事件元素

package/esm/drivers/utilities/implement/SaveUtility.d.ts

@@ -1,16 +1,61 @@
 import Utility from "../Utility";
+import { ITask } from "../../tasks";
+import { IProvider } from "../../providers";
 /**
  * 自动保存工具
  * 函数式编程，从而可以让方法被多处使用
  */
 declare class SaveUtility extends Utility {
+    /**
+     * 已开启窗口
+     * 使用静态对象记录各自工具类开启的窗口，保证同一个kind工具类，被窗口多开时，能够杜绝异步方法导致的变量不一致问题
+     */
+    static opened: {
+        [kind: string]: string[];
+    };
+    /**
+     * 任务实例，用于控制任务并发
+     */
+    task: ITask;
+    /**
+     * 数据库驱动
+     */
+    provider: IProvider;
+    /**
+     * 内容类别标识
+     */
+    kind: string;
+    /**
+     * 实际对应的数据主键
+     */
+    key: string;
+    /**
+     * 最新表单
+     */
+    form: any;
+    /**
+     * 待删除的主键
+     */
+    oldKey: string;
+    /**
+     * 变动实际处理程序
+     */
+    handler: (val: any, oldVal: any) => Promise<void>;
     /**
      * 开启表单监控
      */
-    open(form: any, store: string, id: string): Promise<void>;
+    openAsync(kind: string, key: string, form: any): Promise<IProvider>;
+    /**
+     * 内容变动监听程序
+     */
+    set changeHandler<T>(value: (val: T, oldVal: T) => Promise<void>);
+    /**
+     * 手动保存
+     */
+    saveAsync(form: any): Promise<void>;
     /**
-     * 资源释放
+     * VIP：资源释放
      */
-    dispose(): void;
+    dispose(dispose?: boolean): Promise<void>;
 }
 export default SaveUtility;

package/esm/drivers/videos/VideoFactory.d.ts

@@ -1,6 +1,6 @@
-import Factory from "../../factorying/Factory";
+import Factory from "../../factory/Factory";
 import IVideo from "./IVideo";
 declare class VideoFactory extends Factory<IVideo> {
-    get instances(): IVideo[];
+    open(): void;
 }
 export default VideoFactory;

package/esm/drivers/voices/VoiceFactory.d.ts

@@ -1,6 +1,6 @@
-import Factory from "../../factorying/Factory";
+import Factory from "../../factory/Factory";
 import { IVoice } from "./IVoice";
 declare class VoiceFactory extends Factory<IVoice> {
-    get instances(): IVoice[];
+    open(): void;
 }
 export default VoiceFactory;