feat: Workfloat support variable assign(#2114)

Author: wangdan-fit2cloud

ui/src/assets/icon_assigner.svg

@@ -19,7 +19,7 @@ export default {
     autoSave: 'Auto Save',
     latestRelease: 'Latest Release',
     copyParam: 'Copy Parameters',
-    debug: 'Run',
+    debug: 'Run'
   },
   tip: {
     publicSuccess: 'Published successfully',
@@ -48,12 +48,13 @@ export default {
     beautify: 'Auto-Arrange'
   },
   variable: {
+    label: 'Variable',
     global: 'Global Variable',
     Referencing: 'Referenced Variable',
     ReferencingRequired: 'Referenced variable is required',
     ReferencingError: 'Invalid referenced variable',
     NoReferencing: 'Referenced variable does not exist',
-    fieldMessage: 'Please select a variable'
+    placeholder: 'Please select a variable'
   },
   condition: {
     title: 'Execution Condition',
@@ -82,12 +83,11 @@ export default {
     baseNode: {
       label: 'Base Information',
       appName: {
-        label: 'App Name',
-    
+        label: 'App Name'
       },
       appDescription: {
-        label: 'App Description',
-       },
+        label: 'App Description'
+      },
       fileUpload: {
         label: 'File Upload',
         tooltip: 'When enabled, the Q&A page will display a file upload button.'
@@ -114,7 +114,7 @@ export default {
                   If you want the user to see the output of this node, please turn on the switch.`
       },
       defaultPrompt: 'Known Information',
-      think: 'Thinking Process',
+      think: 'Thinking Process'
     },
     searchDatasetNode: {
       label: 'Knowledge Retrieval',
@@ -188,8 +188,7 @@ export default {
         label: 'Form Output Content',
         requiredMessage:
           'Please set the output content of this node, { form } is a placeholder for the form.',
-        tooltip:
-          'Define the output content of this node. { form } is a placeholder for the form'
+        tooltip: 'Define the output content of this node. { form } is a placeholder for the form'
       },
       formAllContent: 'All Form Content',
       formSetting: 'Form Configuration'
@@ -213,20 +212,9 @@ export default {
       }
     },
     variableAssignNode: {
-      label: 'Variable assign',
+      label: 'Variable Assign',
       text: 'Update the value of the global variable',
-      variable: {
-        label: 'select variable',
-        requiredMessage: 'Please select a variable'
-      },
-      value: {
-        label: 'Set value',
-      },
-      source: {
-        reference: 'Reference Variable',
-        custom: 'Custom'
-      },
-      addVariable: 'Add Variable',
+      assign: 'Set Value'
     },
     imageGenerateNode: {
       label: 'Image Generation',
@@ -238,13 +226,11 @@ export default {
       },
       prompt: {
         label: 'Positive Prompt',
-        tooltip:
-          'Describe elements and visual features you want in the generated image'
+        tooltip: 'Describe elements and visual features you want in the generated image'
       },
       negative_prompt: {
         label: 'Negative Prompt',
-        tooltip:
-          'Describe elements you want to exclude from the generated image',
+        tooltip: 'Describe elements you want to exclude from the generated image',
         placeholder:
           'Please describe content you do not want to generate, such as color, bloody content'
       }

ui/src/locales/lang/en-US/views/application-workflow.ts

@@ -19,7 +19,7 @@ export default {
     autoSave: '自动保存',
     latestRelease: '最近发布',
     copyParam: '复制参数',
-    debug: '调试',
+    debug: '调试'
   },
   tip: {
     publicSuccess: '发布成功',
@@ -48,12 +48,13 @@ export default {
     beautify: '一键美化'
   },
   variable: {
+    label: '变量',
     global: '全局变量',
     Referencing: '引用变量',
     ReferencingRequired: '引用变量必填',
     ReferencingError: '引用变量错误',
     NoReferencing: '不存在的引用变量',
-    fieldMessage: '请选择变量'
+    placeholder: '请选择变量'
   },
   condition: {
     title: '执行条件',
@@ -83,12 +84,11 @@ export default {
     baseNode: {
       label: '基本信息',
       appName: {
-        label: '应用名称',
-    
+        label: '应用名称'
       },
       appDescription: {
-        label: '应用描述',
-       },
+        label: '应用描述'
+      },
       fileUpload: {
         label: '文件上传',
         tooltip: '开启后，问答页面会显示上传文件的按钮。'
@@ -115,7 +115,7 @@ export default {
                   如果你想让用户看到该节点的输出内容，请打开开关。`
       },
       defaultPrompt: '已知信息',
-      think: '思考过程',
+      think: '思考过程'
     },
     searchDatasetNode: {
       label: '知识库检索',
@@ -214,18 +214,7 @@ export default {
     variableAssignNode: {
       label: '变量赋值',
       text: '更新全局变量的值',
-      variable: {
-        label: '选择变量',
-        requiredMessage: '请选择变量'
-      },
-      value: {
-        label: '赋值',
-      },
-      source: {
-        reference: '引用变量',
-        custom: '自定义'
-      },
-      addVariable: '添加变量'
+      assign: '赋值'
     },
     imageGenerateNode: {
       label: '图片生成',

ui/src/locales/lang/zh-CN/views/application-workflow.ts

@@ -48,12 +48,13 @@ export default {
     beautify: '一鍵美化'
   },
   variable: {
+    label: '變量',
     global: '全局變量',
     Referencing: '引用變量',
     ReferencingRequired: '引用變量必填',
     ReferencingError: '引用變量錯誤',
     NoReferencing: '不存在的引用變量',
-    fieldMessage: '請選擇變量'
+    placeholder: '請選擇變量'
   },
   condition: {
     title: '執行條件',
@@ -114,7 +115,7 @@ export default {
                   如果你想讓用戶看到該節點的輸出內容，請打開開關。`
       },
       defaultPrompt: '已知信息',
-      think: '思考過程',
+      think: '思考過程'
     },
     searchDatasetNode: {
       label: '知識庫檢索',
@@ -213,18 +214,7 @@ export default {
     variableAssignNode: {
       label: '變數賦值',
       text: '更新全域變數的值',
-      variable: {
-        label: '選擇變數',
-        requiredMessage: '請選擇變數'
-      },
-      value: {
-        label: '設置值',
-      },
-      source: {
-        reference: '引用變數',
-        custom: '自定義'
-      },
-      addVariable: '添加變數',
+      assign: '賦值'
     },
     imageGenerateNode: {
       label: '圖片生成',

ui/src/locales/lang/zh-Hant/views/application-workflow.ts

@@ -25,6 +25,7 @@ import { t } from '@/locales'
 const props = defineProps<{
   nodeModel: any
   modelValue: Array<any>
+  global?: Boolean
 }>()
 const emit = defineEmits(['update:modelValue'])
 const data = computed({
@@ -49,7 +50,9 @@ const wheel = (e: any) => {
 
 function visibleChange(bool: boolean) {
   if (bool) {
-    options.value = props.nodeModel.get_up_node_field_list(false, true)
+    options.value = props.global
+      ? props.nodeModel.get_up_node_field_list(false, true).filter((v) => v.value === 'global')
+      : props.nodeModel.get_up_node_field_list(false, true)
   }
 }
 
@@ -76,7 +79,9 @@ const validate = () => {
 }
 defineExpose({ validate })
 onMounted(() => {
-  options.value = props.nodeModel.get_up_node_field_list(false, true)
+  options.value = props.global
+    ? props.nodeModel.get_up_node_field_list(false, true).filter((v) => v.value === 'global')
+    : props.nodeModel.get_up_node_field_list(false, true)
 })
 </script>
 <style scoped></style>

ui/src/workflow/common/NodeCascader.vue

@@ -1,6 +1,6 @@
 <template>
-  <AppAvatar shape="square" style="background: #FF8800">
-    <img src="@/assets/icon_reply.svg" style="width: 65%" alt="" />
+  <AppAvatar shape="square">
+    <img src="@/assets/icon_assigner.svg" style="width: 65%" alt="" />
   </AppAvatar>
 </template>
 <script setup lang="ts"></script>

ui/src/workflow/icons/variable-assign-node-icon.vue

@@ -48,7 +48,7 @@
                     :rules="{
                       type: 'array',
                       required: true,
-                      message: $t('views.applicationWorkflow.variable.fieldMessage'),
+                      message: $t('views.applicationWorkflow.variable.placeholder'),
                       trigger: 'change'
                     }"
                   >
@@ -57,7 +57,7 @@
                       :nodeModel="nodeModel"
                       class="w-full"
                       :placeholder="
-                        $t('views.applicationWorkflow.variable.fieldMessage')
+                        $t('views.applicationWorkflow.variable.placeholder')
                       "
                       v-model="condition.field"
                     />

ui/src/workflow/nodes/condition-node/index.vue

@@ -45,7 +45,7 @@
                 :rules="{
                   type: 'array',
                   required: true,
-                  message: $t('views.applicationWorkflow.variable.fieldMessage'),
+                  message: $t('views.applicationWorkflow.variable.placeholder'),
                   trigger: 'change'
                 }"
               >