feat(公司tab): 接线 视频任务记录——company_id 走 DataReadScope,detail/zip 用同一把 ReadScope 门住
Task 8 的前半页(生成记录那半页 BLOCKED,见账本裁定)。 - controller 接住 requireAdminOrInternal 的返回值算范围,page 侧 readScope(operator, companyId) .userIdsOr(base):显式 user_id 与公司 tab 是交集,不是替换。 - mapper 的 userId 单值条件保留、并列 userIds IN <foreach>;null=不筛,空集在 service 首行早退, 绝不把 [] 交给 mapper(渲染成 IN () 是 500)。 - selectAdminZipRows 补 t.user_id:download-zip 的闸门要不越权就得先拿得到行主人。 - detail 的 404 文案拆开:404 只留给"真查不到行",越权是 403。zip 整单任一条越界 ⇒ 403, 不借 X-Archive-Error-Count 的"部分失败"语义盖越权。 - 前端 company_id 落在 builder 之后、发请求之前的唯一一处(normalizeHistoryParams 那类白名单 构造会把键静默丢掉);页面 watch(activeId) + 读 requestCompanyId。 验证(我自己复跑,不是转述):干净树定向 7/0(新 5 支 + G2 2 支)、全量前端 1726/1725/1 (G1 缺口清单 8 页→7 页,admin_image_video_tasks 已消失)、vue-tsc rc=0。
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
/** 视频任务记录页 · 像素复刻旧版 admin.html panel-image-video-tasks(自绘:form-box 筛选[用户名/提交起止+查询/重置] + panel-box toolbar[全选/批量下载/权限配置/汇总] + 任务卡片网格 + 旧式分页)。
|
||||
* script 逻辑沿用现有 Vue 实现(批量打包/明细抽屉/权限授权)。 */
|
||||
import { computed, onMounted, reactive, ref } from 'vue'
|
||||
import { computed, onMounted, reactive, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { requestVideoZipDownload, fetchImageVideoTasks, fetchImageVideoTaskDetail } from './image-video-api.ts'
|
||||
import { fetchImageVideoPermissionUsers, saveImageVideoPermissions } from './image-video-api.ts'
|
||||
@@ -18,9 +18,11 @@ import {
|
||||
import { grantedUserIds, type TaskPermissionItem } from './task-permission.ts'
|
||||
import { imageVideoDownloadFilename, videoKeysOf } from './image-video-view.ts'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
const loading = ref(false)
|
||||
const tasks = ref<ImageVideoRow[]>([])
|
||||
const totalTasks = ref(0)
|
||||
@@ -114,7 +116,7 @@ function toFilter(): ImageVideoFilter {
|
||||
async function load() {
|
||||
loading.value = true
|
||||
try {
|
||||
const result = await fetchImageVideoTasks(toFilter(), page.value, pageSize.value)
|
||||
const result = await fetchImageVideoTasks(toFilter(), page.value, pageSize.value, companyTab.requestCompanyId)
|
||||
tasks.value = result.items
|
||||
totalTasks.value = result.total
|
||||
page.value = result.page
|
||||
@@ -125,6 +127,9 @@ async function load() {
|
||||
}
|
||||
}
|
||||
|
||||
// 切公司 = 重新取数。不重取的页 = tab 在那页上是假的(G1 的 pageFiles 断言盯着这条)。
|
||||
watch(() => companyTab.activeId, () => void load())
|
||||
|
||||
function apply() {
|
||||
page.value = 1
|
||||
void load()
|
||||
|
||||
@@ -12,10 +12,12 @@ export async function fetchImageVideoTasks(
|
||||
filter: ImageVideoFilter,
|
||||
page: number,
|
||||
pageSize: number,
|
||||
companyId?: number | null,
|
||||
): Promise<ImageVideoPageResult> {
|
||||
const { data } = await http.get<unknown>(IMAGE_VIDEO_TASKS_ENDPOINT, {
|
||||
params: toImageVideoQuery(filter, page, pageSize),
|
||||
})
|
||||
// 公司 tab 的值由页面传进来,落在 builder 之后(filter 里塞不进:toImageVideoQuery 是白名单构造)。
|
||||
const query = toImageVideoQuery(filter, page, pageSize)
|
||||
if (companyId != null) query.company_id = companyId
|
||||
const { data } = await http.get<unknown>(IMAGE_VIDEO_TASKS_ENDPOINT, { params: query })
|
||||
return parseImageVideoPage(data)
|
||||
}
|
||||
|
||||
|
||||
@@ -27,6 +27,7 @@ export interface ImageVideoQuery {
|
||||
coze_execute_id?: string
|
||||
submitted_from?: string
|
||||
submitted_to?: string
|
||||
company_id?: number
|
||||
}
|
||||
|
||||
export function createImageVideoFilter(): ImageVideoFilter {
|
||||
|
||||
Reference in New Issue
Block a user