halo-fe 1.0.16 → 1.0.17

package/esm/drivers/cdns/Cdn.d.ts

@@ -1,20 +1,24 @@
 import ICdn from "./ICdn";
+import { ITask } from "../tasks";
 /**
  * CDN抽象基类
  */
 declare abstract class Cdn implements ICdn {
     abstract type: string;
-    abstract open(conn: string): Promise<void>;
+    /**
+     * 任务实例，用于控制并发
+     */
+    task: ITask;
+    open(conn: string): Promise<void>;
     abstract getCrypto(): Promise<any>;
     abstract getECharts(): Promise<any>;
     abstract getElementPlus(): Promise<any>;
     abstract getFortAwesome(): Promise<any>;
-    abstract getMonacoPath(): string;
-    abstract getMonaco(): Promise<any>;
-    abstract getQuill(): Promise<any>;
+    getMonaco(baseUrl?: string): Promise<any>;
+    getQuill(basePath?: string): Promise<any>;
     abstract getWeiXin(): Promise<any>;
     abstract getXlsx(): Promise<any>;
-    loadFilesAsync(path: string, files: string[]): Promise<void>;
+    loadFilesAsync(path: string, files: string[], handler?: () => void): Promise<void>;
     loadAsync(path: string | string[]): Promise<HTMLElement[]>;
     /**
      * 异步加载脚本/样式内容，把内容处理为行内html
@@ -24,6 +28,6 @@ declare abstract class Cdn implements ICdn {
     /**
      * 通过注入DOM标签异步加载脚本或样式表，已防重
      */
-    loadResourceAsync: (url: string | string[]) => Promise<HTMLElement[]>;
+    loadResourceAsync: (url: string | string[], handler?: () => void) => Promise<HTMLElement[]>;
 }
 export default Cdn;

package/esm/drivers/cdns/ICdn.d.ts

@@ -31,10 +31,6 @@ interface ICdn extends IDriver {
      * 加载Monaco编辑器
      */
     getMonaco(): Promise<any>;
-    /**
-     * 获取Monaco编辑器路径
-     */
-    getMonacoPath(): string;
     /**
      * 获取编辑器
      */

package/esm/drivers/cdns/implements/LocalCdn.d.ts

@@ -6,13 +6,11 @@ import Cdn from "../Cdn";
  */
 declare class LocalCdn extends Cdn {
     type: string;
-    open(conn: string): Promise<void>;
     getCrypto(): Promise<any>;
     getECharts(): Promise<any>;
     getElementPlus(): Promise<any>;
     getFortAwesome(): Promise<any>;
     getMonaco(): Promise<any>;
-    getMonacoPath(): string;
     getQuill(): Promise<any>;
     getWeiXin(): Promise<any>;
     getXlsx(): Promise<any>;

package/esm/drivers/cdns/implements/ThirdCdn.d.ts

@@ -1,5 +1,4 @@
 import Cdn from "../Cdn";
-import { ITask } from "../../tasks";
 /**
  * 三方资源包
  * https://unpkg.com
@@ -16,18 +15,12 @@ import { ITask } from "../../tasks";
  */
 declare class ThirdCdn extends Cdn {
     type: string;
-    /**
-     * 任务实例，用于控制并发
-     */
-    task: ITask;
     staticFileCdn: string;
     jdCdn: string;
-    open(conn: string): Promise<void>;
     getCrypto(): Promise<any>;
     getECharts(): Promise<any>;
     getElementPlus(): Promise<any>;
     getFortAwesome(): Promise<any>;
-    getMonacoPath(): string;
     getMonaco(): Promise<any>;
     getQuill(): Promise<any>;
     getWeiXin(): Promise<any>;

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

@@ -3,6 +3,7 @@ import { IDriver, IDispose } from "../types";
  * 任务接口
  */
 interface ITask extends IDriver, IDispose {
+    taskLimit: number;
     /**
      * 多线程执行任务，会在主线程空闲时按顺序执行
      */
@@ -13,9 +14,11 @@ interface ITask extends IDriver, IDispose {
     executeFrequency<T>(entities: T[], frequency: number, threads: number, handler: (chunk: T[], index: number) => Promise<void>): Promise<void>;
     /**
      * 按照并发数量控制多个任务执行
+     * handler不能直接放置promise，因为promise被传递前的实例化过程就会执行内部方法
+     * 场景：通过并发数为1，来控制不通类库，在并发加载时，define函数冲突问题
      * 注意：是相同时间的并发数控制，不是1s内的并发数控制
      */
-    concurrent<T>(handler: Promise<T>, limit: number): Promise<T>;
+    concurrent<T>(handler: () => Promise<T>): Promise<T>;
     /**
      * 每间隔指定时间执行指定任务
      */

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

@@ -4,9 +4,10 @@ import ITask from "./ITask";
  */
 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 concurrent<T>(handler: Promise<T>, total: number): Promise<T>;
+    abstract concurrent<T>(handler: () => Promise<T>): Promise<T>;
     abstract interval(ms: number, task: () => void): void;
     abstract dispose(): void;
 }

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

@@ -10,14 +10,14 @@ declare class MemoryTask extends Task {
     /**
      * 待执行的任务队列
      */
-    tasks: Promise<any>[];
+    tasks: (() => Promise<any>)[];
     taskLimit: number;
     taskExecuting: number;
     taskResolves: ((value: any) => void)[];
     /**
      * 相同时间的并发数控制，不是1s内的并发数控制
      */
-    concurrent<T>(handler: Promise<T>, limit: number): Promise<T>;
+    concurrent<T>(handler: () => Promise<T>): Promise<T>;
     /**
      * 按照并发执行
      */

package/esm/plugins/index.d.ts

@@ -1,5 +1,4 @@
-import loader from "@monaco-editor/loader";
 import type * as Monaco from 'monaco-editor/esm/vs/editor/editor.api';
 import moment from "moment";
 import Ref from "./Ref";
-export { loader, Monaco, moment, Ref };
+export { Monaco, moment, Ref };

package/esm/types/CreateFeOptions.d.ts

@@ -19,6 +19,6 @@ declare class CreateFeOptions {
     /**
      * CDN类型
      */
-    cdn: string;
+    cdn: 'Local' | "Third";
 }
 export default CreateFeOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "halo-fe",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "Halo front end sdk",
   "scripts": {
     "halo-fe:tsc": "vue-tsc",
@@ -33,7 +33,6 @@
     "vue-i18n": "9.13.1"
   },
   "dependencies": {
-    "@monaco-editor/loader": "1.4.0",
     "clone": "2.1.2",
     "file-saver": "2.0.5",
     "liquidjs": "10.16.1",

package/dist/assets/@monaco-editor-BCDRi0Ti.js

@@ -1,258 +0,0 @@
-import { i as w } from "./state-local-CEworIRt.js";
-function O(n, e, r) {
-  return e in n ? Object.defineProperty(n, e, {
-    value: r,
-    enumerable: !0,
-    configurable: !0,
-    writable: !0
-  }) : n[e] = r, n;
-}
-function d(n, e) {
-  var r = Object.keys(n);
-  if (Object.getOwnPropertySymbols) {
-    var t = Object.getOwnPropertySymbols(n);
-    e && (t = t.filter(function(o) {
-      return Object.getOwnPropertyDescriptor(n, o).enumerable;
-    })), r.push.apply(r, t);
-  }
-  return r;
-}
-function m(n) {
-  for (var e = 1; e < arguments.length; e++) {
-    var r = arguments[e] != null ? arguments[e] : {};
-    e % 2 ? d(Object(r), !0).forEach(function(t) {
-      O(n, t, r[t]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(n, Object.getOwnPropertyDescriptors(r)) : d(Object(r)).forEach(function(t) {
-      Object.defineProperty(n, t, Object.getOwnPropertyDescriptor(r, t));
-    });
-  }
-  return n;
-}
-function I(n, e) {
-  if (n == null) return {};
-  var r = {}, t = Object.keys(n), o, i;
-  for (i = 0; i < t.length; i++)
-    o = t[i], !(e.indexOf(o) >= 0) && (r[o] = n[o]);
-  return r;
-}
-function S(n, e) {
-  if (n == null) return {};
-  var r = I(n, e), t, o;
-  if (Object.getOwnPropertySymbols) {
-    var i = Object.getOwnPropertySymbols(n);
-    for (o = 0; o < i.length; o++)
-      t = i[o], !(e.indexOf(t) >= 0) && Object.prototype.propertyIsEnumerable.call(n, t) && (r[t] = n[t]);
-  }
-  return r;
-}
-function P(n, e) {
-  return A(n) || E(n, e) || T(n, e) || C();
-}
-function A(n) {
-  if (Array.isArray(n)) return n;
-}
-function E(n, e) {
-  if (!(typeof Symbol > "u" || !(Symbol.iterator in Object(n)))) {
-    var r = [], t = !0, o = !1, i = void 0;
-    try {
-      for (var a = n[Symbol.iterator](), u; !(t = (u = a.next()).done) && (r.push(u.value), !(e && r.length === e)); t = !0)
-        ;
-    } catch (c) {
-      o = !0, i = c;
-    } finally {
-      try {
-        !t && a.return != null && a.return();
-      } finally {
-        if (o) throw i;
-      }
-    }
-    return r;
-  }
-}
-function T(n, e) {
-  if (n) {
-    if (typeof n == "string") return v(n, e);
-    var r = Object.prototype.toString.call(n).slice(8, -1);
-    if (r === "Object" && n.constructor && (r = n.constructor.name), r === "Map" || r === "Set") return Array.from(n);
-    if (r === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)) return v(n, e);
-  }
-}
-function v(n, e) {
-  (e == null || e > n.length) && (e = n.length);
-  for (var r = 0, t = new Array(e); r < e; r++) t[r] = n[r];
-  return t;
-}
-function C() {
-  throw new TypeError(`Invalid attempt to destructure non-iterable instance.
-In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`);
-}
-var z = {
-  paths: {
-    vs: "https://cdn.jsdelivr.net/npm/monaco-editor@0.43.0/min/vs"
-  }
-};
-function D(n) {
-  return function e() {
-    for (var r = this, t = arguments.length, o = new Array(t), i = 0; i < t; i++)
-      o[i] = arguments[i];
-    return o.length >= n.length ? n.apply(this, o) : function() {
-      for (var a = arguments.length, u = new Array(a), c = 0; c < a; c++)
-        u[c] = arguments[c];
-      return e.apply(r, [].concat(o, u));
-    };
-  };
-}
-function M(n) {
-  return {}.toString.call(n).includes("Object");
-}
-function q(n) {
-  return n || g("configIsRequired"), M(n) || g("configType"), n.urls ? (L(), {
-    paths: {
-      vs: n.urls.monacoBase
-    }
-  }) : n;
-}
-function L() {
-  console.warn(b.deprecation);
-}
-function $(n, e) {
-  throw new Error(n[e] || n.default);
-}
-var b = {
-  configIsRequired: "the configuration object is required",
-  configType: "the configuration object should be an object",
-  default: "an unknown error accured in `@monaco-editor/loader` package",
-  deprecation: `Deprecation warning!
-    You are using deprecated way of configuration.
-
-    Instead of using
-      monaco.config({ urls: { monacoBase: '...' } })
-    use
-      monaco.config({ paths: { vs: '...' } })
-
-    For more please check the link https://github.com/suren-atoyan/monaco-loader#config
-  `
-}, g = D($)(b), R = {
-  config: q
-}, _ = function() {
-  for (var e = arguments.length, r = new Array(e), t = 0; t < e; t++)
-    r[t] = arguments[t];
-  return function(o) {
-    return r.reduceRight(function(i, a) {
-      return a(i);
-    }, o);
-  };
-};
-function h(n, e) {
-  return Object.keys(e).forEach(function(r) {
-    e[r] instanceof Object && n[r] && Object.assign(e[r], h(n[r], e[r]));
-  }), m(m({}, n), e);
-}
-var x = {
-  type: "cancelation",
-  msg: "operation is manually canceled"
-};
-function s(n) {
-  var e = !1, r = new Promise(function(t, o) {
-    n.then(function(i) {
-      return e ? o(x) : t(i);
-    }), n.catch(o);
-  });
-  return r.cancel = function() {
-    return e = !0;
-  }, r;
-}
-var W = w.create({
-  config: z,
-  isInitialized: !1,
-  resolve: null,
-  reject: null,
-  monaco: null
-}), y = P(W, 2), f = y[0], l = y[1];
-function B(n) {
-  var e = R.config(n), r = e.monaco, t = S(e, ["monaco"]);
-  l(function(o) {
-    return {
-      config: h(o.config, t),
-      monaco: r
-    };
-  });
-}
-function H() {
-  var n = f(function(e) {
-    var r = e.monaco, t = e.isInitialized, o = e.resolve;
-    return {
-      monaco: r,
-      isInitialized: t,
-      resolve: o
-    };
-  });
-  if (!n.isInitialized) {
-    if (l({
-      isInitialized: !0
-    }), n.monaco)
-      return n.resolve(n.monaco), s(p);
-    if (window.monaco && window.monaco.editor)
-      return j(window.monaco), n.resolve(window.monaco), s(p);
-    _(N, G)(K);
-  }
-  return s(p);
-}
-function N(n) {
-  return document.body.appendChild(n);
-}
-function F(n) {
-  var e = document.createElement("script");
-  return n && (e.src = n), e;
-}
-function G(n) {
-  var e = f(function(t) {
-    var o = t.config, i = t.reject;
-    return {
-      config: o,
-      reject: i
-    };
-  }), r = F("".concat(e.config.paths.vs, "/loader.js"));
-  return r.onload = function() {
-    return n();
-  }, r.onerror = e.reject, r;
-}
-function K() {
-  var n = f(function(r) {
-    var t = r.config, o = r.resolve, i = r.reject;
-    return {
-      config: t,
-      resolve: o,
-      reject: i
-    };
-  }), e = window.require;
-  e.config(n.config), e(["vs/editor/editor.main"], function(r) {
-    j(r), n.resolve(r);
-  }, function(r) {
-    n.reject(r);
-  });
-}
-function j(n) {
-  f().monaco || l({
-    monaco: n
-  });
-}
-function U() {
-  return f(function(n) {
-    var e = n.monaco;
-    return e;
-  });
-}
-var p = new Promise(function(n, e) {
-  return l({
-    resolve: n,
-    reject: e
-  });
-}), J = {
-  config: B,
-  init: H,
-  __getMonacoInstance: U
-};
-export {
-  J as l
-};

package/dist/assets/state-local-CEworIRt.js

@@ -1,131 +0,0 @@
-function O(e, t, n) {
-  return t in e ? Object.defineProperty(e, t, {
-    value: n,
-    enumerable: !0,
-    configurable: !0,
-    writable: !0
-  }) : e[t] = n, e;
-}
-function g(e, t) {
-  var n = Object.keys(e);
-  if (Object.getOwnPropertySymbols) {
-    var r = Object.getOwnPropertySymbols(e);
-    t && (r = r.filter(function(i) {
-      return Object.getOwnPropertyDescriptor(e, i).enumerable;
-    })), n.push.apply(n, r);
-  }
-  return n;
-}
-function v(e) {
-  for (var t = 1; t < arguments.length; t++) {
-    var n = arguments[t] != null ? arguments[t] : {};
-    t % 2 ? g(Object(n), !0).forEach(function(r) {
-      O(e, r, n[r]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(n)) : g(Object(n)).forEach(function(r) {
-      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(n, r));
-    });
-  }
-  return e;
-}
-function y() {
-  for (var e = arguments.length, t = new Array(e), n = 0; n < e; n++)
-    t[n] = arguments[n];
-  return function(r) {
-    return t.reduceRight(function(i, a) {
-      return a(i);
-    }, r);
-  };
-}
-function c(e) {
-  return function t() {
-    for (var n = this, r = arguments.length, i = new Array(r), a = 0; a < r; a++)
-      i[a] = arguments[a];
-    return i.length >= e.length ? e.apply(this, i) : function() {
-      for (var f = arguments.length, s = new Array(f), o = 0; o < f; o++)
-        s[o] = arguments[o];
-      return t.apply(n, [].concat(i, s));
-    };
-  };
-}
-function h(e) {
-  return {}.toString.call(e).includes("Object");
-}
-function m(e) {
-  return !Object.keys(e).length;
-}
-function l(e) {
-  return typeof e == "function";
-}
-function j(e, t) {
-  return Object.prototype.hasOwnProperty.call(e, t);
-}
-function w(e, t) {
-  return h(t) || u("changeType"), Object.keys(t).some(function(n) {
-    return !j(e, n);
-  }) && u("changeField"), t;
-}
-function P(e) {
-  l(e) || u("selectorType");
-}
-function T(e) {
-  l(e) || h(e) || u("handlerType"), h(e) && Object.values(e).some(function(t) {
-    return !l(t);
-  }) && u("handlersType");
-}
-function S(e) {
-  e || u("initialIsRequired"), h(e) || u("initialType"), m(e) && u("initialContent");
-}
-function E(e, t) {
-  throw new Error(e[t] || e.default);
-}
-var D = {
-  initialIsRequired: "initial state is required",
-  initialType: "initial state should be an object",
-  initialContent: "initial state shouldn't be an empty object",
-  handlerType: "handler should be an object or a function",
-  handlersType: "all handlers should be a functions",
-  selectorType: "selector should be a function",
-  changeType: "provided value of changes should be an object",
-  changeField: 'it seams you want to change a field in the state which is not specified in the "initial" state',
-  default: "an unknown error accured in `state-local` package"
-}, u = c(E)(D), p = {
-  changes: w,
-  selector: P,
-  handler: T,
-  initial: S
-};
-function q(e) {
-  var t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-  p.initial(e), p.handler(t);
-  var n = {
-    current: e
-  }, r = c(I)(n, t), i = c(F)(n), a = c(p.changes)(e), f = c(C)(n);
-  function s() {
-    var d = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : function(b) {
-      return b;
-    };
-    return p.selector(d), d(n.current);
-  }
-  function o(d) {
-    y(r, i, a, f)(d);
-  }
-  return [s, o];
-}
-function C(e, t) {
-  return l(t) ? t(e.current) : t;
-}
-function F(e, t) {
-  return e.current = v(v({}, e.current), t), t;
-}
-function I(e, t, n) {
-  return l(t) ? t(e.current) : Object.keys(n).forEach(function(r) {
-    var i;
-    return (i = t[r]) === null || i === void 0 ? void 0 : i.call(t, e.current[r]);
-  }), n;
-}
-var R = {
-  create: q
-};
-export {
-  R as i
-};