Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions ui/src/views/tool/WorkflowFormDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
:size="32"
style="background: none"
>
<img :src="String(workflowForm.icon)" alt=""/>
<img :src="String(workflowForm.icon)" alt="" />
</el-Avatar>
<el-avatar v-else class="avatar-green" shape="square" :size="32">
<img src="@/assets/workflow/logo_workflow.svg" style="width: 58%" alt=""/>
<img src="@/assets/workflow/logo_workflow.svg" style="width: 58%" alt="" />
</el-avatar>
<el-Avatar
v-if="showEditIcon"
Expand All @@ -47,7 +47,7 @@
</el-Avatar>
</div>
<el-avatar v-else class="avatar-green mr-12" shape="square" :size="32">
<img src="@/assets/workflow/logo_workflow.svg" style="width: 58%" alt=""/>
<img src="@/assets/workflow/logo_workflow.svg" style="width: 58%" alt="" />
</el-avatar>
<el-input
v-model="workflowForm.name"
Expand Down Expand Up @@ -80,21 +80,21 @@
</el-button>
</span>
</template>
<EditAvatarDialog ref="EditAvatarDialogRef" @refresh="refreshTool" iconType="WORKFLOW"/>
<EditAvatarDialog ref="EditAvatarDialogRef" @refresh="refreshTool" iconType="WORKFLOW" />
</el-dialog>
</template>
<script setup lang="ts">
import {ref, watch, reactive, computed} from 'vue'
import {useRouter, useRoute} from 'vue-router'
import { ref, watch, reactive, computed } from 'vue'
import { useRouter, useRoute } from 'vue-router'
import EditAvatarDialog from '@/views/tool/component/EditAvatarDialog.vue'
import {isAppIcon} from '@/utils/common'
import {MsgSuccess} from '@/utils/message'
import {t} from '@/locales'
import { isAppIcon } from '@/utils/common'
import { MsgSuccess } from '@/utils/message'
import { t } from '@/locales'
import useStore from '@/stores'
import {loadSharedApi} from '@/utils/dynamics-api/shared-api'
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'

const router = useRouter()
const {user, folder} = useStore()
const { user, folder } = useStore()
const emit = defineEmits(['refresh'])

const props = defineProps({
Expand Down Expand Up @@ -160,6 +160,7 @@ const open = (data?: any) => {
workflowForm.value.name = data.name
workflowForm.value.desc = data.desc
workflowForm.value.icon = data.icon
workflowForm.value.work_flow = data.work_flow
isEdit.value = true
}
dialogVisible.value = true
Expand All @@ -179,7 +180,7 @@ const submitHandle = async () => {
await FolderFormRef.value.validate((valid: any) => {
if (valid) {
if (isEdit.value) {
loadSharedApi({type: 'tool', systemType: apiType.value})
loadSharedApi({ type: 'tool', systemType: apiType.value })
.putTool(editId.value as string, workflowForm.value)
.then((res: any) => {
MsgSuccess(t('common.editSuccess'))
Expand All @@ -192,16 +193,16 @@ const submitHandle = async () => {
loading.value = false
})
} else {
loadSharedApi({type: 'tool', systemType: apiType.value})
.postTool({...workflowForm.value, folder_id: folder.currentFolder?.id, code: 'None'})
loadSharedApi({ type: 'tool', systemType: apiType.value })
.postTool({ ...workflowForm.value, folder_id: folder.currentFolder?.id, code: 'None' })
.then((res: any) => {
MsgSuccess(t('common.createSuccess'))
emit('refresh', res.data)
return user.profile().then(() => {
const folderId = res.data.scope === 'SHARED' ? 'shared' : res.data.folder_id
router.push({
name: 'ToolWorkflow',
params: {id: res.data.id, folderId: folderId},
params: { id: res.data.id, folderId: folderId },
})
dialogVisible.value = false
})
Expand All @@ -214,6 +215,6 @@ const submitHandle = async () => {
})
}

defineExpose({open})
defineExpose({ open })
</script>
<style lang="scss" scoped></style>
16 changes: 14 additions & 2 deletions ui/src/views/tool/component/ToolListContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@
<el-option v-for="u in user_options" :key="u.id" :value="u.id" :label="u.nick_name" />
</el-select>
</div>
<span class="ml-8" v-if="!isShared && (permissionPrecise.batchMove() || permissionPrecise.batchDelete())">
<span
class="ml-8"
v-if="!isShared && (permissionPrecise.batchMove() || permissionPrecise.batchDelete())"
>
<el-button @click="batchSelectedHandle(true)" v-if="isBatch === false">
<AppIcon iconName="app-batch-delete" class="mr-4" />
{{ $t('views.paragraph.setting.batchSelected') }}
Expand Down Expand Up @@ -487,6 +490,7 @@
<ExecutionRecordDrawer ref="toolRecordDrawerRef" />
<WorkflowFormDialog
ref="workflowFormDialogRef"
@refresh="toWorkflow"
:title="workflowFormDialogtitle"
></WorkflowFormDialog>
</ContentContainer>
Expand Down Expand Up @@ -866,7 +870,7 @@ const openCreateWorkflowDialog = (data?: any) => {
loadSharedApi({ type: 'tool', systemType: apiType.value })
.getToolById(data?.id, loading)
.then((res: any) => {
toWorkflow( res.data)
toWorkflow(res.data)
workflowFormDialogRef.value?.open(res.data)
})
} else {
Expand Down Expand Up @@ -980,6 +984,14 @@ async function copyTool(row: any) {
await copySkillTool(row)
return
}
if (row?.tool_type === 'WORKFLOW') {
const res = await loadSharedApi({ type: 'tool', systemType: apiType.value }).getToolById(
row.id,
changeStateloading,
)
workflowFormDialogRef.value?.open(res.data)
return
}
ToolDrawertitle.value = t('views.tool.copyTool')
const res = await loadSharedApi({ type: 'tool', systemType: apiType.value }).getToolById(
row.id,
Expand Down
Loading