Compare commits

..

29 Commits

Author SHA1 Message Date
zhangshun
91ae484b36 修改模型树相关配置 2026-07-11 13:41:11 +08:00
zhangshun
0673de9ebe 修正模型库子路径构建配置 2026-07-10 13:34:03 +08:00
zhangshun
15d2bc51ca 上传模型时自动生成预览图 2026-07-08 18:38:48 +08:00
zhangshun
0665d7a008 上传模型时显示全屏进度 2026-07-08 18:27:51 +08:00
zhangshun
025835c5b3 优化批量上传模型提示 2026-07-08 18:18:11 +08:00
zhangshun
a3e7d93872 支持批量导入模型 2026-07-08 18:03:24 +08:00
zhangshun
e2e7aa5f06 增加前端运行时后端地址配置 2026-06-02 13:32:08 +08:00
zhangshun
8fb45bd42a 生产构建跳过本地开发证书 2026-06-02 11:46:55 +08:00
zhangshun
e215f93ef2 修改部分按钮显示 2026-06-02 10:38:40 +08:00
zhangshun
bbed65e41e 调整模型操作按钮布局 2026-06-02 10:33:37 +08:00
zhangshun
d4e78a666e 免登录隐藏人员权限按钮 2026-06-02 10:07:44 +08:00
zhangshun
74f3e60013 修改测试用例 2026-06-02 10:04:02 +08:00
zhangshun
91f689c3d4 隐藏模型价格重量字段 2026-06-01 18:02:10 +08:00
zhangshun
c1d5240d2c 固定模型缩略图比例 2026-06-01 16:56:35 +08:00
zhangshun
33f1163aa7 调整预览基点显示单位 2026-06-01 16:52:54 +08:00
zhangshun
7ab0c2bba4 支持预览界面接收场景基点 2026-06-01 15:55:39 +08:00
zhangshun
2368d6e6c1 调整模型预览下载按钮位置 2026-06-01 15:24:35 +08:00
zhangshun
b1ef3deb03 增加模型库模型下载入口 2026-06-01 14:34:44 +08:00
zhangshun
5b6d29f0f6 修复场景导入模型名称提交 2026-06-01 14:18:43 +08:00
zhangshun
a059805458 调整模型库上传模型的字段 2026-06-01 14:14:16 +08:00
zhangshun
6206c9556b 优化模型删除后的列表刷新 2026-06-01 13:26:31 +08:00
zhangshun
00f7dc1686 增加模型库无工艺数据播放提示 2026-06-01 13:07:50 +08:00
zhangshun
57d3137640 修复模型库跨端口消息发送 2026-06-01 10:40:04 +08:00
zhangshun
cc58a6e98d 固定模型库工艺预览帧间隔 2026-06-01 10:18:08 +08:00
zhangshun
b6c3bd9922 修复模型库工艺预览播放速度 2026-06-01 10:12:38 +08:00
zhangshun
c14a6aa75c 增强场景模型导入请求反馈 2026-06-01 10:06:55 +08:00
zhangshun
692d61105e 刷新模型库目录模型数量 2026-06-01 09:57:35 +08:00
zhangshun
fcec4f3db4 修复模型库空请求体删除失败 2026-06-01 09:50:52 +08:00
zhangshun
3dfed3a2df 统一模型库确认框调用方式 2026-06-01 09:40:36 +08:00
16 changed files with 980 additions and 245 deletions

View File

@@ -7,7 +7,7 @@ DB_PATH=
# fixed: auto login with FIXED_LOGIN_USERNAME and open model library directly
APP_AUTH_MODE=fixed
FIXED_LOGIN_USERNAME=admin
FIXED_LOGIN_ROLE=user
FIXED_LOGIN_ROLE=admin
ALLOW_USER_EDIT_SYSTEM_LIBRARY=false
# local: write to server/storage and serve via /storage

View File

@@ -7,6 +7,7 @@
</head>
<body>
<div id="app"></div>
<script src="%BASE_URL%model-library-config.js"></script>
<script type="module" src="/src/main.ts"></script>
</body>
</html>

View File

@@ -0,0 +1,9 @@
window.__DMT_MODEL_LIBRARY_CONFIG__ = {
// 后端服务根地址。为空时使用当前页面域名,例如 /api/models。
// 示例:"https://model-api.example.com"
API_BASE_URL: "https://dmt.meswork.com/modelLibrary",
// 模型文件和缩略图服务根地址。为空时优先复用 API_BASE_URL。
// 示例:"https://model-api.example.com"
STORAGE_BASE_URL: "https://dmt.meswork.com"
};

52
web/src/config/runtime.ts Normal file
View File

@@ -0,0 +1,52 @@
type RuntimeConfig = {
API_BASE_URL?: string;
STORAGE_BASE_URL?: string;
};
declare global {
interface Window {
__DMT_MODEL_LIBRARY_CONFIG__?: RuntimeConfig;
}
}
function runtimeConfig() {
return window.__DMT_MODEL_LIBRARY_CONFIG__ ?? {};
}
function cleanBaseUrl(value?: string) {
return value?.trim().replace(/\/+$/g, "") ?? "";
}
function isAbsoluteUrl(url: string) {
return /^https?:\/\//i.test(url);
}
function joinUrl(baseUrl: string, path: string) {
if (!baseUrl || isAbsoluteUrl(path)) return path;
return `${baseUrl}${path.startsWith("/") ? "" : "/"}${path}`;
}
function joinApiUrl(baseUrl: string, path: string) {
if (!baseUrl || isAbsoluteUrl(path)) return path;
try {
const base = new URL(baseUrl);
if (base.pathname.replace(/\/+$/g, "") === "/api" && path.startsWith("/api/")) {
return joinUrl(baseUrl, path.slice(4));
}
} catch {
// 非完整 URL 时按普通路径拼接。
}
return joinUrl(baseUrl, path);
}
export function resolveApiUrl(path: string) {
return joinApiUrl(cleanBaseUrl(runtimeConfig().API_BASE_URL), path);
}
export function resolveStorageUrl(path: string) {
const storageBaseUrl = cleanBaseUrl(runtimeConfig().STORAGE_BASE_URL);
const apiBaseUrl = cleanBaseUrl(runtimeConfig().API_BASE_URL);
return joinUrl(storageBaseUrl || apiBaseUrl, path);
}

View File

@@ -115,23 +115,24 @@
overflow: auto;
padding: 10px 12px;
display: grid;
grid-template-columns: repeat(auto-fill, minmax(190px, 1fr));
grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
align-content: start;
gap: 10px;
}
.model-card {
display: grid;
gap: 8px;
gap: 5px;
background: #ffffff;
border: 1px solid #d7e0e8;
border-radius: 6px;
padding: 8px;
padding: 5px;
}
.thumb {
position: relative;
min-height: 150px;
aspect-ratio: 4 / 3;
min-height: 0;
display: grid;
place-items: center;
/* background:
@@ -151,8 +152,9 @@
.thumb-actions {
position: absolute;
inset: 0;
display: flex;
flex-direction: column;
display: grid;
grid-template-columns: repeat(2, minmax(0, 86px));
align-content: center;
align-items: center;
justify-content: center;
gap: 7px;
@@ -171,7 +173,7 @@
}
.thumb-actions button {
width: min(86px, 80%);
width: 100%;
min-height: 24px;
padding: 3px 8px;
border-color: rgba(255, 255, 255, 0.3);
@@ -179,6 +181,7 @@
}
.thumb img {
display: block;
width: 100%;
height: 100%;
object-fit: contain;

View File

@@ -64,6 +64,105 @@
color: #405469;
}
.selected-file-summary {
display: block;
color: #1f6f8b;
font-weight: 600;
}
.selected-file-list {
display: block;
max-height: 58px;
overflow: auto;
color: #405469;
line-height: 1.45;
word-break: break-all;
}
.upload-status {
padding: 8px 10px;
border: 1px solid #b9d7c1;
border-radius: 6px;
background: #eef8f1;
color: #27613a;
font-size: 13px;
line-height: 1.45;
word-break: break-all;
}
.upload-popup-form.is-uploading .drop-zone {
cursor: progress;
opacity: 0.72;
}
.upload-progress-overlay {
position: fixed;
inset: 0;
z-index: 100000;
display: grid;
place-items: center;
padding: 24px;
background: rgba(15, 23, 42, 0.58);
}
.upload-progress-overlay[hidden] {
display: none;
}
.upload-progress-panel {
width: min(460px, 100%);
display: grid;
gap: 12px;
padding: 22px 24px;
border: 1px solid #dbe5ec;
border-radius: 8px;
background: #ffffff;
box-shadow: 0 18px 48px rgba(15, 23, 42, 0.24);
}
.upload-progress-title {
color: #1c2733;
font-size: 18px;
font-weight: 700;
}
.upload-progress-message {
color: #405469;
font-size: 14px;
line-height: 1.5;
word-break: break-all;
}
.upload-progress-track {
height: 10px;
overflow: hidden;
border-radius: 999px;
background: #e8eef3;
}
.upload-progress-bar {
width: 0;
height: 100%;
border-radius: inherit;
background: #1f6f8b;
transition: width 180ms ease;
}
.upload-progress-meta {
color: #27613a;
font-size: 13px;
font-weight: 700;
}
.upload-progress-file {
max-height: 48px;
overflow: auto;
color: #647586;
font-size: 12px;
line-height: 1.4;
word-break: break-all;
}
.upload-target-path {
display: grid;
grid-template-columns: 64px minmax(0, 1fr);
@@ -236,6 +335,16 @@
padding: 8px;
}
.preview-scene-actions {
display: flex;
align-items: center;
gap: 8px;
}
.preview-scene-actions > button {
flex: 1;
}
.preview-scene-body > button {
width: 100%;
}

View File

@@ -10,6 +10,7 @@ export async function renderApp() {
const currentUser = getCurrentUser();
const isAdmin = currentUser?.role === "admin";
const isFixedLogin = document.body.dataset.authMode === "fixed";
const canManageUsers = isAdmin && !isFixedLogin;
document.querySelector<HTMLDivElement>("#app")!.innerHTML = `
<div class="app-shell">
<header class="topbar">
@@ -32,10 +33,10 @@ export async function renderApp() {
<main class="content-pane">
<div class="content-toolbar">
<div class="content-actions">
${isAdmin ? `<button id="manageUsersBtn" type="button">人员权限</button>` : ""}
${canManageUsers ? `<button id="manageUsersBtn" type="button">人员权限</button>` : ""}
${isAdmin ? `<button id="manageDictionariesBtn" type="button">字典维护</button>` : ""}
${isAdmin ? `<button id="addProcessModelBtn" type="button" hidden>上传工艺模型</button>` : ""}
${isAdmin ? `<button id="addModelBtn1" class="primary-btn" type="button" hidden>增加模型</button>` : ""}
${canManageUsers ? `<button id="addProcessModelBtn" type="button" hidden>上传工艺模型</button>` : ""}
${canManageUsers ? `<button id="addModelBtn1" class="primary-btn" type="button" hidden>增加模型</button>` : ""}
</div>
</div>
<div class="filter-toolbar">
@@ -55,8 +56,8 @@ export async function renderApp() {
<span>关键字</span>
<input id="keywordFilter" placeholder="模型名 / 文件名 / 属性" />
</label>
<button id="resetFilterBtn" type="button">重置</button>
<button id="addModelBtn" class="primary-btn" type="button">增加模型</button>
<button id="resetFilterBtn" type="button">筛选模型</button>
<button id="addModelBtn" class="primary-btn" type="button">导入模型</button>
</div>
<div id="modelGrid" class="model-grid"></div>
<footer id="modelPagination" class="pagination"></footer>

View File

@@ -63,7 +63,8 @@ async function runFolderAction(action: () => Promise<void>) {
}
}
export async function loadFolders() {
export async function loadFolders(options: { reloadModels?: boolean } = {}) {
const reloadModels = options.reloadModels ?? true;
const result = await api<FolderTreeResponse>("/api/folders");
appState.folders = result.folders;
const root = appState.folders.find((folder) => folder.parent_id === null);
@@ -125,8 +126,10 @@ export async function loadFolders() {
if (appState.selectedFolderId) {
$("#folderTree").on("ready.jstree", () => {
$("#folderTree").jstree(true).select_node(String(appState.selectedFolderId));
$("#folderTree").jstree(true).select_node(String(appState.selectedFolderId), true);
});
}
if (reloadModels) {
await loadModels();
}
}

View File

@@ -3,11 +3,16 @@ import { renderPagination } from "../../../components/pagination";
import { getCurrentUser } from "../../../services/authState";
import type { DictionaryResponse, ModelItem, ModelListResponse } from "../../../types";
import { confirmDialog, formDialog, notify, notifyError } from "../../../ui/dialogs";
import { downloadFileFromUrl } from "../../../utils/fileDownload";
import { escapeHtml, modelNameFromFile } from "../../../utils/format";
import { resolveStorageUrl } from "../../../config/runtime";
import { appState } from "../appState";
import { generateModelThumbnailFromFile } from "./thumbnail";
type UploadFormState = {
file: File | null;
files: File[];
thumbnailFailures: string[];
};
type UploadModelPayload = {
@@ -21,6 +26,10 @@ type UploadModelPayload = {
properties?: Record<string, string>;
};
type UploadModelResponse = {
id: number;
};
const defaultOperationTree = JSON.stringify({ OperationTree: "[]" });
const requestSceneModelMessageType = "DMT_MODEL_LIBRARY_REQUEST_SCENE_MODEL";
const sceneModelMessageType = "DMT_MODEL_LIBRARY_SCENE_MODEL";
@@ -35,6 +44,7 @@ type SceneModelMessagePayload = {
type SceneModelMessage = {
type?: string;
requestId?: string;
payload?: SceneModelMessagePayload;
message?: string;
};
@@ -42,6 +52,9 @@ type SceneModelMessage = {
let dictionariesLoaded = false;
let dictionariesLoading: Promise<void> | null = null;
let sceneModelBridgeBound = false;
let pendingSceneModelRequestId = "";
let pendingSceneModelRequestTimer: number | null = null;
let visibleModels = new Map<number, ModelItem>();
export function bindModelActions() {
const isAdmin = getCurrentUser()?.role === "admin";
@@ -120,7 +133,7 @@ export function bindModelActions() {
});
}
export async function loadModels() {
export async function loadModels(options: { preserveCards?: boolean } = {}) {
const grid = document.querySelector<HTMLDivElement>("#modelGrid");
if (!grid || !appState.selectedFolderId) return;
await loadDictionaries();
@@ -150,23 +163,33 @@ export async function loadModels() {
await loadModels();
}
});
grid.innerHTML = result.items.map(renderModelCard).join("") || `<div class="empty-state">当前目录暂无模型</div>`;
grid.querySelectorAll<HTMLButtonElement>("[data-action='preview']").forEach((button) => {
const model = result.items.find((item) => item.id === Number(button.dataset.id));
if (model) {
button.addEventListener("click", async () => {
visibleModels = new Map(result.items.map((item) => [item.id, item]));
renderModelGrid(grid, result.items, options.preserveCards);
bindModelGridActions(grid);
}
function bindModelGridActions(grid: HTMLDivElement) {
if (grid.dataset.actionsBound === "true") return;
grid.dataset.actionsBound = "true";
grid.addEventListener("click", async (event) => {
const target = event.target instanceof Element ? event.target : null;
const button = target?.closest<HTMLButtonElement>("button[data-action][data-id]");
if (!button || !grid.contains(button)) return;
const id = Number(button.dataset.id);
const model = visibleModels.get(id);
try {
switch (button.dataset.action) {
case "preview": {
if (!model) return;
const { openModelPreview } = await import("./preview");
openModelPreview(model, loadModels);
});
break;
}
});
grid.querySelectorAll<HTMLButtonElement>("[data-action='edit']").forEach((button) => {
button.addEventListener("click", () => editModel(Number(button.dataset.id)));
});
grid.querySelectorAll<HTMLButtonElement>("[data-action='import']").forEach((button) => {
const model = result.items.find((item) => item.id === Number(button.dataset.id));
case "edit":
await editModel(id);
break;
case "import": {
if (!model) return;
button.addEventListener("click", async () => {
const { createImportScenePayload, emitImportScenePayload } = await import("./preview");
const payload = createImportScenePayload({
model,
@@ -176,11 +199,53 @@ export async function loadModels() {
});
emitImportScenePayload(payload);
notify("导入场景数据已输出");
break;
}
case "download":
if (!model) return;
await downloadFileFromUrl(model.file_url, model.original_filename || model.name);
break;
case "delete":
await deleteModel(id);
break;
}
} catch (error) {
notifyError(error);
}
});
});
grid.querySelectorAll<HTMLButtonElement>("[data-action='delete']").forEach((button) => {
button.addEventListener("click", () => deleteModel(Number(button.dataset.id)));
});
}
function renderModelGrid(grid: HTMLDivElement, items: ModelItem[], preserveCards = false) {
if (!preserveCards) {
grid.innerHTML = items.map(renderModelCard).join("") || `<div class="empty-state">当前目录暂无模型</div>`;
return;
}
if (items.length === 0) {
grid.innerHTML = `<div class="empty-state">当前目录暂无模型</div>`;
return;
}
const existingCards = new Map(
Array.from(grid.querySelectorAll<HTMLElement>(".model-card[data-model-id]"))
.map((card) => [Number(card.dataset.modelId), card])
);
const fragment = document.createDocumentFragment();
for (const item of items) {
const existingCard = existingCards.get(item.id);
if (existingCard) {
fragment.append(existingCard);
continue;
}
const template = document.createElement("template");
template.innerHTML = renderModelCard(item).trim();
fragment.append(template.content);
}
grid.replaceChildren(fragment);
}
async function reloadFoldersAndModels(preserveModelCards = false) {
const { loadFolders } = await import("./folders");
await loadFolders({ reloadModels: false });
await loadModels({ preserveCards: preserveModelCards });
}
async function loadDictionaries(force = false) {
@@ -230,7 +295,7 @@ function renderModelCard(item: ModelItem) {
const canWrite = item.permissions.write;
const prop = item.properties ?? {};
const thumb = item.thumbnail_url
? `<img src="${item.thumbnail_url}" alt="" />`
? `<img src="${resolveStorageUrl(item.thumbnail_url)}" alt="" />`
: `<div class="thumb-placeholder">暂无预览图</div>`;
return `
<article class="model-card" data-model-id="${item.id}">
@@ -241,6 +306,7 @@ function renderModelCard(item: ModelItem) {
${thumb}
<div class="thumb-actions">
<button data-action="preview" data-id="${item.id}">预览</button>
<button data-action="download" data-id="${item.id}">下载</button>
${canWrite ? `<button data-action="edit" data-id="${item.id}">编辑</button>` : ""}
<button data-action="import" data-id="${item.id}">导入</button>
${canWrite ? `<button data-action="delete" data-id="${item.id}">删除</button>` : ""}
@@ -250,8 +316,6 @@ function renderModelCard(item: ModelItem) {
<div><dt>品牌</dt><dd>${escapeHtml(item.brand_name ?? "")}</dd></div>
<div><dt>类型</dt><dd>${escapeHtml(item.type_name ?? "")}</dd></div>
<div><dt>型号</dt><dd>${escapeHtml(prop.model ?? "")}</dd></div>
<div><dt>价钱</dt><dd>${escapeHtml(prop.price ?? "")}</dd></div>
<div><dt>重量</dt><dd>${escapeHtml(prop.weight ?? "")}</dd></div>
</dl>
</article>
`;
@@ -300,13 +364,27 @@ function requestSceneModelImport() {
notify("请在 DMT 主程序中使用导入场景模型");
return;
}
const requestId = createSceneModelRequestId();
pendingSceneModelRequestId = requestId;
clearSceneModelRequestTimer();
pendingSceneModelRequestTimer = window.setTimeout(() => {
if (pendingSceneModelRequestId !== requestId) return;
pendingSceneModelRequestId = "";
pendingSceneModelRequestTimer = null;
notifyError("主程序未响应导入场景模型请求,请确认模型库是在主程序面板中打开");
}, 15000);
window.parent.postMessage({
type: requestSceneModelMessageType
}, resolveParentOrigin());
notify("已请求主程序导出当前选中模型");
type: requestSceneModelMessageType,
requestId
}, resolveParentPostMessageOrigin());
// notify("已请求主程序导出当前选中模型");
}
async function handleSceneModelMessage(data: SceneModelMessage) {
console.log("Received scene model message:", data);
if (pendingSceneModelRequestId && data.requestId && data.requestId !== pendingSceneModelRequestId) return;
pendingSceneModelRequestId = "";
clearSceneModelRequestTimer();
if (data.type === sceneModelErrorMessageType) {
notifyError(data.message || "主程序导出模型失败");
return;
@@ -327,9 +405,24 @@ async function handleSceneModelMessage(data: SceneModelMessage) {
});
}
function clearSceneModelRequestTimer() {
if (pendingSceneModelRequestTimer === null) return;
window.clearTimeout(pendingSceneModelRequestTimer);
pendingSceneModelRequestTimer = null;
}
function createSceneModelRequestId() {
return `scene-model-${Date.now()}-${Math.random().toString(36).slice(2)}`;
}
function isAllowedParentOrigin(origin: string) {
const expectedOrigin = resolveParentOrigin();
return expectedOrigin === "*" || origin === expectedOrigin;
return expectedOrigin === "*" || origin === expectedOrigin || isLocalDmtParentOrigin(origin);
}
function resolveParentPostMessageOrigin() {
const origin = resolveParentOrigin();
return origin === window.location.origin ? "*" : origin;
}
function resolveParentOrigin() {
@@ -344,6 +437,16 @@ function resolveParentOrigin() {
return "*";
}
function isLocalDmtParentOrigin(origin: string) {
try {
const url = new URL(origin);
const isLocalHost = url.hostname === "localhost" || url.hostname === "127.0.0.1";
return isLocalHost && url.port === "3000";
} catch {
return false;
}
}
function ensureGlbFileName(fileName: string) {
return fileName.toLowerCase().endsWith(".glb") ? fileName : `${fileName}.glb`;
}
@@ -364,7 +467,7 @@ export async function uploadModelToBackend(payload: UploadModelPayload) {
const form = new FormData();
form.set("folderId", String(folderId));
form.set("name", modelNameFromFile(displayName));
form.set("name", displayName);
form.set("brandName", payload.brandName ?? "");
form.set("typeName", payload.typeName ?? "");
form.set("operationTree", normalizeOperationTreeInput(payload.operationTree));
@@ -373,10 +476,11 @@ export async function uploadModelToBackend(payload: UploadModelPayload) {
form.set(`prop.${key}`, value);
}
await api("/api/models/upload", {
const result = await api<UploadModelResponse>("/api/models/upload", {
method: "POST",
body: form
});
return result.id;
}
async function openUploadModelDialog() {
@@ -385,21 +489,21 @@ async function openUploadModelDialog() {
return;
}
const state: UploadFormState = { file: null };
const state: UploadFormState = { file: null, files: [], thumbnailFailures: [] };
await loadDictionaries();
const result = await formDialog<boolean>({
title: "增加模型",
width: 560,
height: 520,
height: 430,
blockPage: false,
body: `
<form id="modelUploadPopupForm" class="popup-form upload-popup-form">
<label>
<span>模型文件</span>
<div id="modelDropZone" class="drop-zone">
<input id="modelUploadFile" type="file" accept=".glb" />
<input id="modelUploadFile" type="file" accept=".glb" multiple />
<strong>选择模型</strong>
<em>或拖拽 .glb 模型到这里</em>
<em>或拖拽一个或多个 .glb 模型到这里</em>
<small id="selectedFileName">未选择文件</small>
</div>
</label>
@@ -411,42 +515,95 @@ async function openUploadModelDialog() {
<label><span>品牌</span><input name="brandName" list="brandOptions" /></label>
<label><span>类型</span><input name="typeName" list="typeOptions" /></label>
<label><span>型号</span><input name="model" /></label>
<label><span>价钱</span><input name="price" /></label>
<label><span>重量</span><input name="weight" /></label>
</div>
<div id="modelUploadStatus" class="upload-status" aria-live="polite" hidden></div>
${dictionaryDatalistHtml()}
</form>
`,
onOpen: () => bindUploadDialogEvents(state),
onSubmit: async () => {
if (!state.file) {
if (state.files.length === 0) {
throw new Error("请选择 .glb 模型文件");
}
const name = document.querySelector<HTMLInputElement>("#modelUploadName")?.value.trim();
if (!name) {
if (state.files.length === 1 && !name) {
throw new Error("模型名称不能为空");
}
const form = new FormData(document.querySelector<HTMLFormElement>("#modelUploadPopupForm")!);
await uploadModelToBackend({
file: state.file,
name,
fileName: state.file.name,
brandName: String(form.get("brandName") ?? ""),
typeName: String(form.get("typeName") ?? ""),
operationTree: defaultOperationTree,
properties: {
model: String(form.get("model") ?? ""),
price: String(form.get("price") ?? ""),
weight: String(form.get("weight") ?? "")
}
const brandName = String(form.get("brandName") ?? "");
const typeName = String(form.get("typeName") ?? "");
const properties = {
model: String(form.get("model") ?? "")
};
let completedCount = 0;
const totalCount = state.files.length;
setUploadDialogBusy(state, true);
showUploadProgressOverlay(totalCount);
try {
for (const [index, file] of state.files.entries()) {
const uploadingMessage = `正在上传 ${index + 1}/${totalCount}${file.name}`;
updateUploadStatus(uploadingMessage);
updateUploadProgressOverlay({
total: totalCount,
completed: completedCount,
message: uploadingMessage,
fileName: file.name
});
await waitForUploadStatusPaint();
const modelId = await uploadModelToBackend({
file,
name: state.files.length === 1 ? name ?? "" : modelNameFromFile(file.name),
fileName: file.name,
brandName,
typeName,
operationTree: defaultOperationTree,
properties
});
const thumbnailMessage = `正在生成预览图 ${index + 1}/${totalCount}${file.name}`;
updateUploadStatus(thumbnailMessage);
updateUploadProgressOverlay({
total: totalCount,
completed: completedCount,
message: thumbnailMessage,
fileName: file.name
});
await waitForUploadStatusPaint();
try {
await generateAndSaveModelThumbnail(modelId, file);
} catch {
state.thumbnailFailures.push(file.name);
}
completedCount += 1;
const completedMessage = `已完成 ${completedCount}/${totalCount}`;
updateUploadStatus(completedMessage);
updateUploadProgressOverlay({
total: totalCount,
completed: completedCount,
message: completedMessage,
fileName: file.name
});
}
} catch (error) {
updateUploadStatus(`上传失败,已完成 ${completedCount}/${totalCount},请处理后重试。`);
throw error;
} finally {
hideUploadProgressOverlay();
if (completedCount < state.files.length) {
setUploadDialogBusy(state, false);
}
}
return true;
}
});
if (result) {
if (state.thumbnailFailures.length > 0) {
notify(`模型上传完成,${state.thumbnailFailures.length} 个预览图生成失败,可稍后在预览窗口手动更新。`);
} else {
notify("模型上传和预览图生成完成");
}
invalidateDictionaries();
await loadModels();
await reloadFoldersAndModels();
}
}
@@ -460,44 +617,22 @@ export async function openProcessModelUploadDialog(input?: {
return;
}
const state: UploadFormState = { file: input?.file ?? null };
const state: UploadFormState = { file: input?.file ?? null, files: input?.file ? [input.file] : [], thumbnailFailures: [] };
await loadDictionaries();
const initialName = input?.modelName || (input?.file ? modelNameFromFile(input.file.name) : "");
const result = await formDialog<boolean>({
title: "上传工艺模型",
width: 640,
height: 650,
title: `上传工艺模型-【${appState.selectedFolderName || "当前目录"}`,
width: 400,
height: 300,
blockPage: false,
body: `
<form id="processModelUploadPopupForm" class="popup-form upload-popup-form">
<div class="upload-target-path">
<span>上传目录</span>
<strong>${escapeHtml(appState.selectedFolderName || "当前目录")}</strong>
</div>
<label>
<span>模型文件</span>
<div id="processModelDropZone" class="drop-zone">
<input id="processModelUploadFile" type="file" accept=".glb" />
<strong>选择模型</strong>
<em>或拖拽 .glb 模型到这里</em>
<small id="processSelectedFileName">${escapeHtml(input?.file?.name ?? "未选择文件")}</small>
</div>
</label>
<label>
<span>模型名称</span>
<input id="processModelUploadName" name="name" placeholder="例如 AA.glb" value="${escapeHtml(initialName)}" />
</label>
<div class="popup-form-grid">
<label><span>品牌</span><input name="brandName" list="brandOptions" /></label>
<label><span>类型</span><input name="typeName" list="typeOptions" /></label>
<label><span>型</span><input name="model" /></label>
<label><span>价钱</span><input name="price" /></label>
<label><span>重量</span><input name="weight" /></label>
<label><span>模型名称</span><input id="processModelUploadName" name="name" value="${escapeHtml(initialName)}" autocomplete="off" /></label>
<label><span>品牌</span><input name="brandName" list="brandOptions" autocomplete="off" /></label>
<label><span>型</span><input name="typeName" list="typeOptions" autocomplete="off" /></label>
<label><span>型号</span><input name="model" autocomplete="off" /></label>
</div>
<label>
<span>工艺数据 JSON</span>
<textarea id="processOperationTreeJson" name="operationTree" placeholder='可以粘贴 {"OperationTree":"[...]"} 或 OperationTree[] 数组 JSON'>${escapeHtml(input?.operationTreeJson ?? "")}</textarea>
</label>
${dictionaryDatalistHtml()}
</form>
`,
@@ -508,7 +643,7 @@ export async function openProcessModelUploadDialog(input?: {
}
const form = new FormData(document.querySelector<HTMLFormElement>("#processModelUploadPopupForm")!);
const name = String(form.get("name") ?? "").trim();
await uploadModelToBackend({
const modelId = await uploadModelToBackend({
file: state.file,
name,
fileName: state.file.name,
@@ -516,18 +651,21 @@ export async function openProcessModelUploadDialog(input?: {
typeName: String(form.get("typeName") ?? ""),
operationTree: String(form.get("operationTree") ?? ""),
properties: {
model: String(form.get("model") ?? ""),
price: String(form.get("price") ?? ""),
weight: String(form.get("weight") ?? "")
model: String(form.get("model") ?? "")
}
});
try {
await generateAndSaveModelThumbnail(modelId, state.file);
} catch {
notify("模型已上传,预览图生成失败,可稍后在预览窗口手动更新。");
}
return true;
}
});
if (result) {
invalidateDictionaries();
await loadModels();
await reloadFoldersAndModels();
}
}
@@ -537,21 +675,48 @@ function bindUploadDialogEvents(state: UploadFormState) {
const nameInput = document.querySelector<HTMLInputElement>("#modelUploadName")!;
const selectedFileName = document.querySelector<HTMLElement>("#selectedFileName")!;
const selectFile = (file: File) => {
if (!file.name.toLowerCase().endsWith(".glb")) {
const renderSelectedFiles = () => {
if (state.files.length === 0) {
selectedFileName.textContent = "未选择文件";
nameInput.disabled = false;
nameInput.value = "";
nameInput.placeholder = "选择文件后自动填入";
return;
}
if (state.files.length === 1) {
const [file] = state.files;
selectedFileName.textContent = file.name;
nameInput.disabled = false;
nameInput.value = modelNameFromFile(file.name);
nameInput.placeholder = "选择文件后自动填入";
return;
}
selectedFileName.innerHTML = `
<span class="selected-file-summary">已选择 ${state.files.length} 个模型,名称按文件名自动生成</span>
<span class="selected-file-list">${state.files.map((file) => escapeHtml(file.name)).join("<br>")}</span>
`;
nameInput.disabled = true;
nameInput.value = `${state.files.length} 个模型按文件名自动命名`;
nameInput.placeholder = "";
};
const selectFiles = (files: FileList | File[]) => {
const selectedFiles = Array.from(files);
if (selectedFiles.length === 0) return;
const invalidFiles = selectedFiles.filter((file) => !file.name.toLowerCase().endsWith(".glb"));
if (invalidFiles.length > 0) {
notify("当前阶段只允许上传 .glb 模型");
return;
}
state.file = file;
selectedFileName.textContent = file.name;
if (!nameInput.value.trim()) {
nameInput.value = modelNameFromFile(file.name);
}
state.files = selectedFiles;
state.file = selectedFiles[0] ?? null;
renderSelectedFiles();
};
fileInput.addEventListener("change", () => {
const file = fileInput.files?.[0];
if (file) selectFile(file);
if (fileInput.files) selectFiles(fileInput.files);
});
dropZone.addEventListener("click", (event) => {
@@ -568,58 +733,140 @@ function bindUploadDialogEvents(state: UploadFormState) {
dropZone.addEventListener("drop", (event) => {
event.preventDefault();
dropZone.classList.remove("is-dragover");
const file = event.dataTransfer?.files?.[0];
if (file) selectFile(file);
const files = event.dataTransfer?.files;
if (files) selectFiles(files);
});
}
function updateUploadStatus(message: string) {
const status = document.querySelector<HTMLElement>("#modelUploadStatus");
if (!status) return;
status.hidden = false;
status.textContent = message;
}
function waitForUploadStatusPaint() {
return new Promise<void>((resolve) => {
window.requestAnimationFrame(() => window.setTimeout(resolve, 0));
});
}
function showUploadProgressOverlay(total: number) {
let overlay = document.querySelector<HTMLElement>("#modelUploadProgressOverlay");
if (!overlay) {
overlay = document.createElement("div");
overlay.id = "modelUploadProgressOverlay";
overlay.className = "upload-progress-overlay";
overlay.setAttribute("role", "status");
overlay.setAttribute("aria-live", "polite");
overlay.innerHTML = `
<div class="upload-progress-panel">
<div class="upload-progress-title">模型上传中</div>
<div id="modelUploadProgressMessage" class="upload-progress-message">正在准备上传...</div>
<div class="upload-progress-track">
<div id="modelUploadProgressBar" class="upload-progress-bar"></div>
</div>
<div id="modelUploadProgressMeta" class="upload-progress-meta">0/${total}</div>
<div id="modelUploadProgressFile" class="upload-progress-file"></div>
</div>
`;
document.body.appendChild(overlay);
}
overlay.hidden = false;
updateUploadProgressOverlay({
total,
completed: 0,
message: "正在准备上传...",
fileName: ""
});
}
function updateUploadProgressOverlay(options: {
total: number;
completed: number;
message: string;
fileName: string;
}) {
const message = document.querySelector<HTMLElement>("#modelUploadProgressMessage");
const meta = document.querySelector<HTMLElement>("#modelUploadProgressMeta");
const file = document.querySelector<HTMLElement>("#modelUploadProgressFile");
const bar = document.querySelector<HTMLElement>("#modelUploadProgressBar");
const percent = options.total > 0 ? Math.round((options.completed / options.total) * 100) : 0;
if (message) message.textContent = options.message;
if (meta) meta.textContent = `${options.completed}/${options.total}`;
if (file) file.textContent = options.fileName;
if (bar) bar.style.width = `${percent}%`;
}
function hideUploadProgressOverlay() {
const overlay = document.querySelector<HTMLElement>("#modelUploadProgressOverlay");
if (overlay) overlay.hidden = true;
}
async function generateAndSaveModelThumbnail(modelId: number, file: File) {
const thumbnail = await generateModelThumbnailFromFile(file);
await api(`/api/models/${modelId}/thumbnail`, {
method: "PUT",
body: JSON.stringify({ thumbnail })
});
}
function setUploadDialogBusy(state: UploadFormState, busy: boolean) {
const form = document.querySelector<HTMLFormElement>("#modelUploadPopupForm");
if (!form) return;
form.classList.toggle("is-uploading", busy);
form.querySelectorAll<HTMLInputElement>("input").forEach((input) => {
input.disabled = busy || (input.id === "modelUploadName" && state.files.length > 1);
});
}
function bindProcessUploadDialogEvents(state: UploadFormState) {
const dropZone = document.querySelector<HTMLDivElement>("#processModelDropZone")!;
const fileInput = document.querySelector<HTMLInputElement>("#processModelUploadFile")!;
const nameInput = document.querySelector<HTMLInputElement>("#processModelUploadName")!;
const selectedFileName = document.querySelector<HTMLElement>("#processSelectedFileName")!;
// const dropZone = document.querySelector<HTMLDivElement>("#processModelDropZone")!;
// const fileInput = document.querySelector<HTMLInputElement>("#processModelUploadFile")!;
// const nameInput = document.querySelector<HTMLInputElement>("#processModelUploadName")!;
// const selectedFileName = document.querySelector<HTMLElement>("#processSelectedFileName")!;
const selectFile = (file: File) => {
if (!file.name.toLowerCase().endsWith(".glb")) {
notify("当前阶段只允许上传 .glb 模型");
return;
}
state.file = file;
selectedFileName.textContent = file.name;
if (!nameInput.value.trim()) {
nameInput.value = file.name;
}
};
// const selectFile = (file: File) => {
// if (!file.name.toLowerCase().endsWith(".glb")) {
// notify("当前阶段只允许上传 .glb 模型");
// return;
// }
// state.file = file;
// selectedFileName.textContent = file.name;
// if (!nameInput.value.trim()) {
// nameInput.value = file.name;
// }
// };
if (state.file) {
selectedFileName.textContent = state.file.name;
if (!nameInput.value.trim()) {
nameInput.value = state.file.name;
}
}
// if (state.file) {
// selectedFileName.textContent = state.file.name;
// if (!nameInput.value.trim()) {
// nameInput.value = state.file.name;
// }
// }
fileInput.addEventListener("change", () => {
const file = fileInput.files?.[0];
if (file) selectFile(file);
});
// fileInput.addEventListener("change", () => {
// const file = fileInput.files?.[0];
// if (file) selectFile(file);
// });
dropZone.addEventListener("click", (event) => {
if (event.target !== fileInput) fileInput.click();
});
// dropZone.addEventListener("click", (event) => {
// if (event.target !== fileInput) fileInput.click();
// });
dropZone.addEventListener("dragover", (event) => {
event.preventDefault();
dropZone.classList.add("is-dragover");
});
dropZone.addEventListener("dragleave", () => {
dropZone.classList.remove("is-dragover");
});
dropZone.addEventListener("drop", (event) => {
event.preventDefault();
dropZone.classList.remove("is-dragover");
const file = event.dataTransfer?.files?.[0];
if (file) selectFile(file);
});
// dropZone.addEventListener("dragover", (event) => {
// event.preventDefault();
// dropZone.classList.add("is-dragover");
// });
// dropZone.addEventListener("dragleave", () => {
// dropZone.classList.remove("is-dragover");
// });
// dropZone.addEventListener("drop", (event) => {
// event.preventDefault();
// dropZone.classList.remove("is-dragover");
// const file = event.dataTransfer?.files?.[0];
// if (file) selectFile(file);
// });
}
function normalizeOperationTreeInput(value?: string) {
@@ -673,7 +920,7 @@ async function editModel(id: number) {
const card = document.querySelector<HTMLButtonElement>(`button[data-id="${id}"]`)?.closest(".model-card");
const oldName = card?.querySelector("strong")?.textContent ?? "";
await loadDictionaries();
const result = await formDialog<{ name: string; brandName: string; typeName: string; model: string; price: string; weight: string }>({
const result = await formDialog<{ name: string; brandName: string; typeName: string; model: string }>({
title: "编辑模型",
width: 520,
height: 390,
@@ -685,8 +932,6 @@ async function editModel(id: number) {
<label><span>品牌</span><input name="brandName" list="brandOptions" value="${escapeHtml(card?.querySelector("dl div:nth-child(1) dd")?.textContent ?? "")}" /></label>
<label><span>类型</span><input name="typeName" list="typeOptions" value="${escapeHtml(card?.querySelector("dl div:nth-child(2) dd")?.textContent ?? "")}" /></label>
<label><span>型号</span><input name="model" value="${escapeHtml(card?.querySelector("dl div:nth-child(3) dd")?.textContent ?? "")}" /></label>
<label><span>价钱</span><input name="price" value="${escapeHtml(card?.querySelector("dl div:nth-child(4) dd")?.textContent ?? "")}" /></label>
<label><span>重量</span><input name="weight" value="${escapeHtml(card?.querySelector("dl div:nth-child(5) dd")?.textContent ?? "")}" /></label>
</div>
${dictionaryDatalistHtml()}
</form>
@@ -701,9 +946,7 @@ async function editModel(id: number) {
name,
brandName: String(form.get("brandName") ?? ""),
typeName: String(form.get("typeName") ?? ""),
model: String(form.get("model") ?? ""),
price: String(form.get("price") ?? ""),
weight: String(form.get("weight") ?? "")
model: String(form.get("model") ?? "")
};
}
});
@@ -715,9 +958,7 @@ async function editModel(id: number) {
brandName: result.brandName,
typeName: result.typeName,
properties: {
model: result.model,
price: result.price,
weight: result.weight
model: result.model
}
})
});
@@ -740,5 +981,5 @@ async function deleteModel(id: number) {
const confirmed = await confirmDialog("确认删除该模型?");
if (!confirmed) return;
await api(`/api/models/${id}`, { method: "DELETE" });
await loadModels();
await reloadFoldersAndModels(true);
}

View File

@@ -5,9 +5,11 @@ import type { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
import type { ModelItem } from "../../../types";
import type { OperationTree, OperationTreeDB } from "../../../types/OperationTree";
import { P_OPERATION } from "../../../types/OPERATION_BaseClass";
import { downloadFileFromUrl } from "../../../utils/fileDownload";
import { escapeHtml, formatBytes } from "../../../utils/format";
import { notify, notifyError } from "../../../ui/dialogs";
import { api } from "../../../services/api";
import { resolveStorageUrl } from "../../../config/runtime";
type PreviewRuntime = {
renderer: WebGLRenderer;
@@ -95,10 +97,24 @@ type ParentImportScenePayload = {
rawOperationTree: string;
};
type ParentBasePointMessage = {
type?: string;
message?: string;
payload?: {
modelId?: string;
modelName?: string;
basePoint?: PreviewBasePoint;
};
};
export type ModelPreviewOptions = {
onImportScene?: (payload: PreviewImportScenePayload) => Promise<void> | void;
};
const BASE_POINT_SUBSCRIBE_MESSAGE = "DMT_MODEL_LIBRARY_BASE_POINT_SUBSCRIBE";
const BASE_POINT_UNSUBSCRIBE_MESSAGE = "DMT_MODEL_LIBRARY_BASE_POINT_UNSUBSCRIBE";
const BASE_POINT_UPDATE_MESSAGE = "DMT_MODEL_LIBRARY_BASE_POINT_UPDATE";
const BASE_POINT_ERROR_MESSAGE = "DMT_MODEL_LIBRARY_BASE_POINT_ERROR";
const zeroBasePoint: PreviewResolvedBasePoint = {
x: 0,
y: 0,
@@ -107,6 +123,11 @@ const zeroBasePoint: PreviewResolvedBasePoint = {
ry: 0,
rz: 0
};
const RAD_TO_DEG = 180 / Math.PI;
const DEG_TO_RAD = Math.PI / 180;
const BASE_POINT_DECIMAL_PLACES = 3;
const THUMBNAIL_WIDTH = 512;
const THUMBNAIL_HEIGHT = 384;
const previewEnvironmentUrl = "/DayCityOutdoor.exr";
const DEFAULT_PREVIEW_FRAME_INTERVAL_MS = 20;
@@ -116,6 +137,8 @@ let runtime: PreviewRuntime | null = null;
let activePreviewContext: PreviewLoadContext | null = null;
let previewEnvironmentTexturePromise: Promise<Texture> | null = null;
let previewPlayback: PreviewPlaybackState = createEmptyPlaybackState();
let basePointBridgeBound = false;
let basePointSubscribed = false;
export function openModelPreview(
model: ModelItem,
@@ -124,7 +147,7 @@ export function openModelPreview(
) {
const context = beginPreviewContext();
const canWrite = model.permissions.write;
const url = model.file_url;
const url = resolveStorageUrl(model.file_url);
const operations = parseModelOperations(model.operation_tree);
const popup = w2popup.open({
title: `模型预览 - ${escapeHtml(model.name)}${formatBytes(model.file_size)}`,
@@ -153,8 +176,8 @@ export function openModelPreview(
</div>
<div class="preview-scene-section">
<div class="preview-scene-body">
<div style="display: flex; align-items: center; ">
<button id="previewImportSceneBtn" class="primary-btn" type="button">导入</button>
<div class="preview-scene-actions">
<button id="previewImportSceneBtn" class="primary-btn" type="button">导入场景</button>
<label class="preview-switch">
<input id="previewUseBasePoint" type="checkbox" />
<span>启用基点</span>
@@ -162,12 +185,12 @@ export function openModelPreview(
</div>
<div class="preview-basepoint-grid">
<label><span>X</span><input name="baseX" type="number" value="0" step="0.001" /></label>
<label><span>Y</span><input name="baseY" type="number" value="0" step="0.001" /></label>
<label><span>Z</span><input name="baseZ" type="number" value="0" step="0.001" /></label>
<label><span>RX</span><input name="baseRx" type="number" value="0" step="0.001" /></label>
<label><span>RY</span><input name="baseRy" type="number" value="0" step="0.001" /></label>
<label><span>RZ</span><input name="baseRz" type="number" value="0" step="0.001" /></label>
<label><span>X(mm)</span><input name="baseX" type="number" value="0.000" step="0.001" /></label>
<label><span>Y(mm)</span><input name="baseY" type="number" value="0.000" step="0.001" /></label>
<label><span>Z(mm)</span><input name="baseZ" type="number" value="0.000" step="0.001" /></label>
<label><span>RX(°)</span><input name="baseRx" type="number" value="0.000" step="0.001" /></label>
<label><span>RY(°)</span><input name="baseRy" type="number" value="0.000" step="0.001" /></label>
<label><span>RZ(°)</span><input name="baseRz" type="number" value="0.000" step="0.001" /></label>
</div>
</div>
</div>
@@ -180,6 +203,9 @@ export function openModelPreview(
</div>
`,
actions: {
() {
bindDownloadModel(model);
},
() {
if (canWrite) {
screenshotModel(model.id, onThumbnailSaved).catch((error) => {
@@ -198,6 +224,7 @@ export function openModelPreview(
.on("open:after", () => {popup
console.log(popup)
bindProcessPlaceholder(operations);
bindBasePointSelection();
bindImportScene(model, operations, options.onImportScene);
if (canWrite) bindThumbnailCapture(model.id, onThumbnailSaved);
requestAnimationFrame(() => {
@@ -206,7 +233,10 @@ export function openModelPreview(
});
});
})
.on("close:after", () => disposePreview());
.on("close:after", () => {
unsubscribeBasePointSelection();
disposePreview();
});
}
export function setPreviewBasePoint(basePoint: PreviewBasePoint, enabled = true) {
@@ -221,7 +251,7 @@ export function setPreviewBasePoint(basePoint: PreviewBasePoint, enabled = true)
for (const [key, name] of fieldMap) {
const input = document.querySelector<HTMLInputElement>(`.preview-basepoint-grid input[name="${name}"]`);
if (input && basePoint[key] !== undefined) {
input.value = String(basePoint[key]);
input.value = formatBasePointDisplayValue(key, basePoint[key]);
}
}
@@ -258,7 +288,7 @@ export function emitImportScenePayload(payload: PreviewImportScenePayload) {
window.parent.postMessage({
type: "DMT_MODEL_LIBRARY_IMPORT_SCENE",
payload: buildParentImportScenePayload(payload)
}, resolveParentOrigin());
}, resolveParentPostMessageOrigin());
} catch (error) {
notifyError(error);
}
@@ -271,7 +301,7 @@ function buildParentImportScenePayload(payload: PreviewImportScenePayload): Pare
id: payload.model.id,
name: payload.model.name,
original_filename: payload.model.original_filename,
file_url: payload.model.file_url
file_url: resolveStorageUrl(payload.model.file_url)
},
modelUrl: payload.modelUrl,
basePointEnabled: payload.basePointEnabled,
@@ -280,6 +310,11 @@ function buildParentImportScenePayload(payload: PreviewImportScenePayload): Pare
};
}
function resolveParentPostMessageOrigin() {
const origin = resolveParentOrigin();
return origin === window.location.origin ? "*" : origin;
}
function resolveParentOrigin() {
try {
const meta = import.meta as ImportMeta & { env?: Record<string, string | undefined> };
@@ -292,6 +327,68 @@ function resolveParentOrigin() {
return "*";
}
function isAllowedParentOrigin(origin: string) {
const expectedOrigin = resolveParentOrigin();
return expectedOrigin === "*" || origin === expectedOrigin || isLocalDmtParentOrigin(origin);
}
function isLocalDmtParentOrigin(origin: string) {
try {
const url = new URL(origin);
const isLocalHost = url.hostname === "localhost" || url.hostname === "127.0.0.1";
return isLocalHost && url.port === "3000";
} catch {
return false;
}
}
function bindBasePointSelection() {
bindBasePointBridge();
const checkbox = document.querySelector<HTMLInputElement>("#previewUseBasePoint");
checkbox?.addEventListener("change", () => {
if (checkbox.checked) {
subscribeBasePointSelection();
} else {
unsubscribeBasePointSelection();
}
});
if (checkbox?.checked) subscribeBasePointSelection();
}
function bindBasePointBridge() {
if (basePointBridgeBound) return;
basePointBridgeBound = true;
window.addEventListener("message", (event) => {
const data = event.data as ParentBasePointMessage;
if (data?.type !== BASE_POINT_UPDATE_MESSAGE && data?.type !== BASE_POINT_ERROR_MESSAGE) return;
if (!isAllowedParentOrigin(event.origin)) return;
if (data.type === BASE_POINT_ERROR_MESSAGE) {
notify(data.message || "请先在主场景中选择模型或坐标");
return;
}
if (data.payload?.basePoint) {
setPreviewBasePoint(data.payload.basePoint, true);
}
});
}
function subscribeBasePointSelection() {
if (!window.parent || window.parent === window) return;
basePointSubscribed = true;
window.parent.postMessage({
type: BASE_POINT_SUBSCRIBE_MESSAGE
}, resolveParentPostMessageOrigin());
}
function unsubscribeBasePointSelection() {
if (!basePointSubscribed) return;
basePointSubscribed = false;
if (!window.parent || window.parent === window) return;
window.parent.postMessage({
type: BASE_POINT_UNSUBSCRIBE_MESSAGE
}, resolveParentPostMessageOrigin());
}
function parseModelOperations(value: string): PreviewOperation[] {
try {
const dbValue = JSON.parse(value || "{}") as Partial<OperationTreeDB>;
@@ -505,15 +602,31 @@ async function screenshotModel(modelId: number, onThumbnailSaved?: () => Promise
controls.update();
const oldBackground = scene.background;
const oldClearAlpha = renderer.getClearAlpha();
const oldPixelRatio = renderer.getPixelRatio();
const oldWidth = renderer.domElement.width / oldPixelRatio;
const oldHeight = renderer.domElement.height / oldPixelRatio;
const oldAspect = camera.aspect;
let thumbnail = "";
try {
if (transparent) {
scene.background = null;
renderer.setClearColor(0x000000, 0);
}
renderer.setPixelRatio(1);
renderer.setSize(THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT, false);
camera.aspect = THUMBNAIL_WIDTH / THUMBNAIL_HEIGHT;
camera.updateProjectionMatrix();
renderer.render(scene, camera);
const thumbnail = renderer.domElement.toDataURL("image/png");
thumbnail = renderer.domElement.toDataURL("image/png");
} finally {
camera.aspect = oldAspect;
camera.updateProjectionMatrix();
renderer.setPixelRatio(oldPixelRatio);
renderer.setSize(oldWidth, oldHeight, false);
if (transparent) {
scene.background = oldBackground;
renderer.setClearAlpha(oldClearAlpha);
}
renderer.render(scene, camera);
}
await api(`/api/models/${modelId}/thumbnail`, {
@@ -535,12 +648,12 @@ function getSelectedOperation(operations: PreviewOperation[]) {
function readPreviewBasePoint(): PreviewResolvedBasePoint {
return resolveBasePoint({
x: readNumberInput("baseX"),
y: readNumberInput("baseY"),
z: readNumberInput("baseZ"),
rx: readNumberInput("baseRx"),
ry: readNumberInput("baseRy"),
rz: readNumberInput("baseRz")
x: roundBasePointValue(readNumberInput("baseX")),
y: roundBasePointValue(readNumberInput("baseY")),
z: roundBasePointValue(readNumberInput("baseZ")),
rx: degreesToRadians(readNumberInput("baseRx")),
ry: degreesToRadians(readNumberInput("baseRy")),
rz: degreesToRadians(readNumberInput("baseRz"))
});
}
@@ -550,6 +663,30 @@ function readNumberInput(name: string) {
return Number.isFinite(numberValue) ? numberValue : 0;
}
function formatBasePointDisplayValue(key: keyof PreviewResolvedBasePoint, value: number) {
const displayValue = key === "rx" || key === "ry" || key === "rz"
? radiansToDegrees(value)
: value;
return formatBasePointNumber(displayValue);
}
function radiansToDegrees(value: number) {
return roundBasePointValue(value * RAD_TO_DEG);
}
function degreesToRadians(value: number) {
return Number.isFinite(value) ? value * DEG_TO_RAD : 0;
}
function roundBasePointValue(value: number) {
if (!Number.isFinite(value)) return 0;
return Number(value.toFixed(BASE_POINT_DECIMAL_PLACES));
}
function formatBasePointNumber(value: number) {
return roundBasePointValue(value).toFixed(BASE_POINT_DECIMAL_PLACES);
}
function bindImportScene(
model: ModelItem,
operations: PreviewOperation[],
@@ -575,6 +712,14 @@ function bindImportScene(
});
}
async function bindDownloadModel(model: ModelItem) {
try {
await downloadFileFromUrl(model.file_url, model.original_filename || model.name);
} catch (error) {
notifyError(error);
}
}
function resolveBasePoint(basePoint?: PreviewBasePoint): PreviewResolvedBasePoint {
return {
x: basePoint?.x ?? zeroBasePoint.x,
@@ -595,7 +740,7 @@ function buildImportScenePayload(options: {
}): PreviewImportScenePayload {
return {
model: options.model,
modelUrl: options.model.file_url,
modelUrl: resolveStorageUrl(options.model.file_url),
basePointEnabled: options.basePointEnabled,
basePoint: options.basePoint,
rawOperationTree: options.model.operation_tree,
@@ -624,6 +769,10 @@ function bindProcessPlaceholder(operations: PreviewOperation[]) {
});
document.querySelector<HTMLButtonElement>("#previewPlayBtn")?.addEventListener("click", () => {
if (operations.length === 0) {
notify("当前模型暂无工艺数据");
return;
}
const operation = getSelectedOperation(operations);
updateStatus(operation);
if (!operation) {
@@ -634,7 +783,7 @@ function bindProcessPlaceholder(operations: PreviewOperation[]) {
notifyError(`工艺播放数据解析失败:${operation.parseError}`);
return;
}
if (!operation.parsedCraftPlayData) {
if (!operation.parsedCraftPlayData || operation.parsedCraftPlayData.OPERATION.frames.length === 0) {
notify("当前工艺暂无播放数据");
return;
}
@@ -648,10 +797,14 @@ function bindProcessPlaceholder(operations: PreviewOperation[]) {
}
function startPreviewPlayback(operation: PreviewOperation) {
if (!runtime?.context.modelObject || !operation.parsedCraftPlayData) {
if (!runtime?.context.modelObject) {
notify("模型还未加载完成");
return;
}
if (!operation.parsedCraftPlayData || operation.parsedCraftPlayData.OPERATION.frames.length === 0) {
notify("当前工艺暂无播放数据");
return;
}
if (previewPlayback.isPlaying && previewPlayback.operation === operation) {
return;
@@ -868,13 +1021,7 @@ function resetPreviewPlaybackScene() {
}
function buildPreviewFrameTimes(frames: P_OPERATION["OPERATION"]["frames"]) {
let previousTime = 0;
return frames.map((frame, index) => {
const parsed = Number(frame.time);
const timeMs = Number.isFinite(parsed) ? Math.max(0, parsed * SECOND_MS) : index * DEFAULT_PREVIEW_FRAME_INTERVAL_MS;
previousTime = index === 0 ? timeMs : Math.max(previousTime + 1, timeMs);
return previousTime;
});
return frames.map((_, index) => index * DEFAULT_PREVIEW_FRAME_INTERVAL_MS);
}
function resolvePreviewFrameIndex(currentTimeMs: number, frameTimesMs: number[]) {

View File

@@ -0,0 +1,96 @@
import type { Material, Object3D, PerspectiveCamera, Texture } from "three";
import type { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
const THUMBNAIL_WIDTH = 512;
const THUMBNAIL_HEIGHT = 384;
type ThreeModule = typeof import("three");
type LoadedGltf = Awaited<ReturnType<GLTFLoader["loadAsync"]>>;
type ParseableGltfLoader = GLTFLoader & {
parseAsync(data: ArrayBuffer | string, path: string): Promise<LoadedGltf>;
};
export async function generateModelThumbnailFromFile(file: File) {
const [THREE, { GLTFLoader }] = await Promise.all([
import("three"),
import("three/examples/jsm/loaders/GLTFLoader.js")
]);
THREE.Object3D.DEFAULT_UP.set(0, 0, 1);
const scene = new THREE.Scene();
const camera = new THREE.PerspectiveCamera(45, THUMBNAIL_WIDTH / THUMBNAIL_HEIGHT, 0.01, 1000);
camera.up.set(0, 0, 1);
const renderer = new THREE.WebGLRenderer({
antialias: true,
alpha: true,
preserveDrawingBuffer: true
});
renderer.setPixelRatio(1);
renderer.setSize(THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT, false);
renderer.setClearColor(0x000000, 0);
renderer.outputColorSpace = THREE.SRGBColorSpace;
const ambientLight = new THREE.HemisphereLight(0xffffff, 0x9aa8b5, 2.2);
const keyLight = new THREE.DirectionalLight(0xffffff, 2.8);
keyLight.position.set(3, -4, 5);
scene.add(ambientLight, keyLight);
let object: Object3D | null = null;
try {
const buffer = await file.arrayBuffer();
const gltf = await (new GLTFLoader() as ParseableGltfLoader).parseAsync(buffer, "");
if (!gltf.scene) {
throw new Error("模型文件中未找到可渲染场景");
}
object = gltf.scene;
scene.add(object);
fitCameraToObject(THREE, camera, object);
renderer.render(scene, camera);
return renderer.domElement.toDataURL("image/png");
} finally {
if (object) disposeObject3D(object);
renderer.dispose();
renderer.forceContextLoss();
renderer.domElement.remove();
}
}
function fitCameraToObject(THREE: ThreeModule, camera: PerspectiveCamera, object: Object3D) {
const box = new THREE.Box3().setFromObject(object);
const size = box.getSize(new THREE.Vector3());
const center = box.getCenter(new THREE.Vector3());
const maxSize = Math.max(size.x, size.y, size.z) || 1;
const distance = maxSize / (2 * Math.tan((camera.fov * Math.PI) / 360));
camera.position.copy(center).add(new THREE.Vector3(distance * 0.9, -distance * 1.15, distance * 0.65));
camera.near = Math.max(distance / 100, 0.01);
camera.far = distance * 100;
camera.lookAt(center);
camera.updateProjectionMatrix();
}
function disposeObject3D(root: Object3D) {
root.traverse((object) => {
const maybeMesh = object as Object3D & {
geometry?: { dispose?: () => void };
material?: Material | Material[];
};
maybeMesh.geometry?.dispose?.();
const materials = Array.isArray(maybeMesh.material) ? maybeMesh.material : maybeMesh.material ? [maybeMesh.material] : [];
for (const material of materials) {
disposeMaterial(material);
}
});
}
function disposeMaterial(material: Material) {
const values = Object.values(material as Material & Record<string, unknown>);
for (const value of values) {
if (value && typeof value === "object" && "isTexture" in value) {
(value as Texture).dispose();
}
}
material.dispose();
}

View File

@@ -1,4 +1,5 @@
import { getToken } from "./authState";
import { resolveApiUrl } from "../config/runtime";
function authHeaders(): Record<string, string> {
const token = getToken();
@@ -6,10 +7,11 @@ function authHeaders(): Record<string, string> {
}
export async function api<T>(url: string, options: RequestInit = {}): Promise<T> {
const response = await fetch(url, {
const hasBody = options.body !== undefined && options.body !== null;
const response = await fetch(resolveApiUrl(url), {
...options,
headers: {
...(options.body instanceof FormData ? {} : { "Content-Type": "application/json" }),
...(hasBody && !(options.body instanceof FormData) ? { "Content-Type": "application/json" } : {}),
...authHeaders(),
...((options.headers as Record<string, string> | undefined) ?? {})
} as HeadersInit
@@ -20,4 +22,3 @@ export async function api<T>(url: string, options: RequestInit = {}): Promise<T>
}
return data as T;
}

View File

@@ -1,4 +1,4 @@
import { w2confirm, w2popup, w2utils } from "../vendor/w2ui";
import { w2popup, w2utils } from "../vendor/w2ui";
type PopupActionEvent = {
detail: {
@@ -23,14 +23,27 @@ export function notifyError(error: unknown) {
export function confirmDialog(message: string, title = "确认") {
return new Promise<boolean>((resolve) => {
w2confirm({
msg: message,
let settled = false;
const settle = (value: boolean) => {
if (settled) return;
settled = true;
resolve(value);
};
w2utils.confirm({
box: "body",
title,
yes: "确定",
no: "取消"
}, undefined, (action: string) => {
resolve(action === "yes" || action === "Yes");
});
text: message,
btn_yes: {
text: "确定"
},
btn_no: {
text: "取消"
}
})
.yes(() => settle(true))
.no(() => settle(false))
.close(() => settle(false));
});
}

View File

@@ -0,0 +1,30 @@
import { resolveStorageUrl } from "../config/runtime";
export async function downloadFileFromUrl(fileUrl: string, fileName: string) {
const response = await fetch(resolveStorageUrl(fileUrl), {
credentials: "include"
});
if (!response.ok) {
throw new Error(`文件下载失败:${response.status} ${response.statusText}`);
}
const blob = await response.blob();
const objectUrl = URL.createObjectURL(blob);
try {
const anchor = document.createElement("a");
anchor.href = objectUrl;
anchor.download = ensureGlbFileName(fileName);
anchor.rel = "noopener";
anchor.style.display = "none";
document.body.appendChild(anchor);
anchor.click();
anchor.remove();
} finally {
window.setTimeout(() => URL.revokeObjectURL(objectUrl), 1000);
}
}
function ensureGlbFileName(fileName: string) {
const name = fileName.trim() || "model.glb";
return name.toLowerCase().endsWith(".glb") ? name : `${name}.glb`;
}

View File

@@ -28,6 +28,29 @@ type W2Utils = {
title?: string;
text?: string;
}): unknown;
confirm(options: {
box?: string | HTMLElement;
title?: string;
text?: string;
btn_yes?: {
text?: string;
class?: string;
style?: string;
attrs?: string;
};
btn_no?: {
text?: string;
class?: string;
style?: string;
attrs?: string;
};
}): W2ConfirmPromise;
};
type W2ConfirmPromise = {
yes(callback: (event: unknown) => void): W2ConfirmPromise;
no(callback: (event: unknown) => void): W2ConfirmPromise;
close(callback: (event: unknown) => void): W2ConfirmPromise;
};
type W2LayoutOptions = {

View File

@@ -5,16 +5,21 @@ import { fileURLToPath } from "node:url";
const __dirname = path.dirname(fileURLToPath(import.meta.url));
const rootDir = path.resolve(__dirname, "../..");
const httpsConfig = {
function getDevHttpsConfig() {
return {
key: fs.readFileSync(path.join(rootDir, "certs/localhost+2-key.pem")),
cert: fs.readFileSync(path.join(rootDir, "certs/localhost+2.pem"))
};
}
export default defineConfig({
server: {
export default defineConfig(({ command }) => ({
base: command === "build" ? "/modelLibrary/" : "/",
server: command === "serve"
? {
port: 5174,
strictPort: true,
https: httpsConfig,
https: getDevHttpsConfig(),
headers: {
// 关键:添加 COEP 和 COOP
"Cross-Origin-Embedder-Policy": "credentialless", // 或 "require-corp"
@@ -31,4 +36,5 @@ export default defineConfig({
"/storage": "http://127.0.0.1:3001"
}
}
});
: undefined
}));