From e69b74ec86c62469a41be2f830f05a9145409abb Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Tue, 24 Sep 2024 14:35:48 +0800
Subject: [PATCH] =?UTF-8?q?perf:=E3=80=90=E5=BA=94=E7=94=A8=E7=BC=96?=
 =?UTF-8?q?=E6=8E=92=E3=80=91=E5=8F=98=E9=87=8F=E8=AE=BE=E7=BD=AE=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/log/component/EditContentDialog.vue |  8 +++-
 ui/src/workflow/common/app-node.ts            |  6 ++-
 ui/src/workflow/common/data.ts                |  6 ++-
 .../base-node/component/FieldFormDialog.vue   | 39 +++++++++++--------
 ui/src/workflow/nodes/base-node/index.vue     |  2 +-
 ui/src/workflow/nodes/start-node/index.vue    |  3 +-
 6 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/ui/src/views/log/component/EditContentDialog.vue b/ui/src/views/log/component/EditContentDialog.vue
index b1febe3b8..17731a094 100644
--- a/ui/src/views/log/component/EditContentDialog.vue
+++ b/ui/src/views/log/component/EditContentDialog.vue
@@ -1,5 +1,11 @@
 <template>
-  <el-dialog title="修改内容" v-model="dialogVisible" width="600">
+  <el-dialog
+    title="修改内容"
+    v-model="dialogVisible"
+    width="600"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+  >
     <el-form
       ref="formRef"
       :model="form"
diff --git a/ui/src/workflow/common/app-node.ts b/ui/src/workflow/common/app-node.ts
index 930126fb4..46bbf9e56 100644
--- a/ui/src/workflow/common/app-node.ts
+++ b/ui/src/workflow/common/app-node.ts
@@ -1,7 +1,7 @@
 import Components from '@/components'
 import ElementPlus from 'element-plus'
 import * as ElementPlusIcons from '@element-plus/icons-vue'
-
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import { HtmlResize } from '@logicflow/extension'
 
 import { h as lh } from '@logicflow/core'
@@ -26,7 +26,9 @@ class AppNode extends HtmlResize.view {
     this.app = createApp({
       render: () => this.r
     })
-    this.app.use(ElementPlus)
+    this.app.use(ElementPlus, {
+      locale: zhCn
+    })
     this.app.use(Components)
     this.app.use(directives)
     this.app.use(i18n)
diff --git a/ui/src/workflow/common/data.ts b/ui/src/workflow/common/data.ts
index 3471fe6ca..b0a883da1 100644
--- a/ui/src/workflow/common/data.ts
+++ b/ui/src/workflow/common/data.ts
@@ -157,7 +157,11 @@ export const rerankerNode = {
     config: {
       fields: [
         {
-          label: '结果',
+          label: '重排结果列表',
+          value: 'result_list'
+        },
+        {
+          label: '重排结果',
           value: 'result'
         }
       ]
diff --git a/ui/src/workflow/nodes/base-node/component/FieldFormDialog.vue b/ui/src/workflow/nodes/base-node/component/FieldFormDialog.vue
index 1805eaea8..38b52af1c 100644
--- a/ui/src/workflow/nodes/base-node/component/FieldFormDialog.vue
+++ b/ui/src/workflow/nodes/base-node/component/FieldFormDialog.vue
@@ -33,7 +33,7 @@
         />
       </el-form-item>
       <el-form-item label="输入类型">
-        <el-select v-model="form.type">
+        <el-select v-model="form.type" @change="changeType">
           <el-option label="文本框" value="input" />
           <el-option label="日期" value="date" />
           <el-option label="下拉选项" value="select" />
@@ -64,7 +64,15 @@
       <el-form-item label="是否必填" @click.prevent>
         <el-switch size="small" v-model="form.is_required"></el-switch>
       </el-form-item>
-      <el-form-item label="默认值" prop="default_value">
+      <el-form-item
+        label="默认值"
+        prop="default_value"
+        :rules="{
+          required: form.is_required,
+          message: '请输入默认值',
+          trigger: 'blur'
+        }"
+      >
         <el-input
           v-if="form.type === 'input'"
           v-model="form.default_value"
@@ -127,25 +135,18 @@ const form = ref<any>({
   type: 'input',
   is_required: true,
   assignment_method: 'user_input',
-  optionList: ['']
+  optionList: [''],
+  default_value: ''
 })
 
 const rules = reactive({
   name: [{ required: true, message: '请输入变量名', trigger: 'blur' }],
-  variable: [{ required: true, message: '请输入变量', trigger: 'blur' }, { pattern: /^[a-zA-Z_]+$/, message: '只能输入字母和下划线', trigger: 'blur' } ],
-  default_value: [{ required: true, message: '请输入默认值', trigger: 'blur' }]
+  variable: [
+    { required: true, message: '请输入变量', trigger: 'blur' },
+    { pattern: /^[a-zA-Z_]+$/, message: '只能输入字母和下划线', trigger: 'blur' }
+  ]
 })
 
-watch(
-  form,
-  (val) => {
-    rules.default_value[0].required = !!val.is_required
-  },
-  {
-    deep: true
-  }
-)
-
 const dialogVisible = ref<boolean>(false)
 
 watch(dialogVisible, (bool) => {
@@ -156,7 +157,8 @@ watch(dialogVisible, (bool) => {
       type: 'input',
       is_required: true,
       assignment_method: 'user_input',
-      optionList: ['']
+      optionList: [''],
+      default_value: ''
     }
     isEdit.value = false
   }
@@ -195,6 +197,11 @@ const delOption = (index: number) => {
   form.value.optionList.splice(index, 1)
 }
 
+const changeType = () => {
+  form.value.optionList = ['']
+  form.value.default_value = ''
+}
+
 defineExpose({ open, close })
 </script>
 <style lang="scss" scoped></style>
diff --git a/ui/src/workflow/nodes/base-node/index.vue b/ui/src/workflow/nodes/base-node/index.vue
index 867e89137..c8121543b 100644
--- a/ui/src/workflow/nodes/base-node/index.vue
+++ b/ui/src/workflow/nodes/base-node/index.vue
@@ -68,7 +68,7 @@
         <el-table-column label="必填">
           <template #default="{ row }">
             <div @click.stop>
-              <el-switch size="small" v-model="row.is_required" />
+              <el-switch disabled size="small" v-model="row.is_required" />
             </div>
           </template>
         </el-table-column>
diff --git a/ui/src/workflow/nodes/start-node/index.vue b/ui/src/workflow/nodes/start-node/index.vue
index e50a109a4..dadf40c3c 100644
--- a/ui/src/workflow/nodes/start-node/index.vue
+++ b/ui/src/workflow/nodes/start-node/index.vue
@@ -2,7 +2,8 @@
   <NodeContainer :nodeModel="nodeModel">
     <h5 class="title-decoration-1 mb-8">全局变量</h5>
     <div
-      v-for="item in nodeModel.properties.config.globalFields"
+      v-for="(item, index) in nodeModel.properties.config.globalFields"
+      :key="index"
       class="flex-between border-r-4 p-8-12 mb-8 layout-bg lighter"
       @mouseenter="showicon = true"
       @mouseleave="showicon = false"