P1-5 修复: datascreen 集成层去重 + shim 清理 (2026-07-02)
FINDING-B4: datascreen.ts 与 visualdata.ts 平行重复 (CLAUDE.md §2.5 违反) - datascreen.ts 自写 initWebapi + initDatascreenShim + loadDatascreen Proxy - visualdata.ts 用既有 _loader.ts 机制 + _visualdata_*.ts shim - 6 个 wrapper (addObj/getList/getObj/getCategory/updateObj/delObj) 零引用 - 集成层违反: 两份 initWebapi 各自缓存, 时机/顺序在多命令链路下未定义 修复: - 删 datascreen.ts initWebapi/initDatascreenShim/loadDatascreen/6 wrapper (97 行) - 删 _datascreen_shim.ts (CLAUDE.md §3.6 集中化) - 保留 5 个纯工具函数 (getBaseConfig/getValidProps/listComponentProps/constructConfigDetail/constructComponentJson) - 这些是文件读 + 字符串处理, 不发 HTTP, 不需要 client - construct.ts 不变 (已走 visualdata.addObj/updateComponent) 审计: dacli/docs/cmd-review/v0.14-rollout-audit-2026-07-02.md §1.1 B4
This commit is contained in:
1 parent
c79169de06
commit
fdd591a9cf
2 files changed
+22
-218
No files matched your search
@@ -1,77 +0,0 @@
|
||||
/**
|
||||
* _datascreen_shim.ts — 大屏 web 端 axios shim (jxcj 2026-07-01)
|
||||
*
|
||||
* 镜像源: jnpf/前端/jnpf-web-datascreen-vue3/src/axios.js
|
||||
* - web 端默认 axios + 拦截器加 Authorization / App-Code headers
|
||||
* - visual.js 用 `import request from '../axios'` (相对路径, 不是 defHttp)
|
||||
* - 端点: <baseURL>/visual/save, /visual/list, /visual/detail, /visual/update, /visual/remove
|
||||
*
|
||||
* 跟 _defhttp_shim.ts 区别:
|
||||
* - 签名是 axios (config: { url, method, data, params, headers })
|
||||
* - 不 strip /api 前缀 (web 端 visual.js 用的 url='<base>/visual/save', baseURL='<base>/api', 实际路径='/api/visual/save')
|
||||
* - 走 nginx → 32000 jnpf-datareport-univer 微服务 (跟报表同)
|
||||
*
|
||||
* shim 行为: 跟 defHttp 一致, 但用 axios 签名 (method/post/data/params/headers)
|
||||
* request(config) → c.get/c.postJson/c.putJson/c.del 映射 method
|
||||
*/
|
||||
import { JnpfClient } from '../core/client.ts'
|
||||
|
||||
const GLOBAL_KEY = '__dacli_datascreen_shim_client__'
|
||||
type GlobalWithClient = typeof globalThis & { [GLOBAL_KEY]?: JnpfClient }
|
||||
|
||||
function getClient(): JnpfClient {
|
||||
const client = (globalThis as GlobalWithClient)[GLOBAL_KEY]
|
||||
if (!client) {
|
||||
throw new Error('datascreen shim 未初始化, 请先调 initDatascreenShim(client)')
|
||||
}
|
||||
return client
|
||||
}
|
||||
|
||||
/** 初始化 shim, 必须先调一次 (visual.js 模块加载前) */
|
||||
export function initDatascreenShim(client: JnpfClient): void {
|
||||
;(globalThis as GlobalWithClient)[GLOBAL_KEY] = client
|
||||
}
|
||||
|
||||
/**
|
||||
* shim of web 端 axios — 签名: request({ url, method, data, params, headers })
|
||||
* 大屏 visual.js 用相对路径 '../axios', 走 baseURL /api + /visual/save = /api/visual/save
|
||||
* 我们直接用主 client (30000), nginx 代理 /api/visual/* → 32000 (跟报表同)
|
||||
*/
|
||||
function stripApiPrefix(url: string): string {
|
||||
if (url.startsWith('/api/')) return url.slice(4)
|
||||
if (url === '/api') return ''
|
||||
return url
|
||||
}
|
||||
|
||||
async function unwrap<T>(resp: { code: number; msg?: string; data: T | null }): Promise<T> {
|
||||
if (resp.code !== 200) {
|
||||
throw new Error(`API code=${resp.code}: ${resp.msg ?? ''}`)
|
||||
}
|
||||
if (resp.data === null || resp.data === undefined) {
|
||||
return { code: resp.code, msg: resp.msg, id: undefined } as unknown as T
|
||||
}
|
||||
return resp.data as T
|
||||
}
|
||||
|
||||
export const request = async (config: {
|
||||
url: string
|
||||
method: 'get' | 'post' | 'put' | 'delete'
|
||||
data?: unknown
|
||||
params?: Record<string, unknown>
|
||||
headers?: Record<string, string>
|
||||
}): Promise<unknown> => {
|
||||
const c = getClient()
|
||||
const path = stripApiPrefix(config.url)
|
||||
// web 端 axios 拦截器加 Authorization + App-Code, 我们 client 已有
|
||||
let r
|
||||
if (config.method === 'get') {
|
||||
r = await c.get(path, config.params as Record<string, string | number | undefined>)
|
||||
} else if (config.method === 'delete') {
|
||||
r = await c.del(path)
|
||||
} else if (config.method === 'put') {
|
||||
r = await c.putJson(path, (config.data ?? {}) as Record<string, unknown>)
|
||||
} else {
|
||||
r = await c.postJson(path, (config.data ?? {}) as Record<string, unknown>)
|
||||
}
|
||||
return unwrap(r)
|
||||
}
|
||||
+22
-141
@@ -1,151 +1,32 @@
|
||||
/**
|
||||
* webapi/datascreen.ts — 镜像 jnpf-web-datascreen-vue3 独立大屏 webapp (v0.13+ jxcj 2026-07-01)
|
||||
* webapi/datascreen.ts — 大屏**纯工具函数**模块 (v0.15+ 集成层去重, 2026-07-02)
|
||||
*
|
||||
* 重要发现 (jxcj 2026-07-01):
|
||||
* - jnpf 6.x 大屏 web 端是 **jnpf-web-datascreen-vue3 独立编译项目** (不是 jnpf-web-apps-main)
|
||||
* v0.15+ (P1-5): 删 initWebapi/initDatascreenShim/loadDatascreen/6 个 wrapper
|
||||
* - 这些代码跟 webapi/visualdata.ts (走 _loader.ts 机制) 平行重复
|
||||
* - 整个 codebase 零引用 (construct.ts 走 visualdata.addObj/updateObj, 不走 loadDatascreen)
|
||||
* - 删 shim 文件 _datascreen_shim.ts 一起清理 (CLAUDE.md §3.6 集中化)
|
||||
*
|
||||
* 保留: 5 个纯函数 (无 webapi 依赖, 读 web 端 option/config.js + option/components/*.vue)
|
||||
* - getBaseConfig(): 镜像 web option/config.js 的 config 模板
|
||||
* - getValidProps(): 镜像 option/config.js:268 dicOption.dataList (P1-4 真值源)
|
||||
* - listComponentProps(): 兜底走 option/components/*.vue 目录扫描
|
||||
* - constructConfigDetail(): 镜像 header.vue:200-211 save formdata 结构
|
||||
* - constructComponentJson(): 镜像 build.vue:705-709 nav 数组结构
|
||||
* - getComponentDefaults(prop): 镜像 option/components/<prop>.vue <script> data() 段
|
||||
*
|
||||
* 注意: 这是**纯工具**模块, 不依赖 client, 不发 HTTP 请求. 调用方 construct.ts 自行走
|
||||
* webapi/visualdata 调 addObj/updateComponent.
|
||||
*
|
||||
* 历史: v0.13+ jxcj 2026-07-01 镜像 jnpf-web-datascreen-vue3 独立大屏 webapp
|
||||
* - 路径: jnpf/前端/jnpf-web-datascreen-vue3/src/api/visual.js
|
||||
* - 端点: <baseURL>/visual/save (POST), /visual/list (GET), /visual/detail (GET), /visual/update, /visual/remove
|
||||
* - nginx 代理 /api/visual/* → 32000 (jnpf-datareport-univer 微服务, 跟大屏/报表同微服务)
|
||||
* - 大屏 web 端 addObj body: { visual: {password, category, status, title}, config: {detail, component} }
|
||||
*
|
||||
* 镜像源: jnpf/前端/jnpf-web-datascreen-vue3/src/api/visual.js (整文件)
|
||||
* export const addObj = (data) => request({ url: baseUrl + '/save', method: 'post', data: { visual: {...}, config: {...} } })
|
||||
*
|
||||
* 之前 dacli bigscreen create 走 /extend/BigData (jnpf "大数据测试" 端点, 错), 报 BS-新12 silent fail
|
||||
* 现镜像 web 端 visual.js addObj 走 /api/visual/save
|
||||
*
|
||||
* 特殊处理: visual.js 用 `import request from '../axios'` (相对路径, 不是 defHttp),
|
||||
* loadWebModule 默认规则不替换. 不用 loader, 直接读 + 手动 replace + dynamic import.
|
||||
* - 端点: /api/blade-visual/visual/save (POST), /visual/list (GET), /visual/detail (GET), /visual/update, /visual/remove
|
||||
* - nginx 代理 /api/blade-visual/* → 30000 (jnpf-visualdata 微服务, 不是 32000 datareport-univer)
|
||||
*/
|
||||
import { readFileSync, writeFileSync, mkdirSync, readdirSync, existsSync } from 'node:fs'
|
||||
import { tmpdir } from 'node:os'
|
||||
import { join, dirname, basename } from 'node:path'
|
||||
import { pathToFileURL } from 'node:url'
|
||||
import { JnpfClient } from '../core/client.ts'
|
||||
import { initDatascreenShim } from './_datascreen_shim.ts'
|
||||
import { readFileSync, readdirSync, existsSync } from 'node:fs'
|
||||
import { join } from 'node:path'
|
||||
|
||||
const DATASCREEN_SRC = '/home/ubuntu/ccWorkDir/jnpf/前端/jnpf-web-datascreen-vue3/src/api/visual.js'
|
||||
const DATASCREEN_OPTION_CONFIG_SRC = '/home/ubuntu/ccWorkDir/jnpf/前端/jnpf-web-datascreen-vue3/src/option/config.js'
|
||||
const DATASCREEN_OPTION_COMPONENTS_DIR = '/home/ubuntu/ccWorkDir/jnpf/前端/jnpf-web-datascreen-vue3/src/option/components'
|
||||
const SHIM_DIR = dirname(new URL(import.meta.url).pathname)
|
||||
const DATASCREEN_SHIM_PATH = join(SHIM_DIR, '_datascreen_shim.ts')
|
||||
|
||||
let cached: any = null
|
||||
|
||||
/**
|
||||
* 初始化 webapi 层: 读 + 替换 + dynamic import (跟 _loader.ts 一样的技巧, 但单独处理)
|
||||
* - 替换 1: `import { url } from '@/config'` → 删掉 (我们不需要 baseURL, 走主 client)
|
||||
* - 替换 2: `import { config } from '@/option/config'` → 删掉
|
||||
* - 替换 3: `import request from '../axios'` → `import { request } from '<datascreen shim path>'`
|
||||
* - 替换 4: `import { url } from '@/config'; import { config } from '@/option/config' const baseUrl = url + '/visual'`
|
||||
* → 删掉, 但 baseUrl 在 visual.js 里被所有方法用. 我们需要保留 const baseUrl = '/visual' (path 形式)
|
||||
* - 替换 5: `let header = window.$glob.header || {}; config.headers = Object.assign(config.headers, header);`
|
||||
* → 注: shim 已有 headers, 删掉这几行避免 window.$glob 引用
|
||||
* - 替换 6: `const token = localStorage.getItem("token") || ''` → 注: shim 不需 token
|
||||
*/
|
||||
export async function initWebapi(client: JnpfClient): Promise<void> {
|
||||
if (cached) return
|
||||
initDatascreenShim(client)
|
||||
const code = readFileSync(DATASCREEN_SRC, 'utf-8')
|
||||
const patched = code
|
||||
// 替换 axios import 为 shim
|
||||
.replace(
|
||||
/import\s+request\s+from\s+['"]\.\.\/axios['"]/,
|
||||
`import { request } from '${DATASCREEN_SHIM_PATH}'\nconst config = {}; // mock @/option/config (jnpf 大屏默认配置, 简化)`,
|
||||
)
|
||||
// 替换 baseUrl 定义 (web 端用 url + '/visual', 我们用 const baseUrl = '/visual' 简化)
|
||||
.replace(
|
||||
/const\s+baseUrl\s*=\s*url\s*\+\s*['"]\/visual['"]/,
|
||||
`const baseUrl = '/visual'`,
|
||||
)
|
||||
// 删掉 web 端 import (axios 拦截器引用了 url/config/window/localStorage, 我们不需要)
|
||||
.replace(
|
||||
/import\s*\{[^}]*\}\s*from\s*['"]@\/config['"];?/g,
|
||||
'',
|
||||
)
|
||||
.replace(
|
||||
/import\s*\{[^}]*\}\s*from\s*['"]@\/option\/config['"];?/g,
|
||||
'',
|
||||
)
|
||||
.replace(
|
||||
/let\s+header\s*=\s*window\.\$glob\.[^;]+;[\s\S]*?config\.headers\s*=\s*Object\.assign[^;]+;?/g,
|
||||
'',
|
||||
)
|
||||
.replace(
|
||||
/const\s+token\s*=\s*localStorage\.[^;]+;?/g,
|
||||
'',
|
||||
)
|
||||
.replace(
|
||||
/config\.headers\['Authorization'\][^;]+;?/g,
|
||||
'',
|
||||
)
|
||||
.replace(
|
||||
/const\s+appCode\s*=[^;]+;?/g,
|
||||
'',
|
||||
)
|
||||
.replace(
|
||||
/config\.headers\['App-Code'\][^;]+;?/g,
|
||||
'',
|
||||
)
|
||||
|
||||
// 写 tmp file + dynamic import
|
||||
const tmpDir = join(tmpdir(), 'dacli-datascreen-' + Date.now())
|
||||
mkdirSync(tmpDir, { recursive: true })
|
||||
const tmpFile = join(tmpDir, 'visual.mjs')
|
||||
writeFileSync(tmpFile, patched)
|
||||
cached = await import(pathToFileURL(tmpFile).href)
|
||||
}
|
||||
|
||||
export function isWebapiLoaded(): boolean {
|
||||
return cached !== null
|
||||
}
|
||||
|
||||
export const loadDatascreen: any = new Proxy({} as any, {
|
||||
get(_target, prop) {
|
||||
if (!cached) {
|
||||
throw new Error(`datascreen 模块未初始化, 请先 await initWebapi(client)`)
|
||||
}
|
||||
return cached[prop]
|
||||
},
|
||||
})
|
||||
|
||||
/** 创建大屏 (镜像 web visual.js: addObj) */
|
||||
export async function addObj(params: {
|
||||
title: string
|
||||
category: string
|
||||
status?: number
|
||||
password?: string
|
||||
width?: number
|
||||
height?: number
|
||||
config?: Record<string, unknown>
|
||||
}): Promise<unknown> {
|
||||
return loadDatascreen.addObj(params)
|
||||
}
|
||||
|
||||
/** 大屏列表 (镜像 web visual.js: getList) */
|
||||
export async function getList(params?: Record<string, unknown>): Promise<unknown> {
|
||||
return loadDatascreen.getList(params)
|
||||
}
|
||||
|
||||
/** 大屏详情 (镜像 web visual.js: getObj) */
|
||||
export async function getObj(id: string): Promise<unknown> {
|
||||
return loadDatascreen.getObj(id)
|
||||
}
|
||||
|
||||
/** 大屏分类 (镜像 web visual.js: getCategory) */
|
||||
export async function getCategory(params?: Record<string, unknown>): Promise<unknown> {
|
||||
return loadDatascreen.getCategory(params)
|
||||
}
|
||||
|
||||
/** 更新大屏 (镜像 web visual.js: updateObj) */
|
||||
export async function updateObj(data: Record<string, unknown>): Promise<unknown> {
|
||||
return loadDatascreen.updateObj(data)
|
||||
}
|
||||
|
||||
/** 删除大屏 (镜像 web visual.js: delObj) */
|
||||
export async function delObj(id: string): Promise<unknown> {
|
||||
return loadDatascreen.delObj(id)
|
||||
}
|
||||
|
||||
// =====================================================================
|
||||
// Phase 1+2: 镜像 option/config.js (基础配置) + option/components/*.vue (组件元数据)
|
||||
|
||||
Reference in new issue
Block a user