@cloud-app-dev/vidc 2.2.0-alpha.7 → 3.0.0

package/es/List/index.js

@@ -1,169 +1,29 @@
-import _isEqual from "@cloud-app-dev/utils/es/isEqual";
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-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; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import VList from './VList';
-import { RenderItem } from './renderItem';
-import CheckExt from './CheckExt';
-import DeviceList from './DeviceList';
-import ListExt from './ListExt';
-import DynamicDeviceList from './DynamicDeviceList';
+import React from 'react';
+import DynamicList from './DynamicList';
 import GridList from './GridList';
 import DynamicGridList from './DynamicGridList';
+import VList from './VList';
 import "./index.css";
 
 function List(props) {
   var className = props.className,
       style = props.style,
-      CustomRender = props.CustomRender,
-      itemNameKey = props.itemNameKey,
-      activeKey = props.activeKey,
-      checkExt = props.checkExt,
-      onChecked = props.onChecked,
+      renderItem = props.renderItem,
       list = props.list,
-      checkedKeys = props.checkedKeys,
-      itemKey = props.itemKey,
-      defaultCheckedIds = props.defaultCheckedIds,
       rowHeight = props.rowHeight,
-      renderHeader = props.renderHeader;
-
-  var _useState = useState({
-    checkedKeys: defaultCheckedIds || checkedKeys || []
-  }),
-      _useState2 = _slicedToArray(_useState, 2),
-      state = _useState2[0],
-      setState = _useState2[1];
-
-  var checkable = useMemo(function () {
-    return !!onChecked;
-  }, []);
-  /**
-   * 列表选中处理
-   */
-
-  var onCheckedAction = useCallback(function (e) {
-    var ids = state.checkedKeys || [];
-    var id = e.target.value;
-    var flag = e.target.checked;
-
-    if (flag) {
-      ids.push(id);
-    } else {
-      ids = ids.filter(function (v) {
-        return v !== id;
-      });
-    }
-
-    setState(function (old) {
-      return Object.assign(Object.assign({}, old), {
-        checkedKeys: _toConsumableArray(ids)
-      });
-    });
-    onChecked && onChecked(ids);
-  }, // eslint-disable-next-line react-hooks/exhaustive-deps
-  [state.checkedKeys]);
-  /**
-   * 列表渲染
-   */
-
-  var renderRow = useCallback(function (data, index) {
-    var options = Object.assign(Object.assign({}, state), {
-      item: data,
-      onChecked: onCheckedAction,
-      checkable: !!onChecked,
-      index: index,
-      style: style,
-      keywords: props.keywords,
-      whatIcon: props.whatIcon,
-      renderItemExt: props.renderItemExt,
-      onClickItem: props.onClickItem,
-      onMouseOutItem: props.onMouseOutItem,
-      onMouseOverItem: props.onMouseOverItem,
-      itemKey: itemKey,
-      itemNameKey: itemNameKey,
-      activeKey: activeKey
-    });
-    var ItemRender = CustomRender ? CustomRender : RenderItem;
-    return /*#__PURE__*/React.createElement(ItemRender, Object.assign({
-      key: index
-    }, options));
-  }, // eslint-disable-next-line react-hooks/exhaustive-deps
-  [list, state, onChecked, CustomRender, activeKey]);
-  /**
-   * 列表全选处理
-   */
-
-  var onCheck = useCallback(function () {
-    var ids = list.map(function (v) {
-      return v[itemKey];
-    });
-    setState(function (old) {
-      return Object.assign(Object.assign({}, old), {
-        checkedKeys: _toConsumableArray(ids)
-      });
-    });
-    props.onChecked && props.onChecked(ids); // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [itemKey, list]);
-  /**
-   * 列表取消
-   */
-
-  var onCancel = useCallback(function () {
-    setState(function (old) {
-      return Object.assign(Object.assign({}, old), {
-        checkedKeys: []
-      });
-    });
-    props.onChecked && props.onChecked([]); // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [itemKey, list]);
-  /**
-   * 同步选中更新
-   */
-
-  useEffect(function () {
-    if (props.checkedKeys && !_isEqual(props.checkedKeys, state.checkedKeys)) {
-      setState(function (old) {
-        return Object.assign(Object.assign({}, old), {
-          checkedKeys: props.checkedKeys
-        });
-      });
-    } // eslint-disable-next-line react-hooks/exhaustive-deps
-
-  }, [props.checkedKeys]);
+      renderHeaderExt = props.renderHeaderExt;
   return /*#__PURE__*/React.createElement("div", {
-    className: "lm-c-check-list-wrapper ".concat(className),
+    className: "lm-c-list-wrapper ".concat(className),
     style: style
-  }, renderHeader && renderHeader(), checkExt, checkable && /*#__PURE__*/React.createElement(CheckExt, {
-    selectCount: state.checkedKeys.length,
-    count: list.length,
-    onCheck: onCheck,
-    onCancel: onCancel
-  }), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "lm-c-list-header"
+  }, renderHeaderExt()), /*#__PURE__*/React.createElement("div", {
     className: "lm-c-base-list-layout"
   }, /*#__PURE__*/React.createElement(VList, {
     className: "lm-c-virtual-layout",
     data: list,
     rowHeight: rowHeight || 30,
-    renderItem: renderRow
+    renderItem: renderItem
   })));
 }
 
@@ -171,12 +31,13 @@ List.defaultProps = {
   className: '',
   list: [],
   itemKey: 'id',
-  itemNameKey: 'name'
+  itemNameKey: 'name',
+  renderHeaderExt: function renderHeaderExt() {
+    return /*#__PURE__*/React.createElement(React.Fragment, null);
+  }
 };
 List.VList = VList;
-List.DeviceList = DeviceList;
-List.ListExt = ListExt;
-List.DynamicDeviceList = DynamicDeviceList;
+List.DynamicList = DynamicList;
 List.GridList = GridList;
 List.DynamicGridList = DynamicGridList;
 export default List;

package/es/List/interface.d.ts

@@ -1,4 +1,4 @@
-export interface CheckListProps<T> {
+export interface ListProps<T> {
   /**
    * @description 列表数据
    * @default []
@@ -21,67 +21,9 @@ export interface CheckListProps<T> {
    * @description 列表自定义渲染
    * @default -
    */
-  CustomRender?: () => JSX.Element;
-
-  /**
-   * @description 列表渲染key字段
-   * @default id
-   */
-  itemKey?: string;
-
-  /**
-   * @description 列表渲染label字段
-   * @default name
-   */
-  itemNameKey?: string;
-
-  /**
-   * @description 激活列表key
-   * @default -
-   */
-  activeKey?: string;
-
-  /**
-   * @description 列表拓展内容
-   * @default -
-   */
-  checkExt?: React.ReactNode;
-
-  /**
-   * @description 选中事件，影响是否有checkbox
-   * @default -
-   */
-  onChecked?: (ids: Array<string>) => void;
-
-  /**
-   * @description 选中的key
-   * @default []
-   */
-  checkedKeys?: string[];
-
-  /**
-   * @description 默认选中的key
-   * @default []
-   */
-  defaultCheckedIds?: string[];
-
-  /**
-   * @description 高亮关键字
-   * @default -
-   */
-  keywords?: string;
+  renderItem: (item: T, index: number) => JSX.Element;
 
   rowHeight?: number;
 
-  whatIcon?: (item: T) => JSX.Element;
-
-  renderItemExt?: (item: T) => JSX.Element;
-
-  onClickItem?: (item: T) => void;
-
-  onMouseOutItem?: (item: T) => void;
-
-  onMouseOverItem?: (item: T) => void;
-
-  renderHeader?: () => JSX.Element;
+  renderHeaderExt?: () => JSX.Element;
 }

package/es/LoaderApp/index.d.ts

@@ -16,7 +16,7 @@ interface ILoaderAppProps {
     };
     /**
      * @description 微应用加载容器样式
-     * @default -
+     * @default
      */
     style?: React.CSSProperties;
 }

package/es/LoaderApp/index.js

@@ -1,26 +1,14 @@
 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); }
 
 import _useUnmount from "ahooks/es/useUnmount";
+import _nextTick from "@cloud-app-dev/utils/es/nextTick";
 import _useMount from "ahooks/es/useMount";
 import _uuid from "@cloud-app-dev/utils/es/uuid";
 
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-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; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 import { __awaiter } from "tslib";
-import React, { useRef, useState, useMemo } from 'react';
-import { getMicroConfig } from './utils';
+import React, { useRef, useMemo } from 'react';
 import LoaderModule from './loader';
 import "./index.css";
 
@@ -32,21 +20,15 @@ function LoaderApp(_ref) {
       style = _ref.style;
   var domRef = useRef(null);
   var styleRef = useRef(null);
-  var loadedAppRef = useRef(null);
+  var loadedAppRef = useRef();
   var id = useMemo(function () {
     return _uuid();
   }, []);
-
-  var _useState = useState('empty'),
-      _useState2 = _slicedToArray(_useState, 2),
-      status = _useState2[0],
-      setStatus = _useState2[1];
+  var statusRef = useRef();
 
   _useMount(function () {
-    var config = getMicroConfig(appConfig, appProps, domRef.current);
-
-    if (!config) {
-      console.error('微应用不存在', 'config ->', appConfig, 'appProps ->', appProps);
+    if (!appConfig) {
+      console.error('微应用不存在', 'appConfig ->', appConfig, 'appProps ->', appProps);
       return undefined;
     }
 
@@ -58,15 +40,10 @@ function LoaderApp(_ref) {
     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 routerPrefix = appConfig.routerPrefix,
+        html = appConfig.html;
     var options = {
-      script: script,
-      style: style,
+      html: html,
       name: routerPrefix,
       prefix: ".".concat(routerPrefix, "-").concat(id),
       styleNode: styleRef.current
@@ -77,25 +54,25 @@ function LoaderApp(_ref) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                loadedAppRef.current = mod;
-
-                if (!status) {
-                  _context.next = 4;
-                  break;
-                }
+                loadedAppRef.current = mod; // 沙箱销毁方法
 
-                _context.next = 4;
+                _context.next = 3;
                 return mod.bootstrap(props);
 
-              case 4:
-                setStatus('bootstrap');
-                _context.next = 7;
+              case 3:
+                _nextTick(function () {
+                  return statusRef.current = 'bootstrap';
+                });
+
+                _context.next = 6;
                 return mod.mount(props);
 
-              case 7:
-                setStatus('mount');
+              case 6:
+                _nextTick(function () {
+                  return statusRef.current = 'mounted';
+                });
 
-              case 8:
+              case 7:
               case "end":
                 return _context.stop();
             }
@@ -112,7 +89,11 @@ function LoaderApp(_ref) {
         container: domRef.current
       });
       app.unmount(props);
-      setStatus('unmount');
+
+      _nextTick(function () {
+        return statusRef.current = 'unmount';
+      });
+
       loadedAppRef.current = null;
     }
   });

package/es/LoaderApp/interface.d.ts

@@ -3,4 +3,7 @@ export interface AppInstance {
   mount: (props: any) => Promise<any>;
   unmount: (props: any) => Promise<any>;
   update: (props: any) => Promise<any>;
+  unmountDev?: (props: any) => Promise<any>;
 }
+
+

package/es/LoaderApp/loader.d.ts

@@ -1,20 +1,19 @@
 import { AppInstance } from './interface';
-interface createScopedCssText {
+interface createScopedCssTextProps {
     styleNode: HTMLStyleElement;
     prefix: string;
 }
-export declare function createScopedCssText({ styleNode, prefix }: createScopedCssText): string;
+export declare function createScopedCssText({ styleNode, prefix }: createScopedCssTextProps): string;
 interface ILoaderStyleProps {
-    style: string;
+    cssText: string;
     prefix: string;
     styleNode: HTMLStyleElement;
 }
-export declare function LoaderStyle({ style, prefix, styleNode }: ILoaderStyleProps): Promise<void>;
+export declare function LoaderStyle({ cssText, prefix, styleNode }: ILoaderStyleProps): Promise<void>;
 interface ILoaderModuleProps {
-    script: string;
-    style: string;
     prefix: string;
     styleNode: HTMLStyleElement;
+    html: string;
 }
-export default function LoaderModule({ script, style, prefix, styleNode }: ILoaderModuleProps): Promise<AppInstance>;
+export default function LoaderModule({ prefix, styleNode, html }: ILoaderModuleProps): Promise<AppInstance>;
 export {};

package/es/LoaderApp/loader.js

@@ -3,8 +3,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 
 import { __awaiter } from "tslib";
-import { arrayify, fetchStyle, rewrite } from './utils';
-var _global = window;
+import { arrayify, rewrite, importHTML } from './utils';
 export function createScopedCssText(_ref) {
   var styleNode = _ref.styleNode,
       prefix = _ref.prefix;
@@ -16,35 +15,23 @@ export function createScopedCssText(_ref) {
   return rewrite(rules, prefix);
 }
 export function LoaderStyle(_ref2) {
-  var style = _ref2.style,
+  var cssText = _ref2.cssText,
       prefix = _ref2.prefix,
       styleNode = _ref2.styleNode;
   return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var cssText, textNode, scopeCssText;
+    var scopeCssText;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            if (!style) {
-              _context.next = 9;
-              break;
-            }
-
-            _context.next = 3;
-            return fetchStyle(style);
-
-          case 3:
-            cssText = _context.sent;
-            textNode = document.createTextNode(cssText || '');
-            styleNode.appendChild(textNode);
+            styleNode.innerHTML = cssText;
             scopeCssText = createScopedCssText({
               prefix: prefix,
               styleNode: styleNode
             });
             styleNode.textContent = scopeCssText;
-            textNode.remove();
 
-          case 9:
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -53,30 +40,33 @@ export function LoaderStyle(_ref2) {
   }));
 }
 export default function LoaderModule(_ref3) {
-  var script = _ref3.script,
-      style = _ref3.style,
-      prefix = _ref3.prefix,
-      styleNode = _ref3.styleNode;
+  var prefix = _ref3.prefix,
+      styleNode = _ref3.styleNode,
+      html = _ref3.html;
   return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var cssText, exports, result;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
+            return importHTML(html);
+
+          case 2:
+            result = _context2.sent;
+            cssText = result.cssTexts.join(' ');
+            exports = result.appInstance;
+            _context2.next = 7;
             return LoaderStyle({
-              style: style,
+              cssText: cssText,
               prefix: prefix,
               styleNode: styleNode
             });
 
-          case 2:
-            _context2.next = 4;
-            return _global.System.import(script);
-
-          case 4:
-            return _context2.abrupt("return", _context2.sent);
+          case 7:
+            return _context2.abrupt("return", exports);
 
-          case 5:
+          case 8:
           case "end":
             return _context2.stop();
         }

package/es/LoaderApp/sandbox.back.d.ts

@@ -0,0 +1,18 @@
+declare type FakeWindow = Window & Record<PropertyKey, any>;
+declare class Sandbox {
+    fakeWindow: FakeWindow;
+    proxy: Window;
+    updateKeys: Set<unknown>;
+    listenerMap: Map<string, EventListenerOrEventListenerObject[]>;
+    timeoutList: number[];
+    intervalList: number[];
+    originKeys: string[];
+    showlog: boolean;
+    hasDisposed: boolean;
+    constructor(showlog?: boolean);
+    execScript(scriptText: string): void;
+    showWindowKeys(): string[];
+    preview(): void;
+    dispose(): void;
+}
+export default Sandbox;