@cloud-app-dev/vidc 2.0.0-alpha.17 → 2.0.0-alpha.20

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

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

package/es/LoaderScript/utils.d.ts

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

package/es/LoaderScript/utils.js

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

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.17",
+  "version": "2.0.0-alpha.20",
   "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",