@cloud-app-dev/vidc 2.0.0-alpha.9 → 2.1.0-alpha.10

package/es/LoaderApp/index.js

@@ -1,3 +1,5 @@
+import _useUnmount from "ahooks/es/useUnmount";
+import _useMount from "ahooks/es/useMount";
 import _uuid from "@cloud-app-dev/utils/es/uuid";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -13,7 +15,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { __awaiter } from "tslib";
-import React, { useRef, useEffect, useState, useMemo } from 'react';
+import React, { useRef, useState, useMemo } from 'react';
 import { getMicroConfig } from './utils';
 import LoaderModule from './loader';
 import "./index.css";
@@ -36,23 +38,33 @@ function LoaderApp(_ref) {
       status = _useState2[0],
       setStatus = _useState2[1];
 
-  useEffect(function () {
-    var app;
+  _useMount(function () {
     var config = getMicroConfig(appConfig, appProps, domRef.current);
 
     if (!config) {
-      console.debug('微应用不存在', 'config ->', appConfig, 'appProps ->', appProps);
+      console.error('微应用不存在', 'config ->', appConfig, 'appProps ->', appProps);
+      return undefined;
+    }
+
+    if (!domRef.current || !styleRef.current) {
+      console.error('LoaderApp组件未正常初始化！', 'config ->', appConfig, 'appProps ->', appProps);
       return undefined;
     }
 
     var props = Object.assign(Object.assign({}, appProps), {
       container: domRef.current
     });
+    var routerPrefix = config.routerPrefix;
+
+    var _appConfig$resource = _slicedToArray(appConfig.resource, 2),
+        script = _appConfig$resource[0],
+        style = _appConfig$resource[1];
+
     var options = {
-      script: appConfig.resource[0],
-      style: appConfig.resource[1],
-      name: config.name,
-      prefix: ".".concat(appConfig.name, "-").concat(id),
+      script: script,
+      style: style,
+      name: routerPrefix,
+      prefix: ".".concat(routerPrefix, "-").concat(id),
       styleNode: styleRef.current
     };
     LoaderModule(options).then(function (mod) {
@@ -61,26 +73,25 @@ function LoaderApp(_ref) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                app = mod;
                 loadedAppRef.current = mod;
 
                 if (!status) {
-                  _context.next = 5;
+                  _context.next = 4;
                   break;
                 }
 
-                _context.next = 5;
-                return app.bootstrap(props);
+                _context.next = 4;
+                return mod.bootstrap(props);
 
-              case 5:
+              case 4:
                 setStatus('bootstrap');
-                _context.next = 8;
-                return app.mount(props);
+                _context.next = 7;
+                return mod.mount(props);
 
-              case 8:
+              case 7:
                 setStatus('mount');
 
-              case 9:
+              case 8:
               case "end":
                 return _context.stop();
             }
@@ -88,28 +99,20 @@ function LoaderApp(_ref) {
         }, _callee);
       }));
     });
-    return function () {
-      try {
-        app.unmount(props);
-        setStatus('unmount');
-        app = null;
-      } catch (error) {
-        console.error(error);
-      }
-    };
-  }, []);
-  useEffect(function () {
-    var currentId = appProps.currentId,
-        tabId = appProps.tabId;
+  });
 
-    if (currentId === tabId && loadedAppRef.current) {
+  _useUnmount(function () {
+    if (loadedAppRef.current) {
+      var app = loadedAppRef.current;
       var props = Object.assign(Object.assign({}, appProps), {
         container: domRef.current
       });
-      console.debug('执行更新！', appProps);
-      loadedAppRef.current.update && loadedAppRef.current.update(props);
+      app.unmount(props);
+      setStatus('unmount');
+      loadedAppRef.current = null;
     }
-  }, [appProps.currentId, appProps.tabId, appProps.updateTime]);
+  });
+
   return /*#__PURE__*/React.createElement("main", {
     ref: domRef,
     className: "loaded-app-layout ".concat(appConfig.routerPrefix, "-").concat(id),
@@ -127,6 +130,7 @@ function LoaderApp(_ref) {
 
 LoaderApp.defaultProps = {
   appConfig: {},
-  appProps: {}
+  appProps: {},
+  style: {}
 };
 export default LoaderApp;

package/es/LoaderApp/loader.js

@@ -1,5 +1,5 @@
 import { __awaiter } from "tslib";
-import { arrayify, rewrite } from './utils';
+import { arrayify, fetchStyle, rewrite } from './utils';
 var _global = window;
 export function createScopedCssText(_ref) {
   var styleNode = _ref.styleNode,
@@ -27,11 +27,7 @@ export function LoaderStyle(_ref2) {
             }
 
             _context.next = 3;
-            return fetch(style).then(function (r) {
-              return r.text();
-            }).catch(function () {
-              return '';
-            });
+            return fetchStyle(style);
 
           case 3:
             cssText = _context.sent;

package/es/LoaderApp/utils.d.ts

@@ -1,6 +1,7 @@
 import { AppItemType } from '../Config/interface';
 export declare const getMicroConfig: (appConfig: AppItemType, appProps: any, container: HTMLDivElement) => {
-    name: string;
+    title: string;
+    routerPrefix: string;
     container: HTMLDivElement;
     props: any;
     entry: {
@@ -9,5 +10,6 @@ export declare const getMicroConfig: (appConfig: AppItemType, appProps: any, con
         html: string;
     };
 };
+export declare function fetchStyle(style: string): Promise<string>;
 export declare const arrayify: <T>(list: CSSRuleList | any[]) => T[];
 export declare function rewrite(rules: CSSRule[], prefix?: string): string;

package/es/LoaderApp/utils.js

@@ -1,21 +1,60 @@
+import { __awaiter } from "tslib";
 export var getMicroConfig = function getMicroConfig() {
   var appConfig = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var appProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var container = arguments.length > 2 ? arguments[2] : undefined;
   var routerPrefix = appConfig.routerPrefix,
-      resource = appConfig.resource;
+      resource = appConfig.resource,
+      name = appConfig.name;
   var microAppEntry = {
     scripts: [resource[0]],
     styles: [resource[1]],
     html: "<div id=\"".concat(routerPrefix, "\" style=\"height:100%\"></div>")
   };
   return {
-    name: routerPrefix,
+    title: name,
+    routerPrefix: routerPrefix,
     container: container,
     props: appProps,
     entry: microAppEntry
   };
 };
+var styleCache = {};
+export function fetchStyle(style) {
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var cssText;
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            if (!styleCache[style]) {
+              _context.next = 2;
+              break;
+            }
+
+            return _context.abrupt("return", styleCache[style]);
+
+          case 2:
+            _context.next = 4;
+            return fetch(style).then(function (r) {
+              return r.text();
+            }).catch(function () {
+              return '';
+            });
+
+          case 4:
+            cssText = _context.sent;
+            styleCache[style] = cssText;
+            return _context.abrupt("return", cssText);
+
+          case 7:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+}
 var RuleType = {
   // type: rule will be rewrote
   STYLE: 1,
@@ -68,7 +107,8 @@ function ruleStyle(rule, prefix) {
   // handle :root { ... }
 
   if (selector === 'html' || selector === 'body' || selector === ':root') {
-    return cssText.replace(rootSelectorRE, prefix);
+    return ''; //微应用模式下清楚顶层样式
+    // return cssText.replace(rootSelectorRE, prefix);
   } // handle html body { ... }
   // handle html > body { ... }
 

package/es/LoaderScript/index.js

@@ -10,14 +10,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import { __asyncValues, __awaiter } from "tslib";
 import React, { useEffect, useState } from 'react';
-import { createAsyncIterable } from './utils';
-import { nextTick, tryCatch } from '../utils';
+import { createAsyncIterable, runAsyncIterable } from './utils';
 
 function LoaderScripts(_ref) {
-  var _this = this;
-
   var _ref$options = _ref.options,
       options = _ref$options === void 0 ? [] : _ref$options,
       children = _ref.children,
@@ -35,90 +31,12 @@ function LoaderScripts(_ref) {
       return setInitStatus(true);
     }
 
-    var asyncIter = createAsyncIterable(options);
-    tryCatch(function () {
-      return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-        var e_1, _a, asyncIter_1, asyncIter_1_1, x;
-
-        return regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.prev = 0;
-                asyncIter_1 = __asyncValues(asyncIter);
-
-              case 2:
-                _context.next = 4;
-                return asyncIter_1.next();
-
-              case 4:
-                asyncIter_1_1 = _context.sent;
-
-                if (asyncIter_1_1.done) {
-                  _context.next = 10;
-                  break;
-                }
-
-                x = asyncIter_1_1.value;
-                console.log('加载完成！', options[x]);
-
-              case 8:
-                _context.next = 2;
-                break;
-
-              case 10:
-                _context.next = 15;
-                break;
-
-              case 12:
-                _context.prev = 12;
-                _context.t0 = _context["catch"](0);
-                e_1 = {
-                  error: _context.t0
-                };
-
-              case 15:
-                _context.prev = 15;
-                _context.prev = 16;
-
-                if (!(asyncIter_1_1 && !asyncIter_1_1.done && (_a = asyncIter_1.return))) {
-                  _context.next = 20;
-                  break;
-                }
-
-                _context.next = 20;
-                return _a.call(asyncIter_1);
-
-              case 20:
-                _context.prev = 20;
-
-                if (!e_1) {
-                  _context.next = 23;
-                  break;
-                }
-
-                throw e_1.error;
-
-              case 23:
-                return _context.finish(20);
-
-              case 24:
-                return _context.finish(15);
-
-              case 25:
-                nextTick(function () {
-                  return onLoadEnd ? onLoadEnd().then(function () {
-                    return setInitStatus(true);
-                  }) : setInitStatus(true);
-                });
-
-              case 26:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, null, [[0, 12, 15, 25], [16,, 20, 24]]);
-      }));
+    runAsyncIterable(createAsyncIterable(options), function (option) {
+      return console.debug('LoaderScript -> Iterable加载完成！', option);
+    }, function () {
+      return onLoadEnd ? onLoadEnd().then(function () {
+        return setInitStatus(true);
+      }) : setInitStatus(true);
     });
   }, [options]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, !initStatus ? Spin : children);

package/es/LoaderScript/utils.d.ts

@@ -10,3 +10,5 @@ export declare function createAsyncIterable(options: IOptionsLoader[]): {
         }>;
     };
 };
+export declare function tryCatch(resolveFn: () => Promise<any>, rejectFn?: (e: unknown) => void): Promise<void>;
+export declare function runAsyncIterable(Iterables: any, runtime?: (conf: any) => void, callback?: () => void): void;

package/es/LoaderScript/utils.js

@@ -1,3 +1,5 @@
+import _nextTick from "@cloud-app-dev/utils/es/nextTick";
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -12,6 +14,7 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
+import { __asyncValues, __awaiter } from "tslib";
 var global = window;
 
 if (!global._LOADER_SCRIPT_URL) {
@@ -67,44 +70,178 @@ export function createAsyncIterable(options) {
     return {
       i: 0,
       next: function next() {
-        var _this = this;
+        return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+          var param, arr;
+          return regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  if (!(this.i < options.length)) {
+                    _context.next = 12;
+                    break;
+                  }
+
+                  param = options[this.i];
+                  arr = [];
+
+                  if (param.scripts && param.scripts.length > 0) {
+                    arr.push.apply(arr, _toConsumableArray(param.scripts.map(function (v) {
+                      return loadScript(v);
+                    })));
+                  }
+
+                  if (param.styles && param.styles.length > 0) {
+                    arr.push.apply(arr, _toConsumableArray(param.styles.map(function (v) {
+                      return loaderCss(v);
+                    })));
+                  }
+
+                  if (!(arr.length > 0)) {
+                    _context.next = 11;
+                    break;
+                  }
+
+                  _context.next = 8;
+                  return Promise.all(arr);
+
+                case 8:
+                  return _context.abrupt("return", {
+                    value: this.i++,
+                    done: false
+                  });
+
+                case 11:
+                  return _context.abrupt("return", Promise.resolve({
+                    value: this.i++,
+                    done: false
+                  }));
+
+                case 12:
+                  return _context.abrupt("return", Promise.resolve({
+                    value: this.i,
+                    done: true
+                  }));
+
+                case 13:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee, this);
+        }));
+      }
+    };
+  });
+}
+export function tryCatch(resolveFn) {
+  var rejectFn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : console.error;
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.prev = 0;
+            _context2.next = 3;
+            return resolveFn();
+
+          case 3:
+            _context2.next = 8;
+            break;
+
+          case 5:
+            _context2.prev = 5;
+            _context2.t0 = _context2["catch"](0);
+            rejectFn(_context2.t0);
+
+          case 8:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2, null, [[0, 5]]);
+  }));
+}
+export function runAsyncIterable(Iterables, runtime, callback) {
+  var _this = this;
+
+  tryCatch(function () {
+    return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
+      var e_1, _a, Iterables_1, Iterables_1_1, x;
+
+      return regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.prev = 0;
+              Iterables_1 = __asyncValues(Iterables);
+
+            case 2:
+              _context3.next = 4;
+              return Iterables_1.next();
+
+            case 4:
+              Iterables_1_1 = _context3.sent;
+
+              if (Iterables_1_1.done) {
+                _context3.next = 10;
+                break;
+              }
+
+              x = Iterables_1_1.value;
+              runtime && runtime(x);
+
+            case 8:
+              _context3.next = 2;
+              break;
+
+            case 10:
+              _context3.next = 15;
+              break;
+
+            case 12:
+              _context3.prev = 12;
+              _context3.t0 = _context3["catch"](0);
+              e_1 = {
+                error: _context3.t0
+              };
 
-        if (this.i < options.length) {
-          var param = options[this.i];
-          var arr = [];
+            case 15:
+              _context3.prev = 15;
+              _context3.prev = 16;
 
-          if (param.scripts && param.scripts.length > 0) {
-            arr.push.apply(arr, _toConsumableArray(param.scripts.map(function (v) {
-              return loadScript(v);
-            })));
-          }
+              if (!(Iterables_1_1 && !Iterables_1_1.done && (_a = Iterables_1.return))) {
+                _context3.next = 20;
+                break;
+              }
 
-          if (param.styles && param.styles.length > 0) {
-            arr.push.apply(arr, _toConsumableArray(param.styles.map(function (v) {
-              return loaderCss(v);
-            })));
-          }
+              _context3.next = 20;
+              return _a.call(Iterables_1);
 
-          if (arr.length > 0) {
-            return Promise.all(arr).then(function () {
-              return {
-                value: _this.i++,
-                done: false
-              };
-            });
-          } else {
-            return Promise.resolve({
-              value: this.i++,
-              done: false
-            });
+            case 20:
+              _context3.prev = 20;
+
+              if (!e_1) {
+                _context3.next = 23;
+                break;
+              }
+
+              throw e_1.error;
+
+            case 23:
+              return _context3.finish(20);
+
+            case 24:
+              return _context3.finish(15);
+
+            case 25:
+              callback && _nextTick(callback);
+
+            case 26:
+            case "end":
+              return _context3.stop();
           }
         }
-
-        return Promise.resolve({
-          value: this.i,
-          done: true
-        });
-      }
-    };
+      }, _callee3, null, [[0, 12, 15, 25], [16,, 20, 24]]);
+    }));
   });
 }

package/es/Picture/component/MoveContent/index.js

@@ -1,12 +1,12 @@
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 

package/es/Picture/index.js

@@ -23,7 +23,7 @@ import Tools from './component/Tools';
 import DrawRect from './component/DrawRect';
 import WheelScale from './component/WheelScale';
 import DefaultRects from './component/DefaultRects';
-import isFunction from 'lodash-es/isFunction';
+import { isFunction } from 'lodash';
 import "./index.css";
 
 function Picture(_a) {

package/es/Picture/utils.js

@@ -1,4 +1,4 @@
-import cloneDeep from 'lodash-es/cloneDeep';
+import { cloneDeep } from 'lodash';
 export function customContextMenu(e) {
   e.preventDefault();
   return false;

package/es/RefDrawer/index.js

@@ -15,7 +15,7 @@ import Drawer from '../Drawer';
 import ConfigContext from '../ConfigContext';
 
 function RefDrawer(_, ref) {
-  var context = useContext(ConfigContext);
+  var context = useContext(ConfigContext.Context);
   var root = useMemo(function () {
     return (context === null || context === void 0 ? void 0 : context.root) || document.body;
   }, [context === null || context === void 0 ? void 0 : context.root]);

package/es/RefModal/index.js

@@ -15,7 +15,7 @@ import Modal from '../Modal';
 import ConfigContext from '../ConfigContext';
 
 function RefModal(_, ref) {
-  var context = useContext(ConfigContext);
+  var context = useContext(ConfigContext.Context);
   var root = useMemo(function () {
     return (context === null || context === void 0 ? void 0 : context.root) || document.body;
   }, [context === null || context === void 0 ? void 0 : context.root]);

package/es/Service/http.d.ts

@@ -1,4 +1,6 @@
-import { RsponseType, XHRResponse } from './interface';
-export declare function $http(options: RsponseType): import("fetch-like-axios").AxiosPromise<any>;
-export declare const $httpMultiPartInstance: import("fetch-like-axios").AxiosInstance;
-export declare const $httpXMLInstance: ({ url, method, data, headers, cancelHttp, isAsync, requestId }: XHRResponse) => Promise<unknown>;
+import { AxiosInstance } from 'fetch-like-axios';
+import type { RsponseType, XHRResponse } from './interface';
+declare function http({ cancelHttp, ...newOptions }: RsponseType): Promise<any>;
+declare const httpMultiPartInstance: AxiosInstance;
+declare function httpXMLInstance({ url, method, data, headers, cancelHttp, isAsync }: XHRResponse): Promise<any>;
+export { http as default, http, httpMultiPartInstance, httpXMLInstance };