@ibiz-template/core 0.0.1-beta.1 → 0.0.2-beta.0

package/out/utils/sync/count-latch.d.ts

@@ -0,0 +1,60 @@
+/**
+ * 计数插销工具类
+ *
+ * @author lxm
+ * @date 2022-11-24 19:11:49
+ * @export
+ * @class CountLatch
+ */
+export declare class CountLatch {
+    private promise;
+    private resolve;
+    /**
+     * 计数，当前等待的异步逻辑个数
+     *
+     * @author lxm
+     * @date 2022-11-24 19:11:59
+     * @type {number}
+     */
+    count: number;
+    /**
+     * 开启promise
+     *
+     * @author lxm
+     * @date 2022-11-24 19:11:32
+     * @private
+     */
+    private startPromise;
+    /**
+     * 结束promise
+     *
+     * @author lxm
+     * @date 2022-11-24 19:11:44
+     * @private
+     */
+    private endPromise;
+    /**
+     * 上锁，计数加一
+     * 第一次计数，开启异步
+     *
+     * @author lxm
+     * @date 2022-11-24 19:11:27
+     */
+    lock(): void;
+    /**
+     * 解锁，计数减一
+     * 归零时结束异步
+     *
+     * @author lxm
+     * @date 2022-11-24 19:11:47
+     */
+    unlock(): void;
+    /**
+     * 等待，计数归零异步结束
+     *
+     * @author lxm
+     * @date 2022-11-24 19:11:20
+     */
+    await(): Promise<void>;
+}
+//# sourceMappingURL=count-latch.d.ts.map

package/out/utils/sync/count-latch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"count-latch.d.ts","sourceRoot":"","sources":["../../../src/utils/sync/count-latch.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAA8B;IAE7C,OAAO,CAAC,OAAO,CAAwC;IAEvD;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAK;IAElB;;;;;;OAMG;IACH,OAAO,CAAC,YAAY;IAMpB;;;;;;OAMG;IACH,OAAO,CAAC,UAAU;IAQlB;;;;;;OAMG;IACH,IAAI;IASJ;;;;;;OAMG;IACH,MAAM;IAYN;;;;;OAKG;IACG,KAAK;CAKZ"}

package/out/utils/sync/count-latch.js

@@ -0,0 +1,93 @@
+import { RuntimeError } from '../../error';
+/**
+ * 计数插销工具类
+ *
+ * @author lxm
+ * @date 2022-11-24 19:11:49
+ * @export
+ * @class CountLatch
+ */
+export class CountLatch {
+    constructor() {
+        this.promise = null;
+        this.resolve = null;
+        /**
+         * 计数，当前等待的异步逻辑个数
+         *
+         * @author lxm
+         * @date 2022-11-24 19:11:59
+         * @type {number}
+         */
+        this.count = 0;
+    }
+    /**
+     * 开启promise
+     *
+     * @author lxm
+     * @date 2022-11-24 19:11:32
+     * @private
+     */
+    startPromise() {
+        this.promise = new Promise(resolve => {
+            this.resolve = resolve;
+        });
+    }
+    /**
+     * 结束promise
+     *
+     * @author lxm
+     * @date 2022-11-24 19:11:44
+     * @private
+     */
+    endPromise() {
+        if (this.resolve) {
+            this.resolve();
+            this.resolve = null;
+            this.promise = null;
+        }
+    }
+    /**
+     * 上锁，计数加一
+     * 第一次计数，开启异步
+     *
+     * @author lxm
+     * @date 2022-11-24 19:11:27
+     */
+    lock() {
+        console.log('lock');
+        this.count += 1;
+        if (!this.promise) {
+            console.log('startPromise');
+            this.startPromise();
+        }
+    }
+    /**
+     * 解锁，计数减一
+     * 归零时结束异步
+     *
+     * @author lxm
+     * @date 2022-11-24 19:11:47
+     */
+    unlock() {
+        if (this.count < 1) {
+            throw new RuntimeError('lock和unlock次数不匹配！');
+        }
+        console.log('unlock');
+        this.count -= 1;
+        if (this.count === 0) {
+            debugger;
+            this.endPromise();
+        }
+    }
+    /**
+     * 等待，计数归零异步结束
+     *
+     * @author lxm
+     * @date 2022-11-24 19:11:20
+     */
+    async await() {
+        if (this.promise) {
+            await this.promise;
+        }
+    }
+}

package/out/utils/sync/index.d.ts

@@ -0,0 +1,2 @@
+export { CountLatch } from './count-latch';
+//# sourceMappingURL=index.d.ts.map

package/out/utils/sync/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/sync/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC"}

package/out/utils/sync/index.js

@@ -0,0 +1 @@
+export { CountLatch } from './count-latch';

package/out/utils/upload/select-file.d.ts

@@ -0,0 +1,53 @@
+/**
+ * 文件List转数组
+ *
+ * @author lxm
+ * @date 2022-11-18 13:11:03
+ * @export
+ * @param {FileList} fileList
+ * @returns {*}
+ */
+export declare function fileListToArr(fileList: FileList): File[];
+/**
+ * JS打开文件上传操作配置参数
+ *
+ * @author lxm
+ * @date 2022-11-20 21:11:47
+ * @export
+ * @interface SelectFileOpts
+ */
+export interface SelectFileOpts {
+    /**
+     * 接受的文件类型
+     *
+     * @author lxm
+     * @date 2022-11-20 21:11:52
+     * @type {string}
+     */
+    accept?: string;
+    /**
+     * 是否支持多选
+     *
+     * @author lxm
+     * @date 2022-11-20 21:11:52
+     * @type {boolean}
+     */
+    multiple?: boolean;
+    /**
+     * 选中文件后回调
+     *
+     * @author lxm
+     * @date 2022-11-20 21:11:50
+     */
+    onSelected: (_fileList: File[]) => void;
+}
+/**
+ * JS打开文件上传操作
+ *
+ * @author lxm
+ * @date 2022-11-20 21:11:31
+ * @export
+ * @param {SelectFileOpts} _opts 配置参数
+ */
+export declare function selectFile(_opts: SelectFileOpts): void;
+//# sourceMappingURL=select-file.d.ts.map

package/out/utils/upload/select-file.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"select-file.d.ts","sourceRoot":"","sources":["../../../src/utils/upload/select-file.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,EAAE,CAMxD;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;OAKG;IACH,UAAU,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;CACzC;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,cAAc,QAwB/C"}

package/out/utils/upload/select-file.js

@@ -0,0 +1,47 @@
+import { merge } from 'lodash-es';
+/**
+ * 文件List转数组
+ *
+ * @author lxm
+ * @date 2022-11-18 13:11:03
+ * @export
+ * @param {FileList} fileList
+ * @returns {*}
+ */
+export function fileListToArr(fileList) {
+    const files = [];
+    for (let i = 0; i < fileList.length; i++) {
+        files.push(fileList[i]);
+    }
+    return files;
+}
+/**
+ * JS打开文件上传操作
+ *
+ * @author lxm
+ * @date 2022-11-20 21:11:31
+ * @export
+ * @param {SelectFileOpts} _opts 配置参数
+ */
+export function selectFile(_opts) {
+    const opts = merge({
+        multiple: true,
+        accept: '',
+    }, _opts);
+    const input = document.createElement('input');
+    input.setAttribute('type', 'file');
+    input.setAttribute('multiple', `${opts.multiple}`);
+    input.setAttribute('accept', opts.accept);
+    input.onchange = e => {
+        const inputEl = e.target;
+        const files = inputEl.files ? fileListToArr(inputEl.files) : [];
+        if (files.length === 0) {
+            return;
+        }
+        opts.onSelected(files);
+        inputEl.value = ''; // 如果不置空，相同的文件不会触发change事件
+    };
+    document.body.appendChild(input);
+    input.click();
+    document.body.removeChild(input);
+}

package/out/utils/upload/upload-file.d.ts

@@ -0,0 +1,46 @@
+import { HttpResponse } from '../net/http-response';
+export interface IUploadFile {
+    name: string;
+    uid: string;
+    status: 'uploading' | 'finished' | 'fail' | 'cancel';
+    percentage: number;
+    response?: HttpResponse;
+    error?: unknown;
+}
+export interface IUploadFileOpts {
+    uploadUrl: string;
+    /**
+     * 接受的文件类型
+     *
+     * @author lxm
+     * @date 2022-11-20 21:11:52
+     * @type {string}
+     */
+    accept?: string;
+    /**
+     * 是否支持多选
+     *
+     * @author lxm
+     * @date 2022-11-20 21:11:52
+     * @type {Boolean}
+     */
+    multiple?: boolean;
+    separate?: string;
+    request?: (_files: File[]) => Promise<HttpResponse>;
+    beforeUpload?: (_fileData: File[], _files: IUploadFile[]) => boolean;
+    finish?: (_resultFiles: IUploadFile[]) => void;
+    success?: (_resultFiles: IUploadFile[], _res: HttpResponse) => void;
+    error?: (_resultFiles: IUploadFile[], _error: unknown) => void;
+    progress?: (_files: IUploadFile[]) => void;
+}
+/**
+ * 使用上传文件逻辑
+ *
+ * @author lxm
+ * @date 2022-11-20 21:11:52
+ * @export
+ * @param {IUploadFileOpts} _opts
+ * @returns {*}
+ */
+export declare function uploadFile(_opts: IUploadFileOpts): void;
+//# sourceMappingURL=upload-file.d.ts.map

package/out/utils/upload/upload-file.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upload-file.d.ts","sourceRoot":"","sources":["../../../src/utils/upload/upload-file.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,CAAC;IACrD,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IACpD,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,OAAO,CAAC;IACrE,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;IAC/C,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACpE,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAC/D,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;CAC5C;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,QA2JhD"}

package/out/utils/upload/upload-file.js

@@ -0,0 +1,151 @@
+/* eslint-disable @typescript-eslint/no-empty-function */
+/* eslint-disable no-param-reassign */
+import { cloneDeep, isFunction, merge, round, uniqueId } from 'lodash-es';
+import { selectFile } from './select-file';
+/**
+ * 使用上传文件逻辑
+ *
+ * @author lxm
+ * @date 2022-11-20 21:11:52
+ * @export
+ * @param {IUploadFileOpts} _opts
+ * @returns {*}
+ */
+export function uploadFile(_opts) {
+    const opts = merge({
+        multiple: true,
+        accept: '',
+        separate: true,
+        beforeUpload: (_fileData, _files) => true,
+        finish: (_resultFiles) => { },
+        success: (_resultFiles, _res) => { },
+        error: (_resultFiles, _error) => { },
+        progress: (_files) => { },
+    }, _opts);
+    /**
+     * 进度条回调
+     *
+     * @author lxm
+     * @date 2022-11-20 21:11:47
+     * @param {IParams} event
+     * @param {IUploadFile[]} files
+     */
+    const onUploadProgress = (event, files) => {
+        files.forEach(file => {
+            file.percentage = round(event.progress * 100);
+        });
+        opts.progress(cloneDeep(files));
+    };
+    /**
+     * 上传请求方法，返回响应对象
+     *
+     * @author lxm
+     * @date 2022-11-18 13:11:57
+     * @param {File[]} files
+     * @returns {*}  {Promise<HttpResponse>}
+     */
+    const uploadRequest = async (files, _onProgress) => {
+        // 自定义上传请求
+        if (opts.request && isFunction(opts.request)) {
+            return opts.request(files);
+        }
+        // 默认每次单个文件上传，可能存在接口一次上传多个文件,
+        const data = new FormData();
+        files.forEach(file => {
+            data.append('file', file);
+        });
+        // const res = await ibiz.net.request(opts.uploadUrl, {
+        //   method: 'post',
+        //   baseURL: '',
+        //   data,
+        //   headers: { 'Content-Type': 'multipart/form-data' },
+        //   onUploadProgress: onProgress,
+        // });
+        // return res;
+        throw new Error(`多应用模式等待重新实现请求`);
+    };
+    /**
+     * 执行一次上传，可能是一个文件也可能是多个文件
+     *
+     * @author lxm
+     * @date 2022-11-18 14:11:54
+     * @param {File[]} files 此次上传文件的集合
+     * @returns {*}  {Promise<IUploadFile[]>}
+     */
+    const executeSingleUpload = async (files) => {
+        const resultFiles = files.map(file => {
+            return {
+                status: 'uploading',
+                name: file.name,
+                uid: uniqueId(),
+                percentage: 0,
+            };
+        });
+        // 上传前回调，可以取消此次下载
+        const pass = opts.beforeUpload(files, resultFiles);
+        if (!pass) {
+            resultFiles.forEach(file => {
+                file.status = 'cancel';
+            });
+            ibiz.log.debug('取消上传', resultFiles);
+            return resultFiles;
+        }
+        try {
+            const res = await uploadRequest(files, event => {
+                onUploadProgress(event, resultFiles);
+            });
+            resultFiles.forEach(file => {
+                file.status = 'finished';
+            });
+            // 上传成功事件
+            opts.success(resultFiles, res);
+            resultFiles.forEach(file => {
+                file.response = res;
+            });
+        }
+        catch (error) {
+            resultFiles.forEach(file => {
+                file.status = 'fail';
+            });
+            // 上传失败事件
+            opts.error(resultFiles, error);
+            resultFiles.forEach(file => {
+                file.error = error;
+            });
+            ibiz.log.error(error);
+            ibiz.log.error(`${files.map(file => file.name).join(',')}上传失败`);
+        }
+        return resultFiles;
+    };
+    /**
+     * 执行上传文件逻辑
+     *
+     * @author lxm
+     * @date 2022-11-18 13:11:21
+     * @param {files} File[] 文件集合
+     */
+    const uploadFiles = async (files) => {
+        const uploadSequence = opts.separate ? files.map(file => [file]) : [files];
+        const res = await Promise.allSettled(uploadSequence.map(async (sequence) => {
+            return executeSingleUpload(sequence);
+        }));
+        // 整合所有的返回文件
+        const resultFiles = [];
+        res.forEach(result => {
+            if (result.status === 'fulfilled') {
+                resultFiles.push(...result.value);
+            }
+        });
+        opts.finish(resultFiles);
+    };
+    const select = () => {
+        selectFile({
+            accept: opts.accept,
+            multiple: opts.multiple,
+            onSelected: files => {
+                uploadFiles(files);
+            },
+        });
+    };
+    select();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/core",
-  "version": "0.0.1-beta.1",
+  "version": "0.0.2-beta.0",
   "description": "核心包",
   "type": "module",
   "main": "out/index.js",
@@ -30,7 +30,7 @@
   "author": "chitanda",
   "license": "MIT",
   "dependencies": {
-    "axios": "^1.1.3",
+    "axios": "^1.2.1",
     "loglevel": "^1.8.0",
     "pluralize": "^8.0.0",
     "qs": "^6.11.0"
@@ -45,5 +45,5 @@
     "lodash-es": "^4.17.21",
     "qx-util": "^0.4.4"
   },
-  "gitHead": "9514cbc720208af6160c67bc43e822262274da1f"
+  "gitHead": "d506d4940ad41b04bd65281df0eb2b444321be16"
 }

package/src/command/command-register.ts

@@ -0,0 +1,135 @@
+import {
+  ICommand,
+  ICommandHandler,
+  ICommandOption,
+  ICommandRegistry,
+  ICommandsMap,
+  IDisposable,
+} from './interface';
+import { LinkedList, toDisposable } from './utils';
+
+/**
+ * 命令注册中心
+ *
+ * @author chitanda
+ * @date 2022-06-27 13:06:50
+ * @export
+ * @class CommandRegisterService
+ * @implements {ICommandRegistry}
+ */
+export class CommandsRegistry implements ICommandRegistry {
+  /**
+   * 已经注册的所有指令
+   *
+   * @author chitanda
+   * @date 2022-07-21 15:07:47
+   * @private
+   */
+  private readonly commands = new Map<string, LinkedList<ICommand>>();
+
+  /**
+   * 注册指令
+   *
+   * @author chitanda
+   * @date 2022-06-27 13:06:31
+   * @param {(string | ICommand)} idOrCommand
+   * @param {ICommandHandler} [handler]
+   * @return {*}  {IDisposable}
+   */
+  registerCommand(
+    idOrCommand: string | ICommand,
+    handler?: ICommandHandler,
+    opts?: ICommandOption,
+  ): IDisposable {
+    if (!idOrCommand) {
+      throw new Error(`invalid command`);
+    }
+
+    if (typeof idOrCommand === 'string') {
+      if (!handler) {
+        throw new Error(`invalid command`);
+      }
+      return this.registerCommand({ id: idOrCommand, handler, opts });
+    }
+
+    const { id } = idOrCommand;
+
+    let commands = this.commands.get(id);
+    if (!commands) {
+      commands = new LinkedList<ICommand>();
+      this.commands.set(id, commands);
+    }
+
+    const removeFn = commands.unshift(idOrCommand);
+
+    const ret = toDisposable(() => {
+      removeFn();
+      const command = this.commands.get(id);
+      if (command?.isEmpty()) {
+        this.commands.delete(id);
+      }
+    });
+
+    return ret;
+  }
+
+  /**
+   * 指令是否已经注册
+   *
+   * @author chitanda
+   * @date 2022-07-21 15:07:58
+   * @param {string} id
+   * @return {*}  {boolean}
+   */
+  hasCommand(id: string): boolean {
+    return this.commands.has(id);
+  }
+
+  /**
+   * 查找指令
+   *
+   * @author chitanda
+   * @date 2022-07-21 16:07:12
+   * @param {string} id
+   * @return {*}  {(ICommand | undefined)}
+   */
+  getCommand(id: string): ICommand | undefined {
+    const list = this.commands.get(id);
+    if (!list || list.isEmpty()) {
+      return undefined;
+    }
+    return list[Symbol.iterator]().next().value;
+  }
+
+  /**
+   * 获取所有指令
+   *
+   * @author chitanda
+   * @date 2022-07-21 16:07:20
+   * @return {*}  {ICommandsMap}
+   */
+  getCommands(): ICommandsMap {
+    const result = new Map<string, ICommand>();
+    const keys = this.commands.keys();
+    for (const key of keys) {
+      const command = this.getCommand(key);
+      if (command) {
+        result.set(key, command);
+      }
+    }
+    return result;
+  }
+
+  /**
+   * 获取指令配置参数
+   *
+   * @author chitanda
+   * @date 2022-07-21 16:07:27
+   * @param {string} id
+   * @return {*}  {(ICommandOption | undefined)}
+   */
+  getCommandOpt(id: string): ICommandOption | undefined {
+    const cmd = this.getCommand(id);
+    return cmd?.opts;
+  }
+}