diff --git a/ui/src/api/system-resource-management/trigger.ts b/ui/src/api/system-resource-management/trigger.ts index 7c2d68a38fc..b04e87b99f1 100644 --- a/ui/src/api/system-resource-management/trigger.ts +++ b/ui/src/api/system-resource-management/trigger.ts @@ -108,7 +108,7 @@ const putResourceTrigger: ( data: TriggerData, loading?: Ref, ) => Promise> = (source_type, source_id, trigger_id, data, loading) => { - return post( + return put( `${prefix}/${source_type}/${source_id}/trigger/${trigger_id}`, data, undefined, diff --git a/ui/src/views/application/index.vue b/ui/src/views/application/index.vue index 5b6a0274fa0..90fac34c677 100644 --- a/ui/src/views/application/index.vue +++ b/ui/src/views/application/index.vue @@ -253,9 +253,7 @@ diff --git a/ui/src/views/system-resource-management/ApplicationResourceIndex.vue b/ui/src/views/system-resource-management/ApplicationResourceIndex.vue index 344bb94a0da..5d3005d2771 100644 --- a/ui/src/views/system-resource-management/ApplicationResourceIndex.vue +++ b/ui/src/views/system-resource-management/ApplicationResourceIndex.vue @@ -286,7 +286,7 @@ {{ $t('views.trigger.title') }} @@ -355,7 +355,8 @@ const MoreFilledPermission = () => { return ( permissionPrecise.value.export() || permissionPrecise.value.delete() || - permissionPrecise.value.auth() + permissionPrecise.value.auth() || + permissionPrecise.value.trigger_read() ) } diff --git a/ui/src/views/system-resource-management/ToolResourceIndex.vue b/ui/src/views/system-resource-management/ToolResourceIndex.vue index e9af166af84..014dad0cac9 100644 --- a/ui/src/views/system-resource-management/ToolResourceIndex.vue +++ b/ui/src/views/system-resource-management/ToolResourceIndex.vue @@ -332,11 +332,7 @@ {{ $t('views.trigger.title') }} @@ -474,6 +470,7 @@ const MoreFilledPermission = (row: any) => { permissionPrecise.value.delete() || permissionPrecise.value.auth() || permissionPrecise.value.relate_map() || + permissionPrecise.value.trigger_read() || (row.init_field_list?.length > 0 && permissionPrecise.value.edit()) ) } diff --git a/ui/src/views/trigger/ResourceTriggerDrawer.vue b/ui/src/views/trigger/ResourceTriggerDrawer.vue index 9ccef7381a0..0548318f0bd 100644 --- a/ui/src/views/trigger/ResourceTriggerDrawer.vue +++ b/ui/src/views/trigger/ResourceTriggerDrawer.vue @@ -97,13 +97,20 @@ const emit = defineEmits(['refresh']) const createTrigger = (trigger: any) => { if (toolId.value) { - return triggerAPI.postResourceTrigger(props.source, toolId.value, trigger) + return loadSharedApi({ type: 'trigger', systemType: apiType.value }).postResourceTrigger( + props.source, + toolId.value, + trigger, + ) } return Promise.resolve({}) } const editTrigger = (trigger_id: string, trigger: any) => { if (toolId.value) { - return triggerAPI.putResourceTrigger(props.source, toolId.value, trigger_id, trigger) + return loadSharedApi({ + type: 'trigger', + systemType: apiType.value, + }).putResourceTrigger(props.source, toolId.value, trigger_id, trigger) } return Promise.resolve({}) } diff --git a/ui/src/views/trigger/TriggerDrawer.vue b/ui/src/views/trigger/TriggerDrawer.vue index 5412f80718b..ddec99cebd9 100644 --- a/ui/src/views/trigger/TriggerDrawer.vue +++ b/ui/src/views/trigger/TriggerDrawer.vue @@ -504,6 +504,7 @@ import Result from '@/request/Result' import { hasPermission } from '@/utils/permission' import permissionMap from '@/permission' import { PermissionConst, RoleConst } from '@/utils/permission/data' +import { loadSharedApi } from '@/utils/dynamics-api/shared-api' const emit = defineEmits(['refresh']) const props = withDefaults( @@ -573,9 +574,11 @@ const applicationRefresh = (application_selected: any) => { application_list .filter((id) => !existApplicationIds.includes(id)) .map((id) => { - return applicationAPI.getApplicationDetail(id).then((ok) => { - applicationDetailsDict.value[ok.data.id] = ok.data - }) + return loadSharedApi({ type: 'application', systemType: apiType.value }) + .getApplicationDetail(id) + .then((ok: any) => { + applicationDetailsDict.value[ok.data.id] = ok.data + }) }) const task_source_id_list = form.value.trigger_task .filter((task: any) => task.source_type === 'APPLICATION') @@ -613,9 +616,11 @@ const toolRefresh = (tool_selected: any) => { tool_ids .filter((id) => !existToolIds.includes(id)) .map((id) => { - toolAPI.getToolById(id).then((ok) => { - toolDetailsDict.value[ok.data.id] = ok.data - }) + loadSharedApi({ type: 'tool', systemType: apiType.value }) + .getToolById(id) + .then((ok: any) => { + toolDetailsDict.value[ok.data.id] = ok.data + }) }) const task_source_id_list = form.value.trigger_task .filter((task: any) => task.source_type === 'TOOL')