jvs-ppt-ui 0.0.18 → 0.0.20

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jvs-ppt-ui",
   "private": false,
-  "version": "0.0.18",
+  "version": "0.0.20",
   "type": "module",
   "main": "./dist/lib/jvs-ppt-ui.umd.js",
   "module": "./dist/lib/jvs-ppt-ui.es.js",

package/src/components/TemplateGallery.vue

@@ -106,9 +106,14 @@ const subTypeNameMap: Record<StockSubType, string> = {
   Videos: '高清视频'
 }
 
-// 顶层 3-Tab 状态（检索 / 我的素材 / 创建素材）与 jvs_session_v3 鉴权
+// 顶层 3-Tab 状态（联网搜索 / AI生成 / 我的空间）与 jvs_session_v3 鉴权
 export type MaterialMainTab = 'search' | 'mine' | 'create'
-const { isDamLoggedIn, sharedMaterialMainTab: activeMainTab, refreshSessionState } = useDamAuth()
+const {
+  isDamLoggedIn,
+  sharedMaterialMainTab: activeMainTab,
+  refreshSessionState,
+  probeRemoteSessionV3
+} = useDamAuth()
 
 const myAssetsRef = ref<InstanceType<typeof MyAssetsPanel> | null>(null)
 const createPanelRef = ref<InstanceType<typeof CreateMaterialPanel> | null>(null)
@@ -119,9 +124,9 @@ const guestToastText = ref('请先登录后使用该功能')
 let guestToastTimer: ReturnType<typeof setTimeout> | null = null
 
 function showGuestAuthToast(tabName: string) {
-  guestToastText.value = tabName === '我的素材'
-    ? '请先登录后查看「我的素材」'
-    : '请先登录后使用「创建素材」'
+  guestToastText.value = tabName === '我的空间'
+    ? '请先登录后查看「我的空间」'
+    : '请先登录后使用「AI生成」'
   guestToastVisible.value = true
   if (guestToastTimer) clearTimeout(guestToastTimer)
   guestToastTimer = setTimeout(() => {
@@ -129,11 +134,14 @@ function showGuestAuthToast(tabName: string) {
   }, 2200)
 }
 
-function handleSwitchMainTab(tab: MaterialMainTab) {
+async function handleSwitchMainTab(tab: MaterialMainTab) {
   refreshSessionState()
   if (tab !== 'search' && !isDamLoggedIn.value) {
-    showGuestAuthToast(tab === 'mine' ? '我的素材' : '创建素材')
-    return
+    const verified = await probeRemoteSessionV3(true)
+    if (!verified && !isDamLoggedIn.value) {
+      showGuestAuthToast(tab === 'mine' ? '我的空间' : 'AI生成')
+      return
+    }
   }
   activeMainTab.value = tab
 }
@@ -350,16 +358,19 @@ function openCustomListPreview(item: MaterialItem, list: MaterialItem[], e?: Eve
   previewVisible.value = true
 }
 
-// 将「检索」或「我的素材」中的图片一键送入「创建素材」作为参考图
-function handleSendToCreateRef(item: MaterialItem, e?: Event) {
+// 将「联网搜索」或「我的空间」中的图片一键送入「AI生成」作为参考图
+async function handleSendToCreateRef(item: MaterialItem, e?: Event) {
   if (e) {
     e.stopPropagation()
     e.preventDefault()
   }
   refreshSessionState()
   if (!isDamLoggedIn.value) {
-    showGuestAuthToast('创建素材')
-    return
+    const verified = await probeRemoteSessionV3(true)
+    if (!verified && !isDamLoggedIn.value) {
+      showGuestAuthToast('AI生成')
+      return
+    }
   }
   const thumbUrl = getMaterialThumb(item)
   if (!thumbUrl) {
@@ -936,7 +947,7 @@ watch([() => materialApiUrl?.value, () => materialPageApiUrl?.value, () => mater
       </button>
     </div>
 
-    <!-- 顶层 3-Tab 分段切换器（检索 | 我的素材 | 创建素材） -->
+    <!-- 顶层 3-Tab 分段切换器（联网搜索 | AI生成 | 我的空间） -->
     <div v-if="activeMainTab !== 'search' || viewMode === 'overview'" class="material-top-tabs-wrap">
       <div class="material-top-segmented">
         <button
@@ -945,22 +956,23 @@ watch([() => materialApiUrl?.value, () => materialPageApiUrl?.value, () => mater
           :class="{ active: activeMainTab === 'search' }"
           @click="handleSwitchMainTab('search')"
         >
-          <span>检索</span>
+          <span>联网搜索</span>
         </button>
 
         <button
           type="button"
           class="material-main-tab-btn"
           :class="{
-            active: activeMainTab === 'mine',
+            active: activeMainTab === 'create',
             'is-disabled': !isDamLoggedIn
           }"
-          :title="!isDamLoggedIn ? '请先登录后查看我的素材' : '查看我的项目与个人素材'"
-          @click="handleSwitchMainTab('mine')"
+          :title="!isDamLoggedIn ? '请先登录后使用AI生成' : 'AI 生成图片或视频素材'"
+          @click="handleSwitchMainTab('create')"
         >
-          <span>我的素材</span>
+          <span>AI生成</span>
+          <span v-if="isDamLoggedIn" class="tab-ai-spark">✦</span>
           <svg
-            v-if="!isDamLoggedIn"
+            v-else
             class="tab-lock-svg"
             viewBox="0 0 24 24"
             width="11"
@@ -978,16 +990,15 @@ watch([() => materialApiUrl?.value, () => materialPageApiUrl?.value, () => mater
           type="button"
           class="material-main-tab-btn"
           :class="{
-            active: activeMainTab === 'create',
+            active: activeMainTab === 'mine',
             'is-disabled': !isDamLoggedIn
           }"
-          :title="!isDamLoggedIn ? '请先登录后使用创建素材' : 'AI 生成图片或视频素材'"
-          @click="handleSwitchMainTab('create')"
+          :title="!isDamLoggedIn ? '请先登录后查看我的空间' : '查看我的项目与个人素材'"
+          @click="handleSwitchMainTab('mine')"
         >
-          <span>创建素材</span>
-          <span v-if="isDamLoggedIn" class="tab-ai-spark">✦</span>
+          <span>我的空间</span>
           <svg
-            v-else
+            v-if="!isDamLoggedIn"
             class="tab-lock-svg"
             viewBox="0 0 24 24"
             width="11"
@@ -1089,7 +1100,7 @@ watch([() => materialApiUrl?.value, () => materialPageApiUrl?.value, () => mater
                     v-if="isDamLoggedIn && cat.subType !== 'Videos' && !isVideoMaterial(item) && getMaterialThumb(item)"
                     type="button"
                     class="overview-card-ref-btn"
-                    title="作为参考图发送到「创建素材」"
+                    title="作为参考图发送到「AI生成」"
                     @click.stop.prevent="handleSendToCreateRef(item, $event)"
                   >
                     @参考
@@ -1240,7 +1251,7 @@ watch([() => materialApiUrl?.value, () => materialPageApiUrl?.value, () => mater
                   v-if="isDamLoggedIn && filterParams.activeSubType !== 'Videos' && !isVideoMaterial(item) && getMaterialThumb(item)"
                   type="button"
                   class="detail-card-ref-btn"
-                  title="作为参考图发送到「创建素材」"
+                  title="作为参考图发送到「AI生成」"
                   @click.stop.prevent="handleSendToCreateRef(item, $event)"
                 >
                   @参考

package/src/components/material/MyAssetsPanel.vue

@@ -522,20 +522,13 @@ function extractUploadedUrl(res: any): string {
 async function handleFileUploadChange(e: Event) {
   const input = e.target as HTMLInputElement
   const files = input.files ? Array.from(input.files) : []
-  input.value = ''
   if (files.length === 0) return
 
   isUploading.value = true
   try {
-    // 确保获取到默认项目 ID
-    let targetProjId = selectedProjectId.value
-    if (!targetProjId) {
-      if (projects.value.length === 0) {
-        await fetchProjectsAndFolders()
-      }
-      const personal = projects.value.find(p => p.type === 'PERSONAL') || projects.value[0]
-      targetProjId = personal?.id || ''
-    }
+    // 若用户已在下拉树中选择了具体项目则传入，否则交由后端 /jvs-dam/upload/file 自动归入当前用户的个人项目
+    const personal = projects.value.find(p => p.type === 'PERSONAL') || projects.value[0]
+    const targetProjId = selectedProjectId.value || personal?.id || ''
 
     let uploadedCount = 0
     for (const file of files) {
@@ -544,6 +537,7 @@ async function handleFileUploadChange(e: Event) {
       formData.append('file', file)
       formData.append('path', '/dam/media/')
       formData.append('fileName', file.name)
+      formData.append('name', file.name)
       formData.append('id', String(Date.now()))
       if (targetProjId) formData.append('projectId', targetProjId)
       if (selectedFolderId.value) formData.append('folderId', selectedFolderId.value)
@@ -556,25 +550,6 @@ async function handleFileUploadChange(e: Event) {
       const fileUrl = extractUploadedUrl(uploadRes)
       if (fileUrl) {
         uploadedCount++
-        // 同步登记为数字资产（若后端 upload/file 未自动入库 asset 表，则补偿调用 POST /asset）
-        if (targetProjId) {
-          try {
-            await damFetchJson('/asset', {
-              method: 'POST',
-              body: JSON.stringify({
-                projectId: targetProjId,
-                folderId: selectedFolderId.value || undefined,
-                name: file.name,
-                assetType: isVid ? 'VIDEO' : 'IMAGE',
-                sourceType: 'UPLOAD',
-                fileUrl,
-                fileExtension: file.name.split('.').pop()?.toLowerCase() || (isVid ? 'mp4' : 'png')
-              })
-            })
-          } catch {
-            // 忽略重复登记异常
-          }
-        }
       }
     }
 
@@ -588,6 +563,7 @@ async function handleFileUploadChange(e: Event) {
     notify(`上传素材失败: ${err.message || '网络异常'}`)
   } finally {
     isUploading.value = false
+    input.value = ''
   }
 }
 

package/src/components/material/useDamAuth.ts

@@ -44,24 +44,63 @@ function readStorageKey(storage: Storage | undefined, key: string): string {
   return ''
 }
 
+/**
+ * 向 Storage 写入 jvs- 标准包装格式数据（对齐 jvs-material-ui / jvs-narrivo-ai-ui 的 setStore 规范）
+ */
+function writeJvsStore(name: string, content: string): void {
+  if (typeof window === 'undefined' || !window.localStorage || !name) return
+  try {
+    const payload = JSON.stringify({
+      dataType: typeof content,
+      content,
+      datetime: Date.now()
+    })
+    window.localStorage.setItem(`jvs-${name}`, payload)
+    if (window.sessionStorage) {
+      window.sessionStorage.setItem(`jvs-${name}`, payload)
+    }
+  } catch {
+    // 忽略隐私模式或配额异常
+  }
+}
+
+function removeJvsStore(name: string): void {
+  if (typeof window === 'undefined') return
+  try {
+    window.localStorage?.removeItem(`jvs-${name}`)
+    window.localStorage?.removeItem(name)
+    window.sessionStorage?.removeItem(`jvs-${name}`)
+    window.sessionStorage?.removeItem(name)
+  } catch {
+    // ignore
+  }
+}
+
 /**
  * 提取 jvs_session_v3 登录凭证
  * 判定顺序：
- * 1. document.cookie 中的 jvs_session_v3
- * 2. localStorage / sessionStorage 中的 jvs_session_v3、jvs-jvs_session_v3、jvs-sessionV3、sessionV3
- * 3. materialHeaders 中显式传入的 jvs_session_v3
+ * 1. document.cookie 中的 jvs_session_v3 或 Set-Cookie（非 HttpOnly 场景）
+ * 2. localStorage / sessionStorage 中的 jvs_session_v3、jvs-jvs_session_v3、jvs-sessionV3、sessionV3、jvs-access_token
+ * 3. materialHeaders 中显式传入的 jvs_session_v3 或 Authorization
  */
 export function resolveJvsSessionV3(extraHeaders?: Record<string, string>): string {
   if (typeof window === 'undefined') return ''
 
-  // 1. Cookie: jvs_session_v3
-  const fromCookie = getCookieValue('jvs_session_v3')
+  // 1. Cookie: jvs_session_v3（若未开启 HttpOnly 可直接读取）
+  const fromCookie = getCookieValue('jvs_session_v3') || getCookieValue('Set-Cookie')
   if (fromCookie && fromCookie.trim()) {
     return fromCookie.trim()
   }
 
   // 2. LocalStorage / SessionStorage
-  const candidateKeys = ['jvs_session_v3', 'jvs-jvs_session_v3', 'jvs-sessionV3', 'sessionV3']
+  const candidateKeys = [
+    'jvs_session_v3',
+    'jvs-jvs_session_v3',
+    'jvs-sessionV3',
+    'sessionV3',
+    'jvs-access_token',
+    'access_token'
+  ]
   for (const key of candidateKeys) {
     const localVal = readStorageKey(window.localStorage, key)
     if (localVal) return localVal
@@ -71,7 +110,11 @@ export function resolveJvsSessionV3(extraHeaders?: Record<string, string>): stri
 
   // 3. 外部注入的 Headers
   if (extraHeaders) {
-    const headerVal = extraHeaders['jvs_session_v3'] || extraHeaders['JVS_SESSION_V3']
+    const headerVal =
+      extraHeaders['jvs_session_v3'] ||
+      extraHeaders['JVS_SESSION_V3'] ||
+      (extraHeaders['Authorization'] ? extraHeaders['Authorization'].replace(/^Bearer\s+/i, '') : '') ||
+      (extraHeaders['authorization'] ? extraHeaders['authorization'].replace(/^Bearer\s+/i, '') : '')
     if (typeof headerVal === 'string' && headerVal.trim()) {
       return headerVal.trim()
     }
@@ -80,6 +123,21 @@ export function resolveJvsSessionV3(extraHeaders?: Record<string, string>): stri
   return ''
 }
 
+/**
+ * 提取服务网关 Origin 前缀（如配置了完整域名则复用该域名，否则使用当前站点相对路径 ''）
+ */
+export function resolveGatewayOrigin(configuredUrl?: string): string {
+  if (configuredUrl && /^https?:\/\//i.test(configuredUrl.trim())) {
+    try {
+      const u = new URL(configuredUrl.trim())
+      return u.origin
+    } catch {
+      return ''
+    }
+  }
+  return ''
+}
+
 /**
  * 提取 DAM 服务基础路径（默认 /jvs-dam）
  */
@@ -101,6 +159,16 @@ export type DamMainTab = 'search' | 'mine' | 'create'
  */
 const sharedMaterialMainTab = ref<DamMainTab>('search')
 
+/**
+ * 针对主域 .bctools.cn 下 HttpOnly Cookie (jvs_session_v3) 的服务端换取/探测状态
+ * 说明：当 jvs_session_v3 设置了 HttpOnly=true 时，前端 document.cookie 无法直接读取，
+ * 需通过同域/跨子域携带 Cookie 请求 /jvs-system/login/token（对齐 jvs-material-ui / jvs-narrivo-ai-ui）换取 sessionV3。
+ */
+const remoteSessionToken = ref<string>('')
+const remoteCookieSessionVerified = ref<boolean>(false)
+let inFlightSessionProbe: Promise<boolean> | null = null
+let hasInitialProbed = false
+
 export function setSharedMaterialMainTab(tab: DamMainTab) {
   sharedMaterialMainTab.value = tab
 }
@@ -113,20 +181,157 @@ export function useDamAuth() {
   const sessionTick = ref(0)
   let pollTimer: ReturnType<typeof setInterval> | null = null
 
+  const damBaseUrl = computed(() => resolveDamBaseUrl(materialApiUrl.value))
+  const gatewayOrigin = computed(() => resolveGatewayOrigin(materialApiUrl.value))
+
+  /**
+   * 通过服务端接口换取/校验主域 (.bctools.cn) 下的 HttpOnly jvs_session_v3 Cookie
+   */
+  async function probeRemoteSessionV3(force = false): Promise<boolean> {
+    if (typeof window === 'undefined') return false
+
+    const localToken = resolveJvsSessionV3(materialHeaders.value) || remoteSessionToken.value
+    if (localToken && !force && hasInitialProbed) {
+      return true
+    }
+
+    if (inFlightSessionProbe) {
+      return inFlightSessionProbe
+    }
+
+    inFlightSessionProbe = (async () => {
+      hasInitialProbed = true
+      const origin = gatewayOrigin.value
+
+      // 1. 标准 JVS 换取方式：请求 /jvs-system/login/token（浏览器自动携带 .bctools.cn 下的 HttpOnly jvs_session_v3）
+      try {
+        const tokenResp = await fetch(`${origin}/jvs-system/login/token`, {
+          method: 'GET',
+          credentials: 'include',
+          headers: {
+            'jvs-rule-ua': encodeURI('2.4'),
+            ...(materialHeaders.value || {})
+          }
+        })
+
+        if (tokenResp.ok) {
+          const text = (await tokenResp.text()).trim()
+          if (text && !text.startsWith('<')) {
+            const parsed = JSON.parse(text)
+            const code = parsed?.code ?? parsed?.data?.code
+            const tokenData = parsed?.data?.data !== undefined ? parsed.data.data : parsed?.data
+
+            if (code === 0) {
+              const tokenStr =
+                typeof tokenData === 'string'
+                  ? tokenData.trim()
+                  : typeof tokenData?.access_token === 'string'
+                    ? tokenData.access_token.trim()
+                    : ''
+
+              if (tokenStr) {
+                remoteSessionToken.value = tokenStr
+                remoteCookieSessionVerified.value = true
+                writeJvsStore('sessionV3', tokenStr)
+                writeJvsStore('access_token', tokenStr)
+                sessionTick.value++
+
+                // 若本地尚无 tenantId，顺带拉取当前租户 ID
+                if (!readStorageKey(window.localStorage, 'jvs-tenantId')) {
+                  fetch(`${origin}/jvs-system/index/this/tenant`, {
+                    method: 'GET',
+                    credentials: 'include',
+                    headers: {
+                      'jvs-rule-ua': encodeURI('2.4'),
+                      Authorization: `Bearer ${tokenStr}`
+                    }
+                  })
+                    .then(r => r.json())
+                    .then(tRes => {
+                      const tData = tRes?.data?.data || tRes?.data
+                      if (tData?.id) {
+                        writeJvsStore('tenantId', String(tData.id))
+                      }
+                    })
+                    .catch(() => {})
+                }
+
+                return true
+              } else {
+                // /jvs-system/login/token 明确返回 code=0 但无 token，说明主域未登录或已退出
+                remoteSessionToken.value = ''
+                remoteCookieSessionVerified.value = false
+                removeJvsStore('sessionV3')
+                removeJvsStore('access_token')
+                sessionTick.value++
+                return false
+              }
+            }
+          }
+        }
+      } catch {
+        // 忽略 /jvs-system/login/token 网络或未代理异常，继续尝试步骤 2
+      }
+
+      // 2. 兜底探测：若当前站点未代理 /jvs-system，但代理了 /jvs-dam 且网关直接透传 .bctools.cn 的 HttpOnly Cookie
+      try {
+        const probeResp = await fetch(`${damBaseUrl.value}/project/my`, {
+          method: 'GET',
+          credentials: 'include',
+          headers: buildDamHeaders(false)
+        })
+        if (probeResp.ok) {
+          const text = (await probeResp.text()).trim()
+          if (text && !text.startsWith('<')) {
+            const parsed = JSON.parse(text)
+            const code = parsed?.code ?? parsed?.data?.code
+            if (code === 0 || code === 200) {
+              remoteCookieSessionVerified.value = true
+              sessionTick.value++
+              return true
+            }
+          }
+        }
+      } catch {
+        // ignore
+      }
+
+      return Boolean(resolveJvsSessionV3(materialHeaders.value))
+    })()
+
+    try {
+      return await inFlightSessionProbe
+    } finally {
+      inFlightSessionProbe = null
+    }
+  }
+
   const refreshSessionState = () => {
     sessionTick.value++
+    if (!resolveJvsSessionV3(materialHeaders.value) && !remoteSessionToken.value && !remoteCookieSessionVerified.value) {
+      void probeRemoteSessionV3(false)
+    }
+  }
+
+  const handleWindowFocus = () => {
+    sessionTick.value++
+    if (!resolveJvsSessionV3(materialHeaders.value) && !remoteSessionToken.value && !remoteCookieSessionVerified.value) {
+      void probeRemoteSessionV3(false)
+    }
   }
 
   onMounted(() => {
     window.addEventListener('storage', refreshSessionState)
-    window.addEventListener('focus', refreshSessionState)
-    // 定期轻量同步 Cookie 中 jvs_session_v3 的变化
-    pollTimer = setInterval(refreshSessionState, 2000)
+    window.addEventListener('focus', handleWindowFocus)
+    // 立即探测一次主域 (.bctools.cn) HttpOnly jvs_session_v3 登录态
+    void probeRemoteSessionV3(false)
+    // 定期轻量同步状态变化
+    pollTimer = setInterval(refreshSessionState, 3000)
   })
 
   onUnmounted(() => {
     window.removeEventListener('storage', refreshSessionState)
-    window.removeEventListener('focus', refreshSessionState)
+    window.removeEventListener('focus', handleWindowFocus)
     if (pollTimer) {
       clearInterval(pollTimer)
       pollTimer = null
@@ -134,15 +339,15 @@ export function useDamAuth() {
   })
 
   const sessionV3 = computed(() => {
-    // 依赖 sessionTick 以感知 cookie 变化
     void sessionTick.value
-    return resolveJvsSessionV3(materialHeaders.value)
+    return remoteSessionToken.value || resolveJvsSessionV3(materialHeaders.value)
   })
 
-  /** 是否已登录（仅当 jvs_session_v3 存在有效内容时为 true） */
-  const isDamLoggedIn = computed(() => Boolean(sessionV3.value))
-
-  const damBaseUrl = computed(() => resolveDamBaseUrl(materialApiUrl.value))
+  /** 是否已登录（jvs_session_v3 存在有效内容，或通过主域 HttpOnly Cookie 换取/验证通过） */
+  const isDamLoggedIn = computed(() => {
+    void sessionTick.value
+    return Boolean(sessionV3.value || remoteCookieSessionVerified.value)
+  })
 
   /**
    * 构造携带鉴权信息的 Headers
@@ -233,6 +438,7 @@ export function useDamAuth() {
     sharedMaterialMainTab,
     setSharedMaterialMainTab,
     refreshSessionState,
+    probeRemoteSessionV3,
     buildDamHeaders,
     damFetchJson
   }