i更新
This commit is contained in:
+20
-4
@@ -20,11 +20,24 @@ export interface PermissionGroup {
|
||||
pages: PermissionPage[];
|
||||
}
|
||||
|
||||
<<<<<<< HEAD:deploy/admin-en-20261008/head-build/pre-release-src/src/views/console/permission-menu.ts
|
||||
export const KIND_LABELS: Record<PermissionItem['kind'], string> = {
|
||||
action: '按钮',
|
||||
link: '菜单链接',
|
||||
page: '页面',
|
||||
};
|
||||
=======
|
||||
// 写成函数而不是常量:t() 每次调用时读当前语言,切换语言后标签跟着变
|
||||
export function kindLabel(kind: PermissionItem['kind'], code?: string): string {
|
||||
if (code === 'knowledge:scope:own') return t('数据权限');
|
||||
const labels: Record<PermissionItem['kind'], string> = {
|
||||
action: t('按钮'),
|
||||
link: t('菜单链接'),
|
||||
page: t('页面'),
|
||||
};
|
||||
return labels[kind];
|
||||
}
|
||||
>>>>>>> main:.pnpm-store/v11/projects/b7e8906144c2cb14d551c0a31b21833c/apps/web-antd/src/views/console/permission-menu.ts
|
||||
|
||||
export const SOURCE_LABELS: Record<PermissionItem['source'], string> = {
|
||||
builtin: '内置',
|
||||
@@ -70,7 +83,7 @@ export function summarizeRole(
|
||||
|
||||
/** 知识中心里碰到聊天原文(来源证据)的按钮:后端同时要求能看正文。 */
|
||||
const KNOWLEDGE_WITH_SOURCES = [
|
||||
'knowledge:run', 'knowledge:run:control', 'knowledge:watch', 'knowledge:write', 'knowledge:restore',
|
||||
'knowledge:write', 'knowledge:restore',
|
||||
'knowledge:delete', 'knowledge:review', 'knowledge:reject', 'knowledge:review:auto', 'knowledge:publish',
|
||||
'knowledge:disable',
|
||||
];
|
||||
@@ -79,9 +92,12 @@ const KNOWLEDGE_WITH_SOURCES = [
|
||||
* 后端同时要求的码(缺一个就 403)。勾按钮时顺手勾上,免得配出"看得见、点不动"的角色。
|
||||
* 同一页面的「页面」码由 checkCode 自动带上,这里只写跨页面的。
|
||||
*/
|
||||
export const REQUIRES: Record<string, string[]> = Object.fromEntries(
|
||||
KNOWLEDGE_WITH_SOURCES.map((code) => [code, ['knowledge:read', 'im:content:read']]),
|
||||
);
|
||||
export const REQUIRES: Record<string, string[]> = {
|
||||
...Object.fromEntries(KNOWLEDGE_WITH_SOURCES.map((code) => [code, ['knowledge:read', 'im:content:read']])),
|
||||
'knowledge:run': ['im:content:read'],
|
||||
'knowledge:run:control': ['im:content:read'],
|
||||
'knowledge:watch': ['im:content:read'],
|
||||
};
|
||||
|
||||
/**
|
||||
* 勾上一个码:同一页面的「页面」码(能打开页面才谈得上操作)和 REQUIRES 里的码一起勾上。
|
||||
|
||||
@@ -231,7 +231,11 @@ onMounted(load);
|
||||
</template>
|
||||
<template v-else-if="column.key === 'kind' && record.item">
|
||||
<Tag :color="record.item.kind === 'page' ? 'blue' : record.item.kind === 'link' ? 'purple' : undefined">
|
||||
<<<<<<< HEAD:deploy/admin-en-20261008/head-build/pre-release-src/src/views/console/permissions.vue
|
||||
{{ KIND_LABELS[record.item.kind as PermissionItem['kind']] }}
|
||||
=======
|
||||
{{ kindLabel(record.item.kind as PermissionItem['kind'], record.item.code) }}
|
||||
>>>>>>> main:.pnpm-store/v11/projects/b7e8906144c2cb14d551c0a31b21833c/apps/web-antd/src/views/console/permissions.vue
|
||||
</Tag>
|
||||
</template>
|
||||
<template v-else-if="column.key === 'source' && record.item">
|
||||
|
||||
+43
-9
@@ -16,7 +16,7 @@ import WashOptions from './wash-options.vue';
|
||||
* 整理聊天记录:一张表单。默认整理全部授权账号的全部聊天,选好模型直接开始。
|
||||
* 范围一改就自动重新统计;不用先选账号、选来源、预览、勾确认框。
|
||||
*/
|
||||
const props = defineProps<{ accountId: number; canWatch?: boolean; open: boolean }>();
|
||||
const props = defineProps<{ accountId: number; canWatch?: boolean; open: boolean; allowedAccountIds?: number[] }>();
|
||||
const emit = defineEmits<{ created: []; 'update:open': [value: boolean] }>();
|
||||
|
||||
const scopeMode = ref<'all' | 'pick'>('all');
|
||||
@@ -32,11 +32,18 @@ const preview = ref<KnowledgeRunPreview | null>(null);
|
||||
const previewing = ref(false);
|
||||
const saving = ref(false);
|
||||
let generation = 0;
|
||||
let previewRequest: AbortController | undefined;
|
||||
let timer: ReturnType<typeof setTimeout> | undefined;
|
||||
|
||||
const accountOptions = computed(() => [
|
||||
<<<<<<< HEAD:deploy/admin-en-20261008/head-build/pre-release-src/src/views/knowledge/run-dialog.vue
|
||||
...(canViewLegacy.value ? [{ value: 0, label: '旧版未归属数据' }] : []),
|
||||
...accounts.value.map((item) => ({ value: item.id, label: `${item.nickname || item.zyt_sn}(${item.zyt_sn})` })),
|
||||
=======
|
||||
...(canViewLegacy.value && props.allowedAccountIds === undefined ? [{ value: 0, label: t('旧版未归属数据') }] : []),
|
||||
...accounts.value.filter((item) => props.allowedAccountIds === undefined || props.allowedAccountIds.includes(item.id))
|
||||
.map((item) => ({ value: item.id, label: t('{name}({code})', { name: item.nickname || item.zyt_sn, code: item.zyt_sn }) })),
|
||||
>>>>>>> main:.pnpm-store/v11/projects/b7e8906144c2cb14d551c0a31b21833c/apps/web-antd/src/views/knowledge/run-dialog.vue
|
||||
]);
|
||||
const scope = computed(() => ({
|
||||
account_ids: scopeMode.value === 'all' ? [] : accountIds.value,
|
||||
@@ -52,49 +59,76 @@ const blocked = computed(() => {
|
||||
return '';
|
||||
});
|
||||
|
||||
watch(() => props.open, async (open) => {
|
||||
function stopPreview() {
|
||||
generation++;
|
||||
if (timer) clearTimeout(timer);
|
||||
previewRequest?.abort();
|
||||
previewRequest = undefined;
|
||||
previewing.value = false;
|
||||
}
|
||||
|
||||
watch(() => props.open, async (open) => {
|
||||
stopPreview();
|
||||
if (!open) return;
|
||||
const current = generation;
|
||||
ready.value = false;
|
||||
preview.value = null;
|
||||
dateFrom.value = '';
|
||||
dateTo.value = '';
|
||||
autoWatch.value = false;
|
||||
scopeMode.value = props.accountId === ALL_ACCOUNTS ? 'all' : 'pick';
|
||||
accountIds.value = props.accountId === ALL_ACCOUNTS ? [] : [props.accountId];
|
||||
accountIds.value = props.accountId === ALL_ACCOUNTS ? [] : [props.accountId]
|
||||
.filter((id) => props.allowedAccountIds === undefined || props.allowedAccountIds.includes(id));
|
||||
const [config, list] = await Promise.all([fetchKnowledgeConfig().catch(() => null), fetchDesktopAccounts(false)]);
|
||||
if (current !== generation) return;
|
||||
wash.value = washFromConfig(config);
|
||||
accounts.value = list.accounts;
|
||||
canViewLegacy.value = list.can_view_legacy;
|
||||
ready.value = true;
|
||||
refresh();
|
||||
});
|
||||
watch(() => props.allowedAccountIds === undefined ? undefined : [...new Set(props.allowedAccountIds)].sort((a, b) => a - b).join(','), () => {
|
||||
if (props.allowedAccountIds !== undefined) accountIds.value = accountIds.value.filter((id) => props.allowedAccountIds!.includes(id));
|
||||
if (props.open && ready.value) refresh();
|
||||
});
|
||||
watch(scope, () => { if (props.open && ready.value) refresh(); }, { deep: true });
|
||||
onBeforeUnmount(() => { generation++; if (timer) clearTimeout(timer); });
|
||||
onBeforeUnmount(stopPreview);
|
||||
|
||||
function refresh() {
|
||||
if (timer) clearTimeout(timer);
|
||||
const current = ++generation;
|
||||
stopPreview();
|
||||
const current = generation;
|
||||
preview.value = null;
|
||||
if (scopeMode.value === 'pick' && !accountIds.value.length) return;
|
||||
if (dateFrom.value && dateTo.value && dateFrom.value > dateTo.value) return;
|
||||
timer = setTimeout(async () => {
|
||||
previewRequest = new AbortController();
|
||||
previewing.value = true;
|
||||
try {
|
||||
const data = await previewKnowledgeRun(scope.value);
|
||||
const data = await previewKnowledgeRun(scope.value, previewRequest.signal);
|
||||
if (current === generation) preview.value = data;
|
||||
} catch {
|
||||
// RequestClient reports real errors and suppresses cancellation.
|
||||
} finally {
|
||||
if (current === generation) previewing.value = false;
|
||||
if (current === generation) {
|
||||
previewRequest = undefined;
|
||||
previewing.value = false;
|
||||
}
|
||||
}
|
||||
}, 300);
|
||||
}
|
||||
|
||||
async function submit() {
|
||||
if (blocked.value || saving.value) return;
|
||||
if (!props.open || blocked.value || saving.value) return;
|
||||
const current = generation;
|
||||
saving.value = true;
|
||||
try {
|
||||
const run = await createKnowledgeRun({ ...scope.value, ...wash.value, auto_watch: !!props.canWatch && autoWatch.value, staff_confirmed: true });
|
||||
<<<<<<< HEAD:deploy/admin-en-20261008/head-build/pre-release-src/src/views/knowledge/run-dialog.vue
|
||||
message.success(`已开始整理:${run.accounts.length} 个账号,在「整理任务」里看进度`);
|
||||
=======
|
||||
if (current !== generation) return;
|
||||
message.success(t('已开始整理:{count} 个账号,在「整理任务」里看进度', { count: run.accounts.length }));
|
||||
>>>>>>> main:.pnpm-store/v11/projects/b7e8906144c2cb14d551c0a31b21833c/apps/web-antd/src/views/knowledge/run-dialog.vue
|
||||
emit('update:open', false);
|
||||
emit('created');
|
||||
} finally {
|
||||
|
||||
+27
-2
@@ -1,7 +1,11 @@
|
||||
<script setup lang="ts">
|
||||
import type { KnowledgeAutoSummary, KnowledgeRun, KnowledgeRunAccount, KnowledgeWashOptions } from '#/api/knowledge';
|
||||
|
||||
<<<<<<< HEAD:deploy/admin-en-20261008/head-build/pre-release-src/src/views/knowledge/runs-panel.vue
|
||||
import { ref } from 'vue';
|
||||
=======
|
||||
import { computed, onActivated, onDeactivated, onScopeDispose, ref, watch } from 'vue';
|
||||
>>>>>>> main:.pnpm-store/v11/projects/b7e8906144c2cb14d551c0a31b21833c/apps/web-antd/src/views/knowledge/runs-panel.vue
|
||||
|
||||
import { Alert, Button, Empty, Form, message, Modal, Progress, Space, Table, Tag, Tooltip } from 'ant-design-vue';
|
||||
|
||||
@@ -20,9 +24,22 @@ const busy = ref(false);
|
||||
const configOpen = ref(false);
|
||||
const configRun = ref<KnowledgeRun | null>(null);
|
||||
const configWash = ref<KnowledgeWashOptions | null>(null);
|
||||
let active = true;
|
||||
let cancelDialog: ReturnType<typeof Modal.confirm> | undefined;
|
||||
|
||||
function closeControls() {
|
||||
configOpen.value = false;
|
||||
cancelDialog?.destroy();
|
||||
cancelDialog = undefined;
|
||||
}
|
||||
function deactivate() { active = false; closeControls(); }
|
||||
watch(() => props.canControl, (allowed) => { if (!allowed) closeControls(); }, { flush: 'sync' });
|
||||
onActivated(() => { active = true; });
|
||||
onDeactivated(deactivate);
|
||||
onScopeDispose(deactivate);
|
||||
|
||||
async function act(run: KnowledgeRun, action: 'cancel' | 'pause' | 'resume') {
|
||||
if (busy.value) return;
|
||||
if (!active || !props.canControl || busy.value) return;
|
||||
busy.value = true;
|
||||
try {
|
||||
await knowledgeRunAction(run.id, action);
|
||||
@@ -34,10 +51,17 @@ async function act(run: KnowledgeRun, action: 'cancel' | 'pause' | 'resume') {
|
||||
}
|
||||
|
||||
function cancel(run: KnowledgeRun) {
|
||||
<<<<<<< HEAD:deploy/admin-en-20261008/head-build/pre-release-src/src/views/knowledge/runs-panel.vue
|
||||
Modal.confirm({
|
||||
title: '取消这个整理批次?',
|
||||
content: '已经生成的草稿保留,剩下的聊天不再整理;正在进行的模型请求可能仍会计费。',
|
||||
okText: '取消整理', cancelText: '不取消', okType: 'danger',
|
||||
=======
|
||||
cancelDialog = Modal.confirm({
|
||||
title: t('取消这个整理批次?'),
|
||||
content: t('已经生成的草稿保留,剩下的聊天不再整理;正在进行的模型请求可能仍会计费。'),
|
||||
okText: t('取消整理'), cancelText: t('不取消'), okType: 'danger',
|
||||
>>>>>>> main:.pnpm-store/v11/projects/b7e8906144c2cb14d551c0a31b21833c/apps/web-antd/src/views/knowledge/runs-panel.vue
|
||||
onOk: () => act(run, 'cancel'),
|
||||
});
|
||||
}
|
||||
@@ -50,10 +74,11 @@ function configure(run: KnowledgeRun) {
|
||||
|
||||
async function saveConfig() {
|
||||
const run = configRun.value;
|
||||
if (!run || !configWash.value || busy.value) return;
|
||||
if (!active || !props.canControl || !run || !configWash.value || busy.value) return;
|
||||
busy.value = true;
|
||||
try {
|
||||
await configureKnowledgeRun(run.id, configWash.value);
|
||||
if (!active || !props.canControl) return;
|
||||
await knowledgeRunAction(run.id, 'resume');
|
||||
configOpen.value = false;
|
||||
message.success('已按新配置继续;已生成的草稿保留,新配置只用于剩下的部分');
|
||||
|
||||
@@ -18,6 +18,7 @@ x-common: &common
|
||||
ZYT_GROUP_BASE_URL: "${ZYT_GROUP_BASE_URL:-}"
|
||||
ZYT_GROUP_API_URL: "${ZYT_GROUP_API_URL:-}"
|
||||
KEFU_PUBLIC_BASE_URL: "${KEFU_PUBLIC_BASE_URL:-}"
|
||||
ZYT_GROUP_ALLOWED_HTTP_ORIGINS: "${ZYT_GROUP_ALLOWED_HTTP_ORIGINS:-}"
|
||||
volumes:
|
||||
- ./data:/data
|
||||
read_only: true
|
||||
|
||||
+19
-3
@@ -8,6 +8,7 @@ import routes from '../../router/routes/modules/console';
|
||||
import {
|
||||
checkCode,
|
||||
groupPermissions,
|
||||
kindLabel,
|
||||
pageMissing,
|
||||
REQUIRES,
|
||||
routePermissions,
|
||||
@@ -35,6 +36,16 @@ const catalog = [
|
||||
];
|
||||
|
||||
describe('permission menu grouping', () => {
|
||||
it('labels own knowledge scope as data permission and preserves independent action grants', () => {
|
||||
const own = item('knowledge:scope:own', '知识中心', '知识加工与检索');
|
||||
const items = [...catalog, own];
|
||||
expect(kindLabel(own.kind, own.code)).toBe('数据权限');
|
||||
expect(checkCode([], own.code, true, items).sort()).toEqual(['knowledge:read', 'knowledge:scope:own']);
|
||||
expect(checkCode(['knowledge:read', own.code], own.code, false, items)).toEqual(['knowledge:read']);
|
||||
const all = groupPermissions(items).find((group) => group.group === '知识中心')!.codes;
|
||||
expect(applyTreeCheck([], all, all, items)).toContain(own.code);
|
||||
});
|
||||
|
||||
it('keeps the backend order and groups by menu then page', () => {
|
||||
const groups = groupPermissions(catalog);
|
||||
expect(groups.map((g) => g.group)).toEqual(['桌面端', '聊天归档', '知识中心', '常用链接']);
|
||||
@@ -60,6 +71,11 @@ describe('permission menu grouping', () => {
|
||||
expect(checkCode(['release:read', 'release:write'], 'release:read', false, catalog)).toEqual(['release:write']);
|
||||
});
|
||||
|
||||
it.each(['knowledge:run', 'knowledge:run:control', 'knowledge:watch'])('grants the task page and source access with %s', (code) => {
|
||||
const items = [...catalog, item('knowledge:tasks:read', '知识中心', '整理任务', 'page'), item(code, '知识中心', '整理任务')];
|
||||
expect(checkCode([], code, true, items).sort()).toEqual(['im:content:read', code, 'knowledge:tasks:read'].sort());
|
||||
});
|
||||
|
||||
it('flags a page whose actions are granted without the page itself', () => {
|
||||
const page = groupPermissions(catalog)[0]!.pages[0]!;
|
||||
expect(pageMissing(page, ['release:write'])).toBe(true);
|
||||
@@ -103,10 +119,10 @@ describe('route ↔ permission menu sync check', () => {
|
||||
'im:read', 'im:content:read', 'im:export', 'im:export:create', 'im:export:download', 'im:identity:read',
|
||||
'im:identity:write', 'im:patient:bind', 'im:patient:unbind', 'im:storage:read', 'im:storage:write',
|
||||
'im:storage:test', 'im:import',
|
||||
'knowledge:read', 'knowledge:run', 'knowledge:run:control', 'knowledge:settings', 'knowledge:watch',
|
||||
'knowledge:read', 'knowledge:tasks:read', 'knowledge:run', 'knowledge:run:control', 'knowledge:settings', 'knowledge:watch',
|
||||
'knowledge:write', 'knowledge:restore', 'knowledge:delete', 'knowledge:review', 'knowledge:reject',
|
||||
'knowledge:review:auto', 'knowledge:publish', 'knowledge:disable', 'knowledge:enable', 'knowledge:search',
|
||||
'knowledge:export',
|
||||
'knowledge:review:auto', 'knowledge:review:assign', 'knowledge:review:settings', 'knowledge:publish', 'knowledge:disable', 'knowledge:enable', 'knowledge:search',
|
||||
'knowledge:export', 'knowledge:scope:own',
|
||||
'role:read', 'role:create', 'role:write', 'role:delete', 'permission:read', 'permission:create',
|
||||
'permission:write', 'permission:delete', 'user:read', 'user:create', 'user:write', 'user:status', 'audit:read',
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user