@cloud-app-dev/vidc 3.2.34 → 3.2.36

package/es/DomMove/index.js

@@ -149,8 +149,8 @@ function DomMove(_ref) {
 DomMove.defaultProps = {
   className: '',
   size: {
-    width: 'max-content',
-    height: 'max-content'
+    width: '100%',
+    height: '100%'
   }
 };
 export default /*#__PURE__*/React.forwardRef(function (props, ref) {

package/es/Picture/demo.js

@@ -17,19 +17,21 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React from 'react';
 import Picture from '.';
-import { useSimpleState } from '..';
+import { Modal, useSimpleState } from '..';
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 export default function App() {
   var _useSimpleState = useSimpleState({
-    open: false
+    open: false,
+    open2: false
   }),
       _useSimpleState2 = _slicedToArray(_useSimpleState, 2),
       state = _useSimpleState2[0],
       updateState = _useSimpleState2[1];
 
-  return /*#__PURE__*/_jsx(_ConfigProvider, {
+  return /*#__PURE__*/_jsxs(_ConfigProvider, {
     prefixCls: "cloudapp",
-    children: /*#__PURE__*/_jsx("div", {
+    children: [/*#__PURE__*/_jsx("div", {
       style: {
         width: 800,
         height: 600,
@@ -43,7 +45,7 @@ export default function App() {
           pathname: '/',
           icon: ''
         }],
-        imagePath: "http://192.168.100.246:1443/image/v1/100005251/objects/63882cf105f5f58310107e95/1669910400.jpg?signature=ad407ae3019acb29b14b4ed2817ad12f&watermark=m_61646D696E0A323032323132303154313332373434&expires=1669910400",
+        imagePath: "http://192.168.100.246:5463/oss/v1/100004008/objects/638da35805f5f0a8101021f9?client_token=100004008_0_1670313176_9a47a8459c120d977904c9feb2354a7e",
         isOpenSelect: state.open,
         rects: [{
           type: 'face',
@@ -73,6 +75,40 @@ export default function App() {
           });
         }
       })
-    })
+    }), /*#__PURE__*/_jsxs("div", {
+      style: {
+        width: 800,
+        height: 600,
+        background: '#000',
+        marginTop: 40
+      },
+      children: [/*#__PURE__*/_jsx(_Button, {
+        onClick: function onClick() {
+          return updateState({
+            open2: true
+          });
+        },
+        children: "\u6253\u5F00"
+      }), /*#__PURE__*/_jsx(Modal, {
+        title: "modal",
+        open: state.open2,
+        onCancel: function onCancel() {
+          return updateState({
+            open2: false
+          });
+        },
+        width: 844,
+        children: /*#__PURE__*/_jsx("div", {
+          style: {
+            width: 800,
+            height: 600
+          },
+          children: /*#__PURE__*/_jsx(Picture, {
+            imagePath: "http://192.168.100.246:5463/oss/v1/100004008/objects/638da35805f5f0a8101021f9?client_token=100004008_0_1670313176_9a47a8459c120d977904c9feb2354a7e",
+            isOpenSelect: false
+          })
+        })
+      })]
+    })]
   });
 }

package/es/Picture/index.js

@@ -97,7 +97,6 @@ function Picture(_ref) {
       return undefined;
     }
 
-    console.log(imagePath);
     var localUrl;
     fetch(imagePath).then(function (res) {
       return res.blob();
@@ -106,6 +105,8 @@ function Picture(_ref) {
       updateState({
         localUrl: localUrl
       });
+    }).catch(function (e) {
+      console.error(e);
     });
     return function () {
       return URL.revokeObjectURL(localUrl);
@@ -363,6 +364,10 @@ function Picture(_ref) {
             ref: domImgRef,
             draggable: false,
             src: state.localUrl,
+            style: {
+              width: state.baseXOrY === 'x' ? '100%' : 'auto',
+              height: state.baseXOrY === 'y' ? '100%' : 'auto'
+            },
             "data-src": imagePath,
             onLoad: loadImageSuccess
           }), !isEmpty ? /*#__PURE__*/_jsx(DrawRect, {

package/es/ScreenPlayer/Record.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-import './index.less';
 import type { IRecordPlayerProps } from './interface';
+import './index.less';
 /**
  * @desc 录像设计的时间全部需要到毫秒
  * @param param0

package/es/ScreenPlayer/Record.js

@@ -35,12 +35,12 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { cloneDeep } from 'lodash-es';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import DisableMark from "../DisableMark";
-import "./index.less";
 import { FrontendPlayerWithExt, SegmentPlayerWithExt } from "./PlayerWithExt";
 import RecordTools from "./RecordTools";
 import SegmentTimeLine from "./SegmentTimeLine";
 import useVideoFit from "./useVideoFit";
 import { mergeFill, ScreenType, sleep } from "./utils";
+import "./index.less";
 import { createElement as _createElement } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -492,7 +492,7 @@ function RecordPlayer(_ref) {
           toggleFit: toggleFit,
           getPlayerItem: getPlayerItem,
           screenNum: screenNum,
-          mode: state.modes[state.selectIndex],
+          mode: segmentItem !== null && segmentItem !== void 0 && segmentItem.cid ? state.modes["".concat(segmentItem.cid, "-").concat(segmentItem.date)] : segmentItem === null || segmentItem === void 0 ? void 0 : segmentItem.mode,
           containerRef: domRef,
           updateState: updateState,
           onTimeChange: onTimeChange,

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "3.2.34",
+  "version": "3.2.36",
   "scripts": {
     "docs:deploy": "gh-pages -d docs-dist",
     "build": "npm run entry && father build",
@@ -66,7 +66,7 @@
     "@types/react-dom": "^18.0.6",
     "antd": "^4.22.6",
     "babel-plugin-import": "^1.13.5",
-    "dumi": "^2.0.9",
+    "dumi": "^2.0.10",
     "gh-pages": "^4.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",