Compare commits
22
Commits
309bb0a5e6
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ecd24acf19 | ||
|
|
37e1e58883 | ||
|
|
a8947696af | ||
|
|
9662f41eec | ||
|
|
fbfaa59b14 | ||
|
|
27b4b720ed | ||
|
|
e62f2b54d5 | ||
|
|
d7c36e31f7 | ||
|
|
985c8d39fc | ||
|
|
5368e52f0d | ||
|
|
83684b4c7b | ||
|
|
6720a3e730 | ||
|
|
e78afc73f3 | ||
|
|
2c62987281 | ||
|
|
ecddca00c9 | ||
|
|
8b363e8eb4 | ||
|
|
43c2be9525 | ||
|
|
838939855e | ||
|
|
e8615c6796 | ||
|
|
d8f98ee295 | ||
|
|
151bc7c8a2 | ||
|
|
404e804143 |
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,364 @@
|
||||
<!doctype html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>TkAstral3D 非分包离线测试</title>
|
||||
<style>
|
||||
:root {
|
||||
--bg: #0b1020;
|
||||
--panel: rgba(15, 23, 42, 0.88);
|
||||
--line: rgba(148, 163, 184, 0.24);
|
||||
--text: #e2e8f0;
|
||||
--muted: #94a3b8;
|
||||
--accent: #22c55e;
|
||||
--accent-2: #38bdf8;
|
||||
--danger: #f87171;
|
||||
}
|
||||
|
||||
* {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
html,
|
||||
body {
|
||||
margin: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
background:
|
||||
radial-gradient(circle at top left, rgba(56, 189, 248, 0.12), transparent 32%),
|
||||
radial-gradient(circle at top right, rgba(34, 197, 94, 0.14), transparent 28%),
|
||||
linear-gradient(180deg, #0b1020, #050814 72%);
|
||||
color: var(--text);
|
||||
font-family: "Segoe UI", "PingFang SC", "Microsoft YaHei", sans-serif;
|
||||
}
|
||||
|
||||
.app {
|
||||
display: grid;
|
||||
grid-template-columns: 360px 1fr;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
padding: 20px;
|
||||
border-right: 1px solid var(--line);
|
||||
background: var(--panel);
|
||||
backdrop-filter: blur(10px);
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.viewer-wrap {
|
||||
position: relative;
|
||||
min-width: 0;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
#viewer {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
h1 {
|
||||
margin: 0 0 10px;
|
||||
font-size: 24px;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.desc,
|
||||
.hint,
|
||||
.meta,
|
||||
.log {
|
||||
color: var(--muted);
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.desc {
|
||||
margin-bottom: 16px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.card {
|
||||
margin-top: 16px;
|
||||
padding: 14px;
|
||||
border: 1px solid var(--line);
|
||||
border-radius: 14px;
|
||||
background: rgba(2, 6, 23, 0.36);
|
||||
}
|
||||
|
||||
.card h2 {
|
||||
margin: 0 0 10px;
|
||||
font-size: 15px;
|
||||
color: #f8fafc;
|
||||
}
|
||||
|
||||
.row {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
margin-top: 12px;
|
||||
}
|
||||
|
||||
button,
|
||||
input[type="file"] {
|
||||
font: inherit;
|
||||
}
|
||||
|
||||
button {
|
||||
padding: 10px 14px;
|
||||
border: 1px solid var(--line);
|
||||
border-radius: 10px;
|
||||
background: linear-gradient(180deg, rgba(56, 189, 248, 0.16), rgba(34, 197, 94, 0.16));
|
||||
color: var(--text);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
button.secondary {
|
||||
background: rgba(15, 23, 42, 0.9);
|
||||
}
|
||||
|
||||
input[type="file"] {
|
||||
width: 100%;
|
||||
color: var(--muted);
|
||||
}
|
||||
|
||||
.status {
|
||||
margin-top: 12px;
|
||||
padding: 10px 12px;
|
||||
border-radius: 10px;
|
||||
border: 1px solid var(--line);
|
||||
background: rgba(15, 23, 42, 0.72);
|
||||
font-size: 13px;
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
|
||||
.status.success {
|
||||
border-color: rgba(34, 197, 94, 0.35);
|
||||
color: #bbf7d0;
|
||||
}
|
||||
|
||||
.status.error {
|
||||
border-color: rgba(248, 113, 113, 0.35);
|
||||
color: #fecaca;
|
||||
}
|
||||
|
||||
.file-list {
|
||||
margin: 10px 0 0;
|
||||
padding-left: 18px;
|
||||
font-size: 13px;
|
||||
color: var(--muted);
|
||||
}
|
||||
|
||||
.tag {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
padding: 4px 8px;
|
||||
border-radius: 999px;
|
||||
background: rgba(56, 189, 248, 0.1);
|
||||
border: 1px solid rgba(56, 189, 248, 0.18);
|
||||
font-size: 12px;
|
||||
color: #bae6fd;
|
||||
}
|
||||
|
||||
@media (max-width: 900px) {
|
||||
.app {
|
||||
grid-template-columns: 1fr;
|
||||
grid-template-rows: auto 1fr;
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
border-right: 0;
|
||||
border-bottom: 1px solid var(--line);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="app">
|
||||
<aside class="sidebar">
|
||||
<h1>Tk 非分包离线测试</h1>
|
||||
<div class="desc">
|
||||
这个页面直接使用 Tk 构建产物来验证离线包加载。
|
||||
仅支持非分包单文件模式:选择 1 个 .astral 文件加载。
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<span class="tag">SDK: TkAstral3D/Test/dist/astral3d.umd.js</span>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h2>选择离线包</h2>
|
||||
<input id="fileInput" type="file" accept=".astral" />
|
||||
<div class="row">
|
||||
<button id="loadBtn">加载离线包</button>
|
||||
<button id="loadLocalBtn" class="secondary">直接加载本目录</button>
|
||||
<button id="resetBtn" class="secondary">重置场景</button>
|
||||
</div>
|
||||
<div id="status" class="status">等待选择 .astral 文件,或点击“直接加载本目录”</div>
|
||||
<ul id="fileList" class="file-list"></ul>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h2>说明(非分包)</h2>
|
||||
<div class="hint">
|
||||
1. 仅选择一个非分包导出的 .astral 文件。\n
|
||||
2. 页面使用 SDK 的 Package.unpack 直接加载,不依赖页面层 JSZip。\n
|
||||
3. 也可点击“直接加载本目录”,默认读取 1121212.astral。\n
|
||||
4. 建议通过本地静态服务器打开此页面,而不是直接 file:// 打开。
|
||||
</div>
|
||||
</div>
|
||||
</aside>
|
||||
|
||||
<main class="viewer-wrap">
|
||||
<div id="viewer"></div>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
<script src="./dist/astral3d.umd.js"></script>
|
||||
<script>
|
||||
(function () {
|
||||
const SDK = globalThis.Astral3D;
|
||||
if (!SDK) {
|
||||
document.getElementById("status").textContent = "Tk SDK 加载失败,请检查 astral3d.umd.js 路径";
|
||||
document.getElementById("status").className = "status error";
|
||||
return;
|
||||
}
|
||||
|
||||
const viewerEl = document.getElementById("viewer");
|
||||
const fileInput = document.getElementById("fileInput");
|
||||
const loadBtn = document.getElementById("loadBtn");
|
||||
const loadLocalBtn = document.getElementById("loadLocalBtn");
|
||||
const resetBtn = document.getElementById("resetBtn");
|
||||
const statusEl = document.getElementById("status");
|
||||
const fileListEl = document.getElementById("fileList");
|
||||
const LOCAL_SINGLE_FILE = "1121212.astral";
|
||||
|
||||
let viewer = null;
|
||||
|
||||
function setStatus(text, type) {
|
||||
statusEl.textContent = text;
|
||||
statusEl.className = "status" + (type ? ` ${type}` : "");
|
||||
}
|
||||
|
||||
function ensureViewer() {
|
||||
if (viewer) return viewer;
|
||||
viewer = new SDK.Viewer({
|
||||
container: viewerEl,
|
||||
edit: { enabled: false },
|
||||
grid: { enabled: true },
|
||||
request: { baseUrl: "" },
|
||||
});
|
||||
globalThis.viewer = viewer;
|
||||
return viewer;
|
||||
}
|
||||
|
||||
function resetViewer() {
|
||||
if (viewer && typeof viewer.dispose === "function") {
|
||||
viewer.dispose();
|
||||
}
|
||||
viewer = null;
|
||||
viewerEl.innerHTML = "";
|
||||
setStatus("场景已重置", "success");
|
||||
}
|
||||
|
||||
function renderFileList(files) {
|
||||
fileListEl.innerHTML = "";
|
||||
Array.from(files || []).forEach(file => {
|
||||
const li = document.createElement("li");
|
||||
li.textContent = `${file.name} (${Math.round(file.size / 1024)} KB)`;
|
||||
fileListEl.appendChild(li);
|
||||
});
|
||||
}
|
||||
|
||||
async function loadByOfflineBundle(bundle, entryName) {
|
||||
setStatus("正在准备离线包...", "");
|
||||
const currentViewer = ensureViewer();
|
||||
const packer = currentViewer.package || new SDK.Package(currentViewer);
|
||||
currentViewer.package = packer;
|
||||
|
||||
setStatus(`开始加载离线包:${entryName}`, "");
|
||||
|
||||
await packer.unpack({
|
||||
url: entryName,
|
||||
offlineBundle: bundle,
|
||||
offlineEntry: entryName,
|
||||
onProgress: progress => {
|
||||
setStatus(`离线包加载中... ${Number(progress || 0).toFixed(2)}%`, "");
|
||||
},
|
||||
onSceneLoad: () => {
|
||||
setStatus("场景首包已解析,正在继续加载资源...", "");
|
||||
},
|
||||
onComplete: () => {
|
||||
setStatus(`离线包加载完成:${entryName}`, "success");
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
async function fetchLocalAstralFile(name) {
|
||||
const response = await fetch(`./${encodeURIComponent(name)}`);
|
||||
if (!response.ok) {
|
||||
throw new Error(`读取本地文件失败:${name}`);
|
||||
}
|
||||
const blob = await response.blob();
|
||||
return new File([blob], name, { type: "application/octet-stream" });
|
||||
}
|
||||
|
||||
function getSingleAstralFromFileList(fileList) {
|
||||
const files = Array.from(fileList || []).filter(file => file.name.toLowerCase().endsWith(".astral"));
|
||||
if (files.length === 0) {
|
||||
throw new Error("请选择 .astral 文件");
|
||||
}
|
||||
if (files.length !== 1) {
|
||||
throw new Error("非分包模式请只选择 1 个 .astral 文件");
|
||||
}
|
||||
return files[0];
|
||||
}
|
||||
|
||||
async function loadOfflinePackage() {
|
||||
try {
|
||||
const file = getSingleAstralFromFileList(fileInput.files);
|
||||
renderFileList([file]);
|
||||
await loadByOfflineBundle(file, file.name);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
setStatus(`加载失败:${error && error.message ? error.message : error}`, "error");
|
||||
}
|
||||
}
|
||||
|
||||
async function loadLocalPackage() {
|
||||
try {
|
||||
renderFileList([{ name: LOCAL_SINGLE_FILE, size: 0 }]);
|
||||
const file = await fetchLocalAstralFile(LOCAL_SINGLE_FILE);
|
||||
await loadByOfflineBundle(file, LOCAL_SINGLE_FILE);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
setStatus(`本目录加载失败:${error && error.message ? error.message : error}`, "error");
|
||||
}
|
||||
}
|
||||
|
||||
fileInput.addEventListener("change", () => {
|
||||
renderFileList(fileInput.files);
|
||||
setStatus("文件已选择,点击“加载离线包”开始测试", "");
|
||||
});
|
||||
|
||||
loadBtn.addEventListener("click", () => {
|
||||
loadOfflinePackage();
|
||||
});
|
||||
|
||||
loadLocalBtn.addEventListener("click", () => {
|
||||
loadLocalPackage();
|
||||
});
|
||||
|
||||
resetBtn.addEventListener("click", () => {
|
||||
resetViewer();
|
||||
});
|
||||
|
||||
ensureViewer();
|
||||
setStatus("Tk SDK 已加载(非分包模式),等待选择离线包", "success");
|
||||
})();
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,369 @@
|
||||
<!doctype html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>TkAstral3D 分包离线测试</title>
|
||||
<style>
|
||||
:root {
|
||||
--bg: #0b1020;
|
||||
--panel: rgba(15, 23, 42, 0.88);
|
||||
--line: rgba(148, 163, 184, 0.24);
|
||||
--text: #e2e8f0;
|
||||
--muted: #94a3b8;
|
||||
--accent: #22c55e;
|
||||
--accent-2: #38bdf8;
|
||||
--danger: #f87171;
|
||||
}
|
||||
|
||||
* {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
html,
|
||||
body {
|
||||
margin: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
background:
|
||||
radial-gradient(circle at top left, rgba(56, 189, 248, 0.12), transparent 32%),
|
||||
radial-gradient(circle at top right, rgba(34, 197, 94, 0.14), transparent 28%),
|
||||
linear-gradient(180deg, #0b1020, #050814 72%);
|
||||
color: var(--text);
|
||||
font-family: "Segoe UI", "PingFang SC", "Microsoft YaHei", sans-serif;
|
||||
}
|
||||
|
||||
.app {
|
||||
display: grid;
|
||||
grid-template-columns: 360px 1fr;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
padding: 20px;
|
||||
border-right: 1px solid var(--line);
|
||||
background: var(--panel);
|
||||
backdrop-filter: blur(10px);
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.viewer-wrap {
|
||||
position: relative;
|
||||
min-width: 0;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
#viewer {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
h1 {
|
||||
margin: 0 0 10px;
|
||||
font-size: 24px;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.desc,
|
||||
.hint,
|
||||
.meta,
|
||||
.log {
|
||||
color: var(--muted);
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.desc {
|
||||
margin-bottom: 16px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.card {
|
||||
margin-top: 16px;
|
||||
padding: 14px;
|
||||
border: 1px solid var(--line);
|
||||
border-radius: 14px;
|
||||
background: rgba(2, 6, 23, 0.36);
|
||||
}
|
||||
|
||||
.card h2 {
|
||||
margin: 0 0 10px;
|
||||
font-size: 15px;
|
||||
color: #f8fafc;
|
||||
}
|
||||
|
||||
.row {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
margin-top: 12px;
|
||||
}
|
||||
|
||||
button,
|
||||
input[type="file"] {
|
||||
font: inherit;
|
||||
}
|
||||
|
||||
button {
|
||||
padding: 10px 14px;
|
||||
border: 1px solid var(--line);
|
||||
border-radius: 10px;
|
||||
background: linear-gradient(180deg, rgba(56, 189, 248, 0.16), rgba(34, 197, 94, 0.16));
|
||||
color: var(--text);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
button.secondary {
|
||||
background: rgba(15, 23, 42, 0.9);
|
||||
}
|
||||
|
||||
input[type="file"] {
|
||||
width: 100%;
|
||||
color: var(--muted);
|
||||
}
|
||||
|
||||
.status {
|
||||
margin-top: 12px;
|
||||
padding: 10px 12px;
|
||||
border-radius: 10px;
|
||||
border: 1px solid var(--line);
|
||||
background: rgba(15, 23, 42, 0.72);
|
||||
font-size: 13px;
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
|
||||
.status.success {
|
||||
border-color: rgba(34, 197, 94, 0.35);
|
||||
color: #bbf7d0;
|
||||
}
|
||||
|
||||
.status.error {
|
||||
border-color: rgba(248, 113, 113, 0.35);
|
||||
color: #fecaca;
|
||||
}
|
||||
|
||||
.file-list {
|
||||
margin: 10px 0 0;
|
||||
padding-left: 18px;
|
||||
font-size: 13px;
|
||||
color: var(--muted);
|
||||
}
|
||||
|
||||
.tag {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
padding: 4px 8px;
|
||||
border-radius: 999px;
|
||||
background: rgba(56, 189, 248, 0.1);
|
||||
border: 1px solid rgba(56, 189, 248, 0.18);
|
||||
font-size: 12px;
|
||||
color: #bae6fd;
|
||||
}
|
||||
|
||||
@media (max-width: 900px) {
|
||||
.app {
|
||||
grid-template-columns: 1fr;
|
||||
grid-template-rows: auto 1fr;
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
border-right: 0;
|
||||
border-bottom: 1px solid var(--line);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="app">
|
||||
<aside class="sidebar">
|
||||
<h1>Tk 分包离线测试</h1>
|
||||
<div class="desc">
|
||||
这个页面直接使用 Tk 构建产物来验证离线包加载。
|
||||
仅支持分包模式:请一次选择多个 .astral 文件并加载。
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<span class="tag">SDK: TkAstral3D/Test/dist/astral3d.umd.js</span>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h2>选择离线包</h2>
|
||||
<input id="fileInput" type="file" multiple accept=".astral" />
|
||||
<div class="row">
|
||||
<button id="loadBtn">加载离线包</button>
|
||||
<button id="loadLocalBtn" class="secondary">直接加载本目录</button>
|
||||
<button id="resetBtn" class="secondary">重置场景</button>
|
||||
</div>
|
||||
<div id="status" class="status">等待选择 .astral 文件,或点击“直接加载本目录”</div>
|
||||
<ul id="fileList" class="file-list"></ul>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h2>说明(分包)</h2>
|
||||
<div class="hint">
|
||||
1. 请选择导出的全部分包 .astral 文件。\n
|
||||
2. 至少包含入口包和依赖包后再点击加载。\n
|
||||
3. 也可点击“直接加载本目录”,默认读取 1121212.astral + 7ff6dd32-25b3-4eea-abdc-6f316ecd668e.astral。\n
|
||||
4. 建议通过本地静态服务器打开此页面,而不是直接 file:// 打开。
|
||||
</div>
|
||||
</div>
|
||||
</aside>
|
||||
|
||||
<main class="viewer-wrap">
|
||||
<div id="viewer"></div>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
<script src="./dist/astral3d.umd.js"></script>
|
||||
<script>
|
||||
(function () {
|
||||
const SDK = globalThis.Astral3D;
|
||||
if (!SDK) {
|
||||
document.getElementById("status").textContent = "Tk SDK 加载失败,请检查 astral3d.umd.js 路径";
|
||||
document.getElementById("status").className = "status error";
|
||||
return;
|
||||
}
|
||||
|
||||
const viewerEl = document.getElementById("viewer");
|
||||
const fileInput = document.getElementById("fileInput");
|
||||
const loadBtn = document.getElementById("loadBtn");
|
||||
const loadLocalBtn = document.getElementById("loadLocalBtn");
|
||||
const resetBtn = document.getElementById("resetBtn");
|
||||
const statusEl = document.getElementById("status");
|
||||
const fileListEl = document.getElementById("fileList");
|
||||
const LOCAL_SPLIT_FILES = [
|
||||
"1121212.astral",
|
||||
"7ff6dd32-25b3-4eea-abdc-6f316ecd668e.astral",
|
||||
];
|
||||
|
||||
let viewer = null;
|
||||
|
||||
function setStatus(text, type) {
|
||||
statusEl.textContent = text;
|
||||
statusEl.className = "status" + (type ? ` ${type}` : "");
|
||||
}
|
||||
|
||||
function guessEntryFile(files) {
|
||||
const uuidReg = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/;
|
||||
const findBaseName = name => name.replace(/\.[^.]+$/, "");
|
||||
return files.find(file => !uuidReg.test(findBaseName(file.name))) || files[0];
|
||||
}
|
||||
|
||||
function ensureViewer() {
|
||||
if (viewer) return viewer;
|
||||
viewer = new SDK.Viewer({
|
||||
container: viewerEl,
|
||||
edit: { enabled: false },
|
||||
grid: { enabled: true },
|
||||
request: { baseUrl: "" },
|
||||
});
|
||||
globalThis.viewer = viewer;
|
||||
return viewer;
|
||||
}
|
||||
|
||||
function resetViewer() {
|
||||
if (viewer && typeof viewer.dispose === "function") {
|
||||
viewer.dispose();
|
||||
}
|
||||
viewer = null;
|
||||
viewerEl.innerHTML = "";
|
||||
setStatus("场景已重置", "success");
|
||||
}
|
||||
|
||||
function renderFileList(files) {
|
||||
fileListEl.innerHTML = "";
|
||||
Array.from(files || []).forEach(file => {
|
||||
const li = document.createElement("li");
|
||||
li.textContent = `${file.name} (${Math.round(file.size / 1024)} KB)`;
|
||||
fileListEl.appendChild(li);
|
||||
});
|
||||
}
|
||||
|
||||
async function loadByOfflineFiles(files, entryName) {
|
||||
setStatus(`开始加载离线包:${entryName}`, "");
|
||||
const currentViewer = ensureViewer();
|
||||
const packer = currentViewer.package || new SDK.Package(currentViewer);
|
||||
currentViewer.package = packer;
|
||||
|
||||
await packer.unpack({
|
||||
url: entryName,
|
||||
offlineFiles: files,
|
||||
offlineEntry: entryName,
|
||||
onProgress: progress => {
|
||||
setStatus(`离线包加载中... ${Number(progress || 0).toFixed(2)}%`, "");
|
||||
},
|
||||
onSceneLoad: () => {
|
||||
setStatus("场景首包已解析,正在继续加载资源...", "");
|
||||
},
|
||||
onComplete: () => {
|
||||
setStatus(`离线包加载完成:${entryName}`, "success");
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
async function fetchLocalAstralFile(name) {
|
||||
const response = await fetch(`./${encodeURIComponent(name)}`);
|
||||
if (!response.ok) {
|
||||
throw new Error(`读取本地文件失败:${name}`);
|
||||
}
|
||||
const blob = await response.blob();
|
||||
return new File([blob], name, { type: "application/octet-stream" });
|
||||
}
|
||||
|
||||
async function loadOfflinePackage() {
|
||||
const files = Array.from(fileInput.files || []).filter(f => f.name.toLowerCase().endsWith(".astral"));
|
||||
if (files.length < 2) {
|
||||
setStatus("分包模式请至少选择 2 个 .astral 文件", "error");
|
||||
return;
|
||||
}
|
||||
|
||||
renderFileList(files);
|
||||
try {
|
||||
const entry = guessEntryFile(files);
|
||||
await loadByOfflineFiles(files, entry.name);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
setStatus(`加载失败:${error && error.message ? error.message : error}`, "error");
|
||||
}
|
||||
}
|
||||
|
||||
async function loadLocalPackages() {
|
||||
try {
|
||||
renderFileList(LOCAL_SPLIT_FILES.map(name => ({ name, size: 0 })));
|
||||
const files = [];
|
||||
for (const name of LOCAL_SPLIT_FILES) {
|
||||
files.push(await fetchLocalAstralFile(name));
|
||||
}
|
||||
await loadByOfflineFiles(files, LOCAL_SPLIT_FILES[0]);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
setStatus(`本目录加载失败:${error && error.message ? error.message : error}`, "error");
|
||||
}
|
||||
}
|
||||
|
||||
fileInput.addEventListener("change", () => {
|
||||
renderFileList(fileInput.files);
|
||||
setStatus("文件已选择,点击“加载离线包”开始测试", "");
|
||||
});
|
||||
|
||||
loadBtn.addEventListener("click", () => {
|
||||
loadOfflinePackage();
|
||||
});
|
||||
|
||||
loadLocalBtn.addEventListener("click", () => {
|
||||
loadLocalPackages();
|
||||
});
|
||||
|
||||
resetBtn.addEventListener("click", () => {
|
||||
resetViewer();
|
||||
});
|
||||
|
||||
ensureViewer();
|
||||
setStatus("Tk SDK 已加载(分包模式),等待选择离线包", "success");
|
||||
})();
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
+425
@@ -0,0 +1,425 @@
|
||||
<!doctype html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>TkAstral3D Offline Package Test</title>
|
||||
<style>
|
||||
:root {
|
||||
--bg: #0b1020;
|
||||
--panel: rgba(15, 23, 42, 0.88);
|
||||
--line: rgba(148, 163, 184, 0.24);
|
||||
--text: #e2e8f0;
|
||||
--muted: #94a3b8;
|
||||
--accent: #22c55e;
|
||||
--accent-2: #38bdf8;
|
||||
--danger: #f87171;
|
||||
}
|
||||
|
||||
* {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
html,
|
||||
body {
|
||||
margin: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
background:
|
||||
radial-gradient(circle at top left, rgba(56, 189, 248, 0.12), transparent 32%),
|
||||
radial-gradient(circle at top right, rgba(34, 197, 94, 0.14), transparent 28%),
|
||||
linear-gradient(180deg, #0b1020, #050814 72%);
|
||||
color: var(--text);
|
||||
font-family: "Segoe UI", "PingFang SC", "Microsoft YaHei", sans-serif;
|
||||
}
|
||||
|
||||
.app {
|
||||
display: grid;
|
||||
grid-template-columns: 360px 1fr;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
padding: 20px;
|
||||
border-right: 1px solid var(--line);
|
||||
background: var(--panel);
|
||||
backdrop-filter: blur(10px);
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.viewer-wrap {
|
||||
position: relative;
|
||||
min-width: 0;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
#viewer {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
h1 {
|
||||
margin: 0 0 10px;
|
||||
font-size: 24px;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.desc,
|
||||
.hint,
|
||||
.meta,
|
||||
.log {
|
||||
color: var(--muted);
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.desc {
|
||||
margin-bottom: 16px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.card {
|
||||
margin-top: 16px;
|
||||
padding: 14px;
|
||||
border: 1px solid var(--line);
|
||||
border-radius: 14px;
|
||||
background: rgba(2, 6, 23, 0.36);
|
||||
}
|
||||
|
||||
.card h2 {
|
||||
margin: 0 0 10px;
|
||||
font-size: 15px;
|
||||
color: #f8fafc;
|
||||
}
|
||||
|
||||
.row {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
margin-top: 12px;
|
||||
}
|
||||
|
||||
button,
|
||||
input[type="file"] {
|
||||
font: inherit;
|
||||
}
|
||||
|
||||
button {
|
||||
padding: 10px 14px;
|
||||
border: 1px solid var(--line);
|
||||
border-radius: 10px;
|
||||
background: linear-gradient(180deg, rgba(56, 189, 248, 0.16), rgba(34, 197, 94, 0.16));
|
||||
color: var(--text);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
button.secondary {
|
||||
background: rgba(15, 23, 42, 0.9);
|
||||
}
|
||||
|
||||
input[type="file"] {
|
||||
width: 100%;
|
||||
color: var(--muted);
|
||||
}
|
||||
|
||||
.status {
|
||||
margin-top: 12px;
|
||||
padding: 10px 12px;
|
||||
border-radius: 10px;
|
||||
border: 1px solid var(--line);
|
||||
background: rgba(15, 23, 42, 0.72);
|
||||
font-size: 13px;
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
|
||||
.status.success {
|
||||
border-color: rgba(34, 197, 94, 0.35);
|
||||
color: #bbf7d0;
|
||||
}
|
||||
|
||||
.status.error {
|
||||
border-color: rgba(248, 113, 113, 0.35);
|
||||
color: #fecaca;
|
||||
}
|
||||
|
||||
.file-list {
|
||||
margin: 10px 0 0;
|
||||
padding-left: 18px;
|
||||
font-size: 13px;
|
||||
color: var(--muted);
|
||||
}
|
||||
|
||||
.tag {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
padding: 4px 8px;
|
||||
border-radius: 999px;
|
||||
background: rgba(56, 189, 248, 0.1);
|
||||
border: 1px solid rgba(56, 189, 248, 0.18);
|
||||
font-size: 12px;
|
||||
color: #bae6fd;
|
||||
}
|
||||
|
||||
@media (max-width: 900px) {
|
||||
.app {
|
||||
grid-template-columns: 1fr;
|
||||
grid-template-rows: auto 1fr;
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
border-right: 0;
|
||||
border-bottom: 1px solid var(--line);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="app">
|
||||
<aside class="sidebar">
|
||||
<h1>Tk 离线包测试</h1>
|
||||
<div class="desc">
|
||||
这个页面直接使用 Tk 构建产物来验证离线包加载。
|
||||
支持单包与多包 .astral 文件,直接通过 SDK 的离线参数加载,不依赖编辑器页面。
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<span class="tag">SDK: TkAstral3D/Test/dist/astral3d.umd.js</span>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h2>选择离线包</h2>
|
||||
<input id="fileInput" type="file" multiple accept=".astral" />
|
||||
<div class="row">
|
||||
<button id="loadBtn">加载离线包</button>
|
||||
<button id="loadLocalSplitBtn" class="secondary">直接加载本目录(分包)</button>
|
||||
<button id="loadLocalSingleBtn" class="secondary">直接加载本目录(单包)</button>
|
||||
<button id="resetBtn" class="secondary">重置场景</button>
|
||||
</div>
|
||||
<div id="status" class="status">等待选择 .astral 文件,或使用“直接加载本目录”</div>
|
||||
<ul id="fileList" class="file-list"></ul>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h2>说明</h2>
|
||||
<div class="hint">
|
||||
1. 多包模式:直接选中全部 .astral 文件后加载。\n
|
||||
2. 单包模式:只需要选择导出的单个 .astral 文件。\n
|
||||
3. 本目录快捷加载:分包=1121212.astral + 7ff6dd32-25b3-4eea-abdc-6f316ecd668e.astral;单包=1121212.astral。\n
|
||||
4. 建议通过本地静态服务器打开此页面,而不是直接 file:// 打开。
|
||||
</div>
|
||||
</div>
|
||||
</aside>
|
||||
|
||||
<main class="viewer-wrap">
|
||||
<div id="viewer"></div>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
<script src="./dist/astral3d.umd.js"></script>
|
||||
<script>
|
||||
(function () {
|
||||
const SDK = globalThis.Astral3D;
|
||||
if (!SDK) {
|
||||
document.getElementById("status").textContent = "Tk SDK 加载失败,请检查 astral3d.umd.js 路径";
|
||||
document.getElementById("status").className = "status error";
|
||||
return;
|
||||
}
|
||||
|
||||
const viewerEl = document.getElementById("viewer");
|
||||
const fileInput = document.getElementById("fileInput");
|
||||
const loadBtn = document.getElementById("loadBtn");
|
||||
const loadLocalSplitBtn = document.getElementById("loadLocalSplitBtn");
|
||||
const loadLocalSingleBtn = document.getElementById("loadLocalSingleBtn");
|
||||
const resetBtn = document.getElementById("resetBtn");
|
||||
const statusEl = document.getElementById("status");
|
||||
const fileListEl = document.getElementById("fileList");
|
||||
const LOCAL_SPLIT_FILES = [
|
||||
"1121212.astral",
|
||||
"7ff6dd32-25b3-4eea-abdc-6f316ecd668e.astral",
|
||||
];
|
||||
const LOCAL_SINGLE_FILE = "1121212-offline.astral";
|
||||
|
||||
let viewer = null;
|
||||
|
||||
function setStatus(text, type) {
|
||||
statusEl.textContent = text;
|
||||
statusEl.className = "status" + (type ? ` ${type}` : "");
|
||||
}
|
||||
|
||||
function guessEntryFile(files) {
|
||||
const uuidReg = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/;
|
||||
return files.find(f => !uuidReg.test(f.name.replace(/\.[^.]+$/, ""))) || files[0];
|
||||
}
|
||||
|
||||
function ensureViewer() {
|
||||
if (viewer) return viewer;
|
||||
viewer = new SDK.Viewer({
|
||||
container: viewerEl,
|
||||
edit: { enabled: false },
|
||||
grid: { enabled: true },
|
||||
request: { baseUrl: "" },
|
||||
});
|
||||
globalThis.viewer = viewer;
|
||||
return viewer;
|
||||
}
|
||||
|
||||
function resetViewer() {
|
||||
if (viewer && typeof viewer.dispose === "function") {
|
||||
viewer.dispose();
|
||||
}
|
||||
viewer = null;
|
||||
viewerEl.innerHTML = "";
|
||||
setStatus("场景已重置", "success");
|
||||
}
|
||||
|
||||
function renderFileList(files) {
|
||||
fileListEl.innerHTML = "";
|
||||
Array.from(files || []).forEach(file => {
|
||||
const li = document.createElement("li");
|
||||
li.textContent = `${file.name} (${Math.round(file.size / 1024)} KB)`;
|
||||
fileListEl.appendChild(li);
|
||||
});
|
||||
}
|
||||
|
||||
async function loadByOfflineFiles(files, entryName) {
|
||||
setStatus(`开始加载离线包:${entryName}`, "");
|
||||
const currentViewer = ensureViewer();
|
||||
const packer = currentViewer.package || new SDK.Package(currentViewer);
|
||||
currentViewer.package = packer;
|
||||
|
||||
await packer.unpack({
|
||||
url: entryName,
|
||||
offlineFiles: files,
|
||||
offlineEntry: entryName,
|
||||
onProgress: progress => {
|
||||
setStatus(`离线包加载中... ${Number(progress || 0).toFixed(2)}%`, "");
|
||||
},
|
||||
onSceneLoad: () => {
|
||||
setStatus("场景首包已解析,正在继续加载资源...", "");
|
||||
},
|
||||
onComplete: () => {
|
||||
setStatus(`离线包加载完成:${entryName}`, "success");
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
async function loadByOfflineBundle(bundle, entryName) {
|
||||
setStatus(`开始加载离线包:${entryName}`, "");
|
||||
const currentViewer = ensureViewer();
|
||||
const packer = currentViewer.package || new SDK.Package(currentViewer);
|
||||
currentViewer.package = packer;
|
||||
console.log({
|
||||
url: "/",
|
||||
offlineBundle: bundle,
|
||||
offlineEntry: entryName,
|
||||
onProgress: progress => {
|
||||
setStatus(`离线包加载中... ${Number(progress || 0).toFixed(2)}%`, "");
|
||||
},
|
||||
onSceneLoad: () => {
|
||||
setStatus("场景首包已解析,正在继续加载资源...", "");
|
||||
},
|
||||
onComplete: () => {
|
||||
setStatus(`离线包加载完成:${entryName}`, "success");
|
||||
},
|
||||
})
|
||||
await packer.unpack({
|
||||
url: "/",
|
||||
offlineBundle: bundle,
|
||||
offlineEntry: entryName,
|
||||
onProgress: progress => {
|
||||
setStatus(`离线包加载中... ${Number(progress || 0).toFixed(2)}%`, "");
|
||||
},
|
||||
onSceneLoad: () => {
|
||||
setStatus("场景首包已解析,正在继续加载资源...", "");
|
||||
},
|
||||
onComplete: () => {
|
||||
setStatus(`离线包加载完成:${entryName}`, "success");
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
async function fetchLocalAstralFile(name) {
|
||||
const response = await fetch(`./${encodeURIComponent(name)}`);
|
||||
if (!response.ok) {
|
||||
throw new Error(`读取本地文件失败:${name}`);
|
||||
}
|
||||
const blob = await response.blob();
|
||||
return new File([blob], name, { type: "application/octet-stream" });
|
||||
}
|
||||
|
||||
async function loadOfflinePackage() {
|
||||
const files = Array.from(fileInput.files || []).filter(f => f.name.toLowerCase().endsWith(".astral"));
|
||||
if (files.length === 0) {
|
||||
setStatus("请选择 .astral 文件", "error");
|
||||
return;
|
||||
}
|
||||
|
||||
renderFileList(files);
|
||||
try {
|
||||
if (files.length === 1) {
|
||||
await loadByOfflineBundle(files[0], files[0].name);
|
||||
} else {
|
||||
const entry = guessEntryFile(files);
|
||||
await loadByOfflineFiles(files, entry.name);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
setStatus(`加载失败:${error && error.message ? error.message : error}`, "error");
|
||||
}
|
||||
}
|
||||
|
||||
async function loadLocalSplitPackage() {
|
||||
try {
|
||||
renderFileList(LOCAL_SPLIT_FILES.map(name => ({ name, size: 0 })));
|
||||
const files = [];
|
||||
for (const name of LOCAL_SPLIT_FILES) {
|
||||
files.push(await fetchLocalAstralFile(name));
|
||||
}
|
||||
await loadByOfflineFiles(files, LOCAL_SPLIT_FILES[0]);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
setStatus(`本目录分包加载失败:${error && error.message ? error.message : error}`, "error");
|
||||
}
|
||||
}
|
||||
|
||||
async function loadLocalSinglePackage() {
|
||||
try {
|
||||
renderFileList([{ name: LOCAL_SINGLE_FILE, size: 0 }]);
|
||||
const file = await fetchLocalAstralFile(LOCAL_SINGLE_FILE);
|
||||
await loadByOfflineBundle(file, LOCAL_SINGLE_FILE);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
setStatus(`本目录单包加载失败:${error && error.message ? error.message : error}`, "error");
|
||||
}
|
||||
}
|
||||
|
||||
fileInput.addEventListener("change", () => {
|
||||
renderFileList(fileInput.files);
|
||||
setStatus("文件已选择,点击“加载离线包”开始测试", "");
|
||||
});
|
||||
|
||||
loadBtn.addEventListener("click", () => {
|
||||
loadOfflinePackage();
|
||||
});
|
||||
|
||||
loadLocalSplitBtn.addEventListener("click", () => {
|
||||
loadLocalSplitPackage();
|
||||
});
|
||||
|
||||
loadLocalSingleBtn.addEventListener("click", () => {
|
||||
loadLocalSinglePackage();
|
||||
});
|
||||
|
||||
resetBtn.addEventListener("click", () => {
|
||||
resetViewer();
|
||||
});
|
||||
|
||||
ensureViewer();
|
||||
setStatus("Tk SDK 已加载,等待选择离线包", "success");
|
||||
})();
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 59 KiB |
@@ -1,21 +0,0 @@
|
||||
1. 脚本系统 支持编写代码脚本进行逻辑交互支持(升级后的)
|
||||
|
||||
2. GLTF轻量化工具 对GLTF格式模型进行轻量化处理,轻量化率达50%以上(升级后的)
|
||||
|
||||
3. 数据组件 支持注册数据源,并驱动模型进行可视化展示
|
||||
|
||||
4. 分包打包 支持ktx2等格式纹理打包,拥有更快的打包速度和更小的包体积(升级后的)
|
||||
|
||||
5. 离线包 导出和加载场景离线包,支持项目二次开发
|
||||
|
||||
6. 扩展3D对象 热力图、U面板、动态路径、水池
|
||||
|
||||
|
||||
```text
|
||||
把 Astral项目的 Astral/3d/editor/src/views/editor/components/extraPane/resource/builtin/Expansion.vue
|
||||
迁移到 TkAstral3D/packages/editor/src/views/editor/components/extraPane/resource/builtin 下
|
||||
要保证扩展中所有相关功能正常
|
||||
|
||||
```
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ VITE_ENABLE_ANALYZE=true
|
||||
VITE_ENABLE_CONFIG_GENERATE=true
|
||||
|
||||
# 当前站点URL
|
||||
VITE_GLOB_ORIGIN=https://editor.astraljs.com/
|
||||
VITE_GLOB_ORIGIN=https://tk.astraltwin.cn/
|
||||
|
||||
#ws接口
|
||||
VITE_GLOB_SOCKET_URL=wss://editor.astraljs.com/socket
|
||||
VITE_GLOB_SOCKET_URL=wss://tk.astraltwin.cn/api/sys/ws
|
||||
Binary file not shown.
@@ -3,7 +3,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue';
|
||||
import { ref, onMounted, onBeforeUnmount, nextTick, watch } from 'vue';
|
||||
import * as monaco from 'monaco-editor';
|
||||
import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
|
||||
import JsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker';
|
||||
@@ -74,10 +74,22 @@ onBeforeUnmount(() => {
|
||||
}
|
||||
});
|
||||
|
||||
watch(
|
||||
() => props.source,
|
||||
value => {
|
||||
if (!editor) return;
|
||||
const currentValue = editor.getValue();
|
||||
if (value !== currentValue) {
|
||||
editor.setValue(value);
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
async function initMonaco() {
|
||||
monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions({
|
||||
noSemanticValidation: false,
|
||||
noSyntaxValidation: false,
|
||||
diagnosticCodesToIgnore: [80002],
|
||||
});
|
||||
// 如果使用 Webpack 或其他打包工具,可以使用 importScripts
|
||||
monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
|
||||
|
||||
@@ -18,7 +18,7 @@ import {onMounted, ref} from "vue";
|
||||
import {Copy} from "@vicons/carbon";
|
||||
import {NIcon, NTooltip} from "naive-ui";
|
||||
import {t} from "@/language";
|
||||
import {App,Hooks,AddObjectCommand} from "@astral3d/engine";
|
||||
import {App,Hooks,Loader,Utils,AddObjectCommand} from "@astral3d/engine";
|
||||
|
||||
const disabled = ref(true);
|
||||
|
||||
@@ -36,6 +36,15 @@ function handleClone() {
|
||||
//避免复制相机或场景
|
||||
if (object === null || object.parent === null) return;
|
||||
|
||||
if (Utils.isHtmlPanelObject(object)) {
|
||||
const _json = object.toJSON() as any;
|
||||
|
||||
Loader.objectLoader.parseAsync(_json).then(newObject3D => {
|
||||
App.execute(new AddObjectCommand(newObject3D));
|
||||
}).catch((e: Error) => window.$message?.error(e.message));
|
||||
return;
|
||||
}
|
||||
|
||||
object = object.clone();
|
||||
|
||||
App.execute(new AddObjectCommand(object));
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<n-button class="mr-2">
|
||||
<template #icon>
|
||||
<n-icon size="22">
|
||||
<DocumentExport/>
|
||||
<DocumentExport />
|
||||
</n-icon>
|
||||
</template>
|
||||
{{ t("layout.header.Export") }}
|
||||
@@ -13,7 +13,7 @@
|
||||
<n-button type="primary" @click="handleImport">
|
||||
<template #icon>
|
||||
<n-icon>
|
||||
<DocumentImport/>
|
||||
<DocumentImport />
|
||||
</n-icon>
|
||||
</template>
|
||||
{{ t("layout.header.Import") }}
|
||||
@@ -21,135 +21,283 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {onMounted} from "vue";
|
||||
import {DocumentImport, DocumentExport} from "@vicons/carbon";
|
||||
import {t} from "@/language";
|
||||
import {App, Export, Loader} from "@astral3d/engine";
|
||||
import { onMounted } from "vue";
|
||||
import { DocumentImport, DocumentExport } from "@vicons/carbon";
|
||||
import { t } from "@/language";
|
||||
import { App, Export, Loader } from "@astral3d/engine";
|
||||
import { useGlobalConfigStore } from "@/store/modules/globalConfig";
|
||||
|
||||
const exportClass = new Export();
|
||||
const exportClass = new Export();
|
||||
const globalConfigStore = useGlobalConfigStore();
|
||||
|
||||
const exportOptions = [
|
||||
{
|
||||
label: t("layout.header['Export Object']"),
|
||||
key: "exportObject",
|
||||
children: [
|
||||
{
|
||||
label: "JSON",
|
||||
key: "exportObjectToJSON"
|
||||
},
|
||||
{
|
||||
label: "GLB",
|
||||
key: "exportObjectToGlb"
|
||||
},
|
||||
{
|
||||
label: "GLTF",
|
||||
key: "exportObjectToGltf"
|
||||
},
|
||||
{
|
||||
label: "OBJ",
|
||||
key: "exportObjectToObj"
|
||||
},
|
||||
{
|
||||
label: "PLY",
|
||||
key: "exportObjectToPly"
|
||||
},
|
||||
{
|
||||
label: t("layout.header['PLY (Binary)']"),
|
||||
key: "exportObjectToPlyBinary"
|
||||
},
|
||||
{
|
||||
label: "STL",
|
||||
key: "exportObjectToStl"
|
||||
},
|
||||
{
|
||||
label: t("layout.header['STL (Binary)']"),
|
||||
key: "exportObjectToStlBinary"
|
||||
},
|
||||
{
|
||||
label: "USDZ",
|
||||
key: "exportObjectToUSDZ"
|
||||
const exportOptions = [
|
||||
{
|
||||
label: t("layout.header['Export Object']"),
|
||||
key: "exportObject",
|
||||
children: [
|
||||
{
|
||||
label: "JSON",
|
||||
key: "exportObjectToJSON",
|
||||
},
|
||||
{
|
||||
label: "GLB",
|
||||
key: "exportObjectToGlb",
|
||||
},
|
||||
{
|
||||
label: "GLTF",
|
||||
key: "exportObjectToGltf",
|
||||
},
|
||||
{
|
||||
label: "OBJ",
|
||||
key: "exportObjectToObj",
|
||||
},
|
||||
{
|
||||
label: "PLY",
|
||||
key: "exportObjectToPly",
|
||||
},
|
||||
{
|
||||
label: t("layout.header['PLY (Binary)']"),
|
||||
key: "exportObjectToPlyBinary",
|
||||
},
|
||||
{
|
||||
label: "STL",
|
||||
key: "exportObjectToStl",
|
||||
},
|
||||
{
|
||||
label: t("layout.header['STL (Binary)']"),
|
||||
key: "exportObjectToStlBinary",
|
||||
},
|
||||
{
|
||||
label: "USDZ",
|
||||
key: "exportObjectToUSDZ",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: t("layout.header['Export Scene']"),
|
||||
key: "exportScene",
|
||||
children: [
|
||||
{
|
||||
label: "JSON",
|
||||
key: "exportSceneToJSON",
|
||||
},
|
||||
{
|
||||
label: "GLB",
|
||||
key: "exportSceneToGlb",
|
||||
},
|
||||
{
|
||||
label: "GLTF",
|
||||
key: "exportSceneToGltf",
|
||||
},
|
||||
{
|
||||
label: "OBJ",
|
||||
key: "exportSceneToObj",
|
||||
},
|
||||
{
|
||||
label: "PLY",
|
||||
key: "exportSceneToPly",
|
||||
},
|
||||
{
|
||||
label: t("layout.header['PLY (Binary)']"),
|
||||
key: "exportSceneToPlyBinary",
|
||||
},
|
||||
{
|
||||
label: "STL",
|
||||
key: "exportSceneToStl",
|
||||
},
|
||||
{
|
||||
label: t("layout.header['STL (Binary)']"),
|
||||
key: "exportSceneToStlBinary",
|
||||
},
|
||||
{
|
||||
label: "USDZ",
|
||||
key: "exportSceneToUSDZ",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
label: t("layout.header['Offline package']"),
|
||||
key: "exportOffline",
|
||||
children: [
|
||||
{
|
||||
label: t("layout.header['Single packet']"),
|
||||
key: "exportOfflineSingle",
|
||||
},
|
||||
{
|
||||
label: t("layout.header['Multiple packet']"),
|
||||
key: "exportOfflineMultiple",
|
||||
},
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
function handleImport() {
|
||||
const form = document.createElement("form");
|
||||
form.style.display = "none";
|
||||
document.body.appendChild(form);
|
||||
|
||||
const fileInput = document.createElement("input");
|
||||
fileInput.multiple = true;
|
||||
fileInput.type = "file";
|
||||
fileInput.addEventListener("change", function () {
|
||||
const files = fileInput.files;
|
||||
if (!files || files.length === 0) {
|
||||
form.reset();
|
||||
return;
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
label: t("layout.header['Export Scene']"),
|
||||
key: "exportScene",
|
||||
children: [
|
||||
{
|
||||
label: "JSON",
|
||||
key: "exportSceneToJSON"
|
||||
},
|
||||
{
|
||||
label: "GLB",
|
||||
key: "exportSceneToGlb"
|
||||
},
|
||||
{
|
||||
label: "GLTF",
|
||||
key: "exportSceneToGltf"
|
||||
},
|
||||
{
|
||||
label: "OBJ",
|
||||
key: "exportSceneToObj"
|
||||
},
|
||||
{
|
||||
label: "PLY",
|
||||
key: "exportSceneToPly"
|
||||
},
|
||||
{
|
||||
label: t("layout.header['PLY (Binary)']"),
|
||||
key: "exportSceneToPlyBinary"
|
||||
},
|
||||
{
|
||||
label: "STL",
|
||||
key: "exportSceneToStl"
|
||||
},
|
||||
{
|
||||
label: t("layout.header['STL (Binary)']"),
|
||||
key: "exportSceneToStlBinary"
|
||||
},
|
||||
{
|
||||
label: "USDZ",
|
||||
key: "exportSceneToUSDZ"
|
||||
|
||||
const astralFiles = Array.from(files).filter(file => file.name.toLowerCase().endsWith(".astral"));
|
||||
if (astralFiles.length > 0) {
|
||||
handleOfflineFiles(files);
|
||||
form.reset();
|
||||
return;
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
function handleImport() {
|
||||
const form = document.createElement('form');
|
||||
form.style.display = 'none';
|
||||
document.body.appendChild(form);
|
||||
|
||||
const fileInput = document.createElement('input');
|
||||
fileInput.multiple = true;
|
||||
fileInput.type = 'file';
|
||||
fileInput.addEventListener('change', function () {
|
||||
Loader.loadFiles(fileInput.files, undefined)
|
||||
.catch((err) => {
|
||||
Loader.loadFiles(files, undefined)
|
||||
.catch(err => {
|
||||
window.$message?.error(err);
|
||||
})
|
||||
.finally(() => {
|
||||
form.reset();
|
||||
});
|
||||
});
|
||||
form.appendChild(fileInput);
|
||||
});
|
||||
form.appendChild(fileInput);
|
||||
|
||||
fileInput.click();
|
||||
}
|
||||
fileInput.click();
|
||||
}
|
||||
|
||||
function handleExportSelect(key: string) {
|
||||
if (key.startsWith("exportObject")) {
|
||||
if (App.selected === null) {
|
||||
window.$message?.error(window.$t("prompt['No object selected.']"));
|
||||
function handleExportSelect(key: string) {
|
||||
if (key === "exportOfflineSingle") {
|
||||
exportOffline("single");
|
||||
return;
|
||||
}
|
||||
if (key === "exportOfflineMultiple") {
|
||||
exportOffline("multiple");
|
||||
return;
|
||||
}
|
||||
|
||||
if (key.startsWith("exportObject")) {
|
||||
if (App.selected === null) {
|
||||
window.$message?.error(window.$t("prompt['No object selected.']"));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
exportClass[key] && exportClass[key]();
|
||||
}
|
||||
|
||||
function downloadFile(file: File) {
|
||||
const url = URL.createObjectURL(file);
|
||||
const link = document.createElement("a");
|
||||
link.href = url;
|
||||
link.download = file.name;
|
||||
document.body.appendChild(link);
|
||||
link.click();
|
||||
link.remove();
|
||||
URL.revokeObjectURL(url);
|
||||
}
|
||||
|
||||
function sleep(ms: number) {
|
||||
return new Promise(resolve => setTimeout(resolve, ms));
|
||||
}
|
||||
|
||||
async function downloadFilesInBatches(files: File[], batchSize = 9, delayMs = 1100) {
|
||||
for (let i = 0; i < files.length; i++) {
|
||||
downloadFile(files[i]);
|
||||
if ((i + 1) % batchSize === 0 && i < files.length - 1) {
|
||||
await sleep(delayMs);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
exportClass[key]();
|
||||
}
|
||||
function exportOffline(mode: "single" | "multiple") {
|
||||
const packer = (window.viewer as any)?.package;
|
||||
if (!packer || typeof packer.packOffline !== "function") {
|
||||
window.$message?.error("当前SDK暂不支持离线包导出");
|
||||
return;
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
})
|
||||
const sceneInfo = App.project.getKey("sceneInfo");
|
||||
const sceneName = sceneInfo?.sceneName || "scene";
|
||||
|
||||
globalConfigStore.loading = true;
|
||||
globalConfigStore.loadingText = "正在导出离线包...";
|
||||
|
||||
packer
|
||||
.packOffline({
|
||||
name: sceneName,
|
||||
layer: 2,
|
||||
mode,
|
||||
onProgress: (progress: number) => {
|
||||
globalConfigStore.loadingText = `离线包导出 ${progress}%`;
|
||||
},
|
||||
})
|
||||
.then(async (result: { files: File[] }) => {
|
||||
await downloadFilesInBatches(result.files);
|
||||
window.$message?.success("离线包导出完成");
|
||||
})
|
||||
.catch(err => {
|
||||
console.error(err);
|
||||
if (err?.code === "SDK_FEATURE_DISABLED") {
|
||||
window.$message?.error("当前授权未开通离线包导出能力");
|
||||
return;
|
||||
}
|
||||
if (typeof err?.message === "string" && err.message.trim()) {
|
||||
window.$message?.error(err.message);
|
||||
return;
|
||||
}
|
||||
window.$message?.error("离线包导出失败");
|
||||
})
|
||||
.finally(() => {
|
||||
globalConfigStore.loading = false;
|
||||
globalConfigStore.loadingText = "";
|
||||
});
|
||||
}
|
||||
|
||||
function handleOfflineFiles(files: FileList | null) {
|
||||
if (!files || files.length === 0) return;
|
||||
|
||||
const astralFiles = Array.from(files).filter(file => file.name.toLowerCase().endsWith(".astral"));
|
||||
if (astralFiles.length === 0) {
|
||||
window.$message?.error("请选择离线包文件(.astral)");
|
||||
return;
|
||||
}
|
||||
|
||||
const packer = (window.viewer as any)?.package;
|
||||
if (!packer || typeof packer.unpack !== "function") {
|
||||
window.$message?.error("当前SDK暂不支持离线包导入");
|
||||
return;
|
||||
}
|
||||
|
||||
const entryFile = guessEntryFile(astralFiles);
|
||||
|
||||
globalConfigStore.loading = true;
|
||||
globalConfigStore.loadingText = "离线包加载中...";
|
||||
|
||||
packer.unpack({
|
||||
url: entryFile.name,
|
||||
offlineFiles: astralFiles,
|
||||
offlineEntry: entryFile.name,
|
||||
onProgress: (progress: number) => {
|
||||
globalConfigStore.loadingText = `离线包加载 ${progress.toFixed(2)}%`;
|
||||
},
|
||||
onComplete: () => {
|
||||
globalConfigStore.loading = false;
|
||||
globalConfigStore.loadingText = "";
|
||||
window.$message?.success("离线包加载完成");
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function guessEntryFile(files: File[]): File {
|
||||
const uuidReg = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/;
|
||||
const findBaseName = (name: string) => name.replace(/\.[^.]+$/, "");
|
||||
|
||||
const candidate = files.find(file => !uuidReg.test(findBaseName(file.name)));
|
||||
return candidate || files[0];
|
||||
}
|
||||
|
||||
onMounted(() => {});
|
||||
</script>
|
||||
|
||||
<style scoped lang="less"></style>
|
||||
@@ -2,7 +2,7 @@
|
||||
import {nextTick} from "vue";
|
||||
import {Save} from "@vicons/carbon";
|
||||
import {t} from "@/language";
|
||||
import {App,Package} from "@astral3d/engine";
|
||||
import {App} from "@astral3d/engine";
|
||||
import { useGlobalConfigStore } from '@/store/modules/globalConfig';
|
||||
import {fetchUpload} from "@/http/api/sys";
|
||||
import {filterSize} from "@/utils/common/file";
|
||||
@@ -59,7 +59,7 @@ function save(){
|
||||
|
||||
globalConfigStore.loadingText = window.$t("scene['Scene is being compressed...']");
|
||||
|
||||
const p = new Package(window.viewer);
|
||||
const p = window.viewer.package;
|
||||
p.pack({
|
||||
// 首包名称
|
||||
name:`${sceneInfo.sceneName}`,
|
||||
@@ -96,8 +96,6 @@ function save(){
|
||||
|
||||
setTimeout(() => {
|
||||
globalConfigStore.loading = false;
|
||||
|
||||
p.dispose();
|
||||
}, 500)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ import {
|
||||
ChoroplethMap
|
||||
} from '@vicons/carbon';
|
||||
import {t} from "@/language";
|
||||
import {App,Hooks, MoveObjectCommand, RemoveObjectCommand, AddObjectCommand} from "@astral3d/engine";
|
||||
import {App,Hooks,Loader,Utils, MoveObjectCommand, RemoveObjectCommand, AddObjectCommand} from "@astral3d/engine";
|
||||
import {escapeHTML, findSiblingsAndIndex} from "@/utils/common/utils";
|
||||
import {getMaterialName} from "@/utils/common/scenes";
|
||||
import EsContextmenu from "@/components/es/EsContextmenu.vue";
|
||||
@@ -367,6 +367,15 @@ function handleContextmenuSelect(key: string) {
|
||||
if (parent !== null) App.execute(new RemoveObjectCommand(object));
|
||||
break;
|
||||
case "clone":
|
||||
if (Utils.isHtmlPanelObject(object)) {
|
||||
const _json = object.toJSON() as any;
|
||||
|
||||
Loader.objectLoader.parseAsync(_json).then(newObject3D => {
|
||||
App.execute(new AddObjectCommand(newObject3D));
|
||||
}).catch((e: Error) => window.$message?.error(e.message));
|
||||
break;
|
||||
}
|
||||
|
||||
const _object = object.clone();
|
||||
|
||||
App.execute(new AddObjectCommand(_object));
|
||||
|
||||
@@ -17,7 +17,7 @@ export interface DataSetPayload {
|
||||
type: "API" | "SQL" | "JSON" | string;
|
||||
method?: IDataSet.Item["method"];
|
||||
api?: string;
|
||||
dataSourceId?: string;
|
||||
dataSourceId?: IDataSet.Item["id"];
|
||||
sql?: string;
|
||||
json?: string;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
import {request} from "@/http/request";
|
||||
|
||||
export interface DataSetGroupPayload {
|
||||
id?: IDataSet.IGroup["id"];
|
||||
name: string;
|
||||
pid: IDataSet.IGroup["pid"];
|
||||
}
|
||||
|
||||
export function fetchDataSetGroupTree() {
|
||||
return request.get<IDataSet.IGroup[]>(`/data-set-group/tree`);
|
||||
}
|
||||
|
||||
export function fetchCreateDataSetGroup(data: DataSetGroupPayload) {
|
||||
return request.post(`/data-set-group`, data);
|
||||
}
|
||||
|
||||
export function fetchUpdateDataSetGroup(data: DataSetGroupPayload) {
|
||||
return request.put(`/data-set-group`, data);
|
||||
}
|
||||
|
||||
export function fetchDeleteDataSetGroup(id: IDataSet.IGroup["id"]) {
|
||||
return request.delete(`/data-set-group/${id}`, {});
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
import {request} from "@/http/request";
|
||||
|
||||
export interface DataSourcePayload {
|
||||
id?: IDataSource.Item["id"];
|
||||
name: string;
|
||||
type: string;
|
||||
connectionString: string;
|
||||
username?: string;
|
||||
password?: string;
|
||||
}
|
||||
|
||||
export function fetchDataSourceList() {
|
||||
return request.get<IDataSource.Item[]>(`/data-source/list`);
|
||||
}
|
||||
|
||||
export function fetchCreateDataSource(data: DataSourcePayload) {
|
||||
return request.post<IDataSource.Item>(`/data-source`, data);
|
||||
}
|
||||
|
||||
export function fetchUpdateDataSource(data: DataSourcePayload) {
|
||||
return request.put<IDataSource.Item>(`/data-source`, data);
|
||||
}
|
||||
|
||||
export function fetchDeleteDataSource(id: IDataSource.Item["id"]) {
|
||||
return request.delete(`/data-source/${id}`, {});
|
||||
}
|
||||
|
||||
export function fetchTestDataSource(data: DataSourcePayload) {
|
||||
return request.post(`/data-source/test`, data);
|
||||
}
|
||||
@@ -77,6 +77,9 @@ export default {
|
||||
Export: '导出',
|
||||
'Export Object': '导出物体',
|
||||
'Export Scene': '导出场景',
|
||||
'Offline package': '离线包',
|
||||
'Single packet': '单包',
|
||||
'Multiple packet': '多包',
|
||||
'PLY (Binary)': 'PLY(二进制)',
|
||||
'STL (Binary)': 'STL(二进制)',
|
||||
/* File 下的选项 End */
|
||||
|
||||
@@ -27,9 +27,10 @@ async function main() {
|
||||
app.mount('#app');
|
||||
|
||||
if (import.meta.env.PROD){
|
||||
DisableDevtool({
|
||||
clearLog:true
|
||||
});
|
||||
// DisableDevtool({
|
||||
// md5: "32981a13284db7a021131df49e6cd203",
|
||||
// clearLog: true,
|
||||
// });
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
import { injectWasm } from "@/utils/wasm/inject";
|
||||
|
||||
export function clearBuffer() {
|
||||
injectWasm({ wasmUrl: "/wasm/Astral3DEditor.wasm" }).then(() => {
|
||||
// 加载完wasm后自动注册了清除缓存的函数调用
|
||||
window.clearBuffer();
|
||||
});
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
<script lang="ts" setup>
|
||||
import {ref, onMounted, nextTick,provide} from 'vue';
|
||||
import {Hooks,App,Package,defaultProjectInfo} from "@astral3d/engine";
|
||||
import {Hooks,App,defaultProjectInfo} from "@astral3d/engine";
|
||||
import * as Layout from './layouts';
|
||||
import {connectWebSocket} from "@/hooks/useWebSocket";
|
||||
import {useRoute} from "vue-router";
|
||||
@@ -82,8 +82,7 @@ function getScene(sceneInfo) {
|
||||
closable: false,
|
||||
})
|
||||
|
||||
const p = new Package(window.viewer);
|
||||
p.unpack({
|
||||
window.viewer.package.unpack({
|
||||
url: sceneInfo.zip,
|
||||
onSceneLoad: () => {
|
||||
drawingInfo.value = App.project.getKey("drawing");
|
||||
@@ -94,8 +93,6 @@ function getScene(sceneInfo) {
|
||||
Hooks.useDispatchSignal("sceneLoadComplete");
|
||||
|
||||
notice.destroy();
|
||||
|
||||
p.dispose();
|
||||
}
|
||||
})
|
||||
return;
|
||||
|
||||
@@ -4,20 +4,16 @@
|
||||
<SceneTree />
|
||||
</div>
|
||||
|
||||
<n-tabs default-value="bim" animated type="line" justify-content="space-around" class="!h-60%"
|
||||
<n-tabs default-value="cad" animated type="line" justify-content="space-around" class="!h-60%"
|
||||
pane-wrapper-class="layout-assets-tab-pane-wrapper">
|
||||
<n-tab-pane name="cad" tab="CAD" display-directive="show">
|
||||
<CadLibrary />
|
||||
</n-tab-pane>
|
||||
<n-tab-pane name="bim" tab="BIM" display-directive="show">
|
||||
<BIMLibrary />
|
||||
</n-tab-pane>
|
||||
</n-tabs>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import BIMLibrary from "./assets/BIMLibrary.vue";
|
||||
import SceneTree from "@/components/tree/SceneTree.vue";
|
||||
import CadLibrary from "./assets/CadLibrary.vue";
|
||||
</script>
|
||||
|
||||
@@ -1,339 +0,0 @@
|
||||
<template>
|
||||
<div id="bim-library" class="h-full flex flex-col">
|
||||
<n-alert type="info" :show-icon="false" :bordered="false" class="mb-2 mx-2">
|
||||
<n-button quaternary round type="primary" @click="showHistoryModal = true">
|
||||
{{ t("layout.sider.History") }}
|
||||
</n-button>
|
||||
|
||||
<n-button quaternary circle type="primary" @click="showBIMUpload = true">
|
||||
<template #icon>
|
||||
<n-icon>
|
||||
<CloudUpload/>
|
||||
</n-icon>
|
||||
</template>
|
||||
</n-button>
|
||||
</n-alert>
|
||||
|
||||
<div class="flex-1 overflow-y-auto px-0.3rem">
|
||||
<div class="grid grid-cols-[repeat(auto-fill,minmax(80px,1fr))] gap-2">
|
||||
<n-card size="small" hoverable v-for="item in objectList" :key="item.id" @dblclick="addToScene(item)"
|
||||
draggable="true" @dragstart="dragStart($event, item)" @dragend="dragEnd">
|
||||
<template #cover>
|
||||
<n-spin :show="item.conversionStatus === 0">
|
||||
<template #description>
|
||||
正在轻量化...
|
||||
</template>
|
||||
<img :src="item.thumbnail ? item.thumbnail : '/static/images/placeholder/占位图.png'"
|
||||
:alt="item.fileName" draggable="false">
|
||||
<n-tag :color="{ color: '#F1C3CC', textColor: '#D03050' }" :bordered="false" size="small"
|
||||
class="absolute top-33px w-full" v-if="item.conversionStatus === 2">
|
||||
轻量化失败
|
||||
<template #icon>
|
||||
<n-icon>
|
||||
<CloseCircleSharp/>
|
||||
</n-icon>
|
||||
</template>
|
||||
</n-tag>
|
||||
</n-spin>
|
||||
</template>
|
||||
<n-tooltip placement="bottom" trigger="hover">
|
||||
<template #trigger> {{ item.fileName }}</template>
|
||||
<span> {{ item.fileName }} </span>
|
||||
</n-tooltip>
|
||||
</n-card>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex justify-center mt-0.5rem">
|
||||
<n-pagination v-bind="paginationReactive"></n-pagination>
|
||||
</div>
|
||||
|
||||
<n-modal v-model:show="showHistoryModal" class="!w-60vw" preset="dialog" display-directive="show"
|
||||
:title="t('bim[\'BIM lightweight\']') + t('layout.sider.History')">
|
||||
<n-data-table class="mt-20px" size="small" :loading="tableLoading" :columns="columns"
|
||||
:data="objectList"></n-data-table>
|
||||
<div class="flex justify-end mt-0.5rem">
|
||||
<n-pagination v-bind="paginationReactive"></n-pagination>
|
||||
</div>
|
||||
</n-modal>
|
||||
|
||||
<!-- BIM文件上传 -->
|
||||
<BimUploadDialog v-model:show="showBIMUpload" ref="uploadDialogRef"/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {ref, reactive, onMounted, h, onBeforeUnmount} from "vue";
|
||||
import type {DataTableColumns} from 'naive-ui';
|
||||
import {NButton, NTag, NIcon} from 'naive-ui'
|
||||
import {CloudUpload, Reload, CheckmarkCircle, CloseOutline, CloseCircleSharp} from '@vicons/ionicons5';
|
||||
import {t} from "@/language";
|
||||
import {useDragStore} from "@/store/modules/drag";
|
||||
import {fetchGetBim2GltfList} from "@/http/api/bim";
|
||||
import {Bim2GltfWsData, WebSocketMessage} from "~/network";
|
||||
import {Loader,Hooks} from "@astral3d/engine";
|
||||
import {filterSize} from "@/utils/common/file";
|
||||
import {onWebSocket, offWebSocket} from "@/hooks/useWebSocket";
|
||||
import {useWebsocketStore} from "@/store/modules/websocket";
|
||||
import {dateTimeFormat} from "@/utils/common/dateTime";
|
||||
import BimUploadDialog from "./bimLibrary/BimUploadDialog.vue";
|
||||
|
||||
const websocketStore = useWebsocketStore();
|
||||
|
||||
let objectList = ref<IBIMData[]>([]);
|
||||
const showHistoryModal = ref(false);
|
||||
const tableLoading = ref(false);
|
||||
const columns: DataTableColumns<IBIMData> = [
|
||||
{
|
||||
title: '文件名',
|
||||
key: 'fileName'
|
||||
},
|
||||
{
|
||||
title: 'bim文件体积',
|
||||
key: 'bimFileSize',
|
||||
render(row) {
|
||||
return filterSize(row.bimFileSize);
|
||||
}
|
||||
},
|
||||
{
|
||||
title: 'gltf文件体积',
|
||||
key: 'gltfFileSize',
|
||||
render(row) {
|
||||
return filterSize(row.gltfFileSize);
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '转换时长',
|
||||
key: 'conversionDuration',
|
||||
render(row) {
|
||||
return row.conversionDuration.toFixed(2) + "s";
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '状态',
|
||||
key: 'conversionStatus',
|
||||
render(row) {
|
||||
return h(
|
||||
NTag,
|
||||
{
|
||||
bordered: false,
|
||||
type: row.conversionStatus === 0 ? "warning" : row.conversionStatus === 1 ? "success" : "error",
|
||||
},
|
||||
{
|
||||
default: () => row.conversionStatus === 0 ? "转换中" : row.conversionStatus === 1 ? "成功" : "失败",
|
||||
icon: () => h(
|
||||
NIcon, {
|
||||
component: row.conversionStatus === 0 ? Reload : row.conversionStatus === 1 ? CheckmarkCircle : CloseOutline
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
key: 'actions',
|
||||
render(row) {
|
||||
if (row.conversionStatus !== 1) return "";
|
||||
return h(
|
||||
NButton,
|
||||
{
|
||||
size: 'small',
|
||||
onClick: () => addToScene(row)
|
||||
},
|
||||
{default: () => t("other.Load")}
|
||||
)
|
||||
}
|
||||
}
|
||||
];
|
||||
let paginationReactive = reactive({
|
||||
page: 1,
|
||||
pageSize: 10,
|
||||
pageCount: 1,
|
||||
"on-update:page": (page: number) => {
|
||||
paginationReactive.page = page;
|
||||
getBim2GltfList();
|
||||
}
|
||||
})
|
||||
|
||||
const showBIMUpload = ref(false);
|
||||
const uploadDialogRef = ref();
|
||||
|
||||
// 获取BIM转换列表
|
||||
async function getBim2GltfList() {
|
||||
const res = await fetchGetBim2GltfList({
|
||||
offset: (paginationReactive.page - 1) * paginationReactive.pageSize,
|
||||
limit: paginationReactive.pageSize
|
||||
});
|
||||
|
||||
objectList.value = res.data?.items || [];
|
||||
paginationReactive.pageCount = res.data?.pages || 1;
|
||||
}
|
||||
|
||||
async function addToScene(item) {
|
||||
showHistoryModal.value = false;
|
||||
|
||||
let notice = window.$notification.info({
|
||||
title: window.$t("scene['Get the scene data']") + "...",
|
||||
content: window.$t("other.Loading") + "...",
|
||||
closable: false,
|
||||
})
|
||||
|
||||
// 从gltfFilePath字段去服务器获取gltf文件
|
||||
fetch(`file/static/${item.gltfFilePath}`)
|
||||
.then(res => res.blob())
|
||||
.then(data => {
|
||||
const file = new File([data as Blob], `${item.fileName}.glb`, {type: 'model/gltf-binary'});
|
||||
|
||||
notice.content = window.$t("scene['Parsing to editor']");
|
||||
|
||||
Loader.loadFiles([file], undefined).finally(() => {
|
||||
setTimeout(() => {
|
||||
notice.destroy();
|
||||
Hooks.useDispatchSignal("sceneGraphChanged");
|
||||
}, 800)
|
||||
Hooks.useDispatchSignal("sceneGraphChanged");
|
||||
})
|
||||
})
|
||||
.catch(() => {
|
||||
notice.content = window.$t("scene['Failed to get scene data']");
|
||||
setTimeout(() => {
|
||||
notice.destroy();
|
||||
}, 500)
|
||||
return null;
|
||||
})
|
||||
}
|
||||
|
||||
// 开始拖拽事件
|
||||
const dragStore = useDragStore();
|
||||
|
||||
function dragStart(_, item) {
|
||||
if (item.conversionStatus !== 1) return;
|
||||
dragStore.setData(item)
|
||||
}
|
||||
|
||||
function dragEnd() {
|
||||
if (dragStore.getActionTarget !== "addToScene") return;
|
||||
|
||||
const data = dragStore.getData
|
||||
if (data.conversionStatus !== 1) return;
|
||||
|
||||
addToScene(data);
|
||||
|
||||
dragStore.setActionTarget("");
|
||||
}
|
||||
|
||||
// websocket监听 bim2gltf 消息
|
||||
function Bim2GltfWsHandle(data: WebSocketMessage<Bim2GltfWsData>) {
|
||||
if (data.type === "bim2gltf") {
|
||||
// 判断订阅者,以确定是自己还是别人轻量化的结果
|
||||
if (data.subscriber === websocketStore.uname) {
|
||||
let wsNotice = uploadDialogRef.value?.getNotice();
|
||||
// 如果是自己的轻量化结果,使用用户登录结果作为uname,则用户可能关闭页面再打开时接收到消息,应继续显示
|
||||
if (!wsNotice) {
|
||||
wsNotice = window.$notification.info({
|
||||
title: t("bim['BIM lightweight']"),
|
||||
content: "",
|
||||
closable: false,
|
||||
})
|
||||
}
|
||||
|
||||
if (data.data.conversionStatus === "progress") {
|
||||
wsNotice.content = t("bim['BIM lightweight is in progress']") + "...";
|
||||
} else if (data.data.conversionStatus === "completed") {
|
||||
wsNotice.content = `${t("bim['BIM lightweight completed']")},${t("bim.In")} ${data.data.item.conversionDuration} ${t("bim.seconds")}`;
|
||||
setTimeout(() => {
|
||||
wsNotice?.destroy();
|
||||
window.$dialog.info({
|
||||
title: t("bim['BIM lightweight completed']"),
|
||||
content: t("bim['Whether to load the BIM model into the scene?']"),
|
||||
positiveText: window.$t('other.Load'),
|
||||
negativeText: window.$t('other.Cancel'),
|
||||
onPositiveClick: () => {
|
||||
addToScene(data.data.item);
|
||||
}
|
||||
})
|
||||
}, 800)
|
||||
getBim2GltfList();
|
||||
} else if (data.data.conversionStatus === "failed") {
|
||||
wsNotice.content = t("bim['BIM lightweight failed']");
|
||||
setTimeout(() => {
|
||||
wsNotice?.destroy();
|
||||
}, 1500)
|
||||
getBim2GltfList();
|
||||
}
|
||||
} else {
|
||||
if (data.data.conversionStatus !== "completed") return;
|
||||
|
||||
// 别人的轻量化结果
|
||||
const n = window.$notification.info({
|
||||
title: t("bim['BIM lightweight']"),
|
||||
content: t("bim['New lightweight BIM model received, do you want to view it?']"),
|
||||
duration: 5000,
|
||||
closable: true,
|
||||
meta: dateTimeFormat("yyyy-MM-dd HH:mm:ss"),
|
||||
action: () =>
|
||||
h(NButton, {
|
||||
text: true,
|
||||
type: 'primary',
|
||||
onClick: () => {
|
||||
addToScene(data.data.item);
|
||||
n.destroy();
|
||||
}
|
||||
},
|
||||
{
|
||||
default: () => t("other.Load")
|
||||
}
|
||||
),
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
getBim2GltfList();
|
||||
|
||||
// 注册websocket消息监听
|
||||
onWebSocket(Bim2GltfWsHandle);
|
||||
})
|
||||
onBeforeUnmount(() => {
|
||||
offWebSocket(Bim2GltfWsHandle)
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped lang="less">
|
||||
#bim-library {
|
||||
overflow-x: hidden;
|
||||
|
||||
.n-alert {
|
||||
:deep(.n-alert-body) {
|
||||
padding: 10px;
|
||||
|
||||
&__content {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.n-card {
|
||||
cursor: pointer;
|
||||
|
||||
:deep(.n-card-cover) {
|
||||
img {
|
||||
height: 89px;
|
||||
object-fit: cover;
|
||||
}
|
||||
}
|
||||
|
||||
:deep(.n-card__content) {
|
||||
padding: 3px 5px;
|
||||
font-size: 13px;
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -1,277 +0,0 @@
|
||||
<template>
|
||||
<n-modal :show="show" @update:show="(b) => emits('update:show',b)" class="!w-500px" preset="card" :title="t('bim.BIM lightweight')">
|
||||
<n-form label-placement="left" :model="BIMModel" :rules="BIMRules"
|
||||
label-width="100px" label-align="right" ref="formRef"
|
||||
require-mark-placement="right-hanging">
|
||||
<!-- <n-form-item :label="t('bim[\'File name\']')" path="fileName">-->
|
||||
<!-- <n-input v-model:value="BIMModel.fileName"-->
|
||||
<!-- :placeholder="t('bim[\'Please enter the BIM file name\']')"/>-->
|
||||
<!-- </n-form-item>-->
|
||||
<n-form-item :label="t('bim.Thumbnail')">
|
||||
<n-upload :default-upload="false" list-type="image-card" :max="1"
|
||||
@change="thumbnailChange"/>
|
||||
</n-form-item>
|
||||
<n-form-item :label="t('bim[\'BIM file\']')" path="bimFile">
|
||||
<n-upload ref="uploadBIMRef" :default-upload="false" directory-dnd :max="1"
|
||||
:accept="'.' + NEED_CONVERT_BIM_MODEL.join(',.')" @change="bimChange">
|
||||
<n-upload-dragger>
|
||||
<div>
|
||||
<n-icon size="48" :depth="3">
|
||||
<ArchiveOutline/>
|
||||
</n-icon>
|
||||
</div>
|
||||
<n-text style="font-size: 14px">
|
||||
{{
|
||||
t("bim['Click or drag the file to this area.Supported formats are:']") + ` ${NEED_CONVERT_BIM_MODEL.join("、")}`
|
||||
}}
|
||||
</n-text>
|
||||
</n-upload-dragger>
|
||||
</n-upload>
|
||||
</n-form-item>
|
||||
<n-collapse>
|
||||
<template #arrow>
|
||||
<n-icon>
|
||||
<CaretForwardOutline />
|
||||
</n-icon>
|
||||
</template>
|
||||
|
||||
<n-collapse-item :title="t('bim[\'Conversion configuration\']')">
|
||||
<!-- 极致轻量化 -->
|
||||
<n-form-item :label="t('bim[\'Extreme lightweight\']')">
|
||||
<n-switch v-model:value="BIMModel.options.Optimize" @change="handleOptimizeChange" />
|
||||
</n-form-item>
|
||||
<!-- 导出属性 -->
|
||||
<n-form-item :label="t('bim[\'Export Property\']')">
|
||||
<n-switch v-model:value="BIMModel.options.ExportProperty" :disabled="exportPropertyDisabled" />
|
||||
</n-form-item>
|
||||
<!-- 转换视图 -->
|
||||
<n-form-item :label="t('bim[\'Conversion view\']')">
|
||||
<n-radio-group v-model:value="BIMModel.options.View" name="View">
|
||||
<n-radio-button value="Default">默认3D视图</n-radio-button>
|
||||
<n-radio-button value="Name">按名称</n-radio-button>
|
||||
</n-radio-group>
|
||||
</n-form-item>
|
||||
<!-- 视图名称 -->
|
||||
<n-form-item :label="t('bim[\'View name\']')" v-if="BIMModel.options.View === 'Name'">
|
||||
<n-input v-model:value="BIMModel.options.ViewName" :placeholder="t('bim[\'Please enter the conversion view name\']')"/>
|
||||
</n-form-item>
|
||||
<!-- 视觉样式 -->
|
||||
<n-form-item :label="t('bim[\'Display style\']')">
|
||||
<n-radio-group v-model:value="BIMModel.options.DisplayStyle" name="DisplayStyle">
|
||||
<n-radio-button value="Colour">{{t("bim.Colour")}}</n-radio-button>
|
||||
<n-radio-button value="Realistic">{{t("bim.Realistic")}}</n-radio-button>
|
||||
<n-radio-button value="ViewDefault">{{t("bim['View default']")}}</n-radio-button>
|
||||
</n-radio-group>
|
||||
</n-form-item>
|
||||
<!-- 坐标参考 -->
|
||||
<n-form-item :label="t('bim[\'Coordinate reference\']')">
|
||||
<n-radio-group v-model:value="BIMModel.options.CoordinateReference" name="CoordinateReference">
|
||||
<n-radio-button value="Origin">{{t("bim.Origin")}}</n-radio-button>
|
||||
<n-radio-button value="ProjectBasePoint">{{t("bim['Project base point']")}}</n-radio-button>
|
||||
<n-radio-button value="MeasuringPoint">{{t("bim['Measuring point']")}}</n-radio-button>
|
||||
</n-radio-group>
|
||||
</n-form-item>
|
||||
</n-collapse-item>
|
||||
</n-collapse>
|
||||
</n-form>
|
||||
|
||||
<div class="flex justify-end">
|
||||
<n-button round type="primary" @click="submit">{{ t("bim['Upload and lightweight']") }}</n-button>
|
||||
</div>
|
||||
</n-modal>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {reactive, ref} from "vue";
|
||||
import {NotificationReactive} from "naive-ui";
|
||||
import {t} from "@/language";
|
||||
import {ArchiveOutline, CaretForwardOutline} from "@vicons/ionicons5";
|
||||
import {fetchUpload} from "@/http/api/sys";
|
||||
import {fetchAddBim2Gltf, fetchUploadRvt} from "@/http/api/bim";
|
||||
import {NEED_CONVERT_BIM_MODEL} from "@/utils/common/constant";
|
||||
|
||||
withDefaults(defineProps<{
|
||||
show:boolean
|
||||
}>(),{
|
||||
show:false
|
||||
})
|
||||
|
||||
const emits = defineEmits(["update:show"]);
|
||||
|
||||
const formRef = ref();
|
||||
const uploadBIMRef = ref();
|
||||
const exportPropertyDisabled = ref(false);
|
||||
|
||||
/* bim文件上传转换 */
|
||||
const BIMModel = reactive<{
|
||||
fileName: string,
|
||||
thumbnail: File | null,
|
||||
bimFile: File | null,
|
||||
options:{
|
||||
// 极致压缩率(会执行实例化网格,破坏模型结构)
|
||||
Optimize:boolean,
|
||||
// 是否导出属性
|
||||
ExportProperty:boolean,
|
||||
// 转换视图 - Default:默认3D视图 | Name:按传入名称查找视图
|
||||
View:string,
|
||||
// 转换视图名称 - View = "Name"时输入有效
|
||||
ViewName:string,
|
||||
// 转换视觉样式 - Colour:着色模式 | Realistic-真实模式 | ViewDefault-视图默认
|
||||
DisplayStyle:string,
|
||||
// 坐标参考 - Origin:默认原点 | ProjectBasePoint:项目基点 | MeasuringPoint:测量点
|
||||
CoordinateReference:string
|
||||
}
|
||||
}>({
|
||||
fileName: "",
|
||||
thumbnail: null,
|
||||
bimFile: null,
|
||||
options:{
|
||||
Optimize:false,
|
||||
ExportProperty:true,
|
||||
View:"Default",
|
||||
ViewName:"",
|
||||
DisplayStyle:"Colour",
|
||||
CoordinateReference:"Origin"
|
||||
}
|
||||
})
|
||||
const BIMRules = {
|
||||
bimFile: {
|
||||
required: true,
|
||||
trigger: 'change',
|
||||
validator: (_, value) => {
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
// 判断value是否是File类型
|
||||
if (value === '' || !(value instanceof File)) {
|
||||
reject(Error(t("bim['Please upload the BIM file']")))
|
||||
} else {
|
||||
resolve()
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 预览图变化
|
||||
function thumbnailChange({file}) {
|
||||
if (file.status === "removed") {
|
||||
BIMModel.thumbnail = null;
|
||||
return;
|
||||
}
|
||||
BIMModel.thumbnail = file.file as File;
|
||||
}
|
||||
|
||||
// bim文件选择变化
|
||||
function bimChange({file}) {
|
||||
if (file.status === "removed") {
|
||||
BIMModel.bimFile = null;
|
||||
formRef.value?.validate();
|
||||
return;
|
||||
}
|
||||
|
||||
if (!NEED_CONVERT_BIM_MODEL.includes(file.name.split(".").at(-1).toLowerCase())) {
|
||||
window.$message?.error(t("prompt['This format is not supported, please upload again! Supported formats are:']") + ` ${NEED_CONVERT_BIM_MODEL.join("、")}`);
|
||||
uploadBIMRef.value.clear();
|
||||
return false
|
||||
}
|
||||
|
||||
BIMModel.bimFile = file.file as File;
|
||||
BIMModel.fileName = BIMModel.bimFile.name;
|
||||
formRef.value?.validate();
|
||||
}
|
||||
|
||||
// 极致轻量化选项变化(导出属性选项跟随变化)
|
||||
function handleOptimizeChange() {
|
||||
if(BIMModel.options.Optimize){
|
||||
BIMModel.options.ExportProperty = false;
|
||||
exportPropertyDisabled.value = true;
|
||||
}else{
|
||||
exportPropertyDisabled.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
// ws 监听使用的notice
|
||||
let wsNotice: null | NotificationReactive = null;
|
||||
const getNotice = () => wsNotice;
|
||||
// 提交
|
||||
function submit(e) {
|
||||
if (import.meta.env.PROD) {
|
||||
window.$message?.error(window.$t("prompt['Disable this function in the demonstration environment!']"));
|
||||
return;
|
||||
}
|
||||
|
||||
e.preventDefault();
|
||||
formRef.value?.validate(async (errors) => {
|
||||
if (!errors) {
|
||||
emits("update:show",false);
|
||||
|
||||
wsNotice = window.$notification.info({
|
||||
title: t("bim['BIM lightweight']"),
|
||||
content: t("prompt.Uploading") + "...",
|
||||
closable: false,
|
||||
})
|
||||
|
||||
// 1. 上传缩略图
|
||||
let thumbnail = "";
|
||||
if (BIMModel.thumbnail) {
|
||||
const res = await fetchUpload({
|
||||
file: BIMModel.thumbnail,
|
||||
biz: "upload/bim/thumbnail"
|
||||
})
|
||||
|
||||
if (res.data === null) {
|
||||
window.$message?.error(t("bim['Failed to upload thumbnail']"));
|
||||
} else {
|
||||
thumbnail = res.data as string;
|
||||
}
|
||||
}
|
||||
|
||||
// 2. 上传bim文件
|
||||
const bimRes = await fetchUploadRvt({
|
||||
file: BIMModel.bimFile,
|
||||
});
|
||||
if (bimRes.data === null) {
|
||||
window.$message?.error(t("bim['Failed to upload BIM file']"));
|
||||
wsNotice.content = `${t("bim['Failed to upload BIM file']")},${t("prompt['Please try again later!']")}`;
|
||||
setTimeout(() => {
|
||||
wsNotice?.destroy();
|
||||
}, 1000)
|
||||
return;
|
||||
}
|
||||
|
||||
//3 启动Revit轻量化服务
|
||||
wsNotice.content = t("bim['BIM lightweight is in progress']") + "...";
|
||||
await fetchAddBim2Gltf({
|
||||
bimFilePath: bimRes.data,
|
||||
bimFileSize: (BIMModel.bimFile as File).size,
|
||||
fileName: BIMModel.fileName,
|
||||
fileSourceIp: "",
|
||||
thumbnail,
|
||||
conversionStatus: 0,
|
||||
// 转换配置
|
||||
options:BIMModel.options
|
||||
})
|
||||
|
||||
// reset
|
||||
BIMModel.fileName = "";
|
||||
BIMModel.thumbnail = null;
|
||||
BIMModel.bimFile = null;
|
||||
BIMModel.options = {
|
||||
Optimize:false,
|
||||
ExportProperty:true,
|
||||
View:"Default",
|
||||
ViewName:"",
|
||||
DisplayStyle:"Colour",
|
||||
CoordinateReference:"Origin"
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
defineExpose({getNotice})
|
||||
</script>
|
||||
|
||||
<style scoped lang="less">
|
||||
.n-form-item{
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
</style>
|
||||
@@ -29,6 +29,22 @@ onBeforeUnmount(() => {
|
||||
Hooks.useRemoveSignal("objectSelected", updateUI);
|
||||
})
|
||||
|
||||
function ensureHtmlPanelOptions(object: any) {
|
||||
const options = object?.options || {};
|
||||
const codes = Array.isArray(options.codes) ? options.codes : [];
|
||||
const isSingleHtml = typeof options.isSingleHtml === 'boolean' ? options.isSingleHtml : true;
|
||||
const isSprite = typeof options.isSprite === 'boolean' ? options.isSprite : !!object?.isHtmlSprite;
|
||||
|
||||
object.options = {
|
||||
...options,
|
||||
codes,
|
||||
isSingleHtml,
|
||||
isSprite
|
||||
};
|
||||
|
||||
return object.options;
|
||||
}
|
||||
|
||||
function updateUI() {
|
||||
const object = App.selected;
|
||||
if(!object) return;
|
||||
@@ -39,7 +55,8 @@ function updateUI() {
|
||||
}
|
||||
|
||||
data.type = object.isHtmlPanel? 'panel' :'sprite';
|
||||
data.codes = object.options.codes;
|
||||
const options = ensureHtmlPanelOptions(object);
|
||||
data.codes = options.codes;
|
||||
}
|
||||
|
||||
function update(method: string){
|
||||
@@ -53,8 +70,9 @@ function update(method: string){
|
||||
if(data.type === 'panel' && object.isHtmlPanel) return;
|
||||
if(data.type === 'sprite' && object.isHtmlSprite) return;
|
||||
|
||||
const _json = object.toJSON();
|
||||
const _json = object.toJSON() as any;
|
||||
_json.object.type = data.type === 'panel' ? 'HtmlSprite' : 'HtmlPanel';
|
||||
_json.object.options = _json.object.options || {};
|
||||
_json.object.options.isSprite = !_json.object.options.isSprite;
|
||||
|
||||
Loader.objectLoader.parseAsync(_json).then(newObject3D => {
|
||||
@@ -73,9 +91,11 @@ function update(method: string){
|
||||
|
||||
_code.content = editorCode.code;
|
||||
|
||||
const options = ensureHtmlPanelOptions(object);
|
||||
|
||||
const htmlPanelOption = {
|
||||
isSprite: object.options.isSprite,
|
||||
isSingleHtml:object.options.isSingleHtml,
|
||||
isSprite: options.isSprite,
|
||||
isSingleHtml: options.isSingleHtml,
|
||||
codes: data.codes
|
||||
}
|
||||
|
||||
@@ -135,19 +155,26 @@ function updateFileList(fList: UploadFileInfo[]) {
|
||||
isSprite: data.type ==='sprite',
|
||||
fileName: file.name
|
||||
}).then(htmlPlaneObj => {
|
||||
data.codes = htmlPlaneObj.options.codes;
|
||||
const options = ensureHtmlPanelOptions(object);
|
||||
|
||||
const _json = object.toJSON();
|
||||
Loader.objectLoader.copyAttrByData(htmlPlaneObj, _json.object)
|
||||
options.codes = htmlPlaneObj.options.codes;
|
||||
options.isSingleHtml = htmlPlaneObj.options.isSingleHtml;
|
||||
|
||||
object.parent?.add(htmlPlaneObj);
|
||||
data.codes = options.codes;
|
||||
|
||||
object.parent?.remove(object);
|
||||
// Keep object identity (id/uuid) so scene tree and context menu references stay valid.
|
||||
while (object.element.firstChild) {
|
||||
object.element.removeChild(object.element.firstChild);
|
||||
}
|
||||
|
||||
App.selected = htmlPlaneObj;
|
||||
while (htmlPlaneObj.element.firstChild) {
|
||||
object.element.appendChild(htmlPlaneObj.element.firstChild);
|
||||
}
|
||||
|
||||
Hooks.useDispatchSignal("objectSelected", htmlPlaneObj);
|
||||
}).catch((e:Error) => window.$message?.error(e.message));
|
||||
App.selected = object;
|
||||
Hooks.useDispatchSignal("objectSelected", object);
|
||||
}).catch((e:Error) => window.$message?.error(e.message))
|
||||
.finally(() => URL.revokeObjectURL(tempURL));
|
||||
}
|
||||
|
||||
function getCanEdit(name: string) {
|
||||
|
||||
@@ -121,15 +121,15 @@ const updateUI = Utils.throttle(function(object) {
|
||||
objectData.type = object.type;
|
||||
objectData.uuid = object.uuid;
|
||||
objectData.name = object.name;
|
||||
objectData.position.x = Number(object.position.x.toFixed(3));
|
||||
objectData.position.y = Number(object.position.y.toFixed(3));
|
||||
objectData.position.z = Number(object.position.z.toFixed(3));
|
||||
objectData.rotation.x = Number((object.rotation.x * THREE.MathUtils.RAD2DEG).toFixed(3));
|
||||
objectData.rotation.y = Number((object.rotation.y * THREE.MathUtils.RAD2DEG).toFixed(3));
|
||||
objectData.rotation.z = Number((object.rotation.z * THREE.MathUtils.RAD2DEG).toFixed(3));
|
||||
objectData.scale.x = Number(object.scale.x.toFixed(3));
|
||||
objectData.scale.y = Number(object.scale.y.toFixed(3));
|
||||
objectData.scale.z = Number(object.scale.z.toFixed(3));
|
||||
objectData.position.x = Number(object.position.x.toFixed(6));
|
||||
objectData.position.y = Number(object.position.y.toFixed(6));
|
||||
objectData.position.z = Number(object.position.z.toFixed(6));
|
||||
objectData.rotation.x = Number((object.rotation.x * THREE.MathUtils.RAD2DEG).toFixed(6));
|
||||
objectData.rotation.y = Number((object.rotation.y * THREE.MathUtils.RAD2DEG).toFixed(6));
|
||||
objectData.rotation.z = Number((object.rotation.z * THREE.MathUtils.RAD2DEG).toFixed(6));
|
||||
objectData.scale.x = Number(object.scale.x.toFixed(6));
|
||||
objectData.scale.y = Number(object.scale.y.toFixed(6));
|
||||
objectData.scale.z = Number(object.scale.z.toFixed(6));
|
||||
|
||||
if (object.fov !== undefined) {
|
||||
objectData.fov = object.fov;
|
||||
@@ -225,19 +225,19 @@ const update = (method: string) => {
|
||||
},
|
||||
position: () => {
|
||||
const newPosition = new THREE.Vector3(objectData.position.x, objectData.position.y, objectData.position.z);
|
||||
if (object.position.distanceTo(newPosition) >= 0.01) {
|
||||
if (object.position.distanceTo(newPosition) >= 0.0001) {
|
||||
App.execute(new SetPositionCommand(object, newPosition));
|
||||
}
|
||||
},
|
||||
rotation: () => {
|
||||
const newRotation = new THREE.Euler(objectData.rotation.x * THREE.MathUtils.DEG2RAD, objectData.rotation.y * THREE.MathUtils.DEG2RAD, objectData.rotation.z * THREE.MathUtils.DEG2RAD);
|
||||
if (new THREE.Vector3().setFromEuler(object.rotation).distanceTo(new THREE.Vector3().setFromEuler(newRotation)) >= 0.01) {
|
||||
if (new THREE.Vector3().setFromEuler(object.rotation).distanceTo(new THREE.Vector3().setFromEuler(newRotation)) >= 0.0001) {
|
||||
App.execute(new SetRotationCommand(object, newRotation, undefined));
|
||||
}
|
||||
},
|
||||
scale: () => {
|
||||
const newScale = new THREE.Vector3(objectData.scale.x, objectData.scale.y, objectData.scale.z);
|
||||
if (object.scale.distanceTo(newScale) >= 0.01) {
|
||||
if (object.scale.distanceTo(newScale) >= 0.0001) {
|
||||
App.execute(new SetScaleCommand(object, newScale, undefined));
|
||||
}
|
||||
},
|
||||
@@ -433,11 +433,11 @@ const handleUserDataClick = () => {
|
||||
<div class="sider-scene-attr-item">
|
||||
<EsKeyFrame :label="t('layout.sider.object.position')" attr="position" />
|
||||
<div class="flex">
|
||||
<EsInputNumber v-model:value="objectData.position.x" size="tiny" :show-button="false" :decimal="3" :step="1"
|
||||
<EsInputNumber v-model:value="objectData.position.x" size="tiny" :show-button="false" :decimal="6" :step="1"
|
||||
@change="update('position')" />
|
||||
<EsInputNumber v-model:value="objectData.position.y" size="tiny" :show-button="false" :decimal="3" :step="1"
|
||||
<EsInputNumber v-model:value="objectData.position.y" size="tiny" :show-button="false" :decimal="6" :step="1"
|
||||
@change="update('position')" />
|
||||
<EsInputNumber v-model:value="objectData.position.z" size="tiny" :show-button="false" :decimal="3" :step="1"
|
||||
<EsInputNumber v-model:value="objectData.position.z" size="tiny" :show-button="false" :decimal="6" :step="1"
|
||||
@change="update('position')" />
|
||||
</div>
|
||||
</div>
|
||||
@@ -445,11 +445,11 @@ const handleUserDataClick = () => {
|
||||
<div class="sider-scene-attr-item" v-if="transformRowsVisible.rotation">
|
||||
<EsKeyFrame :label="t('layout.sider.object.rotation')" attr="quaternion" />
|
||||
<div class="flex">
|
||||
<EsInputNumber v-model:value="objectData.rotation.x" size="tiny" :decimal="2" :step="1" :show-button="false"
|
||||
<EsInputNumber v-model:value="objectData.rotation.x" size="tiny" :decimal="6" :step="1" :show-button="false"
|
||||
@change="update('rotation')" unit="°" />
|
||||
<EsInputNumber v-model:value="objectData.rotation.y" size="tiny" :decimal="2" :step="1" :show-button="false"
|
||||
<EsInputNumber v-model:value="objectData.rotation.y" size="tiny" :decimal="6" :step="1" :show-button="false"
|
||||
@change="update('rotation')" unit="°" />
|
||||
<EsInputNumber v-model:value="objectData.rotation.z" size="tiny" :decimal="2" :step="1" :show-button="false"
|
||||
<EsInputNumber v-model:value="objectData.rotation.z" size="tiny" :decimal="6" :step="1" :show-button="false"
|
||||
@change="update('rotation')" unit="°" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
<template>
|
||||
<n-card v-if="visible" class="absolute top-40px right-1 max-w-300px" content-style="padding: 5px 10px;">
|
||||
<n-collapse accordion default-expanded-names="bim">
|
||||
<template #arrow="{ collapsed }">
|
||||
<n-icon v-if="collapsed">
|
||||
<PlanetOutline/>
|
||||
</n-icon>
|
||||
<n-icon v-else>
|
||||
<SunnyOutline/>
|
||||
</n-icon>
|
||||
</template>
|
||||
|
||||
<n-collapse-item title=" BIM 构件信息" name="bim">
|
||||
<div class="max-h-360px overflow-y-auto">
|
||||
<n-descriptions v-for="(item, index) in info.parameters" :key="index" label-placement="left"
|
||||
bordered size="small" :column="1">
|
||||
<template #header>
|
||||
<p class="py-2">{{ item.GroupName }}</p>
|
||||
</template>
|
||||
<n-descriptions-item v-for="(it, i) in item.Parameters" :key="i + it.name" :label="it.name">
|
||||
{{ it.value }}
|
||||
</n-descriptions-item>
|
||||
</n-descriptions>
|
||||
</div>
|
||||
</n-collapse-item>
|
||||
</n-collapse>
|
||||
</n-card>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {PlanetOutline, SunnyOutline} from "@vicons/ionicons5";
|
||||
import {ref, onBeforeUnmount, onMounted} from "vue";
|
||||
import {Hooks} from "@astral3d/engine";
|
||||
|
||||
const visible = ref(false);
|
||||
const info = ref({
|
||||
parameters: [{GroupName: "", Parameters: [{name: "", value: ""}]}]
|
||||
})
|
||||
|
||||
function objectSelected(object) {
|
||||
if (!object) {
|
||||
visible.value = false;
|
||||
return;
|
||||
}
|
||||
if (!object.userData.BIM) {
|
||||
if (!object.parent || !object.parent.userData.BIM) {
|
||||
visible.value = false;
|
||||
} else {
|
||||
visible.value = true;
|
||||
info.value = object.parent.userData.BIM;
|
||||
}
|
||||
} else {
|
||||
visible.value = true;
|
||||
info.value = object.userData.BIM;
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
Hooks.useAddSignal("objectSelected", objectSelected);
|
||||
})
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
Hooks.useRemoveSignal("objectSelected", objectSelected);
|
||||
})
|
||||
</script>
|
||||
@@ -6,9 +6,6 @@
|
||||
<ViewportInfo/>
|
||||
</div>
|
||||
|
||||
<!-- RVT BIM 构件信息悬浮框 -->
|
||||
<BIMProperties/>
|
||||
|
||||
<!-- IFC BIM 构件信息悬浮框 -->
|
||||
<IFCProperties/>
|
||||
|
||||
@@ -18,15 +15,13 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import {onMounted, ref, nextTick, onBeforeUnmount} from 'vue';
|
||||
import {App,Viewer,Hooks} from "@astral3d/engine";
|
||||
import {App,Viewer,Hooks,WaterPool} from "@astral3d/engine";
|
||||
import Toolbar from "./Toolbar.vue";
|
||||
import PathDrawingOverlay from "./PathDrawingOverlay.vue";
|
||||
import {useGlobalConfigStore} from "@/store/modules/globalConfig";
|
||||
import {usePluginStore} from "@/store/modules/plugin";
|
||||
import {installBuiltinPlugin} from "@/plugin";
|
||||
import { clearBuffer } from "@/utils/wasm/optimize";
|
||||
import ViewportInfo from "./ViewportInfo.vue";
|
||||
import BIMProperties from "./BIMProperties.vue";
|
||||
import IFCProperties from "./IFCProperties.vue";
|
||||
|
||||
const globalStore = useGlobalConfigStore();
|
||||
@@ -34,6 +29,43 @@ const pluginStore = usePluginStore();
|
||||
|
||||
const viewportRef = ref();
|
||||
|
||||
function bootstrapWaterPoolWarmup(viewer: Viewer) {
|
||||
const warmupPool = new WaterPool({
|
||||
sky: viewer.scene.environment,
|
||||
name: '__water_pool_warmup__',
|
||||
type: 'cylinder',
|
||||
light: [0.7, 1, -0.3],
|
||||
diameter: 5,
|
||||
height: 5,
|
||||
wallMode: 'none',
|
||||
wallOpacity: 0,
|
||||
useSceneRefraction: 1,
|
||||
surfaceTransmittance: 0.6,
|
||||
normalStrength: 0.5,
|
||||
refractionStrength: 0.035,
|
||||
});
|
||||
|
||||
warmupPool.visible = false;
|
||||
|
||||
// Use scene.add/remove directly to avoid objectAdded/objectRemoved signals and scene tree refresh.
|
||||
viewer.scene.add(warmupPool);
|
||||
|
||||
const removeWarmupPool = () => {
|
||||
if (warmupPool.parent) {
|
||||
warmupPool.parent.remove(warmupPool);
|
||||
}
|
||||
warmupPool.dispose?.();
|
||||
};
|
||||
|
||||
const loaded = (warmupPool as any).loaded;
|
||||
if (loaded && typeof loaded.then === 'function') {
|
||||
loaded.finally(removeWarmupPool);
|
||||
return;
|
||||
}
|
||||
|
||||
removeWarmupPool();
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
App.setConfig({
|
||||
theme: globalStore.theme.replace("Theme", ""),
|
||||
@@ -52,6 +84,8 @@ onMounted(async () => {
|
||||
|
||||
await nextTick();
|
||||
|
||||
bootstrapWaterPoolWarmup(window.viewer);
|
||||
|
||||
// 添加astral engine内置插件并监听插件注册
|
||||
pluginStore.setPlugins(Array.from(window.viewer.modules.plugin.plugins.values()));
|
||||
Hooks.useAddSignal("pluginInstall",pluginStore.addPlugin);
|
||||
@@ -59,9 +93,6 @@ onMounted(async () => {
|
||||
|
||||
// 注册astral editor内置插件
|
||||
installBuiltinPlugin(window.viewer);
|
||||
|
||||
// 清理wasm缓存
|
||||
clearBuffer();
|
||||
})
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
</n-split> -->
|
||||
|
||||
<n-flex class="h-full w-full">
|
||||
<DataSetGroup class="w-50 min-w-300px max-w-500px" />
|
||||
<DataSetGroup class="w-50 min-w-300px max-w-500px" @select="handleGroupSelect" />
|
||||
|
||||
<n-divider vertical class="!h-full" />
|
||||
|
||||
@@ -34,9 +34,9 @@
|
||||
</template>
|
||||
</n-input>
|
||||
|
||||
<n-button type="primary" @click="showDataSetModal = true">{{ t('home.Add data set') }}</n-button>
|
||||
<n-button type="primary" @click="handleAddDataSet">{{ t('home.Add data set') }}</n-button>
|
||||
</div>
|
||||
<n-data-table ref="tableRef" :columns="dataSetColumns" :data="dataSets" :pagination="pagination" />
|
||||
<n-data-table :columns="dataSetColumns" :data="dataSets" :pagination="pagination" :loading="tableLoading" />
|
||||
</div>
|
||||
</n-flex>
|
||||
|
||||
@@ -45,29 +45,32 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, reactive, h, onMounted, useTemplateRef } from 'vue';
|
||||
import { ref, reactive, h, onMounted } from 'vue';
|
||||
import { NButton, NPopconfirm } from 'naive-ui';
|
||||
import type { DataTableInst } from 'naive-ui';
|
||||
import { Search } from '@vicons/carbon';
|
||||
import { t } from "@/language";
|
||||
import { fetchDataSetDetail, fetchDataSetPage, fetchDeleteDataSet } from "@/http/api/dataSet";
|
||||
import DataSetModal from "./DataSetModal.vue";
|
||||
import DataSetGroup from "./DataSetGroup.vue";
|
||||
|
||||
const tableRef = useTemplateRef<DataTableInst>("tableRef");
|
||||
const dataSets = ref<IDataSet.Item[]>([
|
||||
{
|
||||
id: '',
|
||||
groupId:"1",
|
||||
name: '323324234',
|
||||
type: 'SQL'
|
||||
}
|
||||
])
|
||||
const dataSets = ref<IDataSet.Item[]>([])
|
||||
const tableLoading = ref(false);
|
||||
const showDataSetModal = ref(false)
|
||||
const currentDataSet = reactive<IDataSet.Item>({
|
||||
const searchName = ref("");
|
||||
const selectedGroupId = ref<IDataSet.IGroup["id"] | null>(null);
|
||||
const defaultDataSet: IDataSet.Item = {
|
||||
id: '',
|
||||
groupId:"1",
|
||||
groupId: '',
|
||||
name: '',
|
||||
type: 'SQL'
|
||||
type: 'API',
|
||||
method: 'GET',
|
||||
api: '',
|
||||
dataSourceId: '',
|
||||
sql: '',
|
||||
json: ''
|
||||
};
|
||||
const currentDataSet = reactive<IDataSet.Item>({
|
||||
...defaultDataSet
|
||||
})
|
||||
const dataSetColumns = [
|
||||
{
|
||||
@@ -119,23 +122,75 @@ const dataSetColumns = [
|
||||
}
|
||||
]
|
||||
// 分页配置
|
||||
const pagination = { pageSize: 10 }
|
||||
const pagination = reactive({
|
||||
page: 1,
|
||||
pageSize: 10,
|
||||
pageCount: 1,
|
||||
"on-update:page": (page: number) => {
|
||||
pagination.page = page;
|
||||
getList();
|
||||
}
|
||||
})
|
||||
|
||||
function getList() { }
|
||||
|
||||
function handleSearch(searchText: string) {
|
||||
tableRef.value?.filter({
|
||||
name: [searchText]
|
||||
})
|
||||
function resetCurrentDataSet(data?: Partial<IDataSet.Item>) {
|
||||
Object.assign(currentDataSet, defaultDataSet, data || {});
|
||||
}
|
||||
|
||||
function editDataSet(item) {
|
||||
Object.assign(currentDataSet, item)
|
||||
async function getList() {
|
||||
tableLoading.value = true;
|
||||
const res = await fetchDataSetPage({
|
||||
page: pagination.page,
|
||||
pageSize: pagination.pageSize,
|
||||
name: searchName.value || undefined,
|
||||
groupId: selectedGroupId.value ?? undefined
|
||||
});
|
||||
tableLoading.value = false;
|
||||
dataSets.value = res.data?.items || [];
|
||||
pagination.pageCount = res.data?.pages || 1;
|
||||
if (res.data?.current) {
|
||||
pagination.page = res.data.current;
|
||||
}
|
||||
}
|
||||
|
||||
function handleSearch(searchText: string) {
|
||||
searchName.value = searchText;
|
||||
pagination.page = 1;
|
||||
getList();
|
||||
}
|
||||
|
||||
function handleGroupSelect(group: IDataSet.IGroup | null) {
|
||||
selectedGroupId.value = group?.id ?? null;
|
||||
pagination.page = 1;
|
||||
getList();
|
||||
}
|
||||
|
||||
function handleAddDataSet() {
|
||||
resetCurrentDataSet({
|
||||
groupId: selectedGroupId.value ?? ""
|
||||
});
|
||||
showDataSetModal.value = true;
|
||||
}
|
||||
|
||||
async function editDataSet(item) {
|
||||
const res = await fetchDataSetDetail(item.id);
|
||||
if (res.error) {
|
||||
return;
|
||||
}
|
||||
const detail = (res.data || item) as any;
|
||||
resetCurrentDataSet({
|
||||
...detail,
|
||||
dataSourceId: detail.dataSourceId || detail.dataSource ? String(detail.dataSourceId || detail.dataSource) : ""
|
||||
});
|
||||
showDataSetModal.value = true
|
||||
}
|
||||
|
||||
function deleteDataSet(item) {
|
||||
dataSets.value = dataSets.value.filter(ds => ds.id !== item.id)
|
||||
async function deleteDataSet(item) {
|
||||
const res = await fetchDeleteDataSet(item.id);
|
||||
if (res.error) {
|
||||
return;
|
||||
}
|
||||
window.$message?.success(t("prompt.Success to delete"));
|
||||
getList();
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
|
||||
@@ -34,49 +34,20 @@ import { ref, reactive,onMounted } from "vue";
|
||||
import type { DropdownOption, TreeOption, TreeOverrideNodeClickBehaviorReturn } from 'naive-ui';
|
||||
import { Search, Add } from '@vicons/carbon';
|
||||
import { t } from "@/language";
|
||||
import { fetchDataSetGroupTree, fetchDeleteDataSetGroup } from "@/http/api/dataSetGroup";
|
||||
import DataSetGroupModal from "./DataSetGroupModal.vue";
|
||||
|
||||
const pattern = ref("");
|
||||
const data: IDataSet.IGroup[] = [
|
||||
{
|
||||
name: '0',
|
||||
id: '0',
|
||||
children: [
|
||||
{
|
||||
name: '0-0',
|
||||
id: '0-0',
|
||||
children: [
|
||||
{ name: '0-0-0', id: '0-0-0' },
|
||||
{ name: '0-0-1', id: '0-0-1' }
|
||||
]
|
||||
},
|
||||
{
|
||||
name: '0-1',
|
||||
id: '0-1',
|
||||
children: [
|
||||
{ name: '0-1-0', id: '0-1-0' },
|
||||
{ name: '0-1-1', id: '0-1-1' }
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
name: '1',
|
||||
id: '1',
|
||||
children: [
|
||||
{
|
||||
name: '1-0',
|
||||
id: '1-0'
|
||||
},
|
||||
{
|
||||
name: '1-1',
|
||||
id: '1-1'
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
const emits = defineEmits(["select"]);
|
||||
|
||||
function getTreeData(){}
|
||||
const pattern = ref("");
|
||||
const data = ref<IDataSet.IGroup[]>([]);
|
||||
const selectedGroup = ref<IDataSet.IGroup | null>(null);
|
||||
const activeNode = ref<IDataSet.IGroup | null>(null);
|
||||
|
||||
async function getTreeData(){
|
||||
const res = await fetchDataSetGroupTree();
|
||||
data.value = res.data || [];
|
||||
}
|
||||
|
||||
// 子节点选中,含子节点则展开
|
||||
function handleOverride({ option }): TreeOverrideNodeClickBehaviorReturn {
|
||||
@@ -96,7 +67,7 @@ const currentGroup = reactive<IDataSet.IGroup>({
|
||||
|
||||
function handleAddGroup(){
|
||||
currentGroup.id = "";
|
||||
currentGroup.pid = "";
|
||||
currentGroup.pid = selectedGroup.value?.id ?? "";
|
||||
currentGroup.name = "";
|
||||
|
||||
showGroupModal.value = true;
|
||||
@@ -107,8 +78,7 @@ const showDropdown = ref(false);
|
||||
const options = ref<DropdownOption[]>([
|
||||
{
|
||||
label: t("home.Delete"),
|
||||
key: 'delete',
|
||||
disabled: true
|
||||
key: 'delete'
|
||||
},
|
||||
{
|
||||
label: t("layout.sider.script.Edit"),
|
||||
@@ -120,9 +90,15 @@ const y = ref(0)
|
||||
|
||||
// 绑定节点属性以实现右键菜单
|
||||
function handleNodeProps({ option }: { option: TreeOption }) {
|
||||
const group = option as IDataSet.IGroup;
|
||||
return {
|
||||
onClick() { },
|
||||
onClick() {
|
||||
selectedGroup.value = group;
|
||||
emits("select", group);
|
||||
},
|
||||
onContextmenu(e: MouseEvent): void {
|
||||
activeNode.value = group;
|
||||
selectedGroup.value = group;
|
||||
showDropdown.value = true;
|
||||
x.value = e.clientX;
|
||||
y.value = e.clientY;
|
||||
@@ -132,8 +108,34 @@ function handleNodeProps({ option }: { option: TreeOption }) {
|
||||
}
|
||||
}
|
||||
|
||||
function handleDropdownSelect() {
|
||||
async function handleDropdownSelect(key: string) {
|
||||
showDropdown.value = false;
|
||||
if (!activeNode.value) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (key === "edit") {
|
||||
Object.assign(currentGroup, {
|
||||
id: activeNode.value.id,
|
||||
pid: activeNode.value.pid ?? "",
|
||||
name: activeNode.value.name
|
||||
});
|
||||
showGroupModal.value = true;
|
||||
return;
|
||||
}
|
||||
|
||||
if (key === "delete") {
|
||||
const res = await fetchDeleteDataSetGroup(activeNode.value.id);
|
||||
if (res.error) {
|
||||
return;
|
||||
}
|
||||
window.$message?.success(t("prompt.Success to delete"));
|
||||
if (selectedGroup.value?.id === activeNode.value.id) {
|
||||
selectedGroup.value = null;
|
||||
emits("select", null);
|
||||
}
|
||||
getTreeData();
|
||||
}
|
||||
}
|
||||
|
||||
function handleDropdownClickoutside() {
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
<template>
|
||||
<n-modal :show="show" @mask-click="handleClose">
|
||||
<n-card class="w-120 max-w-600px" :title="t('home.Data set group config')">
|
||||
<n-form :model="model" :rules="rules" ref="formRef" label-placement="left" label-width="auto">
|
||||
<n-form :model="model" :rules="rules" ref="formRef" label-placement="left" label-width="auto" :disabled="submitLoading">
|
||||
<n-form-item :label="t('home.Parent group')">
|
||||
<n-cascader v-model:value="model.pid" expand-trigger="hover" :options="treeData"
|
||||
check-strategy="child" show-path filterable clearable label-field="name" value-field="id" />
|
||||
check-strategy="all" show-path filterable clearable label-field="name" value-field="id" />
|
||||
</n-form-item>
|
||||
<n-form-item :label="t('home.Group name')" path="name">
|
||||
<n-input v-model:value="model.name" />
|
||||
</n-form-item>
|
||||
|
||||
<div class="flex justify-end mt-4">
|
||||
<n-button @click="handleClose" class="mr-2">{{ t("other.Cancel") }}</n-button>
|
||||
<n-button type="primary" @click="saveDataSet">{{ t("other.Ok") }}</n-button>
|
||||
<n-button :disabled="submitLoading" @click="handleClose" class="mr-2">{{ t("other.Cancel") }}</n-button>
|
||||
<n-button type="primary" :loading="submitLoading" @click="saveDataSet">{{ t("other.Ok") }}</n-button>
|
||||
</div>
|
||||
</n-form>
|
||||
</n-card>
|
||||
@@ -20,9 +20,10 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { useTemplateRef,computed } from "vue";
|
||||
import { useTemplateRef, ref } from "vue";
|
||||
import type { FormInst } from 'naive-ui'
|
||||
import { t } from "@/language";
|
||||
import { DataSetGroupPayload, fetchCreateDataSetGroup, fetchUpdateDataSetGroup } from "@/http/api/dataSetGroup";
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
show: boolean,
|
||||
@@ -43,6 +44,7 @@ const formRef = useTemplateRef<FormInst>("formRef");
|
||||
const rules = {
|
||||
name: { required: true, message: t("prompt.Please enter a grouping name for the dataset"), trigger: 'blur' }
|
||||
};
|
||||
const submitLoading = ref(false);
|
||||
|
||||
function handleClose() {
|
||||
emits("update:show", false);
|
||||
@@ -51,15 +53,21 @@ function handleClose() {
|
||||
function saveDataSet(e: MouseEvent) {
|
||||
e.preventDefault()
|
||||
|
||||
formRef.value?.validate((errors) => {
|
||||
formRef.value?.validate(async (errors) => {
|
||||
if (!errors) {
|
||||
if (!props.model.id) {
|
||||
// 新增
|
||||
|
||||
} else {
|
||||
// 更新
|
||||
const payload: DataSetGroupPayload = {
|
||||
id: props.model.id || undefined,
|
||||
pid: props.model.pid || "",
|
||||
name: props.model.name?.trim() || ""
|
||||
};
|
||||
|
||||
submitLoading.value = true;
|
||||
const res = props.model.id ? await fetchUpdateDataSetGroup(payload) : await fetchCreateDataSetGroup(payload);
|
||||
submitLoading.value = false;
|
||||
if (res.error) {
|
||||
return;
|
||||
}
|
||||
window.$message?.success(props.model.id ? t("prompt.Success to update") : t("prompt.Saved successfully!"));
|
||||
|
||||
// 刷新父页面表格
|
||||
emits("refresh");
|
||||
|
||||
@@ -1,121 +1,330 @@
|
||||
<template>
|
||||
<n-modal :show="show" @mask-click="handleClose">
|
||||
<n-card class="w-200 max-w-1200px" :title="t('home.Data set config')">
|
||||
<n-form :model="model" :rules="rules" ref="formRef" label-placement="left" label-width="auto">
|
||||
<n-grid :cols="24" :x-gap="24">
|
||||
<n-form-item-gi :span="12" :label="t('home.Data set name')" path="name">
|
||||
<n-input v-model:value="model.name" />
|
||||
</n-form-item-gi>
|
||||
<n-form-item-gi :span="12" :label="t('home.Data set group')">
|
||||
<n-cascader v-model:value="model.groupId" expand-trigger="hover" :options="groupOptions"
|
||||
check-strategy="child" show-path filterable clearable label-field="name" value-field="id" />
|
||||
</n-form-item-gi>
|
||||
<n-form-item-gi :span="12" :label="t('home.Data set type')">
|
||||
<n-select v-model:value="model.type" :options="setTypes" />
|
||||
</n-form-item-gi>
|
||||
<n-modal :show="show" @mask-click="handleClose">
|
||||
<n-card class="w-200 max-w-1200px" :title="t('home.Data set config')">
|
||||
<n-form :model="model" :rules="rules" ref="formRef" label-placement="left" label-width="auto" :disabled="submitLoading">
|
||||
<n-grid :cols="24" :x-gap="24">
|
||||
<n-form-item-gi :span="12" :label="t('home.Data set name')" path="name">
|
||||
<n-input v-model:value="model.name" />
|
||||
</n-form-item-gi>
|
||||
<n-form-item-gi :span="12" :label="t('home.Data set group')" path="groupId">
|
||||
<n-cascader
|
||||
v-model:value="model.groupId"
|
||||
expand-trigger="hover"
|
||||
:options="groupOptions"
|
||||
check-strategy="all"
|
||||
show-path
|
||||
filterable
|
||||
clearable
|
||||
label-field="name"
|
||||
value-field="id"
|
||||
/>
|
||||
</n-form-item-gi>
|
||||
<n-form-item-gi :span="12" :label="t('home.Data set type')" path="type">
|
||||
<n-select v-model:value="model.type" :options="setTypes" />
|
||||
</n-form-item-gi>
|
||||
|
||||
<template v-if="model.type === 'API'">
|
||||
<n-form-item-gi :span="12" :label="t('home.Method')">
|
||||
<n-select v-model:value="model.type" :options="[
|
||||
{ label: 'GET', value: 'GET' },
|
||||
{ label: 'POST', value: 'POST' },
|
||||
]" />
|
||||
</n-form-item-gi>
|
||||
<n-form-item-gi :span="24" :label="t('home.API interface')">
|
||||
<n-input v-model:value="model.api" type="textarea" />
|
||||
</n-form-item-gi>
|
||||
</template>
|
||||
<template v-if="model.type === 'API'">
|
||||
<n-form-item-gi :span="12" :label="t('home.Method')" path="method">
|
||||
<n-select
|
||||
:key="'dataset-method-select'"
|
||||
v-model:value="model.method"
|
||||
:options="[
|
||||
{ label: 'GET', value: 'GET' },
|
||||
{ label: 'POST', value: 'POST' },
|
||||
]"
|
||||
/>
|
||||
</n-form-item-gi>
|
||||
<n-form-item-gi :span="24" :label="t('home.API interface')" path="api">
|
||||
<n-input v-model:value="model.api" type="textarea" />
|
||||
</n-form-item-gi>
|
||||
</template>
|
||||
|
||||
<template v-else-if="model.type === 'SQL'">
|
||||
<n-form-item-gi :span="12" :label="t('home.Data sources')">
|
||||
<n-select v-model:value="model.dataSource" :options="dataSourceOptions" />
|
||||
</n-form-item-gi>
|
||||
<n-form-item-gi :span="24" :label="`SQL(${t('home.Query only')})`">
|
||||
<SQLEditor v-model:value="model.sql as string" />
|
||||
</n-form-item-gi>
|
||||
<n-form-item-gi :span="24" label=" ">
|
||||
<n-blockquote>
|
||||
{{ t('home.Parameter is passed as ') }}
|
||||
'${id}' ,
|
||||
{{ t('home.For example:') }}
|
||||
SELECT * FROM table WHERE id='${id}'
|
||||
</n-blockquote>
|
||||
</n-form-item-gi>
|
||||
</template>
|
||||
<template v-else-if="model.type === 'SQL'">
|
||||
<n-form-item-gi :span="12" :label="t('home.Data sources')" path="dataSourceId">
|
||||
<n-select :key="'dataset-datasource-select'" v-model:value="model.dataSourceId" :options="dataSourceOptions" />
|
||||
</n-form-item-gi>
|
||||
<n-form-item-gi :span="24" :label="`SQL(${t('home.Query only')})`" path="sql">
|
||||
<SQLEditor v-model:value="model.sql as string" />
|
||||
</n-form-item-gi>
|
||||
<n-form-item-gi :span="24" label=" ">
|
||||
<n-blockquote>
|
||||
{{ t('home.Parameter is passed as ') }}
|
||||
'${id}' ,
|
||||
{{ t('home.For example:') }}
|
||||
SELECT * FROM table WHERE id='${id}'
|
||||
</n-blockquote>
|
||||
</n-form-item-gi>
|
||||
</template>
|
||||
|
||||
<template v-else-if="model.type === 'JSON'">
|
||||
<n-form-item-gi :span="24" label="JSON">
|
||||
<JSONEditor v-model:value="model.json as string" />
|
||||
</n-form-item-gi>
|
||||
</template>
|
||||
<template v-else-if="model.type === 'JSON'">
|
||||
<n-form-item-gi :span="24" label="JSON" path="json">
|
||||
<JSONEditor v-model:value="model.json as string" />
|
||||
</n-form-item-gi>
|
||||
</template>
|
||||
|
||||
<n-gi :span="24">
|
||||
<div class="flex justify-end mt-4">
|
||||
<n-button @click="handleClose" class="mr-2">{{ t("other.Cancel") }}</n-button>
|
||||
<n-button type="primary" @click="saveDataSet">{{ t("other.Ok") }}</n-button>
|
||||
</div>
|
||||
</n-gi>
|
||||
</n-grid>
|
||||
</n-form>
|
||||
</n-card>
|
||||
</n-modal>
|
||||
<n-gi :span="24">
|
||||
<div class="flex justify-end mt-4">
|
||||
<n-button :disabled="submitLoading" @click="handleClose" class="mr-2">{{ t("other.Cancel") }}</n-button>
|
||||
<n-button type="primary" :loading="submitLoading" @click="saveDataSet">{{ t("other.Ok") }}</n-button>
|
||||
</div>
|
||||
</n-gi>
|
||||
</n-grid>
|
||||
</n-form>
|
||||
</n-card>
|
||||
</n-modal>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { useTemplateRef } from "vue";
|
||||
import type { FormInst } from 'naive-ui'
|
||||
import { t } from "@/language";
|
||||
import SQLEditor from "@/components/code/SQLEditor.vue";
|
||||
import JSONEditor from "@/components/code/JSONEditor.vue";
|
||||
import { ref, watch, computed, useTemplateRef } from "vue";
|
||||
import type { FormInst } from "naive-ui";
|
||||
import { t } from "@/language";
|
||||
import { DataSetPayload, fetchCreateDataSet, fetchUpdateDataSet } from "@/http/api/dataSet";
|
||||
import { fetchDataSetGroupTree } from "@/http/api/dataSetGroup";
|
||||
import { fetchDataSourceList } from "@/http/api/dataSource";
|
||||
import SQLEditor from "@/components/code/SQLEditor.vue";
|
||||
import JSONEditor from "@/components/code/JSONEditor.vue";
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
show: boolean;
|
||||
model?: IDataSet.Item;
|
||||
}>(),
|
||||
{
|
||||
show: false,
|
||||
model: () => ({
|
||||
id: "",
|
||||
groupId: "",
|
||||
name: "",
|
||||
type: "API",
|
||||
method: "GET",
|
||||
api: "",
|
||||
dataSourceId: "",
|
||||
sql: "",
|
||||
json: "",
|
||||
createTime: "",
|
||||
}),
|
||||
}
|
||||
);
|
||||
const emits = defineEmits(["update:show", "refresh"]);
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
show: boolean,
|
||||
model: IDataSet.Item
|
||||
}>(), {
|
||||
show: false,
|
||||
model: () => ({
|
||||
id: '',
|
||||
groupId: "",
|
||||
name: '',
|
||||
type: 'SQL',
|
||||
})
|
||||
})
|
||||
const emits = defineEmits(["update:show", "refresh"]);
|
||||
const formRef = useTemplateRef<FormInst>("formRef");
|
||||
function createRequiredRule(message: string, trigger: Array<"input" | "blur" | "change">) {
|
||||
return {
|
||||
trigger,
|
||||
validator(_: unknown, value: unknown) {
|
||||
if (value === undefined || value === null || value === "") {
|
||||
return new Error(message);
|
||||
}
|
||||
if (Array.isArray(value) && value.length === 0) {
|
||||
return new Error(message);
|
||||
}
|
||||
return true;
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
const formRef = useTemplateRef<FormInst>("formRef");
|
||||
const rules = {
|
||||
name: { required: true, message: t("prompt.Please enter a name for the dataset"), trigger: 'blur' }
|
||||
};
|
||||
const groupOptions = [];
|
||||
const setTypes = [
|
||||
{ label: 'API', value: 'API' },
|
||||
{ label: 'SQL', value: 'SQL' },
|
||||
{ label: 'JSON', value: 'JSON' },
|
||||
];
|
||||
const dataSourceOptions = [];
|
||||
const rules = computed(() => {
|
||||
const baseRules: Record<string, any> = {
|
||||
name: { required: true, message: t("prompt.Please enter a name for the dataset"), trigger: ["input", "blur"] },
|
||||
groupId: createRequiredRule("请选择数据集分组", ["change", "blur"]),
|
||||
type: { required: true, message: "请选择数据集类型", trigger: ["change", "blur"] },
|
||||
};
|
||||
const type = props.model?.type;
|
||||
if (type === "API") {
|
||||
baseRules.method = {
|
||||
required: true,
|
||||
message: "请选择请求方式",
|
||||
trigger: ["change", "blur"],
|
||||
};
|
||||
baseRules.api = {
|
||||
required: true,
|
||||
message: "请输入接口地址",
|
||||
trigger: ["input", "blur"],
|
||||
};
|
||||
} else if (type === "SQL") {
|
||||
baseRules.dataSourceId = createRequiredRule("请选择数据源", ["change", "blur"]);
|
||||
baseRules.sql = { required: true, message: "请输入 SQL 语句", trigger: ["blur"] };
|
||||
} else if (type === "JSON") {
|
||||
baseRules.json = { required: true, message: "请输入 JSON 数据", trigger: ["blur"] };
|
||||
}
|
||||
return baseRules;
|
||||
});
|
||||
const groupOptions = ref<IDataSet.IGroup[]>([]);
|
||||
const setTypes = [
|
||||
{ label: "API", value: "API" },
|
||||
{ label: "SQL", value: "SQL" },
|
||||
{ label: "JSON", value: "JSON" },
|
||||
];
|
||||
const dataSourceOptions = ref<{ label: string; value: IDataSource.Item["id"] }[]>([]);
|
||||
const submitLoading = ref(false);
|
||||
const isEdit = computed(() => Boolean(props.model?.id));
|
||||
|
||||
function handleClose() {
|
||||
emits("update:show", false);
|
||||
}
|
||||
function normalizeDataSourceId(value: unknown): IDataSource.Item["id"] | undefined {
|
||||
if (value === undefined || value === null || value === "") {
|
||||
return undefined;
|
||||
}
|
||||
return String(value);
|
||||
}
|
||||
|
||||
function saveDataSet(e: MouseEvent) {
|
||||
e.preventDefault()
|
||||
function extractList<T>(value: unknown): T[] {
|
||||
if (Array.isArray(value)) {
|
||||
return value as T[];
|
||||
}
|
||||
if (value && typeof value === "object") {
|
||||
const nested = (value as Record<string, unknown>).result;
|
||||
if (Array.isArray(nested)) {
|
||||
return nested as T[];
|
||||
}
|
||||
}
|
||||
return [];
|
||||
}
|
||||
|
||||
formRef.value?.validate((errors) => {
|
||||
if (!errors) {
|
||||
if (!props.model.id) {
|
||||
// 新增
|
||||
async function loadOptions() {
|
||||
const [groupRes, dataSourceRes] = await Promise.allSettled([fetchDataSetGroupTree(), fetchDataSourceList()]);
|
||||
|
||||
} else {
|
||||
// 更新
|
||||
if (groupRes.status === "fulfilled") {
|
||||
groupOptions.value = extractList<IDataSet.IGroup>(groupRes.value.data);
|
||||
} else {
|
||||
groupOptions.value = [];
|
||||
}
|
||||
|
||||
}
|
||||
if (dataSourceRes.status === "fulfilled") {
|
||||
const list = extractList<IDataSource.Item>(dataSourceRes.value.data);
|
||||
dataSourceOptions.value = list.map(item => ({
|
||||
label: item.name,
|
||||
value: String(item.id),
|
||||
}));
|
||||
} else {
|
||||
dataSourceOptions.value = [];
|
||||
}
|
||||
}
|
||||
|
||||
// 刷新父页面表格
|
||||
emits("refresh");
|
||||
function normalizeJsonValue(value?: IDataSet.Item["json"]) {
|
||||
if (!value) {
|
||||
return "";
|
||||
}
|
||||
if (typeof value === "string") {
|
||||
return value;
|
||||
}
|
||||
try {
|
||||
return JSON.stringify(value, null, 2);
|
||||
} catch {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
handleClose();
|
||||
}
|
||||
})
|
||||
}
|
||||
function resetFieldsForType(type: string, prevType?: string) {
|
||||
if (!props.model) {
|
||||
return;
|
||||
}
|
||||
if (type !== "API") {
|
||||
props.model.method = undefined;
|
||||
props.model.api = "";
|
||||
}
|
||||
if (type === "API" && !props.model.method) {
|
||||
props.model.method = "GET";
|
||||
}
|
||||
if (type !== "SQL") {
|
||||
props.model.dataSourceId = undefined;
|
||||
props.model.sql = "";
|
||||
} else if (prevType && prevType !== "SQL") {
|
||||
props.model.dataSourceId = undefined;
|
||||
props.model.sql = "";
|
||||
}
|
||||
if (type !== "JSON") {
|
||||
props.model.json = "";
|
||||
}
|
||||
}
|
||||
|
||||
function validateSql(sql: string) {
|
||||
const trimmed = sql.trim();
|
||||
if (!/^(SELECT|WITH)\b/i.test(trimmed)) {
|
||||
window.$message?.error("SQL 必须以 SELECT 或 WITH 开头");
|
||||
return false;
|
||||
}
|
||||
if (/[;]|--|\/\*/.test(trimmed)) {
|
||||
window.$message?.error("SQL 不允许包含危险语句标记");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function buildPayload(): DataSetPayload {
|
||||
const payload: DataSetPayload = {
|
||||
name: props.model?.name?.trim() || "",
|
||||
groupId: props.model?.groupId ?? "",
|
||||
type: props.model?.type || "API",
|
||||
};
|
||||
if (props.model?.id) {
|
||||
payload.id = props.model.id;
|
||||
}
|
||||
if (payload.type === "API") {
|
||||
payload.method = props.model?.method;
|
||||
payload.api = props.model?.api?.trim();
|
||||
} else if (payload.type === "SQL") {
|
||||
payload.dataSourceId = normalizeDataSourceId(props.model?.dataSourceId);
|
||||
payload.sql = props.model?.sql?.trim();
|
||||
} else if (payload.type === "JSON") {
|
||||
payload.json = normalizeJsonValue(props.model?.json);
|
||||
}
|
||||
return payload;
|
||||
}
|
||||
|
||||
watch(
|
||||
() => props.show,
|
||||
show => {
|
||||
if (!show) {
|
||||
return;
|
||||
}
|
||||
loadOptions();
|
||||
if (props.model) {
|
||||
props.model.dataSourceId = normalizeDataSourceId(props.model.dataSourceId);
|
||||
}
|
||||
if (props.model?.type === "API" && !props.model.method) {
|
||||
props.model.method = "GET";
|
||||
}
|
||||
if (props.model?.type === "JSON") {
|
||||
props.model.json = normalizeJsonValue(props.model.json);
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
watch(
|
||||
() => props.model?.type,
|
||||
(next, prev) => {
|
||||
if (!next || next === prev) {
|
||||
return;
|
||||
}
|
||||
resetFieldsForType(next, prev);
|
||||
formRef.value?.restoreValidation();
|
||||
}
|
||||
);
|
||||
|
||||
function handleClose() {
|
||||
emits("update:show", false);
|
||||
}
|
||||
|
||||
function saveDataSet(e: MouseEvent) {
|
||||
e.preventDefault();
|
||||
|
||||
formRef.value?.validate(async errors => {
|
||||
if (errors || !props.model) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (props.model.type === "SQL" && !validateSql(props.model.sql || "")) {
|
||||
return;
|
||||
}
|
||||
|
||||
submitLoading.value = true;
|
||||
const payload = buildPayload();
|
||||
const res = isEdit.value ? await fetchUpdateDataSet(payload) : await fetchCreateDataSet(payload);
|
||||
submitLoading.value = false;
|
||||
if (res.error) {
|
||||
return;
|
||||
}
|
||||
window.$message?.success(isEdit.value ? t("prompt.Success to update") : t("prompt.Saved successfully!"));
|
||||
emits("refresh");
|
||||
handleClose();
|
||||
});
|
||||
}
|
||||
</script>
|
||||
@@ -7,9 +7,9 @@
|
||||
</template>
|
||||
</n-input>
|
||||
|
||||
<n-button type="primary" @click="showDataSourceModal = true">{{ t('home.Add data source') }}</n-button>
|
||||
<n-button type="primary" @click="handleAddDataSource">{{ t('home.Add data source') }}</n-button>
|
||||
</div>
|
||||
<n-data-table ref="tableRef" :columns="dataSourceColumns" :data="dataSources" :pagination="pagination" striped />
|
||||
<n-data-table ref="tableRef" :columns="dataSourceColumns" :data="dataSources" :pagination="pagination" :loading="tableLoading" striped />
|
||||
|
||||
<!-- 数据源模态框 -->
|
||||
<DataSourceModal v-model:show="showDataSourceModal" :model="currentDataSource" @refresh="getList" />
|
||||
@@ -21,18 +21,23 @@ import { NButton, NPopconfirm } from 'naive-ui';
|
||||
import type { DataTableInst } from 'naive-ui';
|
||||
import { Search } from '@vicons/carbon';
|
||||
import { t } from "@/language";
|
||||
import { fetchDataSourceList, fetchDeleteDataSource } from "@/http/api/dataSource";
|
||||
import DataSourceModal from "./DataSourceModal.vue";
|
||||
|
||||
const tableRef = useTemplateRef<DataTableInst>("tableRef");
|
||||
const dataSources = ref<IDataSource.Item[]>([])
|
||||
const showDataSourceModal = ref(false)
|
||||
const currentDataSource = reactive({
|
||||
const tableLoading = ref(false);
|
||||
const defaultDataSource = {
|
||||
id: '',
|
||||
name: '',
|
||||
type: 'MySQL',
|
||||
connectionString: '',
|
||||
username: "",
|
||||
password: ""
|
||||
}
|
||||
const currentDataSource = reactive({
|
||||
...defaultDataSource
|
||||
})
|
||||
const dataSourceColumns = [
|
||||
{
|
||||
@@ -106,7 +111,21 @@ const dataSourceColumns = [
|
||||
// 分页配置
|
||||
const pagination = { pageSize: 10 }
|
||||
|
||||
function getList() { }
|
||||
async function getList() {
|
||||
tableLoading.value = true;
|
||||
const res = await fetchDataSourceList();
|
||||
tableLoading.value = false;
|
||||
dataSources.value = res.data || [];
|
||||
}
|
||||
|
||||
function resetCurrentDataSource(data?: Partial<IDataSource.Item>) {
|
||||
Object.assign(currentDataSource, defaultDataSource, data || {});
|
||||
}
|
||||
|
||||
function handleAddDataSource() {
|
||||
resetCurrentDataSource();
|
||||
showDataSourceModal.value = true;
|
||||
}
|
||||
|
||||
function handleSearch(searchText: string) {
|
||||
tableRef.value?.filter({
|
||||
@@ -115,12 +134,17 @@ function handleSearch(searchText: string) {
|
||||
}
|
||||
|
||||
function editDataSource(item) {
|
||||
Object.assign(currentDataSource, item)
|
||||
resetCurrentDataSource(item)
|
||||
showDataSourceModal.value = true
|
||||
}
|
||||
|
||||
function deleteDataSource(item) {
|
||||
dataSources.value = dataSources.value.filter(ds => ds.id !== item.id)
|
||||
async function deleteDataSource(item) {
|
||||
const res = await fetchDeleteDataSource(item.id);
|
||||
if (res.error) {
|
||||
return;
|
||||
}
|
||||
window.$message?.success(t("prompt.Success to delete"));
|
||||
getList();
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<n-modal :show="show" @mask-click="handleClose">
|
||||
<n-card class="w-100 max-w-600px" :title="t('home.Data source config')">
|
||||
<n-form :model="model" :rules="rules" ref="formRef" label-placement="left" label-width="auto">
|
||||
<n-form :model="model" :rules="rules" ref="formRef" label-placement="left" label-width="auto" :disabled="testLinkLoading || submitLoading">
|
||||
<n-form-item :label="t('home.Data source name')" path="name">
|
||||
<n-input v-model:value="model.name" :disabled="testLinkLoading" />
|
||||
</n-form-item>
|
||||
@@ -22,8 +22,8 @@
|
||||
<n-button type="primary" :loading="testLinkLoading" @click="handleTestLink">{{ t("home.Test the connection") }}</n-button>
|
||||
|
||||
<div>
|
||||
<n-button @click="handleClose" class="mr-2">{{ t("other.Cancel") }}</n-button>
|
||||
<n-button type="primary" @click="saveDataSource">{{ t("other.Ok") }}</n-button>
|
||||
<n-button :disabled="testLinkLoading || submitLoading" @click="handleClose" class="mr-2">{{ t("other.Cancel") }}</n-button>
|
||||
<n-button type="primary" :loading="submitLoading" @click="saveDataSource">{{ t("other.Ok") }}</n-button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -33,9 +33,10 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, useTemplateRef } from "vue";
|
||||
import { ref, computed, useTemplateRef } from "vue";
|
||||
import type { FormInst } from 'naive-ui'
|
||||
import { t } from "@/language";
|
||||
import { DataSourcePayload, fetchCreateDataSource, fetchTestDataSource, fetchUpdateDataSource } from "@/http/api/dataSource";
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
show: boolean,
|
||||
@@ -65,6 +66,8 @@ const dbTypes = [
|
||||
{ label: 'Oracle', value: 'Oracle' }
|
||||
]
|
||||
const testLinkLoading = ref(false);
|
||||
const submitLoading = ref(false);
|
||||
const isEdit = computed(() => Boolean(props.model.id));
|
||||
|
||||
function handleClose() {
|
||||
emits("update:show", false);
|
||||
@@ -72,25 +75,52 @@ function handleClose() {
|
||||
|
||||
function handleTestLink(e: MouseEvent) {
|
||||
e.preventDefault()
|
||||
formRef.value?.validate((errors) => {
|
||||
formRef.value?.validate(async (errors) => {
|
||||
if (!errors) {
|
||||
testLinkLoading.value = true;
|
||||
const res = await fetchTestDataSource(buildPayload(false));
|
||||
testLinkLoading.value = false;
|
||||
if (res.error) {
|
||||
return;
|
||||
}
|
||||
window.$message?.success(t("prompt.Operation successful"));
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
function buildPayload(includeId: boolean): DataSourcePayload {
|
||||
const payload: DataSourcePayload = {
|
||||
name: props.model.name?.trim() || "",
|
||||
type: props.model.type,
|
||||
connectionString: props.model.connectionString?.trim() || ""
|
||||
};
|
||||
|
||||
if (props.model.username) {
|
||||
payload.username = props.model.username;
|
||||
}
|
||||
if (props.model.password) {
|
||||
payload.password = props.model.password;
|
||||
}
|
||||
if (includeId && props.model.id) {
|
||||
payload.id = props.model.id;
|
||||
}
|
||||
|
||||
return payload;
|
||||
}
|
||||
|
||||
function saveDataSource(e: MouseEvent) {
|
||||
e.preventDefault()
|
||||
|
||||
formRef.value?.validate((errors) => {
|
||||
formRef.value?.validate(async (errors) => {
|
||||
if (!errors) {
|
||||
if (!props.model.id) {
|
||||
// 新增
|
||||
|
||||
} else {
|
||||
// 更新
|
||||
|
||||
submitLoading.value = true;
|
||||
const payload = buildPayload(true);
|
||||
const res = isEdit.value ? await fetchUpdateDataSource(payload) : await fetchCreateDataSource(payload);
|
||||
submitLoading.value = false;
|
||||
if (res.error) {
|
||||
return;
|
||||
}
|
||||
window.$message?.success(isEdit.value ? t("prompt.Success to update") : t("prompt.Saved successfully!"));
|
||||
|
||||
// 刷新父页面表格
|
||||
emits("refresh");
|
||||
|
||||
@@ -19,26 +19,12 @@ const options = [
|
||||
key: 'details',
|
||||
icon: renderIcon(Information)
|
||||
},
|
||||
{
|
||||
label: () => cpt("home.Rename").value,
|
||||
key: 'rename',
|
||||
icon: renderIcon(Edit)
|
||||
},
|
||||
{
|
||||
label: () => cpt("home.Delete").value,
|
||||
key: 'delete',
|
||||
icon: renderIcon(Delete)
|
||||
},
|
||||
{
|
||||
label: () => cpt("home.Release").value,
|
||||
key: 'release',
|
||||
icon: renderIcon(SendAlt)
|
||||
},
|
||||
{
|
||||
label: () => cpt("layout.header.Export").value,
|
||||
key: 'export',
|
||||
icon: renderIcon(Export)
|
||||
}
|
||||
|
||||
]
|
||||
const detail = ref();
|
||||
const detailVisible = ref(false);
|
||||
|
||||
@@ -3,7 +3,7 @@ import {nextTick, onMounted, provide, ref} from "vue";
|
||||
import {useRoute} from 'vue-router';
|
||||
import {t} from "@/language";
|
||||
import {fetchGetOneScene} from "@/http/api/scenes";
|
||||
import {App,Viewer,Hooks,Package,defaultProjectInfo} from "@astral3d/engine";
|
||||
import {App,Viewer,Hooks,defaultProjectInfo} from "@astral3d/engine";
|
||||
import {usePreviewOperationStore} from "@/store/modules/previewOperation";
|
||||
import EsCubeLoading from "@/components/es/EsCubeLoading.vue";
|
||||
import PreviewSceneTree from "@/views/preview/components/PreviewSceneTree.vue";
|
||||
@@ -97,8 +97,7 @@ function getScene(sceneInfo) {
|
||||
closable: false,
|
||||
})
|
||||
|
||||
const p = new Package(window.viewer);
|
||||
p.unpack({
|
||||
window.viewer.package.unpack({
|
||||
url: sceneInfo.zip,
|
||||
onSceneLoad: (sceneJson: ISceneJson) => {
|
||||
if (sceneJson.controls?.state) {
|
||||
|
||||
+10
-6
@@ -1,6 +1,7 @@
|
||||
declare namespace IDataSource {
|
||||
type Id = string | number;
|
||||
interface Item {
|
||||
id: string;
|
||||
id: Id;
|
||||
name: string;
|
||||
type: string;
|
||||
connectionString: string;
|
||||
@@ -10,21 +11,24 @@ declare namespace IDataSource {
|
||||
}
|
||||
|
||||
declare namespace IDataSet {
|
||||
type Id = string | number;
|
||||
interface Item {
|
||||
id: string;
|
||||
groupId: string;
|
||||
id: Id;
|
||||
groupId: Id;
|
||||
name: string;
|
||||
type: string;
|
||||
method?: "GET" | "POST";
|
||||
api?: string;
|
||||
dataSource?: string;
|
||||
dataSourceId?: Id;
|
||||
dataSource?: Id;
|
||||
sql?: string;
|
||||
json?: string;
|
||||
createTime?: string;
|
||||
}
|
||||
|
||||
interface IGroup {
|
||||
id: string;
|
||||
pid?: string;
|
||||
id: Id;
|
||||
pid?: Id;
|
||||
name: string;
|
||||
children?: IGroup[];
|
||||
}
|
||||
|
||||
@@ -158,7 +158,8 @@ export default defineConfig(async ({mode, command}) => {
|
||||
// }),
|
||||
viteStaticCopy({
|
||||
targets: [
|
||||
{ src: 'node_modules/@astral3d/engine/dist/libs/*', dest: 'assets/libs' }
|
||||
{ src: 'node_modules/@astral3d/engine/dist/libs/*', dest: 'assets/libs' },
|
||||
{ src: 'node_modules/@astral3d/engine/dist/resource/**/*', dest: 'assets/resource' }
|
||||
],
|
||||
}),
|
||||
...plugins
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -65,6 +65,8 @@ export default class Path extends THREE.Mesh {
|
||||
if (Path.flowSignalBound) return;
|
||||
Path.flowSignalBound = true;
|
||||
useAddSignal("sceneRendered", Path.handleFlowTick);
|
||||
// 立即请求一帧渲染,防止场景静止时 sceneRendered 永远不触发导致流动停止
|
||||
(App.viewer as any)?.pluginRequestRender?.(true);
|
||||
}
|
||||
|
||||
private static unbindFlowSignal() {
|
||||
|
||||
@@ -4,6 +4,7 @@ import {Timer} from 'three/examples/jsm/misc/Timer.js';
|
||||
import {CSS2DRenderer} from "three/examples/jsm/renderers/CSS2DRenderer";
|
||||
import {CSS3DRenderer} from "three/examples/jsm/renderers/CSS3DRenderer.js";
|
||||
import {TransformControls} from "three/examples/jsm/controls/TransformControls.js";
|
||||
import TWEEN from "three/examples/jsm/libs/tween.module.js";
|
||||
import App from "../app/App";
|
||||
import {ViewerOptions} from "./ViewerOptions";
|
||||
import {PluginManager} from "@/core/plugin/plugin";
|
||||
@@ -32,6 +33,7 @@ import ParticleEmitter from "@/core/objects/ParticleEmitter.ts";
|
||||
import {ViewerPathTracer} from "@/core/viewer/ViewerPathTracer.ts";
|
||||
import {Helper as ScriptHelper} from "../script";
|
||||
import Tiles from "../objects/Tile.ts";
|
||||
import {Package} from "@/core/loader/Package";
|
||||
|
||||
export interface ViewerEventMap {
|
||||
// 场景加载完成时执行,仅执行一次
|
||||
@@ -118,6 +120,11 @@ export interface ViewerModules {
|
||||
tilesManage:TilesManage,
|
||||
}
|
||||
|
||||
export interface InstallScriptsOptions {
|
||||
invokeLoaded?: boolean;
|
||||
loadedScriptNames?: string[];
|
||||
}
|
||||
|
||||
CameraControls.install({
|
||||
THREE: {
|
||||
Vector2: THREE.Vector2,
|
||||
@@ -139,25 +146,14 @@ const onDoubleClickPosition = new THREE.Vector2();
|
||||
// 表示animate()函数被多次调用累积时间,用于限制FPS
|
||||
let timeStamp = 0;
|
||||
|
||||
// 事件绑定
|
||||
const Fn: any = {
|
||||
pointerdown: null,
|
||||
pointerup: null,
|
||||
pointermove: null,
|
||||
keydown: null,
|
||||
keyup: null,
|
||||
touchstart: null,
|
||||
dblclick: null,
|
||||
}
|
||||
|
||||
// 脚本管理数据结构
|
||||
type EventHandlers = {
|
||||
[eventName: string]: {
|
||||
[uuid: string]: Function[];
|
||||
};
|
||||
};
|
||||
// 脚本中可写的所有事件
|
||||
let events: EventHandlers = {
|
||||
|
||||
const createScriptEvents = (): EventHandlers => ({
|
||||
loaded: {},
|
||||
beforeAnimation: {},
|
||||
afterAnimation: {},
|
||||
@@ -167,6 +163,7 @@ let events: EventHandlers = {
|
||||
afterDestroy: {},
|
||||
onPick: {},
|
||||
onDoubleClick: {},
|
||||
bindDataChange: {},
|
||||
onKeyDown: {},
|
||||
onKeyUp: {},
|
||||
onPointerDown: {},
|
||||
@@ -174,9 +171,7 @@ let events: EventHandlers = {
|
||||
onPointerMove: {},
|
||||
onTouchStart: {},
|
||||
onTouchEnd: {},
|
||||
};
|
||||
// UUID 到事件的映射
|
||||
const uuidEventMap: Map<string, Map<string, { name: string, fn: Function }[]>> = new Map();
|
||||
});
|
||||
|
||||
export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
public container: HTMLElement;
|
||||
@@ -196,8 +191,27 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
public css2DRenderer: CSS2DRenderer = new CSS2DRenderer();
|
||||
public css3DRenderer: CSS3DRenderer = new CSS3DRenderer();
|
||||
public timer = new Timer();
|
||||
public events: EventHandlers = createScriptEvents();
|
||||
public uuidEventMap: Map<string, Map<string, { name: string, fn: Function }[]>> = new Map();
|
||||
public fns: any = {
|
||||
mousedown: null,
|
||||
pointerdown: null,
|
||||
pointerup: null,
|
||||
pointermove: null,
|
||||
keydown: null,
|
||||
keyup: null,
|
||||
touchstart: null,
|
||||
dblclick: null,
|
||||
};
|
||||
//整个主场景的box3
|
||||
public sceneBox3 = new THREE.Box3();
|
||||
public package: Package;
|
||||
private _pluginNeedsRender = false;
|
||||
|
||||
/** 供插件/内部模块请求下一帧强制渲染,传 true 标记,animate() 检测后自动清除 */
|
||||
pluginRequestRender(value: boolean) {
|
||||
this._pluginNeedsRender = value;
|
||||
}
|
||||
|
||||
constructor(options: IViewerSetting) {
|
||||
super();
|
||||
@@ -216,6 +230,7 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
this.renderer = this.createEngine();
|
||||
|
||||
this.modules = this.initModules();
|
||||
this.package = new Package(this);
|
||||
|
||||
/** helpers **/
|
||||
if (this.options.grid.enabled) {
|
||||
@@ -359,6 +374,8 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
set enableScript(enable: boolean) {
|
||||
if (enable === this.enableScript) return;
|
||||
|
||||
this.options.enableScript = enable;
|
||||
|
||||
if (enable) {
|
||||
this.installScripts();
|
||||
} else {
|
||||
@@ -588,14 +605,14 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
* 初始化事件监听
|
||||
*/
|
||||
initEvent() {
|
||||
Fn.pointerdown = this.onPointerDown.bind(this);
|
||||
this.container.addEventListener('pointerdown', Fn.pointerdown);
|
||||
Fn.pointermove = this.onPointerMove.bind(this);
|
||||
this.container.addEventListener('pointermove', Fn.pointermove);
|
||||
Fn.touchstart = this.onTouchStart.bind(this);
|
||||
this.container.addEventListener('touchstart', Fn.touchstart);
|
||||
Fn.dblclick = this.onDoubleClick.bind(this)
|
||||
this.container.addEventListener('dblclick', Fn.dblclick);
|
||||
this.fns.pointerdown = this.onPointerDown.bind(this);
|
||||
this.container.addEventListener('pointerdown', this.fns.pointerdown);
|
||||
this.fns.pointermove = this.onPointerMove.bind(this);
|
||||
this.container.addEventListener('pointermove', this.fns.pointermove);
|
||||
this.fns.touchstart = this.onTouchStart.bind(this);
|
||||
this.container.addEventListener('touchstart', this.fns.touchstart);
|
||||
this.fns.dblclick = this.onDoubleClick.bind(this)
|
||||
this.container.addEventListener('dblclick', this.fns.dblclick);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -603,9 +620,13 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
* @param uuids 传入此参数则仅组装此数组下Object.uuid的脚本
|
||||
* @param filterName 传入此参数则仅组装此数组下Object.uuid的脚本中name匹配的脚本
|
||||
*/
|
||||
installScripts(uuids?: string | string[], filterName: string = "") {
|
||||
installScripts(uuids?: string | string[], filterName: string = "", options: InstallScriptsOptions = {}) {
|
||||
if (!this.enableScript) return;
|
||||
|
||||
const { invokeLoaded = false, loadedScriptNames = [] } = options;
|
||||
const loadedScriptNameSet = new Set(loadedScriptNames.filter(Boolean));
|
||||
const shouldInvokeLoadedAfterInstall = invokeLoaded || loadedScriptNameSet.size > 0;
|
||||
|
||||
// 注册 Helper
|
||||
const helper = new ScriptHelper(this.scene);
|
||||
|
||||
@@ -619,7 +640,7 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
}
|
||||
|
||||
// 拼接下方闭包函数返回的结构,即返回脚本中写的支持的事件函数
|
||||
const validEvents = Object.keys(events);
|
||||
const validEvents = Object.keys(this.events);
|
||||
|
||||
// 准备返回结构
|
||||
validEvents.forEach(eventName => {
|
||||
@@ -643,7 +664,8 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
|
||||
// 一个模型允许存在多个脚本
|
||||
const scripts = App.scripts[uuid] || [];
|
||||
const uuidEvents = uuidEventMap.get(uuid) || new Map<string, { name: string, fn: Function }[]>();
|
||||
const uuidEvents = this.uuidEventMap.get(uuid) || new Map<string, { name: string, fn: Function }[]>();
|
||||
const scriptsNeedLoaded = new Set<string>();
|
||||
|
||||
scripts.forEach(script => {
|
||||
// 如果存在需要按照name过滤
|
||||
@@ -657,6 +679,11 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
this.camera, this.modules.controls, this.timer, fns.render
|
||||
);
|
||||
|
||||
const shouldInvokeLoaded = loadedScriptNameSet.size > 0 ? loadedScriptNameSet.has(script.name) : invokeLoaded;
|
||||
if (shouldInvokeLoaded && typeof functions.loaded === "function") {
|
||||
scriptsNeedLoaded.add(script.name);
|
||||
}
|
||||
|
||||
Object.entries(functions).forEach(([name, fn]) => {
|
||||
if (!fn || !validEvents.includes(name)) {
|
||||
if (fn && !validEvents.includes(name)) {
|
||||
@@ -669,12 +696,16 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
const {type, target, ...params} = e;
|
||||
|
||||
// 点击事件只分发给对应模型
|
||||
if (["onPick", "onDoubleClick"].includes(name)) {
|
||||
const {intersect, object: _object} = params;
|
||||
if (["onPick", "onDoubleClick", "bindDataChange"].includes(name)) {
|
||||
const {intersect, object: _object, data, config, index} = params;
|
||||
|
||||
if (_object.uuid !== object.uuid) return;
|
||||
|
||||
(fn as Function).bind(object)(intersect as THREE.Intersection);
|
||||
if (name === "bindDataChange") {
|
||||
(fn as Function).bind(object)(data, config, index);
|
||||
} else {
|
||||
(fn as Function).bind(object)(intersect as THREE.Intersection);
|
||||
}
|
||||
} else {
|
||||
if (isEmptyObject(params)) {
|
||||
(fn as Function).bind(object)();
|
||||
@@ -685,8 +716,8 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
}
|
||||
|
||||
// 添加到全局事件集合
|
||||
if (!events[name][uuid]) events[name][uuid] = [];
|
||||
events[name][uuid].push(boundFn);
|
||||
if (!this.events[name][uuid]) this.events[name][uuid] = [];
|
||||
this.events[name][uuid].push(boundFn);
|
||||
|
||||
// 添加到 UUID 事件映射
|
||||
if (!uuidEvents.has(name)) uuidEvents.set(name, []);
|
||||
@@ -701,7 +732,13 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
});
|
||||
|
||||
// 更新 UUID 映射
|
||||
uuidEventMap.set(uuid, uuidEvents);
|
||||
this.uuidEventMap.set(uuid, uuidEvents);
|
||||
|
||||
if (shouldInvokeLoadedAfterInstall) {
|
||||
scriptsNeedLoaded.forEach(scriptName => {
|
||||
this.invokeInstalledScriptEvent(uuid, scriptName, "loaded");
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// 处理指定 UUID 或全部
|
||||
@@ -711,15 +748,15 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
Object.keys(App.scripts).forEach(processUuid);
|
||||
}
|
||||
|
||||
if (!Fn.keydown) {
|
||||
Fn.keydown = (event: KeyboardEvent) => {
|
||||
if (!this.fns.keydown) {
|
||||
this.fns.keydown = (event: KeyboardEvent) => {
|
||||
this.dispatchEvent({type: "onKeyDown", event})
|
||||
}
|
||||
window.addEventListener('keydown', Fn.keydown);
|
||||
Fn.keyup = (event: KeyboardEvent) => {
|
||||
window.addEventListener('keydown', this.fns.keydown);
|
||||
this.fns.keyup = (event: KeyboardEvent) => {
|
||||
this.dispatchEvent({type: "onKeyUp", event})
|
||||
}
|
||||
window.addEventListener('keyup', Fn.keyup);
|
||||
window.addEventListener('keyup', this.fns.keyup);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -729,9 +766,9 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
* @param filterName 传入此参数则仅卸载此Object.uuid的脚本中name匹配的脚本
|
||||
*/
|
||||
uninstallScriptsByUuid(uuid: string, filterName: string = "") {
|
||||
if (!uuidEventMap.has(uuid)) return;
|
||||
if (!this.uuidEventMap.has(uuid)) return;
|
||||
|
||||
const uuidEvents = uuidEventMap.get(uuid)!;
|
||||
const uuidEvents = this.uuidEventMap.get(uuid)!;
|
||||
|
||||
const uuidEventsArray = Array.from(uuidEvents);
|
||||
for (let i = uuidEventsArray.length - 1; i >= 0; i--) {
|
||||
@@ -753,7 +790,7 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
}
|
||||
|
||||
// 全局事件集合
|
||||
const es = events[eventName][uuid];
|
||||
const es = this.events[eventName][uuid];
|
||||
// 移除相应函数
|
||||
const ei = es.findIndex(f => f === sc.fn);
|
||||
if (ei !== -1) {
|
||||
@@ -761,40 +798,79 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
}
|
||||
|
||||
if (es.length === 0) {
|
||||
delete events[eventName][uuid];
|
||||
delete this.events[eventName][uuid];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 清理 UUID 映射
|
||||
if (Array.from(uuidEvents.keys()).length === 0) {
|
||||
uuidEventMap.delete(uuid);
|
||||
this.uuidEventMap.delete(uuid);
|
||||
}
|
||||
}
|
||||
|
||||
invokeInstalledScriptEvent<T extends keyof ViewerEventMap>(
|
||||
uuid: string,
|
||||
scriptName: string,
|
||||
eventName: T,
|
||||
payload: Partial<ViewerEventMap[T]> = {}
|
||||
): boolean {
|
||||
const uuidEvents = this.uuidEventMap.get(uuid);
|
||||
if (!uuidEvents) return false;
|
||||
|
||||
const handlers = uuidEvents.get(String(eventName));
|
||||
if (!handlers || handlers.length === 0) return false;
|
||||
|
||||
let executed = false;
|
||||
handlers.forEach(handler => {
|
||||
if (handler.name !== scriptName) return;
|
||||
|
||||
try {
|
||||
handler.fn({
|
||||
...payload,
|
||||
type: eventName,
|
||||
target: this,
|
||||
});
|
||||
executed = true;
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
App.log.error(`[Script] 执行 ${scriptName}.${String(eventName)} 失败: ${message}`);
|
||||
}
|
||||
});
|
||||
|
||||
return executed;
|
||||
}
|
||||
|
||||
reinstallObjectScripts(uuid: string, loadedScriptNames: string[] = []): void {
|
||||
if (!uuid) return;
|
||||
|
||||
const uniqueLoadedScriptNames = Array.from(new Set(loadedScriptNames.filter(Boolean)));
|
||||
|
||||
this.uninstallScriptsByUuid(uuid);
|
||||
this.installScripts([uuid], "", uniqueLoadedScriptNames.length > 0 ? { loadedScriptNames: uniqueLoadedScriptNames } : undefined);
|
||||
}
|
||||
|
||||
/**
|
||||
* 卸载所有脚本
|
||||
*/
|
||||
unInstallScripts() {
|
||||
if (this.enableScript) return;
|
||||
|
||||
// 直接遍历 UUID 映射,复杂度 O(n)
|
||||
uuidEventMap.forEach((_, uuid) => {
|
||||
this.uuidEventMap.forEach((_, uuid) => {
|
||||
this.uninstallScriptsByUuid(uuid);
|
||||
});
|
||||
|
||||
// 重置数据结构
|
||||
uuidEventMap.clear();
|
||||
Object.keys(events).forEach(event => {
|
||||
events[event] = {};
|
||||
this.uuidEventMap.clear();
|
||||
Object.keys(this.events).forEach(event => {
|
||||
this.events[event] = {};
|
||||
});
|
||||
|
||||
if (Fn.keydown) {
|
||||
window.removeEventListener('keydown', Fn.keydown);
|
||||
Fn.keydown = null;
|
||||
if (this.fns.keydown) {
|
||||
window.removeEventListener('keydown', this.fns.keydown);
|
||||
this.fns.keydown = null;
|
||||
|
||||
window.removeEventListener('keyup', Fn.keyup);
|
||||
Fn.keyup = null;
|
||||
window.removeEventListener('keyup', this.fns.keyup);
|
||||
this.fns.keyup = null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -901,8 +977,8 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
event.preventDefault();
|
||||
const array = getMousePosition(this.container, event.clientX, event.clientY);
|
||||
onDownPosition.fromArray(array);
|
||||
Fn.pointerup = this.onPointerUp.bind(this);
|
||||
document.addEventListener('pointerup', Fn.pointerup);
|
||||
this.fns.pointerup = this.onPointerUp.bind(this);
|
||||
document.addEventListener('pointerup', this.fns.pointerup);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -915,8 +991,8 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
const array = getMousePosition(this.container, event.clientX, event.clientY);
|
||||
onUpPosition.fromArray(array);
|
||||
this.handleClick();
|
||||
document.removeEventListener('pointerup', Fn.pointerup);
|
||||
Fn.pointerup = null;
|
||||
document.removeEventListener('pointerup', this.fns.pointerup);
|
||||
this.fns.pointerup = null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -937,8 +1013,8 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
const touch = event.changedTouches[0];
|
||||
const array = getMousePosition(this.container, touch.clientX, touch.clientY);
|
||||
onDownPosition.fromArray(array);
|
||||
Fn.pointerup = this.onTouchEnd.bind(this);
|
||||
document.addEventListener('touchend', Fn.pointerup);
|
||||
this.fns.pointerup = this.onTouchEnd.bind(this);
|
||||
document.addEventListener('touchend', this.fns.pointerup);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -952,8 +1028,8 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
const array = getMousePosition(this.container, touch.clientX, touch.clientY);
|
||||
onUpPosition.fromArray(array);
|
||||
this.handleClick();
|
||||
document.removeEventListener('touchend', Fn.pointerup);
|
||||
Fn.pointerup = null;
|
||||
document.removeEventListener('touchend', this.fns.pointerup);
|
||||
this.fns.pointerup = null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -991,6 +1067,9 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
this.dispatchEvent({type: 'beforeAnimation', delta: timeStamp});
|
||||
|
||||
let needRender = App.animationManager.update(timeStamp);
|
||||
if (TWEEN.update()) {
|
||||
needRender = true;
|
||||
}
|
||||
if (needRender) {
|
||||
if (App.selected !== null && App.selected.animations.length > 0) {
|
||||
// 避免某些蒙皮网格的帧延迟效应(e.g. Michelle.glb)
|
||||
@@ -1034,6 +1113,11 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
needRender = true;
|
||||
}
|
||||
|
||||
if (this._pluginNeedsRender) {
|
||||
needRender = true;
|
||||
this._pluginNeedsRender = false;
|
||||
}
|
||||
|
||||
this.dispatchEvent({type: 'afterAnimation', delta: timeStamp, toBeRender: (_needRender:boolean = false) => {
|
||||
needRender = _needRender;
|
||||
}
|
||||
@@ -1130,14 +1214,14 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
dispose() {
|
||||
this.dispatchEvent({type: "beforeDestroy"});
|
||||
|
||||
this.container.removeEventListener('mousedown', Fn.mousedown);
|
||||
Fn.mousedown = null;
|
||||
this.container.removeEventListener('pointermove', Fn.pointermove);
|
||||
Fn.pointermove = null;
|
||||
this.container.removeEventListener('touchstart', Fn.touchstart);
|
||||
Fn.touchstart = null;
|
||||
this.container.removeEventListener('dblclick', Fn.dblclick);
|
||||
Fn.dblclick = null;
|
||||
this.container.removeEventListener('mousedown', this.fns.mousedown);
|
||||
this.fns.mousedown = null;
|
||||
this.container.removeEventListener('pointermove', this.fns.pointermove);
|
||||
this.fns.pointermove = null;
|
||||
this.container.removeEventListener('touchstart', this.fns.touchstart);
|
||||
this.fns.touchstart = null;
|
||||
this.container.removeEventListener('dblclick', this.fns.dblclick);
|
||||
this.fns.dblclick = null;
|
||||
|
||||
Object.keys(this.modules).forEach(key => {
|
||||
if (this.modules[key].dispose) {
|
||||
@@ -1148,6 +1232,8 @@ export default class Viewer extends THREE.EventDispatcher<ViewerEventMap> {
|
||||
this.dispatchEvent({type: "afterDestroy"});
|
||||
|
||||
this.unInstallScripts();
|
||||
this.package?.dispose();
|
||||
this.package = null as any;
|
||||
}
|
||||
|
||||
/* -----------------暂时放在Viewer下的工具方法-------------------- */
|
||||
|
||||
@@ -2,15 +2,21 @@ import * as THREE from "three";
|
||||
import {RoomEnvironment} from "three/examples/jsm/environments/RoomEnvironment.js";
|
||||
import {ShaderPass} from "three/examples/jsm/postprocessing/ShaderPass.js";
|
||||
import {Effect} from "./Effect";
|
||||
import {useAddSignal} from "@/hooks";
|
||||
import {useAddSignal, useRemoveSignal} from "@/hooks";
|
||||
import Viewer from "../Viewer";
|
||||
import App from "@/core/app/App";
|
||||
import {focusObject} from "@/utils/scene/controls.ts";
|
||||
|
||||
type SignalListenerRecord = {
|
||||
name: string;
|
||||
listener: (...params: any[]) => void;
|
||||
};
|
||||
|
||||
export class Signals {
|
||||
private readonly viewer: Viewer;
|
||||
|
||||
private useBackgroundAsEnvironment = false;
|
||||
private readonly signalListeners: SignalListenerRecord[] = [];
|
||||
|
||||
constructor(viewer:Viewer) {
|
||||
this.viewer = viewer;
|
||||
@@ -18,41 +24,46 @@ export class Signals {
|
||||
this.init();
|
||||
}
|
||||
|
||||
private registerSignal(name: string, listener: (...params: any[]) => void) {
|
||||
this.signalListeners.push({ name, listener });
|
||||
useAddSignal(name, listener);
|
||||
}
|
||||
|
||||
init() {
|
||||
useAddSignal("sceneCleared", this.sceneCleared.bind(this));
|
||||
useAddSignal("transformModeChanged", this.transformModeChanged.bind(this));
|
||||
useAddSignal("snapChanged", this.snapChanged.bind(this));
|
||||
useAddSignal("spaceChanged", this.spaceChanged.bind(this));
|
||||
useAddSignal("effectEnabledChange", this.effectEnabledChange.bind(this));
|
||||
this.registerSignal("sceneCleared", this.sceneCleared.bind(this));
|
||||
this.registerSignal("transformModeChanged", this.transformModeChanged.bind(this));
|
||||
this.registerSignal("snapChanged", this.snapChanged.bind(this));
|
||||
this.registerSignal("spaceChanged", this.spaceChanged.bind(this));
|
||||
this.registerSignal("effectEnabledChange", this.effectEnabledChange.bind(this));
|
||||
|
||||
useAddSignal("rendererUpdated", this.rendererUpdated.bind(this));
|
||||
useAddSignal("rendererCreated", this.rendererCreated.bind(this));
|
||||
useAddSignal("rendererConfigUpdate", this.rendererConfigUpdate.bind(this));
|
||||
useAddSignal("rendererDetectKTX2Support", this.rendererDetectKTX2Support.bind(this));
|
||||
this.registerSignal("rendererUpdated", this.rendererUpdated.bind(this));
|
||||
this.registerSignal("rendererCreated", this.rendererCreated.bind(this));
|
||||
this.registerSignal("rendererConfigUpdate", this.rendererConfigUpdate.bind(this));
|
||||
this.registerSignal("rendererDetectKTX2Support", this.rendererDetectKTX2Support.bind(this));
|
||||
|
||||
useAddSignal("sceneBackgroundChanged", this.sceneBackgroundChanged.bind(this));
|
||||
useAddSignal("sceneEnvironmentChanged", this.sceneEnvironmentChanged.bind(this));
|
||||
useAddSignal("sceneGraphChanged", this.sceneGraphChanged.bind(this));
|
||||
useAddSignal("cameraChanged", this.cameraChanged.bind(this));
|
||||
useAddSignal("cameraReset", this.viewer.updateAspectRatio.bind(this.viewer));
|
||||
useAddSignal("viewportCameraChanged", this.viewportCameraChanged.bind(this));
|
||||
useAddSignal("viewportShadingChanged", this.viewportShadingChanged.bind(this));
|
||||
this.registerSignal("sceneBackgroundChanged", this.sceneBackgroundChanged.bind(this));
|
||||
this.registerSignal("sceneEnvironmentChanged", this.sceneEnvironmentChanged.bind(this));
|
||||
this.registerSignal("sceneGraphChanged", this.sceneGraphChanged.bind(this));
|
||||
this.registerSignal("cameraChanged", this.cameraChanged.bind(this));
|
||||
this.registerSignal("cameraReset", this.viewer.updateAspectRatio.bind(this.viewer));
|
||||
this.registerSignal("viewportCameraChanged", this.viewportCameraChanged.bind(this));
|
||||
this.registerSignal("viewportShadingChanged", this.viewportShadingChanged.bind(this));
|
||||
|
||||
useAddSignal("objectSelected", this.objectSelected.bind(this));
|
||||
useAddSignal("objectFocused", this.objectFocused.bind(this));
|
||||
useAddSignal("objectAdded", this.objectAdded.bind(this));
|
||||
useAddSignal("objectChanged", this.objectChanged.bind(this));
|
||||
useAddSignal("objectRemoved", this.objectRemoved.bind(this));
|
||||
this.registerSignal("objectSelected", this.objectSelected.bind(this));
|
||||
this.registerSignal("objectFocused", this.objectFocused.bind(this));
|
||||
this.registerSignal("objectAdded", this.objectAdded.bind(this));
|
||||
this.registerSignal("objectChanged", this.objectChanged.bind(this));
|
||||
this.registerSignal("objectRemoved", this.objectRemoved.bind(this));
|
||||
|
||||
useAddSignal("geometryChanged", this.geometryChanged.bind(this));
|
||||
useAddSignal("materialChanged", this.materialChanged.bind(this));
|
||||
this.registerSignal("geometryChanged", this.geometryChanged.bind(this));
|
||||
this.registerSignal("materialChanged", this.materialChanged.bind(this));
|
||||
|
||||
useAddSignal("sceneResize", this.sceneResize.bind(this));
|
||||
useAddSignal("showGridChanged", this.showGridChanged.bind(this));
|
||||
this.registerSignal("sceneResize", this.sceneResize.bind(this));
|
||||
this.registerSignal("showGridChanged", this.showGridChanged.bind(this));
|
||||
|
||||
useAddSignal("scriptAdded",this.scriptAdded.bind(this));
|
||||
useAddSignal("scriptRemoved",this.scriptRemoved.bind(this));
|
||||
useAddSignal("scriptChanged",this.scriptChanged.bind(this));
|
||||
this.registerSignal("scriptAdded",this.scriptAdded.bind(this));
|
||||
this.registerSignal("scriptRemoved",this.scriptRemoved.bind(this));
|
||||
this.registerSignal("scriptChanged",this.scriptChanged.bind(this));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -66,6 +77,8 @@ export class Signals {
|
||||
* 清空
|
||||
*/
|
||||
sceneCleared() {
|
||||
this.viewer.unInstallScripts();
|
||||
|
||||
this.viewer.modules.controls.setTarget(0, 0, 0,true);
|
||||
this.viewer.pathtracer?.reset();
|
||||
|
||||
@@ -453,15 +466,29 @@ export class Signals {
|
||||
/**
|
||||
* 添加脚本
|
||||
*/
|
||||
scriptAdded(object:THREE.Object3D, _:ISceneScript){
|
||||
this.viewer.installScripts([object.uuid]);
|
||||
scriptAdded(object:THREE.Object3D, sc:ISceneScript){
|
||||
if (!object?.uuid || !sc?.name) return;
|
||||
|
||||
try {
|
||||
this.viewer.reinstallObjectScripts(object.uuid, [sc.name]);
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
App.log.error(`[Script] 热安装脚本 ${sc.name} 失败: ${message}`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 移除脚本
|
||||
*/
|
||||
scriptRemoved(object:THREE.Object3D, sc:ISceneScript){
|
||||
this.viewer.uninstallScriptsByUuid(object.uuid,sc.name);
|
||||
if (!object?.uuid) return;
|
||||
|
||||
try {
|
||||
this.viewer.reinstallObjectScripts(object.uuid);
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
App.log.error(`[Script] 卸载脚本 ${sc?.name || "unknown"} 失败: ${message}`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -469,8 +496,14 @@ export class Signals {
|
||||
*/
|
||||
scriptChanged(attributeName:string,object:THREE.Object3D, sc:ISceneScript){
|
||||
if(attributeName !== "source") return;
|
||||
if (!object?.uuid || !sc?.name) return;
|
||||
|
||||
this.viewer.installScripts([object.uuid],sc.name);
|
||||
try {
|
||||
this.viewer.reinstallObjectScripts(object.uuid, [sc.name]);
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
App.log.error(`[Script] 热更新脚本 ${sc.name} 失败: ${message}`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -479,4 +512,11 @@ export class Signals {
|
||||
render(){
|
||||
this.viewer.render();
|
||||
}
|
||||
|
||||
dispose() {
|
||||
this.signalListeners.forEach(({ name, listener }) => {
|
||||
useRemoveSignal(name, listener);
|
||||
});
|
||||
this.signalListeners.length = 0;
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,8 @@ export default defineConfig(async ({mode, command}) => {
|
||||
root,
|
||||
compress: {
|
||||
compress: VITE_BUILD_COMPRESS,
|
||||
deleteOriginFile: VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE,
|
||||
// SDK 作为 workspace 依赖需要保留原始产物,package.json 的 main/module/exports 依赖这些文件
|
||||
deleteOriginFile: false,
|
||||
},
|
||||
enableAnalyze: VITE_ENABLE_ANALYZE,
|
||||
enableConfig:VITE_ENABLE_CONFIG_GENERATE
|
||||
|
||||
Reference in New Issue
Block a user