Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 9d5fd240 by heheer Committed by GitHub
Options

feat: plugin input type add select and custom var (#2571) 

* feat: plugin input type add select and custom var

* fix

* fix ui

* fix

* fix
parent 903f39fe
Showing with 132 additions and 102 deletions
packages/global/core/workflow/node/constant.ts
......@@ -15,6 +15,7 @@ export enum FlowNodeInputTypeEnum { // render ui
// special input
selectApp = 'selectApp',
customVariable = 'customVariable',
// ai model select
selectLLMModel = 'selectLLMModel',
......@@ -44,7 +45,7 @@ export const FlowNodeInputMap: Record<
icon: 'core/workflow/inputType/numberInput'
},
[FlowNodeInputTypeEnum.select]: {
icon: 'core/workflow/inputType/input'
icon: 'core/workflow/inputType/option'
},
[FlowNodeInputTypeEnum.switch]: {
icon: 'core/workflow/inputType/switch'
......@@ -79,8 +80,11 @@ export const FlowNodeInputMap: Record<
[FlowNodeInputTypeEnum.hidden]: {
icon: 'core/workflow/inputType/select'
},
[FlowNodeInputTypeEnum.customVariable]: {
icon: 'core/workflow/inputType/customVariable'
},
[FlowNodeInputTypeEnum.custom]: {
icon: 'core/workflow/inputType/select'
icon: 'core/workflow/inputType/custom'
}
};
......
packages/global/core/workflow/utils.ts
......@@ -173,14 +173,17 @@ export const pluginData2FlowNodeIO = ({
const pluginOutput = nodes.find((node) => node.flowNodeType === FlowNodeTypeEnum.pluginOutput);
return {
inputs: pluginInput
? pluginInput.inputs.map((item) => ({
...item,
...getModuleInputUiField(item),
value: getOrInitModuleInputValue(item),
canEdit: false
}))
: [],
inputs:
pluginInput?.inputs.map((item) => ({
...item,
...getModuleInputUiField(item),
value: getOrInitModuleInputValue(item),
canEdit: false,
renderTypeList:
item.renderTypeList[0] === FlowNodeInputTypeEnum.customVariable
? [FlowNodeInputTypeEnum.reference, FlowNodeInputTypeEnum.input]
: item.renderTypeList
})) || [],
outputs: pluginOutput
? [
...pluginOutput.inputs.map((item) => ({
......
packages/web/components/common/Icon/constants.ts
......@@ -8,12 +8,10 @@ export const iconPaths = {
collectionLight: () => import('./icons/collectionLight.svg'),
collectionSolid: () => import('./icons/collectionSolid.svg'),
'common/add2': () => import('./icons/common/add2.svg'),
'common/setting': () => import('./icons/common/setting.svg'),
'common/addUser': () => import('./icons/common/addUser.svg'),
'common/monitor': () => import('./icons/common/monitor.svg'),
'common/list': () => import('./icons/common/list.svg'),
'common/addCircleLight': () => import('./icons/common/addCircleLight.svg'),
'common/addLight': () => import('./icons/common/addLight.svg'),
'common/addUser': () => import('./icons/common/addUser.svg'),
'common/arrowLeft': () => import('./icons/common/arrowLeft.svg'),
'common/backFill': () => import('./icons/common/backFill.svg'),
'common/backLight': () => import('./icons/common/backLight.svg'),
'common/check': () => import('./icons/common/check.svg'),
......@@ -29,6 +27,7 @@ export const iconPaths = {
'common/errorFill': () => import('./icons/common/errorFill.svg'),
'common/file/move': () => import('./icons/common/file/move.svg'),
'common/folderFill': () => import('./icons/common/folderFill.svg'),
'common/folderImport': () => import('./icons/common/folderImport.svg'),
'common/fullScreenLight': () => import('./icons/common/fullScreenLight.svg'),
'common/gitFill': () => import('./icons/common/gitFill.svg'),
'common/gitInlight': () => import('./icons/common/gitInlight.svg'),
......@@ -41,12 +40,12 @@ export const iconPaths = {
'common/language/en': () => import('./icons/common/language/en.svg'),
'common/language/zh': () => import('./icons/common/language/zh.svg'),
'common/leftArrowLight': () => import('./icons/common/leftArrowLight.svg'),
'common/arrowLeft': () => import('./icons/common/arrowLeft.svg'),
'common/lineChange': () => import('./icons/common/lineChange.svg'),
'common/linkBlue': () => import('./icons/common/linkBlue.svg'),
'common/folderImport': () => import('./icons/common/folderImport.svg'),
'common/list': () => import('./icons/common/list.svg'),
'common/loading': () => import('./icons/common/loading.svg'),
'common/logLight': () => import('./icons/common/logLight.svg'),
'common/monitor': () => import('./icons/common/monitor.svg'),
'common/navbar/pluginFill': () => import('./icons/common/navbar/pluginFill.svg'),
'common/navbar/pluginLight': () => import('./icons/common/navbar/pluginLight.svg'),
'common/openai': () => import('./icons/common/openai.svg'),
......@@ -67,6 +66,7 @@ export const iconPaths = {
'common/searchLight': () => import('./icons/common/searchLight.svg'),
'common/select': () => import('./icons/common/select.svg'),
'common/selectLight': () => import('./icons/common/selectLight.svg'),
'common/setting': () => import('./icons/common/setting.svg'),
'common/settingLight': () => import('./icons/common/settingLight.svg'),
'common/subtract': () => import('./icons/common/subtract.svg'),
'common/text/t': () => import('./icons/common/text/t.svg'),
......@@ -176,12 +176,16 @@ export const iconPaths = {
'core/workflow/debugResult': () => import('./icons/core/workflow/debugResult.svg'),
'core/workflow/edgeArrow': () => import('./icons/core/workflow/edgeArrow.svg'),
'core/workflow/grout': () => import('./icons/core/workflow/grout.svg'),
'core/workflow/inputType/customVariable': () =>
import('./icons/core/workflow/inputType/customVariable.svg'),
'core/workflow/inputType/dynamic': () => import('./icons/core/workflow/inputType/dynamic.svg'),
'core/workflow/inputType/file': () => import('./icons/core/workflow/inputType/file.svg'),
'core/workflow/inputType/input': () => import('./icons/core/workflow/inputType/input.svg'),
'core/workflow/inputType/jsonEditor': () =>
import('./icons/core/workflow/inputType/jsonEditor.svg'),
'core/workflow/inputType/numberInput': () =>
import('./icons/core/workflow/inputType/numberInput.svg'),
'core/workflow/inputType/option': () => import('./icons/core/workflow/inputType/option.svg'),
'core/workflow/inputType/reference': () =>
import('./icons/core/workflow/inputType/reference.svg'),
'core/workflow/inputType/select': () => import('./icons/core/workflow/inputType/select.svg'),
......
packages/web/components/common/Icon/icons/core/workflow/inputType/customVariable.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" >
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.99974 18.8083C14.8644 18.8083 18.8081 14.8647 18.8081 9.99998C18.8081 5.13527 14.8644 1.19165 9.99974 1.19165C5.13503 1.19165 1.19141 5.13527 1.19141 9.99998C1.19141 14.8647 5.13503 18.8083 9.99974 18.8083ZM9.65746 5.75817C9.39635 5.8758 9.20193 6.24428 8.81311 6.98124L8.69748 7.20039C8.58335 7.4167 8.52629 7.52486 8.44539 7.60926C8.37669 7.68093 8.29574 7.73974 8.20635 7.78293C8.10108 7.83379 7.98058 7.85464 7.73959 7.89634L7.49543 7.93859C6.67439 8.08065 6.26387 8.15168 6.07131 8.36366C5.91079 8.54037 5.83377 8.77742 5.85976 9.01473C5.89095 9.29941 6.18132 9.59817 6.76205 10.1957L6.93475 10.3734C7.10521 10.5488 7.19044 10.6365 7.2457 10.7395C7.29263 10.827 7.32356 10.9221 7.33701 11.0205C7.35285 11.1363 7.33544 11.2574 7.30063 11.4995L7.26536 11.7447C7.14675 12.5695 7.08745 12.9819 7.22955 13.2305C7.348 13.4378 7.54966 13.5843 7.78338 13.6329C8.06377 13.6912 8.43764 13.5074 9.18537 13.1397L9.40774 13.0304C9.6272 12.9224 9.73695 12.8685 9.85201 12.8478C9.94971 12.8302 10.0498 12.8302 10.1475 12.8478C10.2625 12.8685 10.3723 12.9224 10.5917 13.0304L10.8141 13.1397C11.5619 13.5074 11.9357 13.6912 12.2161 13.6329C12.4498 13.5843 12.6515 13.4378 12.7699 13.2305C12.912 12.9819 12.8527 12.5695 12.7341 11.7447L12.6989 11.4995C12.664 11.2574 12.6466 11.1363 12.6625 11.0205C12.6759 10.9221 12.7069 10.827 12.7538 10.7395C12.8091 10.6365 12.8943 10.5488 13.0647 10.3734L13.2374 10.1957C13.8182 9.59817 14.1085 9.29941 14.1397 9.01473C14.1657 8.77742 14.0887 8.54037 13.9282 8.36366C13.7356 8.15168 13.3251 8.08065 12.5041 7.93859L12.2599 7.89634C12.0189 7.85464 11.8984 7.83379 11.7931 7.78293C11.7038 7.73974 11.6228 7.68093 11.5541 7.60926C11.4732 7.52486 11.4161 7.41671 11.302 7.20039L11.1864 6.98124C10.7976 6.24428 10.6031 5.8758 10.342 5.75817C10.1244 5.66012 9.87512 5.66012 9.65746 5.75817Z" />
</svg>
\ No newline at end of file
packages/web/components/common/Icon/icons/core/workflow/inputType/dynamic.svg
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 13" fill="none">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M3 1.5C1.89543 1.5 1 2.39543 1 3.5V9.5C1 10.6046 1.89543 11.5 3 11.5H9C10.1046 11.5 11 10.6046 11 9.5V3.5C11 2.39543 10.1046 1.5 9 1.5H3ZM6 3.5C6.27614 3.5 6.5 3.72386 6.5 4V6H8.5C8.77614 6 9 6.22386 9 6.5C9 6.77614 8.77614 7 8.5 7H6.5V9C6.5 9.27614 6.27614 9.5 6 9.5C5.72386 9.5 5.5 9.27614 5.5 9V7H3.5C3.22386 7 3 6.77614 3 6.5C3 6.22386 3.22386 6 3.5 6H5.5V4C5.5 3.72386 5.72386 3.5 6 3.5Z"
fill="#3370FF" />
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="none">
<path d="M18.8654 6.72204C19.4209 7.04279 19.4209 7.84467 18.8654 8.16542L15.7404 9.96964C15.1848 10.2904 14.4904 9.88945 14.4904 9.24795V8.52482H12.7497C12.5542 8.52482 12.3716 8.62282 12.2635 8.78582L10.8957 10.8489L9.62426 12.7869C9.11595 13.5617 8.25159 14.0285 7.32492 14.0285H4.9393C4.55654 14.7239 3.8167 15.1951 2.9668 15.1951C1.72416 15.1951 0.716797 14.1878 0.716797 12.9451C0.716797 11.7025 1.72416 10.6951 2.9668 10.6951C3.8167 10.6951 4.55654 11.1663 4.9393 11.8618H7.32492C7.52149 11.8618 7.70484 11.7628 7.81266 11.5984L8.07952 11.1917C8.09986 11.1504 8.12305 11.1099 8.14915 11.0706L9.08701 9.65599L9.41409 9.15744C9.42981 9.13348 9.44631 9.11034 9.46355 9.08805L10.4577 7.58856C10.9672 6.82015 11.8278 6.35816 12.7497 6.35816H14.4904V5.63951C14.4904 4.99801 15.1848 4.59707 15.7404 4.91782L18.8654 6.72204Z" />
</svg>
\ No newline at end of file
packages/web/components/common/Icon/icons/core/workflow/inputType/file.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 20" >
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.6463 1.77489C12.9629 1.95789 13.2376 2.21585 13.787 2.73178L16.2103 5.00736C16.8092 5.56977 17.1087 5.85101 17.3218 6.18531C17.503 6.46943 17.6377 6.78064 17.7208 7.1072C17.8185 7.49147 17.8185 7.90227 17.8185 8.72388V13.5518C17.8185 15.3551 17.8185 16.2568 17.462 16.9432C17.1616 17.5215 16.69 17.9931 16.1116 18.2936C15.4253 18.6501 14.5236 18.6501 12.7202 18.6501H7.94501C6.14163 18.6501 5.23993 18.6501 4.55359 18.2936C3.97522 17.9931 3.50364 17.5215 3.2032 16.9432C2.84668 16.2568 2.84668 15.3551 2.84668 13.5518V6.44831C2.84668 4.64492 2.84668 3.74323 3.2032 3.05689C3.50364 2.47852 3.97522 2.00694 4.55359 1.7065C5.23993 1.34998 6.14163 1.34998 7.94501 1.34998H10.297C11.0507 1.34998 11.4275 1.34998 11.7836 1.43334C12.0864 1.50422 12.377 1.6193 12.6463 1.77489ZM12.2767 3.8772C11.7823 3.4032 11.5351 3.1662 11.323 3.15761C11.1545 3.15079 10.9918 3.22016 10.8801 3.34651C10.7395 3.50559 10.7395 3.84804 10.7395 4.53294V5.31491C10.7395 6.31675 10.7395 6.81768 10.9345 7.20033C11.106 7.53693 11.3796 7.81059 11.7162 7.98209C12.0989 8.17706 12.5998 8.17706 13.6017 8.17706H14.5012C15.2222 8.17706 15.5827 8.17706 15.743 8.03156C15.8702 7.91612 15.9375 7.74873 15.9256 7.57736C15.9105 7.36137 15.6503 7.11187 15.1299 6.61289L12.2767 3.8772ZM6.16992 11.3969C6.16992 10.9366 6.54301 10.5636 7.00325 10.5636H13.6656C14.1259 10.5636 14.499 10.9366 14.499 11.3969C14.499 11.8571 14.1259 12.2302 13.6656 12.2302H7.00325C6.54301 12.2302 6.16992 11.8571 6.16992 11.3969ZM6.16015 14.5204C6.16015 14.0602 6.53325 13.6871 6.99348 13.6871H11.9948C12.4551 13.6871 12.8282 14.0602 12.8282 14.5204C12.8282 14.9806 12.4551 15.3537 11.9948 15.3537H6.99348C6.53325 15.3537 6.16015 14.9806 6.16015 14.5204Z" />
</svg>
\ No newline at end of file
packages/web/components/common/Icon/icons/core/workflow/inputType/input.svg
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 13" fill="none">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M2.1 1.93982C1.21634 1.93982 0.5 2.65616 0.5 3.53982V9.46026C0.5 10.3439 1.21635 11.0603 2.1 11.0603H9.89076C10.7744 11.0603 11.4908 10.3439 11.4908 9.46026V3.53982C11.4908 2.65616 10.7744 1.93982 9.89076 1.93982H2.1ZM2.51667 4.54432C2.51667 4.26817 2.74053 4.04432 3.01667 4.04432H4.51156C4.7877 4.04432 5.01156 4.26817 5.01156 4.54432C5.01156 4.82046 4.7877 5.04432 4.51156 5.04432H4.21412V7.96631H4.51156C4.7877 7.96631 5.01156 8.19017 5.01156 8.46631C5.01156 8.74245 4.7877 8.96631 4.51156 8.96631H3.01667C2.74053 8.96631 2.51667 8.74245 2.51667 8.46631C2.51667 8.19017 2.74053 7.96631 3.01667 7.96631H3.31412L3.31412 5.04432H3.01667C2.74053 5.04432 2.51667 4.82046 2.51667 4.54432ZM6.63225 8.11713C6.43699 7.92186 6.1204 7.92186 5.92514 8.11713C5.72988 8.31239 5.72988 8.62897 5.92514 8.82423L5.92868 8.82777C6.12394 9.02303 6.44052 9.02303 6.63578 8.82777C6.83105 8.63251 6.83105 8.31592 6.63578 8.12066L6.63225 8.11713ZM8.39262 8.11713C8.19736 7.92186 7.88078 7.92186 7.68552 8.11713C7.49025 8.31239 7.49025 8.62897 7.68552 8.82423L7.68905 8.82777C7.88431 9.02303 8.2009 9.02303 8.39616 8.82777C8.59142 8.63251 8.59142 8.31592 8.39616 8.12066L8.39262 8.11713Z"
fill="#3370FF" />
/>
</svg>
\ No newline at end of file
packages/web/components/common/Icon/icons/core/workflow/inputType/jsonEditor.svg
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 13" fill="none">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M2.88975 10.8967C2.88975 11.0071 2.8002 11.0967 2.68975 11.0967C2.15996 11.0967 1.73117 10.9541 1.45361 10.6262C1.17933 10.3022 1.06787 9.76439 1.06787 9.07305V7.87396C1.06787 7.57981 1.02517 7.39135 0.96387 7.28288C0.912043 7.19117 0.847959 7.15465 0.74834 7.15465C0.637883 7.15465 0.54834 7.06511 0.54834 6.95465V6.03535C0.54834 5.92489 0.637883 5.83535 0.74834 5.83535C0.80324 5.83535 0.841829 5.82312 0.871201 5.80514C0.90104 5.78687 0.93262 5.75572 0.962333 5.70115C1.02503 5.58598 1.06787 5.38756 1.06787 5.08107V3.96691C1.06787 3.27188 1.17842 2.73052 1.44688 2.39779C1.7217 2.0538 2.1535 1.90332 2.68975 1.90332C2.8002 1.90332 2.88975 1.99286 2.88975 2.10332V3.03761C2.88975 3.14807 2.8002 3.23761 2.68975 3.23761C2.57083 3.23761 2.50064 3.27916 2.44888 3.36144C2.38733 3.45929 2.34287 3.63168 2.34287 3.90696V4.97115C2.34287 5.64299 2.22284 6.17887 1.92133 6.49478C2.04321 6.62283 2.1348 6.78712 2.20045 6.97842C2.29802 7.26273 2.34287 7.6188 2.34287 8.03883V9.06306C2.34287 9.38235 2.386 9.56491 2.4389 9.65146C2.48116 9.71748 2.54956 9.76238 2.68975 9.76238C2.8002 9.76238 2.88975 9.85192 2.88975 9.96238V10.8967ZM6.35515 10.0916C6.24755 10.224 6.13168 10.2985 6.00752 10.315C5.89165 10.3399 5.78819 10.3192 5.69714 10.253C5.60609 10.1868 5.55643 10.0916 5.54816 9.96741C5.53988 9.85154 5.59368 9.72325 5.70956 9.58254C5.87509 9.37562 5.98683 9.16869 6.04477 8.96177C6.05824 8.91365 6.07015 8.86665 6.08049 8.82077C5.84197 8.8016 5.64384 8.72031 5.48608 8.57689C5.31226 8.40308 5.22536 8.17547 5.22536 7.89405C5.22536 7.62919 5.30813 7.41399 5.47366 7.24845C5.6392 7.07464 5.86268 6.98773 6.14409 6.98773C6.43378 6.98773 6.6614 7.08705 6.82694 7.2857C6.99247 7.47607 7.07524 7.75334 7.07524 8.11753C7.07524 8.31617 7.05455 8.52309 7.01317 8.73829C6.98006 8.94522 6.90971 9.16041 6.80211 9.38389C6.70278 9.61564 6.5538 9.85154 6.35515 10.0916ZM6.15651 6.07963C5.87509 6.07963 5.64748 5.99272 5.47366 5.81891C5.30813 5.64509 5.22536 5.42575 5.22536 5.16089C5.22536 4.88776 5.30813 4.66842 5.47366 4.50288C5.64748 4.32906 5.87509 4.24216 6.15651 4.24216C6.4462 4.24216 6.66968 4.32906 6.82694 4.50288C6.99247 4.66842 7.07524 4.88776 7.07524 5.16089C7.07524 5.42575 6.99247 5.64509 6.82694 5.81891C6.66968 5.99272 6.4462 6.07963 6.15651 6.07963ZM9.31047 11.0967C9.20002 11.0967 9.11047 11.0071 9.11047 10.8967V9.96238C9.11047 9.85192 9.20002 9.76238 9.31047 9.76238C9.45066 9.76238 9.51906 9.71748 9.56132 9.65146C9.61422 9.56491 9.65735 9.38235 9.65735 9.06306V8.03883C9.65735 7.6188 9.7022 7.26273 9.79977 6.97842C9.86542 6.78712 9.95701 6.62283 10.0789 6.49478C9.77738 6.17887 9.65735 5.64299 9.65735 4.97115V3.90696C9.65735 3.63168 9.61289 3.45929 9.55134 3.36144C9.49957 3.27916 9.42939 3.23761 9.31047 3.23761C9.20002 3.23761 9.11047 3.14807 9.11047 3.03761V2.10332C9.11047 1.99286 9.20002 1.90332 9.31047 1.90332C9.84672 1.90332 10.2785 2.0538 10.5533 2.39779C10.8218 2.73052 10.9323 3.27188 10.9323 3.96691V5.08107C10.9323 5.38756 10.9752 5.58598 11.0379 5.70115C11.0676 5.75572 11.0992 5.78687 11.129 5.80514C11.1584 5.82312 11.197 5.83535 11.2519 5.83535C11.3623 5.83535 11.4519 5.92489 11.4519 6.03535V6.95465C11.4519 7.06511 11.3623 7.15465 11.2519 7.15465C11.1523 7.15465 11.0882 7.19117 11.0364 7.28288C10.9751 7.39135 10.9323 7.57981 10.9323 7.87396V9.07305C10.9323 9.76439 10.8209 10.3022 10.5466 10.6262C10.269 10.9541 9.84026 11.0967 9.31047 11.0967Z"
fill="#3370FF" />
/>
</svg>
\ No newline at end of file
packages/web/components/common/Icon/icons/core/workflow/inputType/numberInput.svg
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 13" fill="none">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 13" >
<path fill-rule="evenodd" clip-rule="evenodd"
d="M2.15029 1.93982C1.26664 1.93982 0.550293 2.65616 0.550293 3.53982V9.46026C0.550293 10.3439 1.26664 11.0603 2.15029 11.0603H9.94105C10.8247 11.0603 11.541 10.3439 11.541 9.46026V3.53982C11.541 2.65616 10.8247 1.93982 9.94105 1.93982H2.15029ZM9.73568 5.20096C9.76406 5.20037 9.79111 5.18883 9.81118 5.16876C9.85416 5.12578 9.85416 5.0561 9.81118 5.01312L9.10484 4.30678C8.97883 4.18078 8.91583 4.11778 8.84318 4.09417C8.77928 4.07341 8.71044 4.07341 8.64654 4.09417C8.57389 4.11778 8.51088 4.18078 8.38488 4.30678L7.68209 5.00957C7.6289 5.06276 7.6289 5.14901 7.68209 5.2022C7.70834 5.22845 7.74416 5.24285 7.78127 5.24207L9.73568 5.20096ZM7.74658 7.79908C7.71819 7.79968 7.69114 7.81122 7.67107 7.83129C7.62809 7.87427 7.62809 7.94395 7.67107 7.98693L8.37741 8.69327C8.50341 8.81927 8.56641 8.88227 8.63906 8.90588C8.70297 8.92664 8.7718 8.92664 8.83571 8.90588C8.90836 8.88227 8.97136 8.81927 9.09736 8.69328L9.80015 7.99048C9.85334 7.93729 9.85334 7.85104 9.80015 7.79784C9.7739 7.7716 9.73808 7.7572 9.70096 7.75798L7.74658 7.79908ZM3.63517 5.7237L3.63379 5.72502C3.51254 5.83616 3.43555 6.00224 3.41249 6.23013V8.05389C3.41249 8.13674 3.34533 8.2039 3.26249 8.2039H2.67383C2.59098 8.2039 2.52383 8.13674 2.52383 8.05389V5.03075C2.52383 4.94791 2.59098 4.88075 2.67383 4.88075H3.26249C3.34533 4.88075 3.41249 4.94791 3.41249 5.03075V5.09827C3.49536 5.02672 3.58462 4.96667 3.67927 4.92115C3.85169 4.83509 4.03622 4.79618 4.23675 4.79618C4.644 4.79618 4.96805 4.90706 5.18859 5.14719C5.40765 5.3857 5.50868 5.73462 5.50868 6.17685V8.05389C5.50868 8.13674 5.44152 8.2039 5.35868 8.2039H4.77002C4.68718 8.2039 4.62002 8.13674 4.62002 8.05389V6.23726C4.62002 5.99389 4.56401 5.83095 4.46984 5.72893C4.37709 5.62845 4.23143 5.57006 4.01323 5.57006C3.87026 5.57006 3.7438 5.62025 3.63517 5.7237Z"
fill="#3370FF" />
/>
</svg>
\ No newline at end of file
packages/web/components/common/Icon/icons/core/workflow/inputType/option.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 21">
<path fill-rule="evenodd" clip-rule="evenodd" d="M5.00033 2.22217C3.15938 2.22217 1.66699 3.71455 1.66699 5.5555V15.5555C1.66699 17.3965 3.15938 18.8888 5.00033 18.8888H15.0003C16.8413 18.8888 18.3337 17.3965 18.3337 15.5555V5.5555C18.3337 3.71455 16.8413 2.22217 15.0003 2.22217H5.00033ZM8.52689 7.35494C8.81978 7.06204 8.81978 6.58717 8.52689 6.29428C8.23399 6.00138 7.75912 6.00138 7.46623 6.29427L5.8429 7.9176L5.24853 7.32322C4.95563 7.03033 4.48076 7.03033 4.18787 7.32322C3.89497 7.61612 3.89497 8.09099 4.18786 8.38388L5.31032 9.50633C5.4569 9.65292 5.64907 9.72614 5.84119 9.726C6.03445 9.72702 6.22803 9.6538 6.37548 9.50634L8.52689 7.35494ZM16.0325 7.9003C16.0325 8.31452 15.6967 8.6503 15.2825 8.6503H10.7764C10.3622 8.6503 10.0264 8.31452 10.0264 7.9003C10.0264 7.48609 10.3622 7.1503 10.7764 7.1503L15.2825 7.1503C15.6967 7.1503 16.0325 7.48609 16.0325 7.9003ZM6.12591 15.3471C6.95434 15.3471 7.62591 14.6755 7.62591 13.8471C7.62591 13.0186 6.95434 12.3471 6.12591 12.3471C5.29748 12.3471 4.62591 13.0186 4.62591 13.8471C4.62591 14.6755 5.29748 15.3471 6.12591 15.3471ZM16.0325 13.8471C16.0325 14.2613 15.6967 14.5971 15.2825 14.5971H10.7764C10.3622 14.5971 10.0264 14.2613 10.0264 13.8471C10.0264 13.4329 10.3622 13.0971 10.7764 13.0971H15.2825C15.6967 13.0971 16.0325 13.4329 16.0325 13.8471Z" />
</svg>
\ No newline at end of file
packages/web/components/common/Icon/icons/core/workflow/inputType/reference.svg
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 13" fill="none">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M2.78998 10.9576C2.8971 10.9576 2.98393 10.8708 2.98393 10.7637V9.85766C2.98393 9.75055 2.8971 9.66371 2.78998 9.66371C2.65404 9.66371 2.58771 9.62017 2.54672 9.55615C2.49543 9.47222 2.45361 9.29518 2.45361 8.98556V7.99232C2.45361 7.585 2.41011 7.23971 2.31549 6.964C2.25183 6.77849 2.16301 6.61917 2.04482 6.49499C2.33721 6.18865 2.45361 5.66899 2.45361 5.01748V3.98548C2.45361 3.71854 2.49672 3.55136 2.55641 3.45648C2.6066 3.37668 2.67467 3.3364 2.78998 3.3364C2.8971 3.3364 2.98393 3.24956 2.98393 3.14245V2.23643C2.98393 2.12931 2.8971 2.04248 2.78998 2.04248C2.26996 2.04248 1.85123 2.18841 1.58473 2.52198C1.32439 2.84465 1.21719 3.36963 1.21719 4.04362V5.12407C1.21719 5.42128 1.17565 5.6137 1.11484 5.72538C1.08603 5.77831 1.05541 5.80851 1.02647 5.82622C0.997986 5.84366 0.960565 5.85552 0.907327 5.85552C0.800212 5.85552 0.713379 5.94235 0.713379 6.04947V6.94095C0.713379 7.04807 0.800212 7.1349 0.907327 7.1349C1.00393 7.1349 1.06608 7.17032 1.11633 7.25925C1.17578 7.36443 1.21719 7.54719 1.21719 7.83244V8.99525C1.21719 9.66566 1.32527 10.1872 1.59125 10.5014C1.86042 10.8193 2.27623 10.9576 2.78998 10.9576Z"
fill="#3370FF" />
<path
d="M9.01641 10.7637C9.01641 10.8708 9.10324 10.9576 9.21036 10.9576C9.72411 10.9576 10.1399 10.8193 10.4091 10.5014C10.6751 10.1872 10.7832 9.66566 10.7832 8.99525V7.83244C10.7832 7.54719 10.8246 7.36443 10.884 7.25925C10.9343 7.17032 10.9964 7.1349 11.093 7.1349C11.2001 7.1349 11.287 7.04807 11.287 6.94095V6.04947C11.287 5.94235 11.2001 5.85552 11.093 5.85552C11.0398 5.85552 11.0024 5.84366 10.9739 5.82622C10.9449 5.80851 10.9143 5.77831 10.8855 5.72538C10.8247 5.6137 10.7832 5.42128 10.7832 5.12407V4.04362C10.7832 3.36958 10.6759 2.84457 10.4156 2.52191C10.149 2.18839 9.73034 2.04248 9.21036 2.04248C9.10324 2.04248 9.01641 2.12931 9.01641 2.23643V3.14245C9.01641 3.24956 9.10324 3.3364 9.21036 3.3364C9.32567 3.3364 9.39374 3.37668 9.44393 3.45648C9.50362 3.55136 9.54673 3.71854 9.54673 3.98548V5.01748C9.54673 5.66899 9.66313 6.18865 9.95552 6.49499C9.83733 6.61917 9.74851 6.77849 9.68485 6.964C9.59023 7.23971 9.54673 7.585 9.54673 7.99232V8.98556C9.54673 9.2952 9.50491 9.47224 9.4536 9.55617C9.41262 9.62018 9.34629 9.66371 9.21036 9.66371C9.10324 9.66371 9.01641 9.75055 9.01641 9.85766V10.7637Z"
fill="#3370FF" />
<path fill-rule="evenodd" clip-rule="evenodd"
d="M3.90876 5.16292C3.70047 4.95463 3.70047 4.61693 3.90876 4.40864C4.11705 4.20036 4.45475 4.20036 4.66304 4.40864L6.00017 5.74578L7.3373 4.40864C7.54559 4.20036 7.88329 4.20036 8.09158 4.40864C8.29987 4.61693 8.29987 4.95463 8.09158 5.16292L6.75445 6.50006L8.09158 7.83719C8.29987 8.04548 8.29987 8.38318 8.09158 8.59147C7.88329 8.79976 7.54559 8.79976 7.3373 8.59147L6.00017 7.25433L4.66304 8.59147C4.45475 8.79976 4.11705 8.79976 3.90876 8.59147C3.70047 8.38318 3.70047 8.04548 3.90876 7.83719L5.24589 6.50005L3.90876 5.16292Z"
fill="#3370FF" />
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 16" fill="none">
<path fill-rule="evenodd" clip-rule="evenodd" d="M3.65046 15.4293C3.82898 15.4293 3.97371 15.2846 3.97371 15.1061V13.596C3.97371 13.4175 3.82898 13.2728 3.65046 13.2728C3.42388 13.2728 3.31334 13.2002 3.24503 13.0935C3.15953 12.9536 3.08983 12.6586 3.08983 12.1425V10.4871C3.08983 9.80828 3.01734 9.23278 2.85965 8.77327C2.75355 8.46409 2.60551 8.19855 2.40852 7.9916C2.89584 7.48102 3.08983 6.61492 3.08983 5.52907V3.80908C3.08983 3.36417 3.16168 3.08554 3.26116 2.92741C3.34483 2.79441 3.45826 2.72727 3.65046 2.72727C3.82898 2.72727 3.97371 2.58254 3.97371 2.40402V0.893986C3.97371 0.715462 3.82898 0.57074 3.65046 0.57074C2.78376 0.57074 2.08587 0.813953 1.6417 1.36991C1.2078 1.90768 1.02914 2.78266 1.02914 3.90598V5.70672C1.02914 6.20208 0.959899 6.52277 0.858562 6.70891C0.810539 6.79712 0.759499 6.84745 0.711271 6.87698C0.663799 6.90604 0.60143 6.92581 0.512699 6.92581C0.334175 6.92581 0.189453 7.07053 0.189453 7.24905V8.73486C0.189453 8.91339 0.334175 9.05811 0.512699 9.05811C0.673707 9.05811 0.777281 9.11713 0.861045 9.26535C0.960118 9.44066 1.02914 9.74525 1.02914 10.2207V12.1587C1.02914 13.276 1.20928 14.1453 1.65257 14.6689C2.10119 15.1988 2.7942 15.4293 3.65046 15.4293Z"/>
<path d="M14.0278 15.1061C14.0278 15.2846 14.1726 15.4293 14.3511 15.4293C15.2073 15.4293 15.9004 15.1988 16.349 14.6689C16.7923 14.1453 16.9724 13.276 16.9724 12.1587V10.2207C16.9724 9.74525 17.0414 9.44066 17.1405 9.26535C17.2243 9.11713 17.3278 9.05811 17.4888 9.05811C17.6674 9.05811 17.8121 8.91339 17.8121 8.73486V7.24905C17.8121 7.07053 17.6674 6.92581 17.4888 6.92581C17.4001 6.92581 17.3377 6.90604 17.2903 6.87698C17.242 6.84745 17.191 6.79712 17.143 6.70891C17.0416 6.52277 16.9724 6.20208 16.9724 5.70672V3.90598C16.9724 2.78257 16.7937 1.90755 16.3597 1.36979C15.9156 0.813918 15.2177 0.57074 14.3511 0.57074C14.1726 0.57074 14.0278 0.715462 14.0278 0.893986V2.40402C14.0278 2.58254 14.1726 2.72727 14.3511 2.72727C14.5433 2.72727 14.6567 2.79441 14.7404 2.92741C14.8399 3.08554 14.9117 3.36417 14.9117 3.80908V5.52907C14.9117 6.61492 15.1057 7.48102 15.593 7.9916C15.396 8.19855 15.248 8.4641 15.1419 8.77327C14.9842 9.23278 14.9117 9.80828 14.9117 10.4871V12.1425C14.9117 12.6586 14.842 12.9537 14.7565 13.0936C14.6882 13.2002 14.5776 13.2728 14.3511 13.2728C14.1726 13.2728 14.0278 13.4175 14.0278 13.596V15.1061Z"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M5.51509 5.77148C5.16794 5.42433 5.16794 4.86149 5.51509 4.51435C5.86224 4.1672 6.42507 4.1672 6.77222 4.51435L9.00077 6.7429L11.2293 4.51435C11.5765 4.1672 12.1393 4.1672 12.4865 4.51435C12.8336 4.86149 12.8336 5.42433 12.4865 5.77148L10.2579 8.00003L12.4865 10.2286C12.8336 10.5757 12.8336 11.1386 12.4865 11.4857C12.1393 11.8329 11.5765 11.8329 11.2293 11.4857L9.00077 9.25716L6.77222 11.4857C6.42507 11.8329 5.86224 11.8329 5.51509 11.4857C5.16794 11.1386 5.16794 10.5757 5.51509 10.2286L7.74364 8.00003L5.51509 5.77148Z"/>
</svg>
\ No newline at end of file
packages/web/components/common/Icon/icons/core/workflow/inputType/selectApp.svg
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 13" fill="none">
<path
d="M2.15029 2C1.81892 2 1.55029 2.26863 1.55029 2.6V5.4C1.55029 5.73137 1.81892 6 2.15029 6H4.95029C5.28166 6 5.55029 5.73137 5.55029 5.4V2.6C5.55029 2.26863 5.28166 2 4.95029 2H2.15029Z"
fill="#3370FF" />
/>
<path
d="M7.15029 2C6.81892 2 6.55029 2.26863 6.55029 2.6V5.4C6.55029 5.73137 6.81892 6 7.15029 6H9.95029C10.2817 6 10.5503 5.73137 10.5503 5.4V2.6C10.5503 2.26863 10.2817 2 9.95029 2H7.15029Z"
fill="#3370FF" />
/>
<path
d="M6.55029 7.6C6.55029 7.26863 6.81892 7 7.15029 7H9.95029C10.2817 7 10.5503 7.26863 10.5503 7.6V10.4C10.5503 10.7314 10.2817 11 9.95029 11H7.15029C6.81892 11 6.55029 10.7314 6.55029 10.4V7.6Z"
fill="#3370FF" />
/>
<path
d="M2.15029 7C1.81892 7 1.55029 7.26863 1.55029 7.6V10.4C1.55029 10.7314 1.81892 11 2.15029 11H4.95029C5.28166 11 5.55029 10.7314 5.55029 10.4V7.6C5.55029 7.26863 5.28166 7 4.95029 7H2.15029Z"
fill="#3370FF" />
/>
</svg>
\ No newline at end of file
packages/web/components/common/Icon/icons/core/workflow/inputType/selectDataset.svg
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 13" fill="none">
<path
d="M10.5575 3.60361V3.35278L10.5573 3.32928C10.5302 2.1679 8.50023 1.5 5.99999 1.5C3.49961 1.5 1.46924 2.15844 1.44245 3.32928V3.60361H1.4447C1.4432 3.62291 1.44245 3.64237 1.44245 3.662C1.44245 4.54398 3.06399 5.25897 5.99999 5.25897C8.93598 5.25897 10.5575 4.54398 10.5575 3.662C10.5575 3.64238 10.5568 3.62292 10.5552 3.60361H10.5575Z"
fill="#3370FF" />
/>
<path
d="M1.44245 4.98138V6.7607C1.44235 6.76488 1.44238 6.76906 1.44242 6.77325L1.44245 6.77956C1.44245 7.66049 3.06399 8.37462 5.99999 8.37462C8.93599 8.37462 10.5575 7.66049 10.5575 6.77956C10.5575 6.77326 10.5574 6.76697 10.5573 6.7607L10.5575 4.98138H10.5262C10.2879 5.78445 8.69962 6.40445 5.99999 6.40445C3.30036 6.40445 1.71206 5.78445 1.47382 4.98138H1.44245Z"
fill="#3370FF" />
/>
<path
d="M1.44245 7.92288V9.71144H1.44459C1.51115 10.705 3.12566 11.5 5.99999 11.5C8.87432 11.5 10.4888 10.705 10.5554 9.71144H10.5575V7.92288C10.5575 8.88094 8.93598 9.6576 5.99999 9.6576C3.06399 9.6576 1.44245 8.88094 1.44245 7.92288Z"
fill="#3370FF" />
/>
</svg>
\ No newline at end of file
packages/web/components/common/Icon/icons/core/workflow/inputType/selectLLM.svg
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 13" fill="none">
<path
d="M8.564 3.52507H9.125C10.1605 3.52507 11 4.36454 11 5.40006V7.90003C11 8.93555 10.1605 9.77502 9.125 9.77502H2.875C1.83947 9.77502 1 8.93555 1 7.90003V5.40006C1 4.36454 1.83947 3.52507 2.875 3.52507H3.436L3.20765 2.15506C3.15657 1.84864 3.3636 1.55882 3.67002 1.50774C3.97645 1.45667 4.26628 1.66369 4.31735 1.97011L4.56735 3.4701C4.57043 3.4885 4.57255 3.50685 4.5738 3.52507H7.4262C7.42745 3.50682 7.42957 3.4885 7.43265 3.4701L7.68265 1.97011C7.73373 1.66369 8.02355 1.45667 8.32998 1.50774C8.6364 1.55882 8.84343 1.84864 8.79235 2.15506L8.564 3.52507ZM3.45 6.15005V6.65004C3.45 6.96069 3.70185 7.21254 4.0125 7.21254C4.32315 7.21254 4.575 6.96069 4.575 6.65004V6.15005C4.575 5.8394 4.32315 5.58755 4.0125 5.58755C3.70185 5.58755 3.45 5.8394 3.45 6.15005ZM7.425 6.15005V6.65004C7.425 6.96069 7.67685 7.21254 7.9875 7.21254C8.29815 7.21254 8.55 6.96069 8.55 6.65004V6.15005C8.55 5.8394 8.29815 5.58755 7.9875 5.58755C7.67685 5.58755 7.425 5.8394 7.425 6.15005ZM3.5 11.5C3.18935 11.5 2.9375 11.2482 2.9375 10.9375C2.9375 10.6269 3.18935 10.375 3.5 10.375H8.5C8.81065 10.375 9.0625 10.6269 9.0625 10.9375C9.0625 11.2482 8.81065 11.5 8.5 11.5H3.5Z"
fill="#3370FF" />
/>
</svg>
\ No newline at end of file
packages/web/components/common/Icon/icons/core/workflow/inputType/switch.svg
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 13" fill="none">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 13">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M2.7131 2.18115C1.62837 2.18115 0.749023 3.0605 0.749023 4.14523C0.749023 5.22996 1.62838 6.10931 2.71311 6.10931H9.28722C10.3719 6.10931 11.2513 5.22996 11.2513 4.14523C11.2513 3.0605 10.3719 2.18115 9.28721 2.18115H2.7131ZM9.14821 5.39507C9.83847 5.39507 10.398 4.8355 10.398 4.14524C10.398 3.45498 9.83847 2.89542 9.14821 2.89542C8.45795 2.89542 7.89838 3.45498 7.89838 4.14524C7.89838 4.8355 8.45795 5.39507 9.14821 5.39507Z"
fill="#3370FF" />
/>
<path fill-rule="evenodd" clip-rule="evenodd"
d="M9.28722 6.89078C10.3719 6.89078 11.2513 7.77013 11.2513 8.85486C11.2513 9.93959 10.3719 10.8189 9.28721 10.8189H2.7131C1.62837 10.8189 0.749023 9.93959 0.749023 8.85486C0.749023 7.77013 1.62838 6.89078 2.71311 6.89078H9.28722ZM2.85211 10.1047C2.16185 10.1047 1.60229 9.54513 1.60229 8.85487C1.60229 8.16461 2.16185 7.60504 2.85211 7.60504C3.54237 7.60504 4.10194 8.16461 4.10194 8.85487C4.10194 9.54513 3.54237 10.1047 2.85211 10.1047Z"
fill="#3370FF" />
/>
</svg>
\ No newline at end of file
packages/web/components/common/Icon/icons/core/workflow/inputType/textarea.svg
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 13" fill="none">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 13">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M0.745605 3.49392C0.745605 2.61027 1.46195 1.89392 2.34561 1.89392H9.65449C10.5381 1.89392 11.2545 2.61027 11.2545 3.49392V9.50605C11.2545 10.3897 10.5381 11.106 9.65449 11.106H2.34561C1.46195 11.106 0.745605 10.3897 0.745605 9.50605V3.49392ZM2.9713 4.11962V4.48246C2.9713 4.56262 2.90632 4.6276 2.82616 4.6276H2.39074C2.31059 4.6276 2.24561 4.56262 2.24561 4.48246V3.53906C2.24561 3.4589 2.31059 3.39392 2.39074 3.39392H5.72894C5.8091 3.39392 5.87408 3.4589 5.87408 3.53906V4.48246C5.87408 4.56262 5.8091 4.6276 5.72894 4.6276H5.29352C5.21337 4.6276 5.14839 4.56262 5.14839 4.48246V4.11962H4.42269V6.31302H4.84215C4.92231 6.31302 4.98729 6.378 4.98729 6.45816V6.89357C4.98729 6.97373 4.92231 7.03871 4.84215 7.03871H4.06068L4.05984 7.03871L4.059 7.03871H3.27753C3.19738 7.03871 3.1324 6.97373 3.1324 6.89357V6.45815C3.1324 6.378 3.19738 6.31302 3.27753 6.31302H3.69699L3.69699 4.11962H2.9713ZM8.65425 9.9972C8.65425 9.96913 8.6651 9.94214 8.68453 9.92188L10.0225 8.52639C10.0479 8.49989 10.0831 8.48491 10.1198 8.48491C10.1942 8.48491 10.2545 8.54522 10.2545 8.61963V9.62605C10.2545 9.79406 10.2545 9.87807 10.2218 9.94225C10.193 9.99869 10.1471 10.0446 10.0907 10.0734C10.0265 10.106 9.94251 10.106 9.77449 10.106H8.76309C8.70298 10.106 8.65425 10.0573 8.65425 9.9972Z"
fill="#3370FF" />
/>
</svg>
\ No newline at end of file
packages/web/components/common/MySelect/MultipleSelect.tsx
......@@ -76,6 +76,7 @@ const MultipleSelect = <T = any,>({
as={Box}
ref={ref}
width={width}
minH={'40px'}
px={3}
py={2}
borderRadius={'md'}
......
packages/web/components/core/workflow/NodeInputSelect.tsx
......@@ -151,7 +151,7 @@ const NodeInputSelect = ({
Button={
<Button
size={'xs'}
leftIcon={<MyIcon name={renderTypeData.icon as any} w={'0.8rem'} />}
leftIcon={<MyIcon name={renderTypeData.icon as any} w={'0.8rem'} color={'primary.600'} />}
rightIcon={<MyIcon name={'common/select'} w={'0.8rem'} color={'myGray.500'} />}
variant={'grayBase'}
border={theme.borders.base}
......
packages/web/i18n/en/common.json
......@@ -27,6 +27,7 @@
"Login": "Login",
"Move": "Move",
"Name": "Name",
"Not_selected": "Not selected",
"Rename": "Rename",
"Resume": "Resume",
"Running": "Running",
......@@ -293,6 +294,9 @@
"zoomout_tip": "zoomOut ctrl +",
"zoomout_tip_mac": "zoomOut ⌘ +"
},
"comon": {
"Continue_Adding": "Continue Adding"
},
"confirm_choice": "Confirm selection",
"contribute_app_template": "Contribution template",
"core": {
......@@ -982,9 +986,12 @@
"Manual input": "Manual input",
"Manual select": "Manual select",
"Reference": "Variable reference",
"custom": "Custom",
"dynamicTargetInput": "Dynamic external data",
"file_link": "File link",
"input": "Single line input box",
"number input": "Number input box",
"select": "Select",
"selectApp": "App selection",
"selectDataset": "Knowledge base selection",
"selectLLMModel": "Dialogue model selection",
......
packages/web/i18n/zh/common.json
......@@ -27,6 +27,7 @@
"Login": "登录",
"Move": "移动",
"Name": "名称",
"Not_selected": "未选择",
"Rename": "重命名",
"Resume": "恢复",
"Running": "运行中",
......@@ -293,6 +294,9 @@
"zoomout_tip": "放大 ctrl +",
"zoomout_tip_mac": "放大 ⌘ +"
},
"comon": {
"Continue_Adding": "继续添加"
},
"confirm_choice": "确认选择",
"contribute_app_template": "贡献模板",
"core": {
......@@ -638,8 +642,7 @@
"success": "开始同步"
}
},
"training": {
}
"training": {}
},
"data": {
"Auxiliary Data": "辅助数据",
......@@ -982,9 +985,12 @@
"Manual input": "手动输入",
"Manual select": "手动选择",
"Reference": "变量引用",
"custom": "自定义变量",
"dynamicTargetInput": "动态外部数据",
"file_link": "文件上传",
"input": "单行输入框",
"number input": "数字输入框",
"select": "单选框",
"selectApp": "应用选择",
"selectDataset": "知识库选择",
"selectLLMModel": "对话模型选择",
......@@ -1130,10 +1136,10 @@
"package_tip": {
"buy": "您购买的套餐等级低于当前套餐，该套餐将在当前套餐过期后生效。\n您可在账号—个人信息—套餐详情里，查看套餐使用情况。",
"renewal": "您正在续费套餐。您可在账号—个人信息—套餐详情里，查看套餐使用情况。",
"upgrade": "您购买的套餐等级高于当前套餐，该套餐将即刻生效，当前套餐将延后生效。\n您可在账号—个人信息—套餐详情里，查看套餐使用情况。"
"upgrade": "您购买的套餐等级高于当前套餐，该套餐将即刻生效，当前套餐将延后生效。您可在账号—个人信息—套餐详情里，查看套餐使用情况。"
},
"to_recharge": "余额不足，去充值",
"wechat": "微信扫码支付: {{price}}元\n请勿关闭页面",
"wechat": "请微信扫码支付: {{price}}元\n请勿关闭页面",
"yuan": "{{amount}}元"
},
"permission": {
......
projects/app/public/appMarketTemplates/CQ/template.json
......@@ -411,7 +411,7 @@
},
{
"key": "userChatInput",
"renderTypeList": ["FlowNodeInputTypeEnum.reference", "FlowNodeInputTypeEnum.textarea"],
"renderTypeList": ["reference", "FlowNodeInputTypeEnum.textarea"],
"valueType": "WorkflowIOValueTypeEnum.string",
"label": "用户问题",
"required": true,
......
projects/app/public/appMarketTemplates/simpleDatasetChat/template.json
......@@ -258,7 +258,7 @@
},
{
"key": "limit",
"renderTypeList": ["FlowNodeInputTypeEnum.hidden"],
"renderTypeList": ["hidden"],
"label": "",
"value": 1500,
"valueType": "WorkflowIOValueTypeEnum.number"
......
projects/app/src/components/core/chat/ChatContainer/PluginRunBox/components/RenderInput.tsx
......@@ -108,15 +108,9 @@ const RenderInput = () => {
<RenderPluginInput
value={value}
onChange={onChange}
label={input.label}
description={input.description}
isDisabled={isDisabledInput}
valueType={input.valueType}
placeholder={input.placeholder}
required={input.required}
min={input.min}
max={input.max}
isInvalid={errors && Object.keys(errors).includes(input.key)}
input={input}
/>
);
}}
......
projects/app/src/components/core/chat/ChatContainer/PluginRunBox/components/renderPluginInput.tsx
......@@ -6,10 +6,14 @@ import {
NumberInput,
NumberInputField,
NumberInputStepper,
Select,
Switch,
Textarea
} from '@chakra-ui/react';
import { WorkflowIOValueTypeEnum } from '@fastgpt/global/core/workflow/constants';
import { FlowNodeInputTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
import { FlowNodeInputItemType } from '@fastgpt/global/core/workflow/type/io';
import MySelect from '@fastgpt/web/components/common/MySelect';
import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
import { useTranslation } from 'next-i18next';
import dynamic from 'next/dynamic';
......@@ -18,58 +22,53 @@ const JsonEditor = dynamic(() => import('@fastgpt/web/components/common/Textarea
const RenderPluginInput = ({
value,
defaultValue,
onChange,
label,
description,
isDisabled,
valueType,
placeholder,
required,
min,
max,
isInvalid
isInvalid,
input
}: {
value: any;
defaultValue?: any;
onChange: () => void;
label: string;
description?: string;
isDisabled?: boolean;
valueType: WorkflowIOValueTypeEnum | undefined;
placeholder?: string;
required?: boolean;
min?: number;
max?: number;
isInvalid: boolean;
input: FlowNodeInputItemType;
}) => {
const { t } = useTranslation();
const inputType = input.renderTypeList[0];
const render = (() => {
if (valueType === WorkflowIOValueTypeEnum.string) {
if (inputType === FlowNodeInputTypeEnum.customVariable) {
return null;
}
if (inputType === FlowNodeInputTypeEnum.select && input.list) {
return (
<MySelect list={input.list} value={value} onchange={onChange} isDisabled={isDisabled} />
);
}
if (input.valueType === WorkflowIOValueTypeEnum.string) {
return (
<Textarea
value={value}
defaultValue={defaultValue}
defaultValue={input.defaultValue}
onChange={onChange}
isDisabled={isDisabled}
placeholder={t(placeholder as any)}
placeholder={t(input.placeholder as any)}
bg={'myGray.50'}
isInvalid={isInvalid}
/>
);
}
if (valueType === WorkflowIOValueTypeEnum.number) {
if (input.valueType === WorkflowIOValueTypeEnum.number) {
return (
<NumberInput
step={1}
min={min}
max={max}
min={input.min}
max={input.max}
bg={'myGray.50'}
isDisabled={isDisabled}
isInvalid={isInvalid}
>
<NumberInputField value={value} onChange={onChange} defaultValue={defaultValue} />
<NumberInputField value={value} onChange={onChange} defaultValue={input.defaultValue} />
<NumberInputStepper>
<NumberIncrementStepper />
<NumberDecrementStepper />
......@@ -77,14 +76,14 @@ const RenderPluginInput = ({
</NumberInput>
);
}
if (valueType === WorkflowIOValueTypeEnum.boolean) {
if (input.valueType === WorkflowIOValueTypeEnum.boolean) {
return (
<Switch
isChecked={value}
onChange={onChange}
isDisabled={isDisabled}
isInvalid={isInvalid}
defaultChecked={defaultValue}
defaultChecked={!!input.defaultValue}
/>
);
}
......@@ -92,12 +91,12 @@ const RenderPluginInput = ({
return (
<JsonEditor
bg={'myGray.50'}
placeholder={t(placeholder || ('' as any))}
placeholder={t(input.placeholder as any)}
resize
value={value}
onChange={onChange}
isInvalid={isInvalid}
defaultValue={defaultValue}
defaultValue={input.defaultValue}
/>
);
})();
......@@ -106,14 +105,14 @@ const RenderPluginInput = ({
<Box _notLast={{ mb: 4 }} px={1}>
<Flex alignItems={'center'} mb={1}>
<Box position={'relative'}>
{required && (
{input.required && (
<Box position={'absolute'} left={-2} top={'-1px'} color={'red.600'}>
*
</Box>
)}
{label}
{input.label}
</Box>
{description && <QuestionTip ml={2} label={description} />}
{input.description && <QuestionTip ml={2} label={input.description} />}
</Flex>
{render}
</Box>
......
projects/app/src/pages/app/detail/components/SimpleApp/components/ToolSelectModal.tsx
......@@ -378,15 +378,9 @@ const RenderList = React.memo(function RenderList({
return (
<RenderPluginInput
value={value}
onChange={onChange}
label={input.label}
description={input.description}
valueType={input.valueType}
placeholder={input.placeholder}
required={input.required}
min={input.min}
max={input.max}
isInvalid={errors && Object.keys(errors).includes(input.key)}
onChange={onChange}
input={input}
/>
);
}}
......
projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeCode.tsx
......@@ -38,7 +38,7 @@ const NodeCode = ({ data, selected }: NodeProps<FlowNodeItemType>) => {
return (
<Box>
<Flex mb={1} alignItems={'flex-end'}>
<Box flex={'1'}>Javascript{workflowT('Code')}</Box>
<Box flex={'1'}>{'Javascript ' + workflowT('Code')}</Box>
<Box
cursor={'pointer'}
color={'primary.500'}
......
projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodePluginIO/VariableTable.tsx
......@@ -36,7 +36,9 @@ const VariableTable = ({
<Tr key={item.key}>
<Td>
<Flex alignItems={'center'}>
{!!item.icon && <MyIcon name={item.icon as any} w={'14px'} mr={1} />}
{!!item.icon && (
<MyIcon name={item.icon as any} w={'14px'} mr={1} color={'primary.600'} />
)}
{item.label || item.key}
</Flex>
</Td>
......@@ -48,6 +50,7 @@ const VariableTable = ({
name={'common/settingLight'}
w={'16px'}
cursor={'pointer'}
_hover={{ color: 'primary.600' }}
onClick={() => onEdit(item.key)}
/>
<MyIcon
......
projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeVariableUpdate.tsx
......@@ -174,6 +174,7 @@ const NodeVariableUpdate = ({ data, selected }: NodeProps<FlowNodeItemType>) =>
bg={'white'}
borderRadius={'xs'}
mx={2}
color={'primary.600'}
onClick={() => {
onUpdateList(
updateList.map((update, i) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment