@cloud-app-dev/vidc 2.2.0-alpha.1 → 2.2.0-alpha.2

package/es/Picture/component/Tools/index.js

@@ -72,11 +72,6 @@ function Tools(_ref) {
       return containerEle;
     },
     fullScreenChange: fullScreenChange
-  }, function (isFullscreen) {
-    return /*#__PURE__*/React.createElement(IconFont, {
-      title: !isFullscreen ? '全屏' : '退出全屏',
-      type: !isFullscreen ? 'icon-S_View_ScreenViewFull' : 'icon-S_View_ScreenViewExit'
-    });
   }))));
 }
 

package/es/Player/contraller_bar/contraller_event.js

@@ -26,6 +26,7 @@ function ContrallerEvent(_ref) {
 
   useEffect(function () {
     var showContraller = function showContraller() {
+      clearTimeout(timer.current);
       setVisibel(true);
       event.emit(EventName.SHOW_CONTRALLER);
     };

package/es/Player/frontend_timeline.js

@@ -40,6 +40,9 @@ function FrontendTimeLine(_ref) {
       _useTimes2 = _slicedToArray(_useTimes, 1),
       currentTime = _useTimes2[0];
 
+  var rTime = useMemo(function () {
+    return state.time + currentTime;
+  }, [state.time, currentTime]);
   useEffect(function () {
     return setState(function (old) {
       return Object.assign(Object.assign({}, old), {
@@ -47,30 +50,24 @@ function FrontendTimeLine(_ref) {
       });
     });
   }, [begin]);
-  useEffect(function () {
-    return setState(function (old) {
-      return Object.assign(Object.assign({}, old), {
-        time: currentTime
-      });
-    });
-  }, [currentTime]);
   var playPercent = useMemo(function () {
-    return state.time / duration * 100;
-  }, [state.time]);
+    return rTime / duration * 100;
+  }, [rTime]);
   var cTime = useMemo(function () {
-    return begin + state.time * 1000;
-  }, [begin, state.time]);
+    return begin + rTime * 1000;
+  }, [begin, rTime]);
   var seekWithLine = useCallback(function (e) {
     var rect = e.currentTarget.getBoundingClientRect();
     var current = e.pageX - rect.left;
     var cTime = current / rect.width * duration;
-    onSeek && onSeek(begin + cTime * 1000);
+    onSeek && onSeek(begin + cTime * 1000); //时间轴进度条rTime是要加上currentTime,这里要减去一下，包装交互一致性
+
     setState(function (old) {
       return Object.assign(Object.assign({}, old), {
-        time: cTime
+        time: cTime - currentTime
       });
     });
-  }, [api, duration, begin, onSeek]);
+  }, [api, duration, begin, onSeek, currentTime]);
   var onLineMouseOver = useCallback(function (e) {
     var rect = e.currentTarget.getBoundingClientRect();
     var left = e.pageX - rect.left;

package/es/Player/index.d.ts

@@ -1,4 +1,8 @@
-import SinglePlayer from './single_player';
 import SegmentPlayer from './segment_player';
 import FrontendPlayer from './frontend_player';
-export { SinglePlayer as default, SinglePlayer, FrontendPlayer, SegmentPlayer };
+declare const _default: {
+    SinglePlayer: import("react").MemoExoticComponent<import("react").ForwardRefExoticComponent<import("./player").ISinglePlayerProps & import("react").RefAttributes<import("./player").ExportPlayerType>>>;
+    FrontendPlayer: typeof FrontendPlayer;
+    SegmentPlayer: typeof SegmentPlayer;
+};
+export default _default;

package/es/Player/index.js

@@ -1,4 +1,8 @@
 import SinglePlayer from './single_player';
 import SegmentPlayer from './segment_player';
 import FrontendPlayer from './frontend_player';
-export { SinglePlayer as default, SinglePlayer, FrontendPlayer, SegmentPlayer };
+export default {
+  SinglePlayer: SinglePlayer,
+  FrontendPlayer: FrontendPlayer,
+  SegmentPlayer: SegmentPlayer
+};

package/es/SegmentPlayer/index.d.ts

@@ -0,0 +1,2 @@
+import SegmentPlayer from '../Player/segment_player';
+export default SegmentPlayer;

package/es/SegmentPlayer/index.js

@@ -0,0 +1,2 @@
+import SegmentPlayer from '../Player/segment_player';
+export default SegmentPlayer;

package/es/Service/fetch-adapter.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="typings/global" />
+import { AxiosRequestConfig, AxiosPromise } from 'axios';
+export interface AxiosFetchRequestConfig extends AxiosRequestConfig<BodyInit> {
+    mode?: RequestMode;
+    body?: BodyInit;
+    cache?: RequestCache;
+    integrity?: string;
+    redirect?: RequestRedirect;
+    referrer?: string;
+    credentials?: RequestCredentials;
+}
+export default function fetchAdapter(config: AxiosFetchRequestConfig): AxiosPromise;

package/es/Service/fetch-adapter.js

@@ -0,0 +1,184 @@
+/// <reference path="../../typings/global.d.ts"/>
+import { __awaiter } from "tslib";
+import { AxiosError } from 'axios';
+import settle from 'axios/lib/core/settle';
+import buildURL from 'axios/lib/helpers/buildURL';
+import buildFullPath from 'axios/lib/core/buildFullPath';
+import CanceledError from 'axios/lib/cancel/CanceledError';
+import { isUndefined } from 'lodash-es';
+export default function fetchAdapter(config) {
+  return new Promise(function (resolve, reject) {
+    var controller = new AbortController();
+    var signal = controller.signal;
+    var request = createRequest(config, signal);
+    var promises = [getResponse(request, config)];
+
+    if (config.timeout && config.timeout > 0) {
+      promises.push(timeoutHandle(request, controller, config));
+    }
+
+    if (config.cancelToken) {
+      // Handle cancellation
+      config.cancelToken.promise.then(function onCanceled(cancel) {
+        if (!request) {
+          return;
+        }
+
+        reject(!cancel ? new CanceledError(null, config, request) : cancel);
+        controller.abort();
+      });
+    }
+
+    return Promise.race(promises).then(function (data) {
+      return settle(resolve, reject, data);
+    }).catch(reject);
+  });
+}
+
+function timeoutHandle(request, controller, config) {
+  return new Promise(function (resolve) {
+    setTimeout(function () {
+      var message = config.timeoutErrorMessage ? config.timeoutErrorMessage : 'timeout of ' + config.timeout + 'ms exceeded';
+      resolve(createError(message, config, 'ECONNABORTED', request));
+      controller.abort();
+    }, config.timeout);
+  });
+}
+
+function getResponse(request, config) {
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var stageOne, response;
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return fetch(request);
+
+          case 3:
+            stageOne = _context.sent;
+            _context.next = 9;
+            break;
+
+          case 6:
+            _context.prev = 6;
+            _context.t0 = _context["catch"](0);
+            return _context.abrupt("return", createError('Network Error', config, 'ERR_NETWORK', request));
+
+          case 9:
+            response = {
+              ok: stageOne.ok,
+              status: stageOne.status,
+              statusText: stageOne.statusText,
+              headers: new Headers(stageOne.headers),
+              config: config,
+              request: request
+            };
+
+            if (!(stageOne.status >= 200 && stageOne.status !== 204)) {
+              _context.next = 30;
+              break;
+            }
+
+            _context.t1 = config.responseType;
+            _context.next = _context.t1 === 'arraybuffer' ? 14 : _context.t1 === 'blob' ? 18 : _context.t1 === 'json' ? 22 : 26;
+            break;
+
+          case 14:
+            _context.next = 16;
+            return stageOne.arrayBuffer();
+
+          case 16:
+            response.data = _context.sent;
+            return _context.abrupt("break", 30);
+
+          case 18:
+            _context.next = 20;
+            return stageOne.blob();
+
+          case 20:
+            response.data = _context.sent;
+            return _context.abrupt("break", 30);
+
+          case 22:
+            _context.next = 24;
+            return stageOne.json();
+
+          case 24:
+            response.data = _context.sent;
+            return _context.abrupt("break", 30);
+
+          case 26:
+            _context.next = 28;
+            return stageOne.text();
+
+          case 28:
+            response.data = _context.sent;
+            return _context.abrupt("break", 30);
+
+          case 30:
+            return _context.abrupt("return", response);
+
+          case 31:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[0, 6]]);
+  }));
+}
+
+function createRequest(config, signal) {
+  var headers = new Headers(config.headers);
+
+  if (config.auth) {
+    var username = config.auth.username || '';
+    var password = config.auth.password ? decodeURI(encodeURIComponent(config.auth.password)) : '';
+    headers.set('Authorization', "Basic ".concat(btoa(username + ':' + password)));
+  }
+
+  var method = config.method.toUpperCase();
+  var options = {
+    headers: headers,
+    method: method,
+    signal: signal
+  };
+
+  if (method !== 'GET' && method !== 'HEAD') {
+    options.body = config.data;
+  }
+
+  if (config.mode) {
+    options.mode = config.mode;
+  }
+
+  if (config.cache) {
+    options.cache = config.cache;
+  }
+
+  if (config.integrity) {
+    options.integrity = config.integrity;
+  }
+
+  if (config.redirect) {
+    options.redirect = config.redirect;
+  }
+
+  if (config.referrer) {
+    options.referrer = config.referrer;
+  }
+
+  if (!isUndefined(config.withCredentials)) {
+    options.credentials = config.withCredentials ? 'include' : 'omit';
+  }
+
+  var fullPath = buildFullPath(config.baseURL, config.url);
+  var url = buildURL(fullPath, config.params, config.paramsSerializer); // Expected browser to throw error if there is any wrong configuration value
+
+  return new Request(url, options);
+}
+
+function createError(message, config, code, request, response) {
+  return new AxiosError(message, AxiosError[code], config, request, response);
+}

package/es/Service/http.d.ts

@@ -1,4 +1,4 @@
-import { AxiosInstance } from 'fetch-like-axios';
+import { AxiosInstance } from 'axios';
 import type { RsponseType, XHRResponse } from './interface';
 declare function http({ cancelHttp, ...newOptions }: RsponseType): Promise<any>;
 declare const httpMultiPartInstance: AxiosInstance;

package/es/Service/http.js

@@ -1,11 +1,13 @@
 import { __rest } from "tslib";
-import Axios from 'fetch-like-axios';
+import Axios from 'axios';
+import fetchAdapter from './fetch-adapter';
 import * as Middleware from './middleware';
 var CancelToken = Axios.CancelToken;
 var config = {
   baseURL: '/',
   timeout: 60 * 1000,
   xhrMode: 'fetch',
+  adapter: fetchAdapter,
   headers: {
     Accept: 'application/json; charset=utf-8',
     'Content-Type': 'application/json; charset=utf-8'
@@ -68,8 +70,8 @@ function http(_a) {
 }
 
 var httpMultiPartInstance = Axios.create({
-  xhrMode: 'fetch',
   timeout: 10 * 60 * 1000,
+  adapter: fetchAdapter,
   headers: {
     'Content-Type': 'multipart/form-data'
   }

package/es/Service/interface.d.ts

@@ -1,4 +1,4 @@
-import type { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'fetch-like-axios';
+import type { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
 export type RsponseType = AxiosRequestConfig & { requestId?: string; cancelHttp?: (cancel: Function) => void; loggerIndex?: number };
 
 export type XHRResponse = {
@@ -20,3 +20,4 @@ export type IServiceInterface = {
   registerResponseMiddleware(fn: MiddleWareType): void;
   registerResponseErrorMiddleware(fn: MiddleWareType): void;
 };
+

package/es/Tree/BaseTree/demo.js

@@ -55,8 +55,10 @@ function App() {
       height: 400
     }
   }, /*#__PURE__*/React.createElement(Tree, {
-    key: state.keyword,
     treeData: treeData,
+    treeNodeProps: {
+      keyword: state.keyword
+    },
     virtual: false,
     icon: function icon(node) {
       return /*#__PURE__*/React.createElement(IconFont, {

package/es/WorkerFlow/Form/Condition.js

@@ -18,7 +18,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import Box from '../../Box';
 import IconFont from '../../IconFont';
-import RefModal from '../../RefModal';
+import Modal from '../../Modal';
+var RefModal = Modal.RefModal;
 
 function ConditionForm(_ref) {
   var form = _ref.form,

package/es/WorkerFlow/Form/EmptyUserSet.js

@@ -22,8 +22,9 @@ import React, { useCallback, useMemo, useRef, useState, useEffect } from 'react'
 import { replace } from 'lodash';
 import chroma from 'chroma-js';
 import UserSelectModalContent from './UserSelectModalContent';
-import RefModal from '../../RefModal';
 import IconFont from '../../IconFont';
+import Modal from '../../Modal';
+var RefModal = Modal.RefModal;
 
 function EmptyUserSet(_ref) {
   var _this = this;

package/es/WorkerFlow/Form/GroupSelect.js

@@ -24,7 +24,8 @@ import chroma from 'chroma-js';
 import GroupSelectModalContent from './GroupSelectModalContent';
 import IconFont from '../../IconFont';
 import { formatRenderGroup } from './utils';
-import RefModal from '../../RefModal';
+import Modal from '../../Modal';
+var RefModal = Modal.RefModal;
 
 function GroupSelect(_ref) {
   var _this = this;

package/es/WorkerFlow/Form/LevelGroupSelect.js

@@ -25,8 +25,9 @@ import { replace } from 'lodash';
 import chroma from 'chroma-js';
 import GroupSelectModalContent from './GroupSelectModalContent';
 import { formatRenderGroup, ToUpperNumberString } from './utils';
-import RefModal from '../../RefModal';
 import IconFont from '../../IconFont';
+import Modal from '../../Modal';
+var RefModal = Modal.RefModal;
 var levelDict = Array.from(new Array(30)).map(function (_, i) {
   return i + 1;
 });

package/es/WorkerFlow/Form/UserAndGroupSelect.js

@@ -25,9 +25,10 @@ import { replace } from 'lodash';
 import chroma from 'chroma-js';
 import UserSelectModalContent from './UserSelectModalContent';
 import GroupSelectModalContent from './GroupSelectModalContent';
-import RefModal from '../../RefModal';
 import { formatRenderGroup } from './utils';
 import IconFont from '../../IconFont';
+import Modal from '../../Modal';
+var RefModal = Modal.RefModal;
 
 function UserAndGroupSelect(_ref) {
   var _this = this;

package/es/WorkerFlow/Form/UserSelect.js

@@ -22,8 +22,9 @@ import React, { useCallback, useMemo, useRef, useState, useEffect } from 'react'
 import { replace } from 'lodash';
 import chroma from 'chroma-js';
 import UserSelectModalContent from './UserSelectModalContent';
-import RefModal from '../../RefModal';
 import IconFont from '../../IconFont';
+import Modal from '../../Modal';
+var RefModal = Modal.RefModal;
 
 function UserSelect(_ref) {
   var _this = this;

package/es/WorkerFlow/Nodes/TitleElement.js

@@ -67,7 +67,9 @@ function TitleElement(_ref) {
   }, [readOnly, isFocus, state.editable]);
 
   _useUpdateEffect(function () {
-    return !readOnly && !state.editable && onTitleChange && onTitleChange(state.title);
+    if (!readOnly && !state.editable && onTitleChange) {
+      onTitleChange(state.title);
+    }
   }, [state.title, state.editable]);
 
   _useUpdateEffect(function () {
@@ -77,7 +79,9 @@ function TitleElement(_ref) {
   }, [state.editable]);
 
   _useUpdateEffect(function () {
-    return !state.title && !isFocus && setTitle(placeholder);
+    if (!state.title && !isFocus) {
+      setTitle(placeholder);
+    }
   }, [isFocus, state.title, placeholder]);
 
   return /*#__PURE__*/React.createElement("div", {

package/es/WorkerFlow/index.js

@@ -39,8 +39,9 @@ import Render from './Nodes/Render';
 import Tools from './Tools';
 import WFC from './OperatorContext';
 import { filterNoticeNode, getJAVATaskData, getUserFormKeys } from './utils';
-import RefDrawer from '../RefDrawer';
+import Drawer from '../Drawer';
 import "./index.css";
+var RefDrawer = Drawer.RefDrawer;
 var FormMap = {
   1: ApproverForm,
   4: ConditionForm,

package/es/index.d.ts

@@ -1,6 +1,5 @@
 export { default as Api } from './Api';
 export { default as AppContext } from './AppContext';
-export { default as AppRedirect } from './AppRedirect';
 export { default as Auth } from './Auth';
 export { default as AutoExit } from './AutoExit';
 export { default as Box } from './Box';
@@ -12,6 +11,7 @@ export { default as DeviceSelect } from './DeviceSelect';
 export { default as Dict } from './Dict';
 export { default as Drag } from './Drag';
 export { default as Drawer } from './Drawer';
+export { default as FrontendPlayer } from './FrontendPlayer';
 export { default as FullScreen } from './FullScreen';
 export { default as HightLevel } from './HightLevel';
 export { default as IconFont } from './IconFont';
@@ -28,8 +28,7 @@ export { default as Modal } from './Modal';
 export { default as Picture } from './Picture';
 export { default as Player } from './Player';
 export { default as Progress } from './Progress';
-export { default as RefDrawer } from './RefDrawer';
-export { default as RefModal } from './RefModal';
+export { default as SegmentPlayer } from './SegmentPlayer';
 export { default as Service } from './Service';
 export { default as TableLayout } from './TableLayout';
 export { default as ThemeAntd } from './ThemeAntd';
@@ -37,7 +36,5 @@ export { default as Title } from './Title';
 export { default as Tree } from './Tree';
 export { default as UserSelect } from './UserSelect';
 export { default as WorkerFlow } from './WorkerFlow';
-export { default as useDrawer } from './useDrawer';
 export { default as useHistory } from './useHistory';
 export { default as useHttp } from './useHttp';
-export { default as useModal } from './useModal';

package/es/index.js

@@ -1,6 +1,5 @@
 export { default as Api } from './Api';
 export { default as AppContext } from './AppContext';
-export { default as AppRedirect } from './AppRedirect';
 export { default as Auth } from './Auth';
 export { default as AutoExit } from './AutoExit';
 export { default as Box } from './Box';
@@ -12,6 +11,7 @@ export { default as DeviceSelect } from './DeviceSelect';
 export { default as Dict } from './Dict';
 export { default as Drag } from './Drag';
 export { default as Drawer } from './Drawer';
+export { default as FrontendPlayer } from './FrontendPlayer';
 export { default as FullScreen } from './FullScreen';
 export { default as HightLevel } from './HightLevel';
 export { default as IconFont } from './IconFont';
@@ -28,8 +28,7 @@ export { default as Modal } from './Modal';
 export { default as Picture } from './Picture';
 export { default as Player } from './Player';
 export { default as Progress } from './Progress';
-export { default as RefDrawer } from './RefDrawer';
-export { default as RefModal } from './RefModal';
+export { default as SegmentPlayer } from './SegmentPlayer';
 export { default as Service } from './Service';
 export { default as TableLayout } from './TableLayout';
 export { default as ThemeAntd } from './ThemeAntd';
@@ -37,7 +36,5 @@ export { default as Title } from './Title';
 export { default as Tree } from './Tree';
 export { default as UserSelect } from './UserSelect';
 export { default as WorkerFlow } from './WorkerFlow';
-export { default as useDrawer } from './useDrawer';
 export { default as useHistory } from './useHistory';
-export { default as useHttp } from './useHttp';
-export { default as useModal } from './useModal';
+export { default as useHttp } from './useHttp';

package/es/typings.d.ts

@@ -0,0 +1 @@
+/// <reference path="../typings/global.d.ts"/>

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "2.2.0-alpha.1",
+  "version": "2.2.0-alpha.2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -30,14 +30,16 @@
     ]
   },
   "dependencies": {
+    "@types/lodash-es": "^4.17.6",
     "add-dom-event-listener": "^1.1.0",
     "ahooks": "^3.1.0",
+    "axios": "^0.27.2",
     "chroma-js": "^2.1.2",
-    "fetch-like-axios": "^0.0.5",
     "flv.zv.js": "^2.2.0",
     "hls.js": "^1.1.5",
     "immer": "^9.0.5",
     "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "rc-queue-anim": "^2.0.0"
   },
   "devDependencies": {
@@ -49,19 +51,19 @@
     "@types/react": "^18.0.9",
     "@types/react-dom": "^18.0.4",
     "@umijs/test": "^3.0.5",
-    "antd": "^4.20.5",
+    "antd": "^4.20.6",
     "babel-plugin-import": "^1.13.3",
     "dumi": "^1.1.40",
     "father-build": "^1.22.1",
     "gh-pages": "^3.0.0",
+    "history": "^5.3.0",
     "lint-staged": "^10.0.7",
     "prettier": "^2.2.1",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "react-router-dom": "^6.3.0",
     "typescript": "^4.5.4",
-    "yorkie": "^2.0.0",
-    "history": "^5.3.0"
+    "yorkie": "^2.0.0"
   },
   "repository": {
     "type": "git",

package/tsconfig.json

@@ -32,6 +32,7 @@
     "allowSyntheticDefaultImports": true,
     "typeRoots": ["typings", "node_modules/@types"]
   },
-  "include": ["src/**/*", "dosc/**/*"],
-  "exclude": ["node_modules", "lib", "es", "dist", "typings", "**/__test__", "test"]
+  "include": ["src/**/*", "dosc/**/*", "typings/*.d.ts"],
+
+  "exclude": ["node_modules", "lib", "es", "dist", "**/__test__", "test"]
 }

package/typings/global.d.ts

@@ -0,0 +1,4 @@
+declare module 'axios/lib/core/settle';
+declare module 'axios/lib/helpers/buildURL';
+declare module 'axios/lib/core/buildFullPath';
+declare module 'axios/lib/cancel/CanceledError';

package/es/AppRedirect/index.d.ts

@@ -1,17 +0,0 @@
-/// <reference types="react" />
-import * as H from 'history';
-import './index.less';
-interface AppRedirectProps {
-    /**
-     * @description 匹配路径
-     * @default -
-     */
-    path?: string | string[];
-    /**
-     * @description 重定向路径
-     * @description -
-     */
-    to: H.Location;
-}
-declare function AppRedirect({ path, to }: AppRedirectProps): JSX.Element;
-export default AppRedirect;

package/es/AppRedirect/index.js

@@ -1,33 +0,0 @@
-import React, { useEffect } from 'react';
-import { useLocation, useNavigate } from 'react-router-dom';
-import "./index.css";
-
-var getKey = function getKey() {
-  return Math.random().toString(36).substr(2);
-};
-
-function AppRedirect(_ref) {
-  var path = _ref.path,
-      to = _ref.to;
-  var navigate = useNavigate();
-  var location = useLocation();
-  useEffect(function () {
-    if (path === location.pathname) {
-      if (typeof to !== 'string') {
-        navigate("".concat(to.pathname).concat(to.search ? "".concat(to.search, "&key=").concat(getKey()) : "?key=".concat(getKey())), {
-          replace: true,
-          state: Object.assign({}, to.state, {
-            isReplace: true
-          })
-        });
-      } else {
-        navigate("".concat(to, "?key").concat(getKey()), {
-          replace: true
-        });
-      }
-    }
-  }, [path, location.pathname, to, history]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null);
-}
-
-export default AppRedirect;