Skip to content

Commit 7d0fdbc

Browse files
committed
fix: [Resource Management] An already published workflow tool still prompts for publication when being enabled.
1 parent b2c59d5 commit 7d0fdbc

File tree

1 file changed

+51
-46
lines changed

1 file changed

+51
-46
lines changed

ui/src/views/system-resource-management/ToolResourceIndex.vue

Lines changed: 51 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
style="width: 120px"
1616
@change="search_type_change"
1717
>
18-
<el-option :label="$t('common.creator')" value="create_user"/>
19-
<el-option :label="$t('common.name')" value="name"/>
20-
<el-option :label="$t('common.type')" value="tool_type"/>
21-
<el-option :label="$t('views.tool.form.source.label')" value="source"/>
18+
<el-option :label="$t('common.creator')" value="create_user" />
19+
<el-option :label="$t('common.name')" value="name" />
20+
<el-option :label="$t('common.type')" value="tool_type" />
21+
<el-option :label="$t('views.tool.form.source.label')" value="source" />
2222
</el-select>
2323
<el-input
2424
v-if="search_type === 'name'"
@@ -36,7 +36,7 @@
3636
clearable
3737
style="width: 220px"
3838
>
39-
<el-option v-for="u in user_options" :key="u.id" :value="u.id" :label="u.nick_name"/>
39+
<el-option v-for="u in user_options" :key="u.id" :value="u.id" :label="u.nick_name" />
4040
</el-select>
4141
<el-select
4242
v-else-if="search_type === 'tool_type'"
@@ -46,7 +46,7 @@
4646
filterable
4747
style="width: 220px"
4848
>
49-
<el-option v-for="u in type_options" :key="u.id" :value="u.value" :label="u.label"/>
49+
<el-option v-for="u in type_options" :key="u.id" :value="u.value" :label="u.label" />
5050
</el-select>
5151
<el-select
5252
v-else-if="search_type === 'source'"
@@ -56,7 +56,7 @@
5656
filterable
5757
style="width: 220px"
5858
>
59-
<el-option v-for="u in source_options" :key="u.id" :value="u.value" :label="u.label"/>
59+
<el-option v-for="u in source_options" :key="u.id" :value="u.value" :label="u.label" />
6060
</el-select>
6161
</div>
6262
</div>
@@ -74,10 +74,10 @@
7474
<el-space :size="8">
7575
<el-icon size="24">
7676
<el-avatar v-if="row?.icon" shape="square" :size="24" style="background: none">
77-
<img :src="resetUrl(row?.icon)" alt=""/>
77+
<img :src="resetUrl(row?.icon)" alt="" />
7878
</el-avatar>
7979

80-
<ToolIcon v-else :size="24" :type="row?.tool_type"/>
80+
<ToolIcon v-else :size="24" :type="row?.tool_type" />
8181
</el-icon>
8282
<span class="ellipsis" style="max-width: 160px">
8383
{{ row.name }}
@@ -109,7 +109,7 @@
109109
<template #default="{ row }">
110110
<div v-if="row.is_active" class="flex align-center">
111111
<el-icon class="color-success mr-8" style="font-size: 16px">
112-
<SuccessFilled/>
112+
<SuccessFilled />
113113
</el-icon>
114114
<span class="color-text-primary">
115115
{{ $t('common.status.enabled') }}
@@ -147,7 +147,7 @@
147147
@click="workspaceVisible = !workspaceVisible"
148148
>
149149
<el-icon>
150-
<Filter/>
150+
<Filter />
151151
</el-icon>
152152
</el-button>
153153
</template>
@@ -173,23 +173,23 @@
173173
/>
174174
</el-checkbox-group>
175175
</el-scrollbar>
176-
<el-empty v-else :description="$t('common.noData')"/>
176+
<el-empty v-else :description="$t('common.noData')" />
177177
</div>
178178
</div>
179179
</div>
180180
<div class="text-right">
181181
<el-button size="small" @click="filterWorkspaceChange('clear')"
182-
>{{ $t('common.clear') }}
182+
>{{ $t('common.clear') }}
183183
</el-button>
184184
<el-button type="primary" @click="filterWorkspaceChange" size="small"
185-
>{{ $t('common.confirm') }}
185+
>{{ $t('common.confirm') }}
186186
</el-button>
187187
</div>
188188
</el-popover>
189189
</div>
190190
</template>
191191
</el-table-column>
192-
<el-table-column prop="nick_name" :label="$t('common.creator')" show-overflow-tooltip/>
192+
<el-table-column prop="nick_name" :label="$t('common.creator')" show-overflow-tooltip />
193193
<el-table-column :label="$t('views.document.table.updateTime')" width="180">
194194
<template #default="{ row }">
195195
{{ datetimeFormat(row.update_time) }}
@@ -211,7 +211,7 @@
211211
v-if="permissionPrecise.switch()"
212212
/>
213213
</span>
214-
<el-divider direction="vertical"/>
214+
<el-divider direction="vertical" />
215215

216216
<el-tooltip
217217
effect="dark"
@@ -381,7 +381,10 @@
381381

382382
<el-dropdown-item
383383
@click.stop="openTriggerDrawer(row)"
384-
v-if="(row.tool_type === 'CUSTOM' || row.tool_type === 'WORKFLOW') && permissionPrecise.trigger_read()"
384+
v-if="
385+
(row.tool_type === 'CUSTOM' || row.tool_type === 'WORKFLOW') &&
386+
permissionPrecise.trigger_read()
387+
"
385388
>
386389
<AppIcon iconName="app-trigger" class="color-secondary"></AppIcon>
387390
{{ $t('views.trigger.title') }}
@@ -397,9 +400,12 @@
397400
<el-dropdown-item
398401
text
399402
@click.stop="openToolRecordDrawer(row)"
400-
v-if="(row.tool_type === 'CUSTOM' || row.tool_type === 'WORKFLOW') && permissionPrecise.record()"
403+
v-if="
404+
(row.tool_type === 'CUSTOM' || row.tool_type === 'WORKFLOW') &&
405+
permissionPrecise.record()
406+
"
401407
>
402-
<AppIcon iconName="app-schedule-report" class="color-secondary"/>
408+
<AppIcon iconName="app-schedule-report" class="color-secondary" />
403409
{{ $t('common.ExecutionRecord.subTitle') }}
404410
</el-dropdown-item>
405411
<el-dropdown-item
@@ -418,24 +424,24 @@
418424
</app-table>
419425
</el-card>
420426

421-
<InitParamDrawer ref="InitParamDrawerRef" @refresh="refresh"/>
422-
<ToolFormDrawer ref="ToolFormDrawerRef" @refresh="refresh" :title="ToolDrawertitle"/>
427+
<InitParamDrawer ref="InitParamDrawerRef" @refresh="refresh" />
428+
<ToolFormDrawer ref="ToolFormDrawerRef" @refresh="refresh" :title="ToolDrawertitle" />
423429
<SkillToolFormDrawer
424430
ref="SkillToolFormDrawerRef"
425431
@refresh="refresh"
426432
:title="SkillToolDrawertitle"
427433
/>
428-
<McpToolFormDrawer ref="McpToolFormDrawerRef" @refresh="refresh" :title="McpToolDrawertitle"/>
434+
<McpToolFormDrawer ref="McpToolFormDrawerRef" @refresh="refresh" :title="McpToolDrawertitle" />
429435
<DataSourceToolFormDrawer
430436
ref="DataSourceToolFormDrawerRef"
431437
@refresh="refresh"
432438
:title="DataSourceToolDrawertitle"
433439
/>
434-
<AddInternalToolDialog ref="AddInternalToolDialogRef" @refresh="confirmAddInternalTool"/>
435-
<McpToolConfigDialog ref="McpToolConfigDialogRef" @refresh="refresh"/>
436-
<ResourceAuthorizationDrawer :type="SourceTypeEnum.TOOL" ref="ResourceAuthorizationDrawerRef"/>
440+
<AddInternalToolDialog ref="AddInternalToolDialogRef" @refresh="confirmAddInternalTool" />
441+
<McpToolConfigDialog ref="McpToolConfigDialogRef" @refresh="refresh" />
442+
<ResourceAuthorizationDrawer :type="SourceTypeEnum.TOOL" ref="ResourceAuthorizationDrawerRef" />
437443
<ResourceMappingDrawer ref="resourceMappingDrawerRef"></ResourceMappingDrawer>
438-
<ExecutionRecordDrawer ref="toolRecordDrawerRef"/>
444+
<ExecutionRecordDrawer ref="toolRecordDrawerRef" />
439445
<ResourceTriggerDrawer
440446
ref="resourceTriggerDrawerRef"
441447
:source="SourceTypeEnum.TOOL"
@@ -448,9 +454,9 @@
448454
</template>
449455

450456
<script lang="ts" setup>
451-
import {onMounted, ref, reactive, computed, watch} from 'vue'
452-
import {useRouter, useRoute} from 'vue-router'
453-
import {cloneDeep} from 'lodash'
457+
import { onMounted, ref, reactive, computed, watch } from 'vue'
458+
import { useRouter, useRoute } from 'vue-router'
459+
import { cloneDeep } from 'lodash'
454460
import InitParamDrawer from '@/views/tool/component/InitParamDrawer.vue'
455461
import ToolResourceApi from '@/api/system-resource-management/tool'
456462
import AddInternalToolDialog from '@/views/tool/tool-store/AddInternalToolDialog.vue'
@@ -460,22 +466,22 @@ import DataSourceToolFormDrawer from '@/views/tool/DataSourceToolFormDrawer.vue'
460466
import ResourceAuthorizationDrawer from '@/components/resource-authorization-drawer/index.vue'
461467
import ResourceTriggerDrawer from '@/views/trigger/ResourceTriggerDrawer.vue'
462468
import WorkflowFormDialog from '@/views/tool/WorkflowFormDialog.vue'
463-
import {t} from '@/locales'
464-
import {SourceTypeEnum} from '@/enums/common'
465-
import {resetUrl} from '@/utils/common'
466-
import {ToolType} from '@/enums/tool'
469+
import { t } from '@/locales'
470+
import { SourceTypeEnum } from '@/enums/common'
471+
import { resetUrl } from '@/utils/common'
472+
import { ToolType } from '@/enums/tool'
467473
import useStore from '@/stores'
468-
import {datetimeFormat} from '@/utils/time'
469-
import {loadPermissionApi} from '@/utils/dynamics-api/permission-api.ts'
474+
import { datetimeFormat } from '@/utils/time'
475+
import { loadPermissionApi } from '@/utils/dynamics-api/permission-api.ts'
470476
import UserApi from '@/api/user/user.ts'
471-
import {MsgSuccess, MsgConfirm, MsgError} from '@/utils/message'
477+
import { MsgSuccess, MsgConfirm, MsgError } from '@/utils/message'
472478
import permissionMap from '@/permission'
473479
import McpToolConfigDialog from '@/views/tool/component/McpToolConfigDialog.vue'
474480
import ResourceMappingDrawer from '@/components/resource_mapping/index.vue'
475481
import ExecutionRecordDrawer from '@/views/tool-workflow/execution-record/ExecutionRecordDrawer.vue'
476482
import SkillToolFormDrawer from '@/views/tool/SkillToolFormDrawer.vue'
477483
478-
const {user} = useStore()
484+
const { user } = useStore()
479485
const router = useRouter()
480486
const search_type = ref('name')
481487
const search_form = ref<any>({
@@ -505,7 +511,7 @@ const type_options = ref<any[]>([
505511
{
506512
label: t('views.tool.toolWorkflow.title'),
507513
value: 'WORKFLOW',
508-
}
514+
},
509515
])
510516
const source_options = ref<any[]>([
511517
{
@@ -589,8 +595,7 @@ function deleteTool(row: any) {
589595
MsgSuccess(t('common.deleteSuccess'))
590596
})
591597
})
592-
.catch(() => {
593-
})
598+
.catch(() => {})
594599
}
595600
596601
function configInitParams(item: any) {
@@ -713,7 +718,7 @@ function addInternalTool(data?: any, isEdit?: boolean) {
713718
714719
function confirmAddInternalTool(data?: any, isEdit?: boolean) {
715720
if (isEdit) {
716-
ToolResourceApi.putTool(data?.id as string, {name: data.name}, loading).then((res: any) => {
721+
ToolResourceApi.putTool(data?.id as string, { name: data.name }, loading).then((res: any) => {
717722
MsgSuccess(t('common.saveSuccess'))
718723
refresh()
719724
})
@@ -745,14 +750,14 @@ async function changeState(row: any) {
745750
})
746751
})
747752
} else {
748-
if (row.tool_type === 'WORKFLOW' && !row.is_publish) {
753+
const res = await ToolResourceApi.getToolById(row.id, changeStateloading)
754+
if (row.tool_type === 'WORKFLOW' && !res.data.is_publish) {
749755
MsgConfirm(t('common.tip'), t('views.tool.toolWorkflow.toActiveTip')).then(() => {
750756
toWorkflow(row)
751757
})
752758
return
753759
}
754760
755-
const res = await ToolResourceApi.getToolById(row.id, changeStateloading)
756761
if (
757762
(!res.data.init_params || Object.keys(res.data.init_params).length === 0) &&
758763
res.data.init_field_list &&
@@ -778,7 +783,7 @@ async function changeState(row: any) {
778783
}
779784
780785
function toWorkflow(data: any) {
781-
router.push({name: 'ToolWorkflow', params: {id: data.id, folderId: 'resource-management'}})
786+
router.push({ name: 'ToolWorkflow', params: { id: data.id, folderId: 'resource-management' } })
782787
}
783788
784789
const filterText = ref('')
@@ -794,7 +799,7 @@ watch(
794799
v.label.toLowerCase().includes(filterText.value.toLowerCase()),
795800
)
796801
},
797-
{immediate: true},
802+
{ immediate: true },
798803
)
799804
800805
function filterWorkspaceChange(val: string) {
@@ -816,7 +821,7 @@ async function getWorkspaceList() {
816821
}
817822
818823
const search_type_change = () => {
819-
search_form.value = {name: '', create_user: ''}
824+
search_form.value = { name: '', create_user: '' }
820825
}
821826
822827
function getList() {

0 commit comments

Comments
 (0)