panyy
/
UnisKB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Fix form node drag-and-drop issues and some style errors

v3.2
wangdan-fit2cloud 2025-08-28 16:21:33 +08:00
parent d53b4dcd00
commit 24b36bf90f
30 changed files with 146 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/src/components/app-icon/icons/knowledge.ts
View File

@ -127,25 +127,4 @@ export default {
]) ])
}, },
}, },
'app-add-circle-outlined': {
iconReader: () => {
return h('i', [
h(
'svg',
{
style: { height: '100%', width: '100%' },
viewBox: '0 0 1024 1024',
version: '1.1',
xmlns: 'http://www.w3.org/2000/svg',
},
[
h('path', {
d: 'M469.333333 469.333333V320a21.333333 21.333333 0 0 1 21.333334-21.333333h42.666666a21.333333 21.333333 0 0 1 21.333334 21.333333V469.333333h149.333333a21.333333 21.333333 0 0 1 21.333333 21.333334v42.666666a21.333333 21.333333 0 0 1-21.333333 21.333334H554.666667v149.333333a21.333333 21.333333 0 0 1-21.333334 21.333333h-42.666666a21.333333 21.333333 0 0 1-21.333334-21.333333V554.666667H320a21.333333 21.333333 0 0 1-21.333333-21.333334v-42.666666a21.333333 21.333333 0 0 1 21.333333-21.333334H469.333333z m42.666667 426.666667a384 384 0 1 0 0-768 384 384 0 0 0 0 768z m0 85.333333C252.8 981.333333 42.666667 771.2 42.666667 512S252.8 42.666667 512 42.666667s469.333333 210.133333 469.333333 469.333333-210.133333 469.333333-469.333333 469.333333z',
fill: 'currentColor',
}),
],
),
])
},
},
} }

42
ui/src/components/app-icon/index.ts
View File

@ -453,6 +453,48 @@ export const iconMap: any = {
]) ])
}, },
}, },
'app-add-outlined': {
iconReader: () => {
return h('i', [
h(
'svg',
{
style: { height: '100%', width: '100%' },
viewBox: '0 0 1024 1024',
version: '1.1',
xmlns: 'http://www.w3.org/2000/svg',
},
[
h('path', {
d: 'M469.333333 469.333333V112.682667c0-9.514667 0.981333-12.970667 2.858667-16.426667a19.370667 19.370667 0 0 1 8.064-8.106667c3.456-1.834667 6.912-2.816 16.426667-2.816h30.634666c9.514667 0 12.970667 0.981333 16.426667 2.858667a19.370667 19.370667 0 0 1 8.106667 8.064c1.834667 3.456 2.816 6.912 2.816 16.426667V469.333333h356.650666c9.514667 0 12.970667 0.981333 16.426667 2.858667a19.370667 19.370667 0 0 1 8.106667 8.064c1.834667 3.456 2.816 6.912 2.816 16.426667v30.634666c0 9.514667-0.981333 12.970667-2.858667 16.426667a19.370667 19.370667 0 0 1-8.064 8.106667c-3.456 1.834667-6.912 2.816-16.426667 2.816H554.666667v356.650666c0 9.514667-0.981333 12.970667-2.858667 16.426667a19.370667 19.370667 0 0 1-8.064 8.106667c-3.456 1.834667-6.912 2.816-16.426667 2.816h-30.634666c-9.514667 0-12.970667-0.981333-16.426667-2.858667a19.370667 19.370667 0 0 1-8.106667-8.064c-1.834667-3.456-2.816-6.912-2.816-16.426667V554.666667H112.682667c-9.514667 0-12.970667-0.981333-16.426667-2.858667a19.370667 19.370667 0 0 1-8.106667-8.064C86.357333 540.288 85.333333 536.832 85.333333 527.36v-30.634667c0-9.514667 0.981333-12.970667 2.858667-16.426666a19.370667 19.370667 0 0 1 8.064-8.106667c3.456-1.834667 6.912-2.816 16.426667-2.816H469.333333z',
fill: 'currentColor',
}),
],
),
])
},
},
'app-add-circle-outlined': {
iconReader: () => {
return h('i', [
h(
'svg',
{
style: { height: '100%', width: '100%' },
viewBox: '0 0 1024 1024',
version: '1.1',
xmlns: 'http://www.w3.org/2000/svg',
},
[
h('path', {
d: 'M469.333333 469.333333V320a21.333333 21.333333 0 0 1 21.333334-21.333333h42.666666a21.333333 21.333333 0 0 1 21.333334 21.333333V469.333333h149.333333a21.333333 21.333333 0 0 1 21.333333 21.333334v42.666666a21.333333 21.333333 0 0 1-21.333333 21.333334H554.666667v149.333333a21.333333 21.333333 0 0 1-21.333334 21.333333h-42.666666a21.333333 21.333333 0 0 1-21.333334-21.333333V554.666667H320a21.333333 21.333333 0 0 1-21.333333-21.333334v-42.666666a21.333333 21.333333 0 0 1 21.333333-21.333334H469.333333z m42.666667 426.666667a384 384 0 1 0 0-768 384 384 0 0 0 0 768z m0 85.333333C252.8 981.333333 42.666667 771.2 42.666667 512S252.8 42.666667 512 42.666667s469.333333 210.133333 469.333333 469.333333-210.133333 469.333333-469.333333 469.333333z',
fill: 'currentColor',
}),
],
),
])
},
},
// 动态加载的图标 // 动态加载的图标
...dynamicIcons, ...dynamicIcons,
} }

2
ui/src/components/app-table/index.vue
View File

@ -24,7 +24,7 @@
</div> </div>
<div v-else @click="quickCreateHandle" class="w-full"> <div v-else @click="quickCreateHandle" class="w-full">
<el-button type="primary" link class="quich-button"> <el-button type="primary" link class="quich-button">
<el-icon><Plus /></el-icon> <AppIcon iconName="app-add-outlined"></AppIcon>
<span class="ml-4">{{ quickCreatePlaceholder }}</span> <span class="ml-4">{{ quickCreatePlaceholder }}</span>
</el-button> </el-button>
</div> </div>

4
ui/src/components/dynamics-form/constructor/items/MultiSelectConstructor.vue
View File

@ -57,9 +57,7 @@
<div class="flex-between"> <div class="flex-between">
{{ $t('dynamicsForm.Select.label') }} {{ $t('dynamicsForm.Select.label') }}
<el-button link type="primary" @click.stop="addOption()"> <el-button link type="primary" @click.stop="addOption()">
<el-icon class="mr-4"> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
<Plus />
</el-icon>
{{ $t('common.add') }} {{ $t('common.add') }}
</el-button> </el-button>
</div> </div>

4
ui/src/components/dynamics-form/constructor/items/RadioCardConstructor.vue
View File

@ -56,9 +56,7 @@
<div class="flex-between"> <div class="flex-between">
{{ $t('dynamicsForm.Select.label') }} {{ $t('dynamicsForm.Select.label') }}
<el-button link type="primary" @click.stop="addOption()"> <el-button link type="primary" @click.stop="addOption()">
<el-icon class="mr-4"> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
<Plus />
</el-icon>
{{ $t('common.add') }} {{ $t('common.add') }}
</el-button> </el-button>
</div> </div>

4
ui/src/components/dynamics-form/constructor/items/RadioRowConstructor.vue
View File

@ -56,9 +56,7 @@
<div class="flex-between"> <div class="flex-between">
{{ $t('dynamicsForm.Select.label') }} {{ $t('dynamicsForm.Select.label') }}
<el-button link type="primary" @click.stop="addOption()"> <el-button link type="primary" @click.stop="addOption()">
<el-icon class="mr-4"> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
<Plus />
</el-icon>
{{ $t('common.add') }} {{ $t('common.add') }}
</el-button> </el-button>
</div> </div>

4
ui/src/components/dynamics-form/constructor/items/SingleSelectConstructor.vue
View File

@ -55,9 +55,7 @@
<div class="flex-between"> <div class="flex-between">
{{ $t('dynamicsForm.Select.label') }} {{ $t('dynamicsForm.Select.label') }}
<el-button link type="primary" @click.stop="addOption()"> <el-button link type="primary" @click.stop="addOption()">
<el-icon class="mr-4"> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
<Plus />
</el-icon>
{{ $t('common.add') }} {{ $t('common.add') }}
</el-button> </el-button>
</div> </div>

8
ui/src/components/model-select/index.vue
View File

@ -53,12 +53,8 @@
<template #footer v-if="showFooter"> <template #footer v-if="showFooter">
<slot name="footer"> <slot name="footer">
<div class="w-full text-left cursor" @click="openCreateModel(undefined, props.modelType)"> <div class="w-full text-left cursor" @click="openCreateModel(undefined, props.modelType)">
<el-button type="primary" link <el-button type="primary" link v-if="permissionPrecise.create()">
v-if="permissionPrecise.create()" <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
>
<el-icon class="mr-4">
<Plus />
</el-icon>
{{ $t('views.application.operation.addModel') }} {{ $t('views.application.operation.addModel') }}
</el-button> </el-button>
</div> </div>

17
ui/src/styles/element-plus.scss
View File

@ -304,3 +304,20 @@
.el-pagination .el-select { .el-pagination .el-select {
width: 105px; width: 105px;
} }
// el-checkbox
.el-checkbox {
--el-checkbox-font-weight: 400;
--el-checkbox-text-color: var(--el-text-color-primary);
}
.el-checkbox__input.is-checked + .el-checkbox__label {
color: var(--el-text-color-primary);
}
// el-radio
.el-radio {
--el-radio-font-weight: 400;
}
.el-radio__input.is-checked + .el-radio__label {
color: var(--el-text-color-primary);
}

4
ui/src/views/application/ApplicationSetting.vue
View File

@ -175,9 +175,7 @@
{{ $t('common.paramSetting') }} {{ $t('common.paramSetting') }}
</el-button> </el-button>
<el-button type="primary" link @click="openKnowledgeDialog"> <el-button type="primary" link @click="openKnowledgeDialog">
<el-icon class="mr-4"> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
<Plus />
</el-icon>
{{ $t('common.add') }} {{ $t('common.add') }}
</el-button> </el-button>
</div> </div>

2
ui/src/views/application/component/CreateApplicationDialog.vue
View File

@ -53,7 +53,7 @@
:class="appTemplate === 'blank' ? 'active' : ''" :class="appTemplate === 'blank' ? 'active' : ''"
> >
<div class="flex-center p-24"> <div class="flex-center p-24">
<el-icon class="mr-12"><Plus /></el-icon> <AppIcon iconName="app-add-outlined" class="mr-12"></AppIcon>
{{ $t('views.application.form.appTemplate.blankApp.title') }} {{ $t('views.application.form.appTemplate.blankApp.title') }}
</div> </div>
</el-card> </el-card>

22
ui/src/views/knowledge/component/EditParagraphDialog.vue
View File

@ -10,7 +10,12 @@
> >
<el-row v-if="isConnect"> <el-row v-if="isConnect">
<el-col :span="18" class="p-24"> <el-col :span="18" class="p-24">
<ParagraphForm ref="paragraphFormRef" :data="detail" :isEdit="true" :knowledge-id="knowledgeId"/> <ParagraphForm
ref="paragraphFormRef"
:data="detail"
:isEdit="true"
:knowledge-id="knowledgeId"
/>
</el-col> </el-col>
<el-col :span="6" class="border-l" style="width: 300px"> <el-col :span="6" class="border-l" style="width: 300px">
<p class="bold title p-24" style="padding-bottom: 0"> <p class="bold title p-24" style="padding-bottom: 0">
@ -18,7 +23,7 @@
<span>{{ $t('views.paragraph.relatedProblem.title') }}</span> <span>{{ $t('views.paragraph.relatedProblem.title') }}</span>
<el-divider direction="vertical" class="mr-4" /> <el-divider direction="vertical" class="mr-4" />
<el-button text @click="addProblem"> <el-button text @click="addProblem">
<el-icon><Plus /></el-icon> <AppIcon iconName="app-add-outlined"></AppIcon>
</el-button> </el-button>
</span> </span>
</p> </p>
@ -52,7 +57,12 @@
</el-col> </el-col>
</el-row> </el-row>
<div v-else class="p-24"> <div v-else class="p-24">
<ParagraphForm ref="paragraphFormRef" :data="detail" :isEdit="true" :knowledge-id="knowledgeId"/> <ParagraphForm
ref="paragraphFormRef"
:data="detail"
:isEdit="true"
:knowledge-id="knowledgeId"
/>
</div> </div>
<template #footer> <template #footer>
@ -70,7 +80,7 @@ import ParagraphForm from '@/views/paragraph/component/ParagraphForm.vue'
const props = defineProps({ const props = defineProps({
isConnect: Boolean, isConnect: Boolean,
knowledgeId: String knowledgeId: String,
}) })
const emit = defineEmits(['updateContent']) const emit = defineEmits(['updateContent'])
@ -106,7 +116,7 @@ function addProblemHandle() {
!detail.value?.problem_list.some((item: any) => item.content === problemValue.value.trim()) !detail.value?.problem_list.some((item: any) => item.content === problemValue.value.trim())
) { ) {
detail.value?.problem_list?.push({ detail.value?.problem_list?.push({
content: problemValue.value.trim() content: problemValue.value.trim(),
}) })
} }
@ -125,7 +135,7 @@ const submitHandle = async () => {
if (await paragraphFormRef.value?.validate()) { if (await paragraphFormRef.value?.validate()) {
emit('updateContent', { emit('updateContent', {
problem_list: detail.value.problem_list, problem_list: detail.value.problem_list,
...paragraphFormRef.value?.form ...paragraphFormRef.value?.form,
}) })
dialogVisible.value = false dialogVisible.value = false
} }

9
ui/src/views/paragraph/component/ProblemComponent.vue
View File

@ -3,10 +3,8 @@
<span class="flex align-center"> <span class="flex align-center">
<span>{{ $t('views.paragraph.relatedProblem.title') }}</span> <span>{{ $t('views.paragraph.relatedProblem.title') }}</span>
<el-divider direction="vertical" class="mr-4" /> <el-divider direction="vertical" class="mr-4" />
<el-button text @click="addProblem" <el-button text @click="addProblem" v-if="permissionPrecise.problem_relate(id)">
v-if="permissionPrecise.problem_relate(id)" <AppIcon iconName="app-add-outlined"></AppIcon>
>
<el-icon><Plus /></el-icon>
</el-button> </el-button>
</span> </span>
</p> </p>
@ -45,7 +43,7 @@
class="question-tag" class="question-tag"
type="info" type="info"
effect="plain" effect="plain"
v-bind="permissionPrecise.problem_relate(id) ? {closable:true} : {} " v-bind="permissionPrecise.problem_relate(id) ? { closable: true } : {}"
> >
<auto-tooltip :content="item.content"> <auto-tooltip :content="item.content">
{{ item.content }} {{ item.content }}
@ -62,7 +60,6 @@ import { useRoute } from 'vue-router'
import { loadSharedApi } from '@/utils/dynamics-api/shared-api' import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
import permissionMap from '@/permission' import permissionMap from '@/permission'
const props = defineProps<{ const props = defineProps<{
paragraphId: string paragraphId: string
docId: string docId: string

4
ui/src/views/system-chat-user/group/index.vue
View File

@ -33,9 +33,7 @@
) )
" "
> >
<el-icon :size="18"> <AppIcon iconName="app-add-outlined"></AppIcon>
<Plus />
</el-icon>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
</div> </div>

5
ui/src/views/system-setting/theme/index.vue
View File

@ -420,10 +420,5 @@ onMounted(() => {
background: var(--app-header-bg-color); background: var(--app-header-bg-color);
} }
} }
.theme-form {
:deep(.el-checkbox__input.is-checked + .el-checkbox__label) {
color: var(--el-checkbox-text-color);
}
}
} }
</style> </style>

4
ui/src/views/system/role/component/MemberFormContent.vue
View File

@ -57,9 +57,7 @@
</el-scrollbar> </el-scrollbar>
<!-- 添加按钮 --> <!-- 添加按钮 -->
<el-button type="primary" text class="mt-2" @click="handleAdd"> <el-button type="primary" text class="mt-2" @click="handleAdd">
<el-icon class="mr-4"> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
<Plus />
</el-icon>
{{ props.addText ?? $t('views.role.member.add') }} {{ props.addText ?? $t('views.role.member.add') }}
</el-button> </el-button>
</el-form> </el-form>

2
ui/src/views/system/role/index.vue
View File

@ -53,7 +53,7 @@
) )
" "
> >
<el-icon :size="18"><Plus /></el-icon> <AppIcon iconName="app-add-outlined"></AppIcon>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
</div> </div>

2
ui/src/views/system/workspace/index.vue
View File

@ -18,7 +18,7 @@
@click="createOrUpdateWorkspace()" @click="createOrUpdateWorkspace()"
v-hasPermission="[RoleConst.ADMIN, PermissionConst.WORKSPACE_CREATE]" v-hasPermission="[RoleConst.ADMIN, PermissionConst.WORKSPACE_CREATE]"
> >
<el-icon :size="18"><Plus /></el-icon> <AppIcon iconName="app-add-outlined"></AppIcon>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
</div> </div>

10
ui/src/views/tool/ToolFormDrawer.vue
View File

@ -77,9 +77,7 @@
{{ $t('common.param.initParam') }} {{ $t('common.param.initParam') }}
</h4> </h4>
<el-button link type="primary" @click="openAddInitDialog()"> <el-button link type="primary" @click="openAddInitDialog()">
<el-icon class="mr-4"> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
<Plus />
</el-icon>
{{ $t('common.add') }} {{ $t('common.add') }}
</el-button> </el-button>
</div> </div>
@ -149,9 +147,7 @@
</el-text> </el-text>
</h4> </h4>
<el-button link type="primary" @click="openAddDialog()"> <el-button link type="primary" @click="openAddDialog()">
<el-icon class="mr-4"> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
<Plus />
</el-icon>
{{ $t('common.add') }} {{ $t('common.add') }}
</el-button> </el-button>
</div> </div>
@ -196,7 +192,7 @@
</el-table> </el-table>
<h4 class="title-decoration-1 mb-16"> <h4 class="title-decoration-1 mb-16">
{{ $t('views.tool.form.param.code') }} {{ $t('views.tool.form.param.code') }}
<span class="color-danger" style="margin-left: -10px">*</span> <span class="color-danger" style="margin-left: -10px">*</span>
<el-text type="info" class="color-secondary"> <el-text type="info" class="color-secondary">
{{ $t('views.tool.form.param.paramInfo2') }} {{ $t('views.tool.form.param.paramInfo2') }}
</el-text> </el-text>

14
ui/src/workflow/nodes/base-node/component/ApiInputFieldTable.vue
View File

@ -2,18 +2,16 @@
<div class="flex-between mb-16"> <div class="flex-between mb-16">
<h5 class="lighter">{{ $t('views.model.modelForm.title.apiParamPassing') }}</h5> <h5 class="lighter">{{ $t('views.model.modelForm.title.apiParamPassing') }}</h5>
<el-button link type="primary" @click="openAddDialog()"> <el-button link type="primary" @click="openAddDialog()">
<el-icon class="mr-4"> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
<Plus />
</el-icon>
{{ $t('common.add') }} {{ $t('common.add') }}
</el-button> </el-button>
</div> </div>
<el-table <el-table
v-if="props.nodeModel.properties.api_input_field_list?.length > 0" v-if="props.nodeModel.properties.api_input_field_list?.length > 0"
:data="props.nodeModel.properties.api_input_field_list" :data="props.nodeModel.properties.api_input_field_list"
class="mb-16" class="mb-16 api-input-field-table"
ref="tableRef" ref="tableRef"
row-key="field" row-key="variable"
> >
<el-table-column prop="variable" :label="$t('dynamicsForm.paramForm.field.label')"> <el-table-column prop="variable" :label="$t('dynamicsForm.paramForm.field.label')">
<template #default="{ row }"> <template #default="{ row }">
@ -59,7 +57,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { onMounted, ref } from 'vue' import { onMounted, ref } from 'vue'
import { set } from 'lodash' import { set, cloneDeep } from 'lodash'
import Sortable from 'sortablejs' import Sortable from 'sortablejs'
import ApiFieldFormDialog from './ApiFieldFormDialog.vue' import ApiFieldFormDialog from './ApiFieldFormDialog.vue'
import { MsgError } from '@/utils/message' import { MsgError } from '@/utils/message'
@ -116,7 +114,7 @@ function onDragHandle() {
// 获取表格的 tbody DOM 元素 // 获取表格的 tbody DOM 元素
const wrapper = tableRef.value.$el as HTMLElement const wrapper = tableRef.value.$el as HTMLElement
const tbody = wrapper.querySelector('.el-table__body-wrapper tbody') const tbody = wrapper.querySelector('.api-input-field-table .el-table__body-wrapper tbody')
if (!tbody) return if (!tbody) return
// 初始化 Sortable // 初始化 Sortable
Sortable.create(tbody as HTMLElement, { Sortable.create(tbody as HTMLElement, {
@ -125,7 +123,7 @@ function onDragHandle() {
onEnd: (evt) => { onEnd: (evt) => {
if (evt.oldIndex === undefined || evt.newIndex === undefined) return if (evt.oldIndex === undefined || evt.newIndex === undefined) return
// 更新数据顺序 // 更新数据顺序
const items = [...inputFieldList.value] const items = cloneDeep([...inputFieldList.value])
const [movedItem] = items.splice(evt.oldIndex, 1) const [movedItem] = items.splice(evt.oldIndex, 1)
items.splice(evt.newIndex, 0, movedItem) items.splice(evt.newIndex, 0, movedItem)
inputFieldList.value = items inputFieldList.value = items

4
ui/src/workflow/nodes/base-node/component/ChatFieldTable.vue
View File

@ -6,9 +6,7 @@
<div> <div>
<span class="ml-4"> <span class="ml-4">
<el-button link type="primary" @click="openAddDialog()"> <el-button link type="primary" @click="openAddDialog()">
<el-icon class="mr-4"> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
<Plus />
</el-icon>
{{ $t('common.add') }} {{ $t('common.add') }}
</el-button> </el-button>
</span> </span>

8
ui/src/workflow/nodes/base-node/component/UserInputFieldTable.vue
View File

@ -9,9 +9,7 @@
</el-button> </el-button>
<span class="ml-4"> <span class="ml-4">
<el-button link type="primary" @click="openAddDialog()"> <el-button link type="primary" @click="openAddDialog()">
<el-icon class="mr-4"> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
<Plus />
</el-icon>
{{ $t('common.add') }} {{ $t('common.add') }}
</el-button> </el-button>
</span> </span>
@ -109,7 +107,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { onMounted, ref } from 'vue' import { onMounted, ref } from 'vue'
import { set } from 'lodash' import { set,cloneDeep } from 'lodash'
import Sortable from 'sortablejs' import Sortable from 'sortablejs'
import UserFieldFormDialog from './UserFieldFormDialog.vue' import UserFieldFormDialog from './UserFieldFormDialog.vue'
import { MsgError } from '@/utils/message' import { MsgError } from '@/utils/message'
@ -200,7 +198,7 @@ function onDragHandle() {
onEnd: (evt) => { onEnd: (evt) => {
if (evt.oldIndex === undefined || evt.newIndex === undefined) return if (evt.oldIndex === undefined || evt.newIndex === undefined) return
// 更新数据顺序 // 更新数据顺序
const items = [...inputFieldList.value] const items = cloneDeep([...inputFieldList.value])
const [movedItem] = items.splice(evt.oldIndex, 1) const [movedItem] = items.splice(evt.oldIndex, 1)
items.splice(evt.newIndex, 0, movedItem) items.splice(evt.newIndex, 0, movedItem)
inputFieldList.value = items inputFieldList.value = items

4
ui/src/workflow/nodes/condition-node/index.vue
View File

@ -144,14 +144,14 @@
@click="addCondition(index)" @click="addCondition(index)"
v-if="index !== form_data.branch.length - 1" v-if="index !== form_data.branch.length - 1"
> >
<el-icon class="mr-4"><Plus /></el-icon> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
{{ $t('views.applicationWorkflow.nodes.conditionNode.addCondition') }} {{ $t('views.applicationWorkflow.nodes.conditionNode.addCondition') }}
</el-button> </el-button>
</el-card> </el-card>
</template> </template>
</VueDraggable> </VueDraggable>
<el-button link type="primary" @click="addBranch"> <el-button link type="primary" @click="addBranch">
<el-icon class="mr-4"><Plus /></el-icon> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
{{ $t('views.applicationWorkflow.nodes.conditionNode.addBranch') }} {{ $t('views.applicationWorkflow.nodes.conditionNode.addBranch') }}
</el-button> </el-button>
</el-form> </el-form>

6
ui/src/workflow/nodes/form-node/index.vue
View File

@ -57,9 +57,7 @@
{{ $t('views.applicationWorkflow.nodes.formNode.formSetting') }} {{ $t('views.applicationWorkflow.nodes.formNode.formSetting') }}
</h5> </h5>
<el-button link type="primary" @click="openAddFormCollect()"> <el-button link type="primary" @click="openAddFormCollect()">
<el-icon class="mr-4"> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
<Plus />
</el-icon>
{{ $t('common.add') }} {{ $t('common.add') }}
</el-button> </el-button>
</div></template </div></template
@ -263,7 +261,7 @@ function onDragHandle() {
onEnd: (evt) => { onEnd: (evt) => {
if (evt.oldIndex === undefined || evt.newIndex === undefined) return if (evt.oldIndex === undefined || evt.newIndex === undefined) return
// 更新数据顺序 // 更新数据顺序
const items = [...form_data.value.form_field_list] const items = cloneDeep([...form_data.value.form_field_list])
const [movedItem] = items.splice(evt.oldIndex, 1) const [movedItem] = items.splice(evt.oldIndex, 1)
items.splice(evt.newIndex, 0, movedItem) items.splice(evt.newIndex, 0, movedItem)
form_data.value.form_field_list = items form_data.value.form_field_list = items

63
ui/src/workflow/nodes/mcp-node/index.vue
View File

@ -28,7 +28,7 @@
:label="$t('views.applicationWorkflow.nodes.mcpNode.reference')" :label="$t('views.applicationWorkflow.nodes.mcpNode.reference')"
value="referencing" value="referencing"
/> />
<el-option :label="$t('common.custom')" value="custom"/> <el-option :label="$t('common.custom')" value="custom" />
</el-select> </el-select>
</div> </div>
</template> </template>
@ -41,8 +41,12 @@
@submitDialog="submitDialog" @submitDialog="submitDialog"
:placeholder="mcpServerJson" :placeholder="mcpServerJson"
/> />
<el-select v-else v-model="form_data.mcp_tool_id" filterable <el-select
@change="mcpToolSelectChange"> v-else
v-model="form_data.mcp_tool_id"
filterable
@change="mcpToolSelectChange"
>
<el-option <el-option
v-for="mcpTool in mcpToolSelectOptions" v-for="mcpTool in mcpToolSelectOptions"
:key="mcpTool.id" :key="mcpTool.id"
@ -61,9 +65,7 @@
<div class="flex-between"> <div class="flex-between">
<span>{{ $t('views.tool.title') }}</span> <span>{{ $t('views.tool.title') }}</span>
<el-button type="primary" link @click="getTools()"> <el-button type="primary" link @click="getTools()">
<el-icon class="mr-4"> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
<Plus/>
</el-icon>
{{ $t('views.applicationWorkflow.nodes.mcpNode.getTool') }} {{ $t('views.applicationWorkflow.nodes.mcpNode.getTool') }}
</el-button> </el-button>
</div> </div>
@ -116,7 +118,7 @@
<template #label> <template #label>
<div class="flex-between"> <div class="flex-between">
<div> <div>
<TooltipLabel :label="item.label.label" :tooltip="item.label.attrs.tooltip"/> <TooltipLabel :label="item.label.label" :tooltip="item.label.attrs.tooltip" />
<span v-if="item.required" class="color-danger">*</span> <span v-if="item.required" class="color-danger">*</span>
</div> </div>
<el-select <el-select
@ -130,7 +132,7 @@
:label="$t('views.applicationWorkflow.nodes.replyNode.replyContent.reference')" :label="$t('views.applicationWorkflow.nodes.replyNode.replyContent.reference')"
value="referencing" value="referencing"
/> />
<el-option :label="$t('common.custom')" value="custom"/> <el-option :label="$t('common.custom')" value="custom" />
</el-select> </el-select>
</div> </div>
</template> </template>
@ -185,7 +187,7 @@
<template #label> <template #label>
<div class="flex-between"> <div class="flex-between">
<div> <div>
<TooltipLabel :label="item.label.label" :tooltip="item.label.attrs.tooltip"/> <TooltipLabel :label="item.label.label" :tooltip="item.label.attrs.tooltip" />
<span v-if="item.required" class="color-danger">*</span> <span v-if="item.required" class="color-danger">*</span>
</div> </div>
<el-select <el-select
@ -198,7 +200,7 @@
:label="$t('views.applicationWorkflow.nodes.replyNode.replyContent.reference')" :label="$t('views.applicationWorkflow.nodes.replyNode.replyContent.reference')"
value="referencing" value="referencing"
/> />
<el-option :label="$t('common.custom')" value="custom"/> <el-option :label="$t('common.custom')" value="custom" />
</el-select> </el-select>
</div> </div>
</template> </template>
@ -244,14 +246,14 @@ import TooltipLabel from '@/components/dynamics-form/items/label/TooltipLabel.vu
import NodeCascader from '@/workflow/common/NodeCascader.vue' import NodeCascader from '@/workflow/common/NodeCascader.vue'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import { loadSharedApi } from '@/utils/dynamics-api/shared-api' import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
import useStore from "@/stores"; import useStore from '@/stores'
const props = defineProps<{ nodeModel: any }>() const props = defineProps<{ nodeModel: any }>()
const {user} = useStore() const { user } = useStore()
const route = useRoute() const route = useRoute()
const { const {
params: {id}, params: { id },
} = route as any } = route as any
const getApplicationDetail = inject('getApplicationDetail') as any const getApplicationDetail = inject('getApplicationDetail') as any
const applicationDetail = getApplicationDetail() const applicationDetail = getApplicationDetail()
@ -302,8 +304,10 @@ function submitDialog(val: string) {
} }
async function mcpToolSelectChange() { async function mcpToolSelectChange() {
const tool = await loadSharedApi({type: 'tool', systemType: apiType.value}) const tool = await loadSharedApi({ type: 'tool', systemType: apiType.value }).getToolById(
.getToolById(form_data.value.mcp_tool_id, loading) form_data.value.mcp_tool_id,
loading,
)
form_data.value.mcp_servers = tool.data.code form_data.value.mcp_servers = tool.data.code
} }
@ -322,7 +326,7 @@ function getTools() {
MsgError(t('views.applicationWorkflow.nodes.mcpNode.mcpServerTip')) MsgError(t('views.applicationWorkflow.nodes.mcpNode.mcpServerTip'))
return return
} }
loadSharedApi({type: 'application', systemType: apiType.value}) loadSharedApi({ type: 'application', systemType: apiType.value })
.getMcpTools(id, form_data.value.mcp_servers, loading) .getMcpTools(id, form_data.value.mcp_servers, loading)
.then((res: any) => { .then((res: any) => {
form_data.value.mcp_tools = res.data form_data.value.mcp_tools = res.data
@ -365,7 +369,7 @@ function changeTool() {
label: { label: {
input_type: 'TooltipLabel', input_type: 'TooltipLabel',
label: item2, label: item2,
attrs: {tooltip: params[item2].description}, attrs: { tooltip: params[item2].description },
props_info: {}, props_info: {},
}, },
input_type: input_type, input_type: input_type,
@ -401,7 +405,7 @@ function changeTool() {
label: { label: {
input_type: 'TooltipLabel', input_type: 'TooltipLabel',
label: item, label: item,
attrs: {tooltip: args_schema.properties[item].description}, attrs: { tooltip: args_schema.properties[item].description },
props_info: {}, props_info: {},
}, },
input_type: input_type, input_type: input_type,
@ -421,7 +425,7 @@ function changeTool() {
} }
// //
if (form_data.value.params_nested) { if (form_data.value.params_nested) {
form_data.value.tool_params = {[form_data.value.params_nested]: {}} form_data.value.tool_params = { [form_data.value.params_nested]: {} }
} else { } else {
form_data.value.tool_params = {} form_data.value.tool_params = {}
} }
@ -492,20 +496,21 @@ function getMcpToolSelectOptions() {
const obj = const obj =
apiType.value === 'systemManage' apiType.value === 'systemManage'
? { ? {
scope: 'WORKSPACE', scope: 'WORKSPACE',
tool_type: 'MCP', tool_type: 'MCP',
workspace_id: applicationDetail.value?.workspace_id, workspace_id: applicationDetail.value?.workspace_id,
} }
: { : {
scope: 'WORKSPACE', scope: 'WORKSPACE',
tool_type: 'MCP', tool_type: 'MCP',
} }
loadSharedApi({type: 'tool', systemType: apiType.value}) loadSharedApi({ type: 'tool', systemType: apiType.value })
.getAllToolList(obj, loading) .getAllToolList(obj, loading)
.then((res: any) => { .then((res: any) => {
mcpToolSelectOptions.value = [...res.data.shared_tools, ...res.data.tools] mcpToolSelectOptions.value = [...res.data.shared_tools, ...res.data.tools].filter(
.filter((item: any) => item.is_active) (item: any) => item.is_active,
)
}) })
} }

2
ui/src/workflow/nodes/reranker-node/index.vue
View File

@ -29,7 +29,7 @@
}}<span class="color-danger">*</span></span }}<span class="color-danger">*</span></span
> >
<el-button @click="add_reranker_reference" link type="primary"> <el-button @click="add_reranker_reference" link type="primary">
<el-icon class="mr-4"><Plus /></el-icon> <AppIcon iconName="app-add-outlined"></AppIcon>
</el-button> </el-button>
</div> </div>
</template> </template>

2
ui/src/workflow/nodes/search-knowledge-node/index.vue
View File

@ -15,7 +15,7 @@
<div class="flex-between"> <div class="flex-between">
<span>{{ $t('views.chatLog.selectKnowledge') }}</span> <span>{{ $t('views.chatLog.selectKnowledge') }}</span>
<el-button type="primary" link @click="openknowledgeDialog"> <el-button type="primary" link @click="openknowledgeDialog">
<el-icon><Plus /></el-icon> <AppIcon iconName="app-add-outlined"></AppIcon>
</el-button> </el-button>
</div> </div>
</template> </template>

1
ui/src/workflow/nodes/start-node/index.vue
View File

@ -90,7 +90,6 @@ const getRefreshFieldList = () => {
.map((v: any) => cloneDeep(v.properties.api_input_field_list)) .map((v: any) => cloneDeep(v.properties.api_input_field_list))
.reduce((x: any, y: any) => [...x, ...y], []) .reduce((x: any, y: any) => [...x, ...y], [])
.map((i: any) => ({ label: i.name || i.variable, value: i.variable })) .map((i: any) => ({ label: i.name || i.variable, value: i.variable }))
return [...user_input_fields, ...api_input_fields] return [...user_input_fields, ...api_input_fields]
} }
const refreshFieldList = () => { const refreshFieldList = () => {

2
ui/src/workflow/nodes/tool-node/index.vue
View File

@ -4,7 +4,7 @@
<div class="flex-between"> <div class="flex-between">
<h5 class="lighter mb-8">{{ $t('common.param.inputParam') }}</h5> <h5 class="lighter mb-8">{{ $t('common.param.inputParam') }}</h5>
<el-button link type="primary" @click="openAddDialog()"> <el-button link type="primary" @click="openAddDialog()">
<el-icon class="mr-4"><Plus /></el-icon> {{ $t('common.add') }} <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon> {{ $t('common.add') }}
</el-button> </el-button>
</div> </div>
<el-form <el-form

4
ui/src/workflow/nodes/variable-assign-node/index.vue
View File

@ -136,9 +136,7 @@
</template> </template>
<el-button link type="primary" @click="addVariable"> <el-button link type="primary" @click="addVariable">
<el-icon class="mr-4"> <AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
<Plus />
</el-icon>
{{ $t('common.add') }} {{ $t('common.add') }}
</el-button> </el-button>
</el-form> </el-form>