合并主分支素材库多选更新
合入素材库多选操作与批量导出更新 保留画布生成配方分支改动并解决冲突
This commit is contained in:
@@ -27,17 +27,30 @@ export function formatExportDate(date: Date) {
|
||||
const year = date.getFullYear();
|
||||
const month = String(date.getMonth() + 1).padStart(2, '0');
|
||||
const day = String(date.getDate()).padStart(2, '0');
|
||||
return `${year}${month}${day}`;
|
||||
const hour = String(date.getHours()).padStart(2, '0');
|
||||
const minute = String(date.getMinutes()).padStart(2, '0');
|
||||
const second = String(date.getSeconds()).padStart(2, '0');
|
||||
return `${year}${month}${day}-${hour}${minute}${second}`;
|
||||
}
|
||||
|
||||
export function getLayerExportKey(layer: CanvasLayer) {
|
||||
if (layer.mediaType === 'image-sequence') {
|
||||
return `image-sequence:${
|
||||
layer.taskId ||
|
||||
layer.sourceResourceId ||
|
||||
layer.imageSequenceFrames?.map((frame) => frame.imageSrc).join('|') ||
|
||||
layer.src
|
||||
}`;
|
||||
if (layer.taskId) {
|
||||
return `image-sequence:task:${layer.taskId}`;
|
||||
}
|
||||
if (layer.sourceResourceId) {
|
||||
return `image-sequence:resource:${layer.sourceResourceId}`;
|
||||
}
|
||||
const frameIdentities = layer.imageSequenceFrames?.map((frame) =>
|
||||
frame.assetObjectId
|
||||
? `asset-object:${frame.assetObjectId}`
|
||||
: frame.objectKey
|
||||
? `object-key:${frame.objectKey}`
|
||||
: `source:${frame.imageSrc}`,
|
||||
);
|
||||
return frameIdentities?.length
|
||||
? `image-sequence:frames:${JSON.stringify(frameIdentities)}`
|
||||
: `image-sequence:source:${layer.src}`;
|
||||
}
|
||||
return (
|
||||
layer.assetObjectId ||
|
||||
|
||||
Reference in New Issue
Block a user