@cloud-app-dev/vidc 2.0.0-alpha.15 → 2.0.0-alpha.19

package/.fatherrc.js

@@ -1,10 +1,6 @@
-import nodePolyfills from 'rollup-plugin-node-polyfills';
-
 export default {
   target: 'browser',
   esm: 'babel',
-  extraRollupPlugins: [nodePolyfills()],
-  lessInBabelMode: true, // babel 模式下做 less 编译
   pkgs: [
     // 组件依赖构建顺序， 例如 a组件依赖于b组件，那么需要先编译 b,在编译a,则 这里可以控制组件编译顺序
   ],
@@ -15,4 +11,15 @@ export default {
     ['import', { libraryName: 'ahooks', style: false, camel2DashComponentName: false, libraryDirectory: 'es' }, 'ahooks'],
     ['import', { libraryName: '@cloud-app-dev/map', style: false, camel2DashComponentName: false, libraryDirectory: 'es' }, 'map-components'],
   ],
+  lessInRollupMode: {
+    modifyVars: {
+      '@ant-prefix': 'cloudapp',
+    },
+  },
+  lessInBabelMode: {
+    // babel 模式下做 less 编译
+    modifyVars: {
+      '@ant-prefix': 'cloudapp',
+    },
+  },
 };

package/es/Api/index.js

@@ -2,7 +2,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 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; }
 
 import { __awaiter } from "tslib";
 import Service from '../Service';
@@ -23,7 +23,7 @@ var Api = /*#__PURE__*/function () {
             switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return Service.$http({
+                return Service.http({
                   url: '/api/user/v1/organization/queryChildOrganizationsById',
                   method: 'post',
                   requestId: 'queryChildOrganizationsById',
@@ -60,7 +60,7 @@ var Api = /*#__PURE__*/function () {
             switch (_context2.prev = _context2.next) {
               case 0:
                 _context2.next = 2;
-                return Service.$http({
+                return Service.http({
                   url: '/api/user/v1/queryUsers',
                   method: 'post',
                   requestId: 'queryUsers',
@@ -98,7 +98,7 @@ var Api = /*#__PURE__*/function () {
             switch (_context3.prev = _context3.next) {
               case 0:
                 _context3.next = 2;
-                return Service.$http({
+                return Service.http({
                   url: "/api/user/v2/post/queryPostByOrgId/".concat(orgId),
                   method: 'post',
                   requestId: 'queryPostByOrgId',
@@ -128,7 +128,7 @@ var Api = /*#__PURE__*/function () {
             switch (_context4.prev = _context4.next) {
               case 0:
                 _context4.next = 2;
-                return Service.$http({
+                return Service.http({
                   url: '/api/udm-api/DeviceBuzTree/queryList',
                   method: 'post',
                   requestId: 'getDeviceBzTree',
@@ -158,7 +158,7 @@ var Api = /*#__PURE__*/function () {
             switch (_context5.prev = _context5.next) {
               case 0:
                 _context5.next = 2;
-                return Service.$http({
+                return Service.http({
                   url: '/api/udm-api/customDeviceGroup/queryList',
                   method: 'post',
                   requestId: 'customDeviceGroup',
@@ -188,7 +188,7 @@ var Api = /*#__PURE__*/function () {
             switch (_context6.prev = _context6.next) {
               case 0:
                 _context6.next = 2;
-                return Service.$http({
+                return Service.http({
                   url: '/api/place/v1/getPlacesByHasDevice',
                   method: 'post',
                   requestId: 'getPlacesByHasDevice',

package/es/AppRedirect/index.d.ts

@@ -10,7 +10,7 @@ interface AppRedirectProps {
      * @description 重定向路径
      * @description -
      */
-    to: H.LocationDescriptor<any>;
+    to: H.Location;
 }
 declare function AppRedirect({ path, to }: AppRedirectProps): JSX.Element;
 export default AppRedirect;

package/es/AppRedirect/index.js

@@ -1,6 +1,5 @@
 import React, { useEffect } from 'react';
-import { useLocation } from 'react-router-dom';
-import useNavigate from '../useNavigate';
+import { useLocation, useNavigate } from 'react-router-dom';
 import "./index.css";
 
 var getKey = function getKey() {

package/es/AppRoute/index.js

@@ -1,4 +1,4 @@
-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); }
 
 import _cache from "@cloud-app-dev/utils/es/cache";
 import _useMount from "ahooks/es/useMount";
@@ -7,9 +7,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 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/AutoExit/index.js

@@ -1,6 +1,6 @@
 import _nextTick from "@cloud-app-dev/utils/es/nextTick";
 import React, { useContext, useEffect } from 'react';
-import useNavigate from '../useNavigate';
+import { useNavigate } from 'react-router-dom';
 import AppContext from '../AppContext';
 
 function AutoExit(_ref) {

package/es/ConfigContext/index.d.ts

@@ -5,5 +5,18 @@ export interface IConfigContextProps {
      */
     root: HTMLElement;
 }
-declare const ConfigContext: React.Context<IConfigContextProps>;
-export default ConfigContext;
+interface IProviderProps {
+    getContainer: () => HTMLElement;
+    children: React.ReactNode;
+}
+declare function Provider({ getContainer, children }: IProviderProps): JSX.Element;
+declare namespace Provider {
+    var defaultProps: {
+        getContainer: () => HTMLElement;
+    };
+}
+declare const _default: {
+    Context: React.Context<IConfigContextProps>;
+    Provider: typeof Provider;
+};
+export default _default;

package/es/ConfigContext/index.js

@@ -1,3 +1,25 @@
-import React from 'react';
-var ConfigContext = /*#__PURE__*/React.createContext(null);
-export default ConfigContext;
+import React, { useMemo } from 'react';
+var Context = /*#__PURE__*/React.createContext(null);
+
+function Provider(_ref) {
+  var getContainer = _ref.getContainer,
+      children = _ref.children;
+  var root = useMemo(function () {
+    return getContainer();
+  }, [getContainer]);
+  return /*#__PURE__*/React.createElement(Context.Provider, {
+    value: {
+      root: root
+    }
+  }, children);
+}
+
+Provider.defaultProps = {
+  getContainer: function getContainer() {
+    return document.body;
+  }
+};
+export default {
+  Context: Context,
+  Provider: Provider
+};

package/es/DeviceSelect/index.js

@@ -22,7 +22,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import TreeMode from '../Tree';
 import DynamicDeviceList from '../List/DynamicDeviceList';
 import DeviceList from '../List/DeviceList';
-import { uniq, uniqBy } from 'lodash-es';
+import { uniq, uniqBy } from 'lodash';
 import TreeType from './TreeType';
 import "./index.css";
 

package/es/Dict/desc.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/Dict/utils.js

@@ -4,7 +4,7 @@ export function queryByTypeCode(typeCode) {
   var headers = {
     Authorization: _cache.getCache('token', 'session')
   };
-  return Service.$http({
+  return Service.http({
     url: "/api/dictionary/v1/queryByTypeCode/".concat(typeCode),
     method: 'get',
     requestId: 'queryByTypeCode',
@@ -18,7 +18,7 @@ export function queryByTypeCodes() {
   var headers = {
     Authorization: _cache.getCache('token', 'session')
   };
-  return Service.$http({
+  return Service.http({
     url: "/api/dictionary/v1/queryDictionaryListByCondition",
     method: 'post',
     requestId: 'queryByTypeCode',
@@ -30,7 +30,7 @@ export function queryByTypeCodes() {
   });
 }
 export function queryTypeCodes() {
-  return Service.$http({
+  return Service.http({
     url: "/micro-apps/micro-dep-librarys/config/typeCodes.json",
     method: 'get',
     requestId: 'queryTypeCodes'

package/es/HightLevel/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import replace from 'lodash-es/replace';
-import escapeRegExp from 'lodash-es/escapeRegExp';
+import replace from 'lodash/replace';
+import escapeRegExp from 'lodash/escapeRegExp';
 import "./index.css";
 
 function HighLevel(_ref) {

package/es/InitialConfig/utils.js

@@ -12,7 +12,7 @@ export function queryBSConfig() {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return Service.$http({
+            return Service.http({
               url: '/api/system/config/web'
             });
 
@@ -39,7 +39,7 @@ export function queryMicroApplicationList() {
         switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return Service.$http({
+            return Service.http({
               url: "/api/app/list"
             });
 
@@ -65,7 +65,7 @@ export function querySystemUpdate() {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            return _context3.abrupt("return", Service.$http({
+            return _context3.abrupt("return", Service.http({
               url: "/api/system/config/updateStatus?".concat(Date.now())
             }));
 

package/es/InitialRequest/utils.js

@@ -28,7 +28,7 @@ export function initialization() {
               Authorization: _cache.getCache('token', 'session')
             };
             _context.next = 3;
-            return Service.$http({
+            return Service.http({
               url: '/api/user/v1/getUserByToken',
               method: 'post',
               headers: headers
@@ -44,28 +44,28 @@ export function initialization() {
             systemFeatureUrl = "/api/system/".concat(systemId, "/list");
             themeConfigUrl = '/api/system/config/type';
             _context.next = 13;
-            return Promise.all([Service.$http({
+            return Promise.all([Service.http({
               url: centerUrl,
               headers: headers,
               data: {
                 id: systemId
               },
               method: 'post'
-            }), Service.$http({
+            }), Service.http({
               url: userPrivilegesUrl,
               headers: headers,
               data: {
                 id: userId
               },
               method: 'post'
-            }), Service.$http({
+            }), Service.http({
               url: systemFeatureUrl,
               headers: headers,
               data: {
                 id: systemId
               },
               method: 'get'
-            }), Service.$http({
+            }), Service.http({
               url: themeConfigUrl,
               headers: headers,
               data: {

package/es/InstanceHistory/index.d.ts

@@ -0,0 +1,3 @@
+import type { History } from 'history';
+declare const InstanceHistory: History;
+export default InstanceHistory;

package/es/InstanceHistory/index.js

@@ -0,0 +1,9 @@
+import { createBrowserHistory } from 'history';
+var _global = window;
+
+if (!_global._BSIC_HISTORY_) {
+  _global._BSIC_HISTORY_ = createBrowserHistory();
+}
+
+var InstanceHistory = _global._BSIC_HISTORY_;
+export default InstanceHistory;

package/es/List/DynamicDeviceList/utils.js

@@ -3,7 +3,7 @@ import Service from '../../Service';
 import { getHeader } from '../../utils';
 export function queryDeviceList() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return Service.$http({
+  return Service.http({
     method: 'post',
     url: '/api/udm-api/device/queryList',
     requestId: 'queryDeviceList',

package/es/LoaderApp/index.js

@@ -42,18 +42,29 @@ function LoaderApp(_ref) {
     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) {

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: {

package/es/LoaderApp/utils.js

@@ -3,14 +3,16 @@ export var getMicroConfig = function getMicroConfig() {
   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

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;