merge: integrate WP4-07 Green baseline for TASK-WP7-01
# Conflicts: # package.json
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import type { CanvasState } from "@dada/shared-contracts";
|
||||
import { P0A_COMPLEX_RELEASE_VERSION } from "@dada/template-registry";
|
||||
|
||||
import { fontOption, type FontOption } from "./text-assets.js";
|
||||
import type { DynamicTemplateId } from "./dynamic-provider.js";
|
||||
@@ -46,7 +47,7 @@ export interface DynamicRenderModel {
|
||||
textLayers: readonly DynamicTextLayer[];
|
||||
}
|
||||
|
||||
export const DYNAMIC_RESOURCE_VERSION = "wp4-dynamic-source-v1";
|
||||
export const DYNAMIC_RESOURCE_VERSION = P0A_COMPLEX_RELEASE_VERSION;
|
||||
|
||||
const dynamicFont = (fontId: string): FontOption => ({
|
||||
displayName: fontId,
|
||||
|
||||
@@ -864,7 +864,10 @@ export function EditorPage({ projectId }: { projectId: string }) {
|
||||
<button disabled={selectedElements.length === 0 || !canEdit} onClick={copySelection} title="复制" type="button">复制</button>
|
||||
<button disabled={clipboardRef.current.length === 0 || !canEdit} onClick={pasteSelection} title="粘贴" type="button">粘贴</button>
|
||||
</div>
|
||||
<div className="editor-canvas-frame" style={{ aspectRatio: `${canvasState.pixel_width} / ${canvasState.pixel_height}` }}>
|
||||
<div className="editor-canvas-frame" style={{
|
||||
aspectRatio: `${canvasState.pixel_width} / ${canvasState.pixel_height}`,
|
||||
maxWidth: `min(720px, calc(${(canvasState.pixel_width / canvasState.pixel_height * 100).toFixed(4)}vh - ${(canvasState.pixel_width / canvasState.pixel_height * 168).toFixed(4)}px))`,
|
||||
}}>
|
||||
<EditorStage
|
||||
assetId={canvasState.background.asset_id}
|
||||
canvasState={renderedCanvasState}
|
||||
|
||||
@@ -5,8 +5,9 @@ import {
|
||||
type StaticStickerCatalogItem,
|
||||
type VirtualStickerWindow,
|
||||
} from "@dada/static-sticker-catalog";
|
||||
import { P0A_STATIC_STICKER_RELEASE_VERSION } from "@dada/template-registry";
|
||||
|
||||
const resourceVersion = "fixture-v1";
|
||||
const resourceVersion = P0A_STATIC_STICKER_RELEASE_VERSION;
|
||||
const partCounts = [203, 36, 27, 48, 38, 75, 37, 67, 48, 24, 40, 30, 27, 51, 62, 19, 36, 45, 92, 53, 69, 31, 36, 30, 183] as const;
|
||||
|
||||
function buildCatalog(): StaticStickerCatalogItem[] {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import type { CanvasState } from "@dada/shared-contracts";
|
||||
import { P0A_REQUIRED_FONT_PANEL_IDS, P0A_TEXT_TEMPLATE_IDS } from "@dada/template-registry";
|
||||
import { P0A_COMPLEX_RELEASE_VERSION, P0A_REQUIRED_FONT_PANEL_IDS, P0A_TEXT_TEMPLATE_IDS } from "@dada/template-registry";
|
||||
|
||||
import type { CanvasElementIdentity } from "./editor-elements.js";
|
||||
|
||||
@@ -42,7 +42,7 @@ export interface TextStylePatch {
|
||||
textAlign?: TextAlign;
|
||||
}
|
||||
|
||||
const fixtureVersion = "wp4-fixture-v1";
|
||||
const resourceVersion = P0A_COMPLEX_RELEASE_VERSION;
|
||||
const defaults = {
|
||||
background_color: "#FFE62C",
|
||||
background_enabled: false,
|
||||
@@ -106,9 +106,9 @@ export const P0A_TEXT_TEMPLATES: readonly TextTemplateDefinition[] = P0A_TEXT_TE
|
||||
defaultFontSize: 48,
|
||||
defaultText: seed[3],
|
||||
displayName: seed[2],
|
||||
...(seed[5] === true ? { fontUrl: `/api/v1/assets/public/${fixtureVersion}/${seed[4]}` } : {}),
|
||||
...(seed[5] === true ? { fontUrl: `/api/v1/assets/public/${resourceVersion}/${seed[4]}` } : {}),
|
||||
resourceClass: seed[6] ?? "zip_template",
|
||||
resourceVersion: fixtureVersion,
|
||||
resourceVersion,
|
||||
templateId,
|
||||
};
|
||||
});
|
||||
@@ -130,7 +130,7 @@ const fontOptionDefinitions: Readonly<Record<typeof P0A_REQUIRED_FONT_PANEL_IDS[
|
||||
export const P0A_FONT_OPTIONS: readonly FontOption[] = P0A_REQUIRED_FONT_PANEL_IDS.map((fontId) => ({
|
||||
displayName: fontOptionDefinitions[fontId],
|
||||
fontId,
|
||||
url: `/api/v1/assets/public/${fixtureVersion}/${fontId}`,
|
||||
url: `/api/v1/assets/public/${resourceVersion}/${fontId}`,
|
||||
}));
|
||||
|
||||
export function fontOption(fontId: string) {
|
||||
|
||||
Reference in New Issue
Block a user