sense-react-timeline-editor 1.0.20 → 1.0.22

package/dist/index.esm.js

@@ -2950,6 +2950,8 @@ var EditRow = function EditRow(props) {
       e.stopPropagation();
       if (rowData.canUpload) {
         var files = e.dataTransfer.files;
+        // @ts-expect-error 因为 files 是 FileList 类型，不能直接修改 uid 属性
+        files[0].uid = new Date().getTime().toString();
         uploadBgMusic === null || uploadBgMusic === void 0 ? void 0 : uploadBgMusic(Array.from(files));
       }
     },
@@ -3739,7 +3741,7 @@ var EditAreaO = /*#__PURE__*/React.forwardRef(function (props, ref) {
   // 支持 mp3\wav 格式上传
   var onBeforeUpload = function onBeforeUpload(file) {
     if (file.type !== 'audio/mp3' && file.type !== 'audio/wav' && file.type !== 'audio/mpeg') {
-      message.error('只能上传 mp3wav 格式的音频');
+      message.error('只能上传mp3、wav格式的音频');
       return false;
     }
     var maxSize = 100 * 1024 * 1024;
@@ -3752,22 +3754,48 @@ var EditAreaO = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var handleUploadChange = function handleUploadChange(row) {
     return /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(info) {
-        var _info$file$response;
-        var uid, duration, newAction;
+        var _info$file$response, _info$file;
+        var totalDuration, _newAction, uid, duration, newAction;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
               console.log('Upload info:', info);
-              if (!(!info.file || !info.file.response)) {
+              if (info.file) {
                 _context.n = 1;
                 break;
               }
               return _context.a(2);
             case 1:
+              if (info.file.response) {
+                _context.n = 2;
+                break;
+              }
+              totalDuration = row.actions.reduce(function (max, current) {
+                var _max$end;
+                var currentEnd = current.end || 0;
+                var maxEnd = (_max$end = max === null || max === void 0 ? void 0 : max.end) !== null && _max$end !== void 0 ? _max$end : 0;
+                return currentEnd > maxEnd ? current : max;
+              }, {
+                end: 0
+              }).end || 0;
+              _newAction = {
+                id: info.file.uid,
+                effectId: 'custom_video_effect',
+                flexible: true,
+                url: '',
+                start: totalDuration,
+                end: totalDuration + 5,
+                isUpload: true,
+                segment_type: 'bgm',
+                isUploading: info.isUploading || false
+              };
+              onUpdateEditorData === null || onUpdateEditorData === void 0 ? void 0 : onUpdateEditorData(row, [_newAction]);
+              return _context.a(2);
+            case 2:
               uid = info.file.uid;
-              _context.n = 2;
+              _context.n = 3;
               return getAudioDuration(info.file.response.url);
-            case 2:
+            case 3:
               duration = _context.v;
               newAction = {
                 id: ((_info$file$response = info.file.response) === null || _info$file$response === void 0 ? void 0 : _info$file$response.id) || uid,
@@ -3777,10 +3805,12 @@ var EditAreaO = /*#__PURE__*/React.forwardRef(function (props, ref) {
                 start: currentMouseTime,
                 end: currentMouseTime + duration,
                 isUpload: true,
-                segment_type: 'bgm'
+                segment_type: 'bgm',
+                isUploading: false,
+                uid: (_info$file = info.file) === null || _info$file === void 0 ? void 0 : _info$file.uid
               };
               onUpdateEditorData === null || onUpdateEditorData === void 0 ? void 0 : onUpdateEditorData(row, [newAction]);
-            case 3:
+            case 4:
               return _context.a(2);
           }
         }, _callee);
@@ -3990,12 +4020,20 @@ var EditAreaO = /*#__PURE__*/React.forwardRef(function (props, ref) {
       var canUpload = onBeforeUpload === null || onBeforeUpload === void 0 ? void 0 : onBeforeUpload(file[0]);
       if (!canUpload) return;
       var onSuccess = handleUploadChange(row);
+      onSuccess({
+        file: file[0],
+        isUploading: true
+      });
       customRequest === null || customRequest === void 0 ? void 0 : customRequest({
         file: file[0],
         onSuccess: onSuccess,
         method: 'POST',
         action: 'bgm',
         onError: function onError(err) {
+          onSuccess({
+            file: file[0],
+            isUploading: false
+          });
           console.error('Upload error:', err);
         }
       });

package/dist/index.js

@@ -2959,6 +2959,8 @@ var EditRow = function EditRow(props) {
       e.stopPropagation();
       if (rowData.canUpload) {
         var files = e.dataTransfer.files;
+        // @ts-expect-error 因为 files 是 FileList 类型，不能直接修改 uid 属性
+        files[0].uid = new Date().getTime().toString();
         uploadBgMusic === null || uploadBgMusic === void 0 ? void 0 : uploadBgMusic(Array.from(files));
       }
     },
@@ -3748,7 +3750,7 @@ var EditAreaO = /*#__PURE__*/React__default['default'].forwardRef(function (prop
   // 支持 mp3\wav 格式上传
   var onBeforeUpload = function onBeforeUpload(file) {
     if (file.type !== 'audio/mp3' && file.type !== 'audio/wav' && file.type !== 'audio/mpeg') {
-      es.message.error('只能上传 mp3wav 格式的音频');
+      es.message.error('只能上传mp3、wav格式的音频');
       return false;
     }
     var maxSize = 100 * 1024 * 1024;
@@ -3761,22 +3763,48 @@ var EditAreaO = /*#__PURE__*/React__default['default'].forwardRef(function (prop
   var handleUploadChange = function handleUploadChange(row) {
     return /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(info) {
-        var _info$file$response;
-        var uid, duration, newAction;
+        var _info$file$response, _info$file;
+        var totalDuration, _newAction, uid, duration, newAction;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
               console.log('Upload info:', info);
-              if (!(!info.file || !info.file.response)) {
+              if (info.file) {
                 _context.n = 1;
                 break;
               }
               return _context.a(2);
             case 1:
+              if (info.file.response) {
+                _context.n = 2;
+                break;
+              }
+              totalDuration = row.actions.reduce(function (max, current) {
+                var _max$end;
+                var currentEnd = current.end || 0;
+                var maxEnd = (_max$end = max === null || max === void 0 ? void 0 : max.end) !== null && _max$end !== void 0 ? _max$end : 0;
+                return currentEnd > maxEnd ? current : max;
+              }, {
+                end: 0
+              }).end || 0;
+              _newAction = {
+                id: info.file.uid,
+                effectId: 'custom_video_effect',
+                flexible: true,
+                url: '',
+                start: totalDuration,
+                end: totalDuration + 5,
+                isUpload: true,
+                segment_type: 'bgm',
+                isUploading: info.isUploading || false
+              };
+              onUpdateEditorData === null || onUpdateEditorData === void 0 ? void 0 : onUpdateEditorData(row, [_newAction]);
+              return _context.a(2);
+            case 2:
               uid = info.file.uid;
-              _context.n = 2;
+              _context.n = 3;
               return getAudioDuration(info.file.response.url);
-            case 2:
+            case 3:
               duration = _context.v;
               newAction = {
                 id: ((_info$file$response = info.file.response) === null || _info$file$response === void 0 ? void 0 : _info$file$response.id) || uid,
@@ -3786,10 +3814,12 @@ var EditAreaO = /*#__PURE__*/React__default['default'].forwardRef(function (prop
                 start: currentMouseTime,
                 end: currentMouseTime + duration,
                 isUpload: true,
-                segment_type: 'bgm'
+                segment_type: 'bgm',
+                isUploading: false,
+                uid: (_info$file = info.file) === null || _info$file === void 0 ? void 0 : _info$file.uid
               };
               onUpdateEditorData === null || onUpdateEditorData === void 0 ? void 0 : onUpdateEditorData(row, [newAction]);
-            case 3:
+            case 4:
               return _context.a(2);
           }
         }, _callee);
@@ -3999,12 +4029,20 @@ var EditAreaO = /*#__PURE__*/React__default['default'].forwardRef(function (prop
       var canUpload = onBeforeUpload === null || onBeforeUpload === void 0 ? void 0 : onBeforeUpload(file[0]);
       if (!canUpload) return;
       var onSuccess = handleUploadChange(row);
+      onSuccess({
+        file: file[0],
+        isUploading: true
+      });
       customRequest === null || customRequest === void 0 ? void 0 : customRequest({
         file: file[0],
         onSuccess: onSuccess,
         method: 'POST',
         action: 'bgm',
         onError: function onError(err) {
+          onSuccess({
+            file: file[0],
+            isUploading: false
+          });
           console.error('Upload error:', err);
         }
       });

package/dist/interface/action.d.ts

@@ -32,6 +32,9 @@ export interface TimelineAction {
     isUpload?: boolean;
     /** 动作的类型 */
     segment_type?: string;
+    /** 动作是否正在上传 */
+    isUploading?: boolean;
+    [key: string]: any;
 }
 /**
  * 动作行基本参数

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sense-react-timeline-editor",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "author": "xzdarcy",
   "license": "MIT",
   "keywords": [