@cloud-app-dev/vidc 2.0.0-alpha.18 → 2.0.0-alpha.21

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/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/HightLevel/index.js

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

package/es/InitialConfig/utils.js

@@ -13,7 +13,7 @@ export function queryBSConfig() {
           case 0:
             _context.next = 2;
             return Service.http({
-              url: '/api/system/config/web'
+              url: "/config/web.conf.json?".concat(Date.now())
             });
 
           case 2:
@@ -40,7 +40,7 @@ export function queryMicroApplicationList() {
           case 0:
             _context2.next = 2;
             return Service.http({
-              url: "/api/app/list"
+              url: "/config/app.conf.json?".concat(Date.now())
             });
 
           case 2:
@@ -66,7 +66,7 @@ export function querySystemUpdate() {
         switch (_context3.prev = _context3.next) {
           case 0:
             return _context3.abrupt("return", Service.http({
-              url: "/api/system/config/updateStatus?".concat(Date.now())
+              url: "/config/update.status.conf.json?".concat(Date.now())
             }));
 
           case 1:

package/es/InitialRequest/index.d.ts

@@ -1,7 +1,9 @@
 import React from 'react';
+import { InitDataType } from './utils';
 interface IInitialRequestProps {
     children: React.ReactNode;
     Spin?: React.ReactNode;
+    customInitialization?: () => Promise<InitDataType>;
 }
-declare function InitialRequest({ children, Spin }: IInitialRequestProps): JSX.Element;
+declare function InitialRequest({ children, Spin, customInitialization }: IInitialRequestProps): JSX.Element;
 export default InitialRequest;

package/es/InitialRequest/index.js

@@ -23,7 +23,8 @@ function InitialRequest(_ref) {
   var _this = this;
 
   var children = _ref.children,
-      Spin = _ref.Spin;
+      Spin = _ref.Spin,
+      customInitialization = _ref.customInitialization;
 
   var _useContext = useContext(AppContext.Context),
       updateUser = _useContext.updateUser,
@@ -42,22 +43,23 @@ function InitialRequest(_ref) {
 
     var init = function init() {
       return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-        var _yield$initialization, userFeatures, operationInfo, systemFeatures, userInfo, themeConfig;
+        var fetchInitData, _yield$fetchInitData, userFeatures, operationInfo, systemFeatures, userInfo, themeConfig;
 
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return initialization();
-
-              case 2:
-                _yield$initialization = _context.sent;
-                userFeatures = _yield$initialization.userFeatures;
-                operationInfo = _yield$initialization.operationInfo;
-                systemFeatures = _yield$initialization.systemFeatures;
-                userInfo = _yield$initialization.userInfo;
-                themeConfig = _yield$initialization.themeConfig;
+                fetchInitData = customInitialization || initialization;
+                _context.next = 3;
+                return fetchInitData();
+
+              case 3:
+                _yield$fetchInitData = _context.sent;
+                userFeatures = _yield$fetchInitData.userFeatures;
+                operationInfo = _yield$fetchInitData.operationInfo;
+                systemFeatures = _yield$fetchInitData.systemFeatures;
+                userInfo = _yield$fetchInitData.userInfo;
+                themeConfig = _yield$fetchInitData.themeConfig;
                 updateUser(userInfo);
                 updateOperation(operationInfo);
                 Config.registerFeatrueIds(userFeatures);
@@ -70,7 +72,7 @@ function InitialRequest(_ref) {
 
                 _BASE_DATA_INIT = true;
 
-              case 15:
+              case 16:
               case "end":
                 return _context.stop();
             }

package/es/InitialRequest/utils.d.ts

@@ -1,9 +1,10 @@
 import { UserInfoType, OperationInfoType } from '../AppContext/interface';
 import { FeatureItemType, ThemeInfoType } from '../Config/interface';
-export declare function initialization(): Promise<{
+export declare type InitDataType = {
     userInfo: UserInfoType;
     userFeatures: string[];
     systemFeatures: FeatureItemType[];
     operationInfo: OperationInfoType;
     themeConfig: ThemeInfoType;
-}>;
+};
+export declare function initialization(): Promise<InitDataType>;

package/es/InstanceHistory/index.d.ts

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

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/UserSelect/index.js

@@ -24,10 +24,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useCallback, useMemo, useState, useImperativeHandle } from 'react';
 import api from '../Api';
 import TreeMode from '../Tree';
-import uniq from 'lodash-es/uniq';
-import intersectionWith from 'lodash-es/intersectionWith';
-import uniqBy from 'lodash-es/uniqBy';
-import differenceWith from 'lodash-es/differenceWith';
+import { uniq, intersectionWith, uniqBy, differenceWith } from 'lodash';
 import IconFont from '../IconFont';
 import useHttp from '../useHttp';
 import ListExt from '../List/ListExt';

package/es/WorkerFlow/Form/EmptyUserSet.js

@@ -19,7 +19,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { __awaiter } from "tslib";
 import React, { useCallback, useMemo, useRef, useState, useEffect } from 'react';
-import replace from 'lodash-es/replace';
+import { replace } from 'lodash';
 import chroma from 'chroma-js';
 import UserSelectModalContent from './UserSelectModalContent';
 import RefModal from '../../RefModal';

package/es/WorkerFlow/Form/FormAuth.js

@@ -25,7 +25,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useCallback, useEffect, useState } from 'react';
 import Box from '../../Box';
-import cloneDeep from 'lodash-es/cloneDeep';
+import { cloneDeep } from 'lodash';
 
 function FormAuth(_ref) {
   var form = _ref.form,

package/es/WorkerFlow/Form/GroupSelect.js

@@ -19,7 +19,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { __awaiter } from "tslib";
 import React, { useCallback, useMemo, useRef, useState, useEffect } from 'react';
-import replace from 'lodash-es/replace';
+import { replace } from 'lodash';
 import chroma from 'chroma-js';
 import GroupSelectModalContent from './GroupSelectModalContent';
 import IconFont from '../../IconFont';

package/es/WorkerFlow/Form/GroupSelectModalContent.js

@@ -23,8 +23,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useCallback, useMemo, useState, useImperativeHandle } from 'react';
 import api from '../../Api';
 import TreeMode from '../../Tree';
-import uniq from 'lodash-es/uniq';
-import intersectionWith from 'lodash-es/intersectionWith';
+import { uniq, intersectionWith } from 'lodash';
 import useHttp from '../../useHttp';
 import { formatRenderGroup } from './utils';
 import GroupList from './GroupList';

package/es/WorkerFlow/Form/LevelGroupSelect.js

@@ -21,7 +21,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { __awaiter } from "tslib";
 import React, { useCallback, useMemo, useRef, useState, useEffect } from 'react';
-import replace from 'lodash-es/replace';
+import { replace } from 'lodash';
 import chroma from 'chroma-js';
 import GroupSelectModalContent from './GroupSelectModalContent';
 import { formatRenderGroup, ToUpperNumberString } from './utils';

package/es/WorkerFlow/Form/UserAndGroupSelect.js

@@ -21,7 +21,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { __awaiter } from "tslib";
 import React, { useCallback, useMemo, useRef, useState, useEffect } from 'react';
-import replace from 'lodash-es/replace';
+import { replace } from 'lodash';
 import chroma from 'chroma-js';
 import UserSelectModalContent from './UserSelectModalContent';
 import GroupSelectModalContent from './GroupSelectModalContent';

package/es/WorkerFlow/Form/UserSelect.js

@@ -19,7 +19,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { __awaiter } from "tslib";
 import React, { useCallback, useMemo, useRef, useState, useEffect } from 'react';
-import replace from 'lodash-es/replace';
+import { replace } from 'lodash';
 import chroma from 'chroma-js';
 import UserSelectModalContent from './UserSelectModalContent';
 import RefModal from '../../RefModal';

package/es/WorkerFlow/Form/UserSelectModalContent.js

@@ -22,10 +22,7 @@ import React, { useCallback, useMemo, useState, forwardRef, useImperativeHandle
 import api from '../../Api';
 import TreeMode from '../../Tree';
 import List from '../../List/ListExt';
-import uniq from 'lodash-es/uniq';
-import intersectionWith from 'lodash-es/intersectionWith';
-import uniqBy from 'lodash-es/uniqBy';
-import differenceWith from 'lodash-es/differenceWith';
+import { uniq, uniqBy, differenceWith, intersectionWith } from 'lodash';
 import useHttp from '../../useHttp';
 var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalContent(_ref, ref) {
   var selectUsers = _ref.selectUsers;

package/es/WorkerFlow/Form/UserSet.js

@@ -17,7 +17,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { UserSetOptions } from '../Nodes/Constants';
-import cloneDeep from 'lodash-es/cloneDeep';
+import { cloneDeep } from 'lodash';
 import UsersHandleType from './UsersHandleType';
 import UserSelect from './UserSelect';
 import UserAndGroupSelect from './UserAndGroupSelect';

package/es/WorkerFlow/index.js

@@ -33,7 +33,7 @@ import ApproverForm from './Form/Approver';
 import ConditionForm from './Form/Condition';
 import NotifierForm from './Form/Notifier';
 import { TemplateConfig1 } from './template';
-import cloneDeep from 'lodash-es/cloneDeep';
+import { cloneDeep } from 'lodash';
 import EndNode from './Nodes/End';
 import Render from './Nodes/Render';
 import Tools from './Tools';

package/es/WorkerFlow/utils.js

@@ -10,7 +10,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 cloneDeep from 'lodash-es/cloneDeep';
+import { cloneDeep } from 'lodash';
 import { getNodeById } from './XML/utils';
 export function getJAVATaskData(data) {
   var _a;

package/es/useHistory/index.d.ts

@@ -1,3 +1,3 @@
 import type { History } from 'history';
-declare function useHistory(): History<unknown>;
+declare function useHistory(): History;
 export default useHistory;

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.0-alpha.21",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -35,15 +35,15 @@
     "chroma-js": "^2.1.2",
     "fetch-like-axios": "^0.0.5",
     "immer": "^9.0.5",
-    "lodash-es": "^4.17.21",
+    "lodash": "^4.17.21",
     "rc-queue-anim": "^2.0.0"
   },
   "devDependencies": {
     "@cloud-app-dev/utils": "^3.0.3",
     "@types/add-dom-event-listener": "^1.1.0",
     "@types/chroma-js": "^2.1.3",
-    "@types/lodash-es": "^4.17.5",
     "@types/node": "^17.0.5",
+    "@types/lodash": "^4.14.178",
     "@umijs/test": "^3.0.5",
     "antd": "^4.17.0",
     "babel-plugin-import": "^1.13.3",