@cloud-app-dev/vidc 3.1.17 → 3.1.19

package/es/Picture/useDraw.js

@@ -1,10 +1,11 @@
+import _useEventListener from "ahooks/es/useEventListener";
 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 { useEffect, useState, useRef, useCallback } from 'react';
+import { useState, useRef, useCallback } from 'react';
 export default function useDraw(dom, flag) {
   var _useState = useState({
       rect: [0, 0, 0, 0],
@@ -69,49 +70,28 @@ export default function useDraw(dom, flag) {
       });
     }
   }, [dom]);
-  /**
-   * move 修改框选区域
-   */
-  var changeSelect = useCallback(function (event) {
+  _useEventListener('mousedown', function (event) {
+    selectOptionsRef.current.startSelect = true;
+    selectOptionsRef.current.start = [event.clientX, event.clientY];
+  }, {
+    target: dom
+  });
+  _useEventListener('mousemove', function (event) {
     if (selectOptionsRef.current.startSelect) {
       selectOptionsRef.current.end = [event.clientX, event.clientY];
       drawSelectRact(false);
     }
-  }, [drawSelectRact]);
-  /**
-   * 结束当前框选
-   */
-  var selectEnd = useCallback(function (event) {
+  }, {
+    target: dom
+  });
+  _useEventListener('mouseup', function (event) {
     if (selectOptionsRef.current.startSelect) {
       selectOptionsRef.current.startSelect = false;
       selectOptionsRef.current.end = [event.clientX, event.clientY];
       drawSelectRact(true);
     }
-  }, [drawSelectRact]);
-  var openSelect = useCallback(function (event) {
-    selectOptionsRef.current.startSelect = true;
-    selectOptionsRef.current.start = [event.clientX, event.clientY];
-  }, []);
-  useEffect(function () {
-    if (dom && flag) {
-      dom.addEventListener('mousedown', openSelect, false);
-      dom.addEventListener('mousemove', changeSelect, false);
-      dom.addEventListener('mouseup', selectEnd, false);
-    }
-    if (dom && !flag) {
-      setState(function (old) {
-        return Object.assign(Object.assign({}, old), {
-          rect: [0, 0, 0, 0]
-        });
-      });
-    }
-    return function () {
-      if (dom) {
-        dom.removeEventListener('mousedown', openSelect, false);
-        dom.removeEventListener('mousemove', changeSelect, false);
-        dom.removeEventListener('mouseup', selectEnd, false);
-      }
-    };
-  }, [changeSelect, dom, flag, openSelect, selectEnd]);
+  }, {
+    target: dom
+  });
   return [state.rect, state.isEnd];
 }

package/es/ThemeAntd/index.css

@@ -531,6 +531,21 @@ div .cloudapp-select-focused:not(.cloudapp-select-disabled).cloudapp-select-sing
   border-color: var(--form-active-bg);
   box-shadow: unset;
 }
+div .cloudapp-select:not(.cloudapp-select-customize-input) .cloudapp-select-selector {
+  border-radius: var(--radius1);
+  border-color: var(--form-bd);
+  background-color: var(--form-bg);
+}
+div .cloudapp-select-focused:not(.cloudapp-select-disabled).cloudapp-select:not(.cloudapp-select-customize-input) .cloudapp-select-selector {
+  box-shadow: unset;
+  border-color: var(--form-active-bg);
+}
+div .cloudapp-select-disabled.cloudapp-select:not(.cloudapp-select-customize-input) .cloudapp-select-selector {
+  color: inherit;
+  border-color: var(--form-bd);
+  background-color: var(--form-bg);
+  opacity: 0.8;
+}
 div .cloudapp-tree {
   color: inherit;
   background: transparent;

package/es/ThemeAntd/style/select.css

@@ -56,3 +56,18 @@ div .cloudapp-select-focused:not(.cloudapp-select-disabled).cloudapp-select-sing
   border-color: var(--form-active-bg);
   box-shadow: unset;
 }
+div .cloudapp-select:not(.cloudapp-select-customize-input) .cloudapp-select-selector {
+  border-radius: var(--radius1);
+  border-color: var(--form-bd);
+  background-color: var(--form-bg);
+}
+div .cloudapp-select-focused:not(.cloudapp-select-disabled).cloudapp-select:not(.cloudapp-select-customize-input) .cloudapp-select-selector {
+  box-shadow: unset;
+  border-color: var(--form-active-bg);
+}
+div .cloudapp-select-disabled.cloudapp-select:not(.cloudapp-select-customize-input) .cloudapp-select-selector {
+  color: inherit;
+  border-color: var(--form-bd);
+  background-color: var(--form-bg);
+  opacity: 0.8;
+}

package/es/useDrawROI/index.d.ts

@@ -2,8 +2,9 @@ import { BasicTarget } from 'ahooks/lib/utils/domTarget';
 interface ROIOptions {
     row: number;
     rowItems: number;
+    defaultAreas?: [number, number][][];
 }
-declare function useDrawROI(target: BasicTarget<HTMLCanvasElement>, { row, rowItems }: ROIOptions): {
+declare function useDrawROI(target: BasicTarget<HTMLCanvasElement>, { row, rowItems, defaultAreas }: ROIOptions): {
     open: () => void;
     close: () => void;
     clear: () => void;

package/es/useDrawROI/index.js

@@ -1,4 +1,5 @@
 import _useEventListener from "ahooks/es/useEventListener";
+import _useUpdateEffect from "ahooks/es/useUpdateEffect";
 import _useSize from "ahooks/es/useSize";
 import _useLatest from "ahooks/es/useLatest";
 function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
@@ -13,23 +14,26 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { getTargetElement } from 'ahooks/lib/utils/domTarget';
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo } from 'react';
 import { lineString } from '@turf/helpers';
 import lineToPolygon from '@turf/line-to-polygon';
 import booleanDisjoint from '@turf/boolean-disjoint';
 import { useHotkeys } from 'react-hotkeys-hook';
+import useSimpleState from '../useSimpleState';
 function useDrawROI(target, _ref) {
   var row = _ref.row,
-    rowItems = _ref.rowItems;
-  var _useState = useState({
+    rowItems = _ref.rowItems,
+    defaultAreas = _ref.defaultAreas;
+  var _useSimpleState = useSimpleState({
       pos: [],
       tempPos: [],
-      saveArea: [],
+      saveArea: defaultAreas !== null && defaultAreas !== void 0 ? defaultAreas : [],
       isOpen: false
     }),
-    _useState2 = _slicedToArray(_useState, 2),
-    state = _useState2[0],
-    setState = _useState2[1];
+    _useSimpleState2 = _slicedToArray(_useSimpleState, 3),
+    state = _useSimpleState2[0],
+    updateState = _useSimpleState2[1],
+    setState = _useSimpleState2[2];
   var isOpenRef = _useLatest(state.isOpen);
   var size = _useSize(target);
   useEffect(function () {
@@ -46,6 +50,13 @@ function useDrawROI(target, _ref) {
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [size === null || size === void 0 ? void 0 : size.height, size === null || size === void 0 ? void 0 : size.width]);
+  _useUpdateEffect(function () {
+    if (state.saveArea.length === 0 && defaultAreas.length > 0) {
+      updateState({
+        saveArea: defaultAreas
+      });
+    }
+  }, [defaultAreas, state.saveArea]);
   _useEventListener('click', function (event) {
     if (!isOpenRef.current) {
       return;

package/package.json

@@ -2,7 +2,19 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "3.1.17",
+  "version": "3.1.19",
+  "scripts": {
+    "start": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "build": "npm run entry && father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "release": "npm run build && npm publish",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage",
+    "entry": "node ./scripts/entry.js"
+  },
   "main": "es/index.js",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -63,17 +75,5 @@
     "url": "git+http://git.topvdn.com/cloudapp/vidc.git",
     "branch": "master",
     "platform": "github"
-  },
-  "scripts": {
-    "start": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "build": "npm run entry && father-build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
-    "release": "npm run build && npm publish",
-    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage",
-    "entry": "node ./scripts/entry.js"
   }
-}
+}