From aeaeb9aec570e06ec32f1d0243beaa1ab360fe64 Mon Sep 17 00:00:00 2001
From: zhangshun <453905631@qq.com>
Date: Fri, 29 May 2026 17:24:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=A8=A1=E5=9E=8B=E5=BA=93?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=92=8C=E5=BC=80=E5=8F=91=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example                              |  4 ++--
 web/src/pages/app/app.css                 | 25 +++++++++++++----------
 web/src/pages/app/layout.ts               | 12 +++++------
 web/src/pages/app/modules/dictionaries.ts |  1 +
 web/src/pages/app/modules/models.ts       |  5 ++++-
 web/src/pages/app/modules/preview.ts      |  1 +
 web/src/pages/app/modules/users.ts        |  1 +
 web/src/styles/base.css                   |  5 +++--
 web/src/ui/dialogs.ts                     |  3 +++
 web/src/vendor/w2ui.ts                    |  1 +
 web/vite.config.ts                        | 10 ++++++++-
 11 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/.env.example b/.env.example
index 9531c24..8e32cda 100644
--- a/.env.example
+++ b/.env.example
@@ -5,8 +5,8 @@ DB_PATH=
 
 # login: show login page
 # fixed: auto login with FIXED_LOGIN_USERNAME and open model library directly
-APP_AUTH_MODE=login
-FIXED_LOGIN_USERNAME=
+APP_AUTH_MODE=fixed
+FIXED_LOGIN_USERNAME=admin
 FIXED_LOGIN_ROLE=user
 ALLOW_USER_EDIT_SYSTEM_LIBRARY=false
 
diff --git a/web/src/pages/app/app.css b/web/src/pages/app/app.css
index 18da720..009002a 100644
--- a/web/src/pages/app/app.css
+++ b/web/src/pages/app/app.css
@@ -1,11 +1,12 @@
 .app-shell {
   height: 100vh;
   display: grid;
-  grid-template-rows: 42px 1fr;
+  /* grid-template-rows: 42px 1fr; */
 }
 
 .topbar {
-  display: flex;
+  /* display: flex; */
+  display: none;
   align-items: center;
   justify-content: space-between;
   gap: 14px;
@@ -50,6 +51,7 @@
   display: grid;
   grid-template-rows: auto auto 1fr auto;
   overflow: hidden;
+  background: #fff;
 }
 
 .content-toolbar {
@@ -80,17 +82,17 @@
 
 .filter-toolbar {
   display: grid;
-  grid-template-columns: minmax(120px, 160px) minmax(120px, 160px) minmax(200px, 1fr) auto;
+  grid-template-columns: minmax(120px, 200px) minmax(120px, 200px) minmax(200px, 200px) minmax(50px, 80px) minmax(50px, 80px);
   align-items: end;
   gap: 8px;
   padding: 8px 12px;
-  background: #f8fafb;
+  /* background: #f8fafb; */
   border-bottom: 1px solid #d8e0e8;
 }
 
 .filter-toolbar label {
-  display: grid;
-  gap: 3px;
+  /* display: grid;
+  gap: 3px; */
 }
 
 .filter-toolbar span {
@@ -129,21 +131,21 @@
 
 .thumb {
   position: relative;
-  height: 150px;
+  min-height: 150px;
   display: grid;
   place-items: center;
-  background:
+  /* background:
     linear-gradient(45deg, #edf2f5 25%, transparent 25%),
     linear-gradient(-45deg, #edf2f5 25%, transparent 25%),
     linear-gradient(45deg, transparent 75%, #edf2f5 75%),
     linear-gradient(-45deg, transparent 75%, #edf2f5 75%),
-    #f8fafb;
+    #f8fafb; */
   background-position: 0 0, 0 6px, 6px -6px, -6px 0;
   background-size: 12px 12px;
   border: 1px solid #d3dde5;
   border-radius: 4px;
   overflow: hidden;
-  padding: 4px;
+  /* padding: 4px; */
 }
 
 .thumb-actions {
@@ -253,6 +255,7 @@ dd {
 
 .pagination-total,
 .pagination-range {
+  display: none;
   color: #647586;
   font-size: 12px;
 }
@@ -331,7 +334,7 @@ dd {
   }
 
   .keyword-filter {
-    grid-column: 1 / -1;
+    /* grid-column: 1 / -1; */
   }
 
   .pagination {
diff --git a/web/src/pages/app/layout.ts b/web/src/pages/app/layout.ts
index a524e08..f9cc8e9 100644
--- a/web/src/pages/app/layout.ts
+++ b/web/src/pages/app/layout.ts
@@ -31,14 +31,11 @@ export async function renderApp() {
       <template id="modelPanelTemplate">
         <main class="content-pane">
           <div class="content-toolbar">
-            <div>
-              <h2>模型列表</h2>
-            </div>
             <div class="content-actions">
               ${isAdmin ? `<button id="manageUsersBtn" type="button">人员权限</button>` : ""}
               ${isAdmin ? `<button id="manageDictionariesBtn" type="button">字典维护</button>` : ""}
-              <button id="addProcessModelBtn" type="button" hidden>上传工艺模型</button>
-              <button id="addModelBtn" class="primary-btn" type="button" hidden>增加模型</button>
+              ${isAdmin ? `<button id="addProcessModelBtn" type="button" hidden>上传工艺模型</button>` : ""}
+              ${isAdmin ? `<button id="addModelBtn1" class="primary-btn" type="button" hidden>增加模型</button>` : ""}
             </div>
           </div>
           <div class="filter-toolbar">
@@ -59,6 +56,7 @@ export async function renderApp() {
               <input id="keywordFilter" placeholder="模型名 / 文件名 / 属性" />
             </label>
             <button id="resetFilterBtn" type="button">重置</button>
+            <button id="addModelBtn" class="primary-btn" type="button">增加模型</button>
           </div>
           <div id="modelGrid" class="model-grid"></div>
           <footer id="modelPagination" class="pagination"></footer>
@@ -92,8 +90,8 @@ function renderWorkspaceLayout() {
     panels: [
       {
         type: "left",
-        size: 300,
-        minSize: 220,
+        size: 180,
+        minSize: 150,
         resizable: true,
         overflow: "hidden",
         html: treeTemplate.innerHTML
diff --git a/web/src/pages/app/modules/dictionaries.ts b/web/src/pages/app/modules/dictionaries.ts
index ebd53b3..3640619 100644
--- a/web/src/pages/app/modules/dictionaries.ts
+++ b/web/src/pages/app/modules/dictionaries.ts
@@ -24,6 +24,7 @@ export async function openDictionaryManager(onChanged?: () => Promise<void> | vo
     title: "品牌 / 类型维护",
     width: 680,
     height: 520,
+    blockPage: false,
     body: `
       <div class="dictionary-manager">
         ${dictionaryPanelHtml("brands", "品牌")}
diff --git a/web/src/pages/app/modules/models.ts b/web/src/pages/app/modules/models.ts
index ebc8250..518f525 100644
--- a/web/src/pages/app/modules/models.ts
+++ b/web/src/pages/app/modules/models.ts
@@ -231,7 +231,7 @@ function renderModelCard(item: ModelItem) {
   const prop = item.properties ?? {};
   const thumb = item.thumbnail_url
     ? `<img src="${item.thumbnail_url}" alt="" />`
-    : `<div class="thumb-placeholder">GLB</div>`;
+    : `<div class="thumb-placeholder">暂无预览图</div>`;
   return `
     <article class="model-card" data-model-id="${item.id}">
       <div class="model-info">
@@ -391,6 +391,7 @@ async function openUploadModelDialog() {
     title: "增加模型",
     width: 560,
     height: 520,
+    blockPage: false,
     body: `
       <form id="modelUploadPopupForm" class="popup-form upload-popup-form">
         <label>
@@ -466,6 +467,7 @@ export async function openProcessModelUploadDialog(input?: {
     title: "上传工艺模型",
     width: 640,
     height: 650,
+    blockPage: false,
     body: `
       <form id="processModelUploadPopupForm" class="popup-form upload-popup-form">
         <div class="upload-target-path">
@@ -656,6 +658,7 @@ async function editModel(id: number) {
     title: "编辑模型",
     width: 520,
     height: 390,
+    blockPage: false,
     body: `
       <form id="modelEditPopupForm" class="popup-form">
         <label><span>模型名称</span><input name="name" value="${escapeHtml(oldName)}" /></label>
diff --git a/web/src/pages/app/modules/preview.ts b/web/src/pages/app/modules/preview.ts
index b569517..563c0a9 100644
--- a/web/src/pages/app/modules/preview.ts
+++ b/web/src/pages/app/modules/preview.ts
@@ -105,6 +105,7 @@ export function openModelPreview(
     width: 860,
     height: 620,
     modal: true,
+    blockPage: false,
     body: `
       <div class="preview-shell">
         <aside class="preview-process-panel">
diff --git a/web/src/pages/app/modules/users.ts b/web/src/pages/app/modules/users.ts
index c9a2c2e..6e504db 100644
--- a/web/src/pages/app/modules/users.ts
+++ b/web/src/pages/app/modules/users.ts
@@ -16,6 +16,7 @@ export async function openUserManager() {
     title: "人员权限管理",
     width: 980,
     height: 560,
+    blockPage: false,
     body: `
       <div class="user-manager">
         <header class="user-manager-head">
diff --git a/web/src/styles/base.css b/web/src/styles/base.css
index be6816c..c44a742 100644
--- a/web/src/styles/base.css
+++ b/web/src/styles/base.css
@@ -1,6 +1,5 @@
 :root {
   font-family: "Microsoft YaHei", Arial, sans-serif;
-  font-size: 13px;
   color: #1c2733;
   background: #eef2f5;
 }
@@ -8,7 +7,9 @@
 * {
   box-sizing: border-box;
 }
-
+html {
+  font-size: 62.5%;
+}
 body {
   margin: 0;
   min-width: 320px;
diff --git a/web/src/ui/dialogs.ts b/web/src/ui/dialogs.ts
index 9f45aea..a9b00a8 100644
--- a/web/src/ui/dialogs.ts
+++ b/web/src/ui/dialogs.ts
@@ -38,6 +38,7 @@ export function formDialog<T>(options: {
   title: string;
   width?: number;
   height?: number;
+  blockPage?: boolean;  
   body: string;
   onOpen?: () => void;
   onSubmit: () => Promise<T> | T;
@@ -57,6 +58,7 @@ export function formDialog<T>(options: {
       height: options.height ?? 300,
       modal: true,
       body: options.body,
+      blockPage: options.blockPage ?? false,  
       actions: {
         取消() {
           closeWith(null);
@@ -96,6 +98,7 @@ export async function promptDialog(options: {
   return formDialog<string>({
     title: options.title,
     height: 210,
+    blockPage: false,
     body: `
       <div class="popup-form">
         <label>
diff --git a/web/src/vendor/w2ui.ts b/web/src/vendor/w2ui.ts
index f34df80..e183a64 100644
--- a/web/src/vendor/w2ui.ts
+++ b/web/src/vendor/w2ui.ts
@@ -13,6 +13,7 @@ type W2Popup = {
     width?: number;
     height?: number;
     modal?: boolean;
+    blockPage?: boolean;
     body?: string;
     actions?: Record<string, () => void | Promise<void>>;
   }): {
diff --git a/web/vite.config.ts b/web/vite.config.ts
index 138187b..21cce82 100644
--- a/web/vite.config.ts
+++ b/web/vite.config.ts
@@ -16,7 +16,15 @@ export default defineConfig({
     strictPort: true,
     https: httpsConfig,
     headers: {
-      "Cross-Origin-Resource-Policy": "same-site"
+      // 关键：添加 COEP 和 COOP
+      "Cross-Origin-Embedder-Policy": "credentialless",  // 或 "require-corp"
+      "Cross-Origin-Opener-Policy": "same-origin",
+      "Cross-Origin-Resource-Policy": "cross-origin",  // 改为 cross-origin
+      // 开发环境允许跨域
+      "Access-Control-Allow-Origin": "https://localhost:3000",  // 父页面的地址
+      "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
+      "Access-Control-Allow-Headers": "Content-Type",
+      "Access-Control-Allow-Credentials": "true"
     },
     proxy: {
       "/api": "http://127.0.0.1:3001",