fix(workspace): 工作控件产线隔离——弹窗与9个子端点全部按产线过滤
- workspace_popup 把 pipeline_id 透传给树/文件/查看/编辑/删除子端点 - 9个子端点 get_project_dir→get_project_dir_pl(跨产线项目视为无项目) - 开发驾驶舱工作空间按钮补传 pipeline_id=sdlc_general - 修复:会话绑投标项目时开发驾驶舱工作空间直接打开投标项目目录(已实测复现)
This commit is contained in:
parent
496a0ca4c8
commit
0c66bdee81
@ -9,11 +9,13 @@ if not uid:
|
||||
uid = 'user-01'
|
||||
|
||||
session_id = (params_kw or {}).get('session_id', '') or ''
|
||||
pipeline_id = (params_kw or {}).get('pipeline_id', '') or ''
|
||||
|
||||
dbname = get_module_dbname('pipeline-sdlc')
|
||||
|
||||
async with DBPools().sqlorContext(dbname) as sor:
|
||||
project_dir, _ = await get_project_dir(sor, uid, session_id)
|
||||
# 产线隔离:跨产线项目视为无项目(与弹窗入口一致,防绕过)
|
||||
project_dir, _ = await get_project_dir_pl(sor, uid, session_id, pipeline_id)
|
||||
space_dir, _ = await get_space_dir(sor, uid, session_id)
|
||||
|
||||
if not file_id or not space_dir:
|
||||
|
||||
@ -11,11 +11,13 @@ if not uid:
|
||||
uid = 'user-01'
|
||||
|
||||
session_id = (params_kw or {}).get('session_id', '') or ''
|
||||
pipeline_id = (params_kw or {}).get('pipeline_id', '') or ''
|
||||
|
||||
dbname = get_module_dbname('pipeline-sdlc')
|
||||
|
||||
async with DBPools().sqlorContext(dbname) as sor:
|
||||
project_dir, _ = await get_project_dir(sor, uid, session_id)
|
||||
# 产线隔离:跨产线项目视为无项目(与弹窗入口一致,防绕过)
|
||||
project_dir, _ = await get_project_dir_pl(sor, uid, session_id, pipeline_id)
|
||||
space_dir, _ = await get_space_dir(sor, uid, session_id)
|
||||
|
||||
if not file_id or not space_dir:
|
||||
|
||||
@ -9,11 +9,13 @@ if not uid:
|
||||
uid = 'user-01'
|
||||
|
||||
session_id = (params_kw or {}).get('session_id', '') or ''
|
||||
pipeline_id = (params_kw or {}).get('pipeline_id', '') or ''
|
||||
|
||||
dbname = get_module_dbname('pipeline-sdlc')
|
||||
|
||||
async with DBPools().sqlorContext(dbname) as sor:
|
||||
project_dir, _ = await get_project_dir(sor, uid, session_id)
|
||||
# 产线隔离:跨产线项目视为无项目(与弹窗入口一致,防绕过)
|
||||
project_dir, _ = await get_project_dir_pl(sor, uid, session_id, pipeline_id)
|
||||
space_dir, _ = await get_space_dir(sor, uid, session_id)
|
||||
|
||||
if not file_id or file_id == '__root__':
|
||||
|
||||
@ -12,11 +12,13 @@ if not uid:
|
||||
uid = 'user-01'
|
||||
|
||||
session_id = (params_kw or {}).get('session_id', '') or ''
|
||||
pipeline_id = (params_kw or {}).get('pipeline_id', '') or ''
|
||||
|
||||
dbname = get_module_dbname('pipeline-sdlc')
|
||||
|
||||
async with DBPools().sqlorContext(dbname) as sor:
|
||||
project_dir, _ = await get_project_dir(sor, uid, session_id)
|
||||
# 产线隔离:跨产线项目视为无项目(与弹窗入口一致,防绕过)
|
||||
project_dir, _ = await get_project_dir_pl(sor, uid, session_id, pipeline_id)
|
||||
space_dir, _ = await get_space_dir(sor, uid, session_id)
|
||||
|
||||
if not file_id or file_id == '__root__':
|
||||
|
||||
@ -10,11 +10,13 @@ if not uid:
|
||||
uid = 'user-01'
|
||||
|
||||
session_id = (params_kw or {}).get('session_id', '') or ''
|
||||
pipeline_id = (params_kw or {}).get('pipeline_id', '') or ''
|
||||
|
||||
dbname = get_module_dbname('pipeline-sdlc')
|
||||
|
||||
async with DBPools().sqlorContext(dbname) as sor:
|
||||
project_dir, _ = await get_project_dir(sor, uid, session_id)
|
||||
# 产线隔离:跨产线项目视为无项目(与弹窗入口一致,防绕过)
|
||||
project_dir, _ = await get_project_dir_pl(sor, uid, session_id, pipeline_id)
|
||||
space_dir, _ = await get_space_dir(sor, uid, session_id)
|
||||
|
||||
full_dir = resolve_workspace_path(project_dir, space_dir, folder_id)
|
||||
|
||||
@ -11,11 +11,13 @@ if not uid:
|
||||
uid = 'user-01'
|
||||
|
||||
session_id = (params_kw or {}).get('session_id', '') or ''
|
||||
pipeline_id = (params_kw or {}).get('pipeline_id', '') or ''
|
||||
|
||||
dbname = get_module_dbname('pipeline-sdlc')
|
||||
|
||||
async with DBPools().sqlorContext(dbname) as sor:
|
||||
project_dir, _ = await get_project_dir(sor, uid, session_id)
|
||||
# 产线隔离:跨产线项目视为无项目(与弹窗入口一致,防绕过)
|
||||
project_dir, _ = await get_project_dir_pl(sor, uid, session_id, pipeline_id)
|
||||
space_dir, _ = await get_space_dir(sor, uid, session_id)
|
||||
|
||||
if not file_id:
|
||||
|
||||
@ -11,7 +11,15 @@ import os
|
||||
|
||||
session_id = (params_kw or {}).get('session_id', '') or ''
|
||||
pipeline_id = (params_kw or {}).get('pipeline_id', '') or ''
|
||||
_sid_q = ("?session_id=" + session_id) if session_id else ""
|
||||
# 查询串:session_id + pipeline_id 一并透传给树/文件/查看/编辑/删除子端点
|
||||
# (子端点各自用 get_project_dir_pl 做产线隔离,跨产线项目一律视为无项目)
|
||||
_qs = []
|
||||
if session_id:
|
||||
_qs.append("session_id=" + session_id)
|
||||
if pipeline_id:
|
||||
_qs.append("pipeline_id=" + pipeline_id)
|
||||
_sid_q = ("?" + "&".join(_qs)) if _qs else ""
|
||||
_sid_js = _json.dumps(("&" + "&".join(_qs)) if _qs else "")
|
||||
|
||||
async with DBPools().sqlorContext(dbname) as sor:
|
||||
# 产线隔离:传了 pipeline_id 时,会话项目跨产线则视为无项目
|
||||
@ -33,7 +41,6 @@ async with DBPools().sqlorContext(dbname) as sor:
|
||||
view_url = entire_url("/pipeline-sdlc/api/workspace_view.dspy")
|
||||
edit_url = entire_url("/pipeline-sdlc/api/workspace_open.dspy")
|
||||
delete_url = entire_url("/pipeline-sdlc/api/workspace_delete.dspy") + _sid_q
|
||||
_sid_js = _json.dumps(("&session_id=" + session_id) if session_id else "")
|
||||
|
||||
# 查看:txt/md 用 MdWidget 渲染,其他下载查看
|
||||
view_script = (
|
||||
|
||||
@ -9,11 +9,13 @@ if not uid:
|
||||
uid = 'user-01'
|
||||
|
||||
session_id = (params_kw or {}).get('session_id', '') or ''
|
||||
pipeline_id = (params_kw or {}).get('pipeline_id', '') or ''
|
||||
|
||||
dbname = get_module_dbname('pipeline-sdlc')
|
||||
|
||||
async with DBPools().sqlorContext(dbname) as sor:
|
||||
project_dir, _ = await get_project_dir(sor, uid, session_id)
|
||||
# 产线隔离:跨产线项目视为无项目(与弹窗入口一致,防绕过)
|
||||
project_dir, _ = await get_project_dir_pl(sor, uid, session_id, pipeline_id)
|
||||
space_dir, _ = await get_space_dir(sor, uid, session_id)
|
||||
# 提前读出项目用到的 apps/modules(sor 在块内有效,块外调用会因 sor 关闭返回空)
|
||||
_apps, _modules = await get_project_apps_modules(sor, uid, session_id)
|
||||
|
||||
@ -12,11 +12,13 @@ if not uid:
|
||||
uid = 'user-01'
|
||||
|
||||
session_id = (params_kw or {}).get('session_id', '') or ''
|
||||
pipeline_id = (params_kw or {}).get('pipeline_id', '') or ''
|
||||
|
||||
dbname = get_module_dbname('pipeline-sdlc')
|
||||
|
||||
async with DBPools().sqlorContext(dbname) as sor:
|
||||
project_dir, _ = await get_project_dir(sor, uid, session_id)
|
||||
# 产线隔离:跨产线项目视为无项目(与弹窗入口一致,防绕过)
|
||||
project_dir, _ = await get_project_dir_pl(sor, uid, session_id, pipeline_id)
|
||||
space_dir, _ = await get_space_dir(sor, uid, session_id)
|
||||
|
||||
if not project_dir or not os.path.isdir(project_dir):
|
||||
|
||||
@ -11,11 +11,13 @@ if not uid:
|
||||
uid = 'user-01'
|
||||
|
||||
session_id = (params_kw or {}).get('session_id', '') or ''
|
||||
pipeline_id = (params_kw or {}).get('pipeline_id', '') or ''
|
||||
|
||||
dbname = get_module_dbname('pipeline-sdlc')
|
||||
|
||||
async with DBPools().sqlorContext(dbname) as sor:
|
||||
project_dir, _ = await get_project_dir(sor, uid, session_id)
|
||||
# 产线隔离:跨产线项目视为无项目(与弹窗入口一致,防绕过)
|
||||
project_dir, _ = await get_project_dir_pl(sor, uid, session_id, pipeline_id)
|
||||
space_dir, _ = await get_space_dir(sor, uid, session_id)
|
||||
|
||||
if not file_id or file_id == '__root__':
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user