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

package/es/Dict/hook.d.ts

@@ -1,4 +1,3 @@
 import { DictItem } from './interface';
 export declare function useDict(typeCode: string | number): DictItem[];
-export declare function useTypeCodes(): DictItem[];
 export declare function useDicts(typeCodes?: any[], isWebVisible?: boolean): DictItem[][];

package/es/Dict/hook.js

@@ -19,7 +19,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { useMemo, useState, useEffect } from 'react';
-import { queryByTypeCode, queryByTypeCodes, queryTypeCodes, formartItemTextExt } from './utils';
+import { queryByTypeCode, queryByTypeCodes, formartItemTextExt } from './utils';
 import LMDict from './cache';
 export function useDict(typeCode) {
   var _useState = useState(LMDict.data[typeCode] || []),
@@ -47,22 +47,6 @@ export function useDict(typeCode) {
   }, [typeCode]);
   return codes;
 }
-export function useTypeCodes() {
-  var _useState3 = useState(LMDict.data['typeCodes'] || []),
-      _useState4 = _slicedToArray(_useState3, 2),
-      typeCodes = _useState4[0],
-      setTypeCodes = _useState4[1];
-
-  useEffect(function () {
-    if (!LMDict.data['typeCodes']) {
-      queryTypeCodes().then(function (res) {
-        setTypeCodes(res);
-        LMDict.updateDictMap('typeCode', res);
-      });
-    }
-  }, []);
-  return typeCodes;
-}
 export function useDicts() {
   var typeCodes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var isWebVisible = arguments.length > 1 ? arguments[1] : undefined;
@@ -70,14 +54,14 @@ export function useDicts() {
     return typeCodes.toString();
   }, [typeCodes]);
 
-  var _useState5 = useState(function () {
+  var _useState3 = useState(function () {
     return typeCodes.map(function (v) {
       return LMDict.data[v] ? LMDict.data[v] : [];
     });
   }),
-      _useState6 = _slicedToArray(_useState5, 2),
-      dicts = _useState6[0],
-      setDicts = _useState6[1];
+      _useState4 = _slicedToArray(_useState3, 2),
+      dicts = _useState4[0],
+      setDicts = _useState4[1];
 
   useEffect(function () {
     var codes = typeCodes.filter(function (v) {

package/es/Dict/index.d.ts

@@ -1,13 +1,9 @@
 import * as device from './device';
-import { useDict, useDicts, useTypeCodes } from './hook';
-import { withDict, withTypeCodes } from './desc';
+import { useDict, useDicts } from './hook';
 declare const Dict: {
     useDict: typeof useDict;
     useDicts: typeof useDicts;
     device: typeof device;
     cacheMap: import("./interface").CacheDictType;
-    withDict: typeof withDict;
-    useTypeCodes: typeof useTypeCodes;
-    withTypeCodes: typeof withTypeCodes;
 };
 export default Dict;

package/es/Dict/index.js

@@ -1,14 +1,10 @@
 import LMDict from './cache';
 import * as device from './device';
-import { useDict, useDicts, useTypeCodes } from './hook';
-import { withDict, withTypeCodes } from './desc';
+import { useDict, useDicts } from './hook';
 var Dict = {
   useDict: useDict,
   useDicts: useDicts,
   device: device,
-  cacheMap: LMDict,
-  withDict: withDict,
-  useTypeCodes: useTypeCodes,
-  withTypeCodes: withTypeCodes
+  cacheMap: LMDict
 };
 export default Dict;

package/es/Dict/utils.d.ts

@@ -5,7 +5,6 @@ export declare function queryByTypeCode(typeCode: any): Promise<{
 export declare function queryByTypeCodes(typeCodes?: any[], isWebVisible?: boolean): Promise<{
     data: DictItem[];
 }>;
-export declare function queryTypeCodes(): Promise<DictItem[]>;
 export declare function formartItemTextExt(text: string): {
     [key: string]: any;
 };

package/es/Dict/utils.js

@@ -29,13 +29,6 @@ export function queryByTypeCodes() {
     }
   });
 }
-export function queryTypeCodes() {
-  return Service.http({
-    url: "/micro-apps/micro-dep-librarys/config/typeCodes.json",
-    method: 'get',
-    requestId: 'queryTypeCodes'
-  });
-}
 export function formartItemTextExt(text) {
   var ext = {};
 

package/es/InitialConfig/index.js

@@ -11,7 +11,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useState, useEffect } from 'react';
-import Dict from '../Dict';
 import Config from '../Config';
 import { queryBSConfig, queryMicroApplicationList, querySystemUpdate, queryDefaultTheme } from './utils';
 
@@ -28,7 +27,6 @@ function InitialConfig(_ref) {
       state = _useState2[0],
       setState = _useState2[1];
 
-  Dict.useTypeCodes();
   useEffect(function () {
     var arr = [queryBSConfig(), queryMicroApplicationList(), querySystemUpdate(), queryDefaultTheme()];
     Promise.all(arr).then(function (_ref2) {

package/es/InitialRequest/utils.js

@@ -99,7 +99,7 @@ export function initialization() {
               userFeatures: featureIds,
               systemFeatures: systemFeatures.data,
               operationInfo: centerInfo.data,
-              themeConfig: ((_a = themeInfo === null || themeInfo === void 0 ? void 0 : themeInfo.data) === null || _a === void 0 ? void 0 : _a.content) || {}
+              themeConfig: ((_a = themeInfo === null || themeInfo === void 0 ? void 0 : themeInfo.data) === null || _a === void 0 ? void 0 : _a.info) || {}
             });
 
           case 24:

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,8 +38,7 @@ function LoaderApp(_ref) {
       status = _useState2[0],
       setStatus = _useState2[1];
 
-  useEffect(function () {
-    var app;
+  _useMount(function () {
     var config = getMicroConfig(appConfig, appProps, domRef.current);
 
     if (!config) {
@@ -72,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();
             }
@@ -99,16 +99,20 @@ function LoaderApp(_ref) {
         }, _callee);
       }));
     });
-    return function () {
-      try {
-        app.unmount(props);
-        setStatus('unmount');
-        app = null;
-      } catch (error) {
-        console.error(error);
-      }
-    };
-  }, []);
+  });
+
+  _useUnmount(function () {
+    if (loadedAppRef.current) {
+      var app = loadedAppRef.current;
+      var props = Object.assign(Object.assign({}, appProps), {
+        container: domRef.current
+      });
+      app.unmount(props);
+      setStatus('unmount');
+      loadedAppRef.current = null;
+    }
+  });
+
   return /*#__PURE__*/React.createElement("main", {
     ref: domRef,
     className: "loaded-app-layout ".concat(appConfig.routerPrefix, "-").concat(id),

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "2.1.0-alpha.6",
+  "version": "2.1.0-alpha.9",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/es/Dict/desc.d.ts

@@ -1,64 +0,0 @@
-import React from 'react';
-import { DictItem } from './interface';
-export declare function withDict(codes?: any[], isWebVisible?: boolean): (Component: any) => (props: any) => JSX.Element;
-export declare function withTypeCodes(Component: any): {
-    new (props: any): {
-        componentDidMount(): void;
-        render(): JSX.Element;
-        context: any;
-        setState<K extends "typeCodes" | "isInit">(state: {
-            typeCodes: DictItem[];
-            isInit: boolean;
-        } | ((prevState: Readonly<{
-            typeCodes: DictItem[];
-            isInit: boolean;
-        }>, props: Readonly<any>) => {
-            typeCodes: DictItem[];
-            isInit: boolean;
-        } | Pick<{
-            typeCodes: DictItem[];
-            isInit: boolean;
-        }, K>) | Pick<{
-            typeCodes: DictItem[];
-            isInit: boolean;
-        }, K>, callback?: () => void): void;
-        forceUpdate(callback?: () => void): void;
-        readonly props: Readonly<any> & Readonly<{
-            children?: React.ReactNode;
-        }>;
-        state: Readonly<{
-            typeCodes: DictItem[];
-            isInit: boolean;
-        }>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
-        shouldComponentUpdate?(nextProps: Readonly<any>, nextState: Readonly<{
-            typeCodes: DictItem[];
-            isInit: boolean;
-        }>, nextContext: any): boolean;
-        componentWillUnmount?(): void;
-        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<any>, prevState: Readonly<{
-            typeCodes: DictItem[];
-            isInit: boolean;
-        }>): any;
-        componentDidUpdate?(prevProps: Readonly<any>, prevState: Readonly<{
-            typeCodes: DictItem[];
-            isInit: boolean;
-        }>, snapshot?: any): void;
-        componentWillMount?(): void;
-        UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<any>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<any>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<any>, nextState: Readonly<{
-            typeCodes: DictItem[];
-            isInit: boolean;
-        }>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<any>, nextState: Readonly<{
-            typeCodes: DictItem[];
-            isInit: boolean;
-        }>, nextContext: any): void;
-    };
-    contextType?: React.Context<any>;
-};

package/es/Dict/desc.js

@@ -1,162 +0,0 @@
-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); 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 } }); 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); }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-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, { useRef, useState, useEffect } from 'react';
-import { queryByTypeCodes, queryTypeCodes, formartItemTextExt } from './utils';
-import LMDict from './cache';
-export function withDict() {
-  var codes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var isWebVisible = arguments.length > 1 ? arguments[1] : undefined;
-  return function (Component) {
-    return function (props) {
-      var isInitRef = useRef(false);
-
-      var _useState = useState(function () {
-        var map = {};
-        codes.forEach(function (code) {
-          if (LMDict.data[code]) {
-            map[code] = LMDict.data[code];
-          } else {
-            map[code] = [];
-          }
-        });
-        return map;
-      }),
-          _useState2 = _slicedToArray(_useState, 2),
-          dictMap = _useState2[0],
-          setDictMap = _useState2[1];
-
-      useEffect(function () {
-        var nocacheCodes = codes.filter(function (v) {
-          return !LMDict.data[v];
-        });
-
-        if (nocacheCodes.length === 0) {
-          isInitRef.current = true;
-          setDictMap(function (old) {
-            return Object.assign({}, old);
-          });
-          return;
-        }
-
-        queryByTypeCodes(nocacheCodes, isWebVisible).then(function (res) {
-          isInitRef.current = true;
-          var data = res.data;
-          data.forEach(function (item) {
-            item.label = item.name;
-            item.value = item.code;
-            item = Object.assign(Object.assign({}, item), formartItemTextExt(item.extText));
-          });
-          setDictMap(function (old) {
-            nocacheCodes.forEach(function (code) {
-              var itemCodes = data.filter(function (v1) {
-                return +v1.typeCode === +code;
-              });
-              old[code] = itemCodes;
-              LMDict.updateDictMap(code, itemCodes);
-            });
-            return Object.assign({}, old);
-          });
-        });
-      }, []);
-
-      if (!isInitRef.current) {
-        return null;
-      }
-
-      return /*#__PURE__*/React.createElement(Component, Object.assign({}, props, {
-        dictMap: dictMap
-      }));
-    };
-  };
-}
-export function withTypeCodes(Component) {
-  return /*#__PURE__*/function (_React$Component) {
-    _inherits(withTypeCodesComponent, _React$Component);
-
-    var _super = _createSuper(withTypeCodesComponent);
-
-    function withTypeCodesComponent(props) {
-      var _this;
-
-      _classCallCheck(this, withTypeCodesComponent);
-
-      _this = _super.call(this, props);
-      _this.state = {
-        typeCodes: LMDict.data['typeCodes'] || [],
-        isInit: false
-      };
-      return _this;
-    }
-
-    _createClass(withTypeCodesComponent, [{
-      key: "componentDidMount",
-      value: function componentDidMount() {
-        var _this2 = this;
-
-        if (!LMDict.data['typeCodes']) {
-          queryTypeCodes().then(function (res) {
-            LMDict.updateDictMap('typeCodes', res);
-
-            _this2.setState({
-              typeCodes: res,
-              isInit: true
-            });
-          }).catch(function () {
-            _this2.setState({
-              typeCodes: [],
-              isInit: true
-            });
-          });
-        } else this.setState({
-          typeCodes: LMDict.data['typeCodes'],
-          isInit: true
-        });
-      }
-    }, {
-      key: "render",
-      value: function render() {
-        if (!this.state.isInit) {
-          return null;
-        }
-
-        return /*#__PURE__*/React.createElement(Component, Object.assign({}, this.props, {
-          typeCodes: this.state.typeCodes
-        }));
-      }
-    }]);
-
-    return withTypeCodesComponent;
-  }(React.Component);
-}