From 69831144fbc3ed5adf1963bf2bc8d48f2035e010 Mon Sep 17 00:00:00 2001
From: beihai <soul.zhanglc@gmail.com>
Date: Wed, 29 Oct 2025 09:57:55 +0800
Subject: [PATCH 01/16] =?UTF-8?q?feat:bpmn=E6=B5=81=E7=A8=8B=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E5=A2=9E=E5=8A=A0http=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/plugins/palette/CustomPalette.js |  29 ++
 .../plugins/palette/paletteProvider.js        |  29 ++
 .../package/designer/plugins/translate/zh.js  |   1 +
 .../task/task-components/ServiceTask.vue      | 271 ++++++++++++++++--
 4 files changed, 312 insertions(+), 18 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js
index 788e4d16..8bdbcfca 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js
@@ -89,6 +89,26 @@ F.prototype.getPaletteEntries = function () {
     create.start(event, elementFactory.createParticipantShape())
   }
 
+  function createHttpServiceTask(event) {
+    const httpTask = elementFactory.createShape({
+      type: 'bpmn:ServiceTask'
+    })
+
+    const businessObject = httpTask.businessObject
+
+    if (typeof businessObject.set === 'function') {
+      businessObject.set('flowable:type', 'http')
+    } else {
+      businessObject['flowable:type'] = 'http'
+    }
+
+    if (!businessObject.name) {
+      businessObject.name = translate('HTTP Task')
+    }
+
+    create.start(event, httpTask)
+  }
+
   assign(actions, {
     'hand-tool': {
       group: 'tools',
@@ -177,6 +197,15 @@ F.prototype.getPaletteEntries = function () {
       'bpmn-icon-service',
       translate('Create Service Task')
     ),
+    'create.http-service-task': {
+      group: 'activity',
+      className: 'bpmn-icon-service',
+      title: translate('Create HTTP Task'),
+      action: {
+        dragstart: createHttpServiceTask,
+        click: createHttpServiceTask
+      }
+    },
     'create.data-object': createAction(
       'bpmn:DataObjectReference',
       'data-object',
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js
index 304875ce..e9cb2d31 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js
@@ -96,6 +96,26 @@ PaletteProvider.prototype.getPaletteEntries = function () {
     create.start(event, elementFactory.createParticipantShape())
   }
 
+  function createHttpServiceTask(event) {
+    const httpTask = elementFactory.createShape({
+      type: 'bpmn:ServiceTask'
+    })
+
+    const businessObject = httpTask.businessObject
+
+    if (typeof businessObject.set === 'function') {
+      businessObject.set('flowable:type', 'http')
+    } else {
+      businessObject['flowable:type'] = 'http'
+    }
+
+    if (!businessObject.name) {
+      businessObject.name = translate('HTTP Task')
+    }
+
+    create.start(event, httpTask)
+  }
+
   assign(actions, {
     'hand-tool': {
       group: 'tools',
@@ -177,6 +197,15 @@ PaletteProvider.prototype.getPaletteEntries = function () {
       'bpmn-icon-service',
       translate('Create Service Task')
     ),
+    'create.http-service-task': {
+      group: 'activity',
+      className: 'bpmn-icon-service',
+      title: translate('Create HTTP Task'),
+      action: {
+        dragstart: createHttpServiceTask,
+        click: createHttpServiceTask
+      }
+    },
     'create.data-object': createAction(
       'bpmn:DataObjectReference',
       'data-object',
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
index d243ec45..4ac5bb5c 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
@@ -43,6 +43,7 @@ export default {
   'Manual Task': '手工任务',
   'Business Rule Task': '业务规则任务',
   'Service Task': '服务任务',
+  'HTTP Task': 'HTTP任务',
   'Script Task': '脚本任务',
   'Call Activity': '调用活动',
   'Sub-Process (collapsed)': '子流程（折叠的）',
diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
index 2f9c535e..cc4d2abf 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
@@ -1,10 +1,11 @@
 <template>
   <div>
-    <el-form-item label="执行类型" key="executeType">
-      <el-select v-model="serviceTaskForm.executeType">
+    <el-form-item label="执行方式" key="executeType">
+      <el-select v-model="serviceTaskForm.executeType" @change="handleExecuteTypeChange">
         <el-option label="Java类" value="class" />
         <el-option label="表达式" value="expression" />
         <el-option label="代理表达式" value="delegateExpression" />
+        <el-option label="HTTP 调用" value="http" />
       </el-select>
     </el-form-item>
     <el-form-item
@@ -31,46 +32,273 @@
     >
       <el-input v-model="serviceTaskForm.delegateExpression" clearable @change="updateElementTask" />
     </el-form-item>
+    <template v-if="serviceTaskForm.executeType === 'http'">
+      <el-form-item label="请求方法" key="http-method">
+        <el-select v-model="httpTaskForm.requestMethod">
+          <el-option label="GET" value="GET" />
+          <el-option label="POST" value="POST" />
+          <el-option label="PUT" value="PUT" />
+          <el-option label="DELETE" value="DELETE" />
+          <el-option label="PATCH" value="PATCH" />
+          <el-option label="HEAD" value="HEAD" />
+          <el-option label="OPTIONS" value="OPTIONS" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="请求地址" key="http-url" prop="requestUrl">
+        <el-input v-model="httpTaskForm.requestUrl" clearable />
+      </el-form-item>
+      <el-form-item label="请求头" key="http-headers">
+        <el-input
+          v-model="httpTaskForm.requestHeaders"
+          type="textarea"
+          resize="vertical"
+          :autosize="{ minRows: 2, maxRows: 4 }"
+          clearable
+        />
+      </el-form-item>
+      <!--      <el-form-item label="禁止重定向" key="http-disallow-redirects">-->
+      <!--        <el-switch v-model="httpTaskForm.disallowRedirects" />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="忽略异常" key="http-ignore-exception">-->
+      <!--        <el-switch v-model="httpTaskForm.ignoreException" />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="瞬态保存响应参数" key="http-save-transient">-->
+      <!--        <el-switch v-model="httpTaskForm.saveResponseParametersTransient" />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="JSON 保存响应变量" key="http-save-json">-->
+      <!--        <el-switch v-model="httpTaskForm.saveResponseVariableAsJson" />-->
+      <!--      </el-form-item>-->
+    </template>
   </div>
 </template>
 
 <script lang="ts" setup>
+import { updateElementExtensions } from '@/components/bpmnProcessDesigner/package/utils'
 defineOptions({ name: 'ServiceTask' })
 const props = defineProps({
   id: String,
   type: String
 })
 
-const defaultTaskForm = ref({
+const prefix = (inject('prefix', 'flowable') || 'flowable') as string
+const flowableTypeKey = `${prefix}:type`
+const flowableFieldType = `${prefix}:Field`
+
+const HTTP_FIELD_NAMES = [
+  'requestMethod',
+  'requestUrl',
+  'requestHeaders',
+  'disallowRedirects',
+  'ignoreException',
+  'saveResponseParametersTransient',
+  'saveResponseVariableAsJson'
+]
+const HTTP_BOOLEAN_FIELDS = new Set([
+  'disallowRedirects',
+  'ignoreException',
+  'saveResponseParametersTransient',
+  'saveResponseVariableAsJson'
+])
+
+const DEFAULT_TASK_FORM = {
   executeType: '',
   class: '',
   expression: '',
   delegateExpression: ''
-})
+}
 
-const serviceTaskForm = ref<any>({})
+const DEFAULT_HTTP_FORM = {
+  requestMethod: 'GET',
+  requestUrl: '',
+  requestHeaders: 'Content-Type: application/json',
+  disallowRedirects: false,
+  ignoreException: false,
+  saveResponseParametersTransient: false,
+  saveResponseVariableAsJson: false
+}
+
+const serviceTaskForm = ref({ ...DEFAULT_TASK_FORM })
+const httpTaskForm = ref({ ...DEFAULT_HTTP_FORM })
 const bpmnElement = ref()
+const httpInitializing = ref(false)
 
 const bpmnInstances = () => (window as any)?.bpmnInstances
 
-const resetTaskForm = () => {
-  for (let key in defaultTaskForm.value) {
-    let value = bpmnElement.value?.businessObject[key] || defaultTaskForm.value[key]
-    serviceTaskForm.value[key] = value
-    if (value) {
-      serviceTaskForm.value.executeType = key
+const collectHttpExtensionInfo = () => {
+  const businessObject = bpmnElement.value?.businessObject
+  const extensionElements = businessObject?.extensionElements
+  const httpFields = new Map<string, string>()
+  const otherExtensions: any[] = []
+
+  extensionElements?.values?.forEach((item: any) => {
+    if (item?.$type === flowableFieldType && HTTP_FIELD_NAMES.includes(item.name)) {
+      const value = item.string ?? item.stringValue ?? item.expression ?? ''
+      httpFields.set(item.name, value)
+    } else {
+      otherExtensions.push(item)
     }
+  })
+
+  return { httpFields, otherExtensions }
+}
+
+const resetHttpDefaults = () => {
+  httpInitializing.value = true
+  httpTaskForm.value = { ...DEFAULT_HTTP_FORM }
+  nextTick(() => {
+    httpInitializing.value = false
+  })
+}
+
+const resetHttpForm = () => {
+  httpInitializing.value = true
+  const { httpFields } = collectHttpExtensionInfo()
+  const nextForm: Record<string, any> = { ...DEFAULT_HTTP_FORM }
+
+  HTTP_FIELD_NAMES.forEach((name) => {
+    const stored = httpFields.get(name)
+    if (stored !== undefined) {
+      nextForm[name] = HTTP_BOOLEAN_FIELDS.has(name) ? stored === 'true' : stored
+    }
+  })
+
+  httpTaskForm.value = nextForm
+  nextTick(() => {
+    httpInitializing.value = false
+    updateHttpExtensions(true)
+  })
+}
+
+const resetServiceTaskForm = () => {
+  const businessObject = bpmnElement.value?.businessObject
+  const nextForm: Record<string, any> = { ...DEFAULT_TASK_FORM }
+
+  if (businessObject) {
+    if (businessObject.class) {
+      nextForm.class = businessObject.class
+      nextForm.executeType = 'class'
+    }
+    if (businessObject.expression) {
+      nextForm.expression = businessObject.expression
+      nextForm.executeType = 'expression'
+    }
+    if (businessObject.delegateExpression) {
+      nextForm.delegateExpression = businessObject.delegateExpression
+      nextForm.executeType = 'delegateExpression'
+    }
+    if (businessObject.$attrs?.[flowableTypeKey] === 'http') {
+      nextForm.executeType = 'http'
+    }
+  }
+
+  serviceTaskForm.value = nextForm
+
+  if (nextForm.executeType === 'http') {
+    resetHttpForm()
+  } else {
+    resetHttpDefaults()
   }
 }
 
-const updateElementTask = () => {
-  let taskAttr = Object.create(null);
-  const type = serviceTaskForm.value.executeType;
-  for (let key in serviceTaskForm.value) {
-    if (key !== 'executeType' && key !== type) taskAttr[key] = null;
+const shouldPersistField = (name: string, value: any) => {
+  if (HTTP_BOOLEAN_FIELDS.has(name)) return true
+  if (name === 'requestMethod') return true
+  if (name === 'requestUrl') return !!value
+  return value !== undefined && value !== ''
+}
+
+const updateHttpExtensions = (force = false) => {
+  if (!bpmnElement.value) return
+  if (!force && (httpInitializing.value || serviceTaskForm.value.executeType !== 'http')) {
+    return
   }
-  taskAttr[type] = serviceTaskForm.value[type] || "";
+
+  const { httpFields: existingFields, otherExtensions } = collectHttpExtensionInfo()
+
+  const desiredEntries: [string, string][] = []
+  HTTP_FIELD_NAMES.forEach((name) => {
+    const rawValue = httpTaskForm.value[name]
+    if (!shouldPersistField(name, rawValue)) {
+      return
+    }
+
+    const persisted = HTTP_BOOLEAN_FIELDS.has(name)
+      ? String(!!rawValue)
+      : rawValue === undefined
+        ? ''
+        : String(rawValue)
+
+    desiredEntries.push([name, persisted])
+  })
+
+  if (
+    !force &&
+    desiredEntries.length === existingFields.size &&
+    desiredEntries.every(([name, value]) => existingFields.get(name) === value)
+  ) {
+    return
+  }
+
+  const moddle = bpmnInstances().moddle
+  const httpFieldElements = desiredEntries.map(([name, value]) =>
+    moddle.create(flowableFieldType, {
+      name,
+      string: value
+    })
+  )
+
+  updateElementExtensions(bpmnElement.value, [...otherExtensions, ...httpFieldElements])
+}
+
+const removeHttpExtensions = () => {
+  if (!bpmnElement.value) return
+  const { httpFields, otherExtensions } = collectHttpExtensionInfo()
+  if (!httpFields.size) {
+    return
+  }
+
+  if (!otherExtensions.length) {
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+      extensionElements: null
+    })
+    return
+  }
+
+  updateElementExtensions(bpmnElement.value, otherExtensions)
+}
+
+const updateElementTask = () => {
+  if (!bpmnElement.value) return
+
+  const taskAttr: Record<string, any> = {
+    class: null,
+    expression: null,
+    delegateExpression: null,
+    [flowableTypeKey]: null
+  }
+
+  const type = serviceTaskForm.value.executeType
+  if (type === 'class' || type === 'expression' || type === 'delegateExpression') {
+    taskAttr[type] = serviceTaskForm.value[type] || null
+  } else if (type === 'http') {
+    taskAttr[flowableTypeKey] = 'http'
+  }
+
   bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), taskAttr)
+
+  if (type === 'http') {
+    updateHttpExtensions(true)
+  } else {
+    removeHttpExtensions()
+  }
+}
+
+const handleExecuteTypeChange = (value: string) => {
+  serviceTaskForm.value.executeType = value
+  if (value === 'http') {
+    resetHttpForm()
+  }
+  updateElementTask()
 }
 
 onBeforeUnmount(() => {
@@ -82,10 +310,17 @@ watch(
   () => {
     bpmnElement.value = bpmnInstances().bpmnElement
     nextTick(() => {
-      resetTaskForm()
+      resetServiceTaskForm()
     })
   },
   { immediate: true }
 )
 
+watch(
+  () => httpTaskForm.value,
+  () => {
+    updateHttpExtensions()
+  },
+  { deep: true }
+)
 </script>

From 50c7d4798436bde5a1221677c6bbf2ebcc7056c8 Mon Sep 17 00:00:00 2001
From: sinkingsoul <286447685@qq.com>
Date: Fri, 31 Oct 2025 17:07:31 +0800
Subject: [PATCH 02/16] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4http=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=BB=84=E4=BB=B6=E5=9B=BE=E6=A0=87=EF=BC=8C=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E6=9C=8D=E5=8A=A1=E4=BB=BB=E5=8A=A1=E7=9A=84=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E4=B8=8B=E6=8B=89=E6=A1=86=E4=B8=AD?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/plugins/palette/CustomPalette.js | 28 -------------------
 .../plugins/palette/paletteProvider.js        | 28 -------------------
 2 files changed, 56 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js
index 8bdbcfca..12683871 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js
@@ -89,25 +89,6 @@ F.prototype.getPaletteEntries = function () {
     create.start(event, elementFactory.createParticipantShape())
   }
 
-  function createHttpServiceTask(event) {
-    const httpTask = elementFactory.createShape({
-      type: 'bpmn:ServiceTask'
-    })
-
-    const businessObject = httpTask.businessObject
-
-    if (typeof businessObject.set === 'function') {
-      businessObject.set('flowable:type', 'http')
-    } else {
-      businessObject['flowable:type'] = 'http'
-    }
-
-    if (!businessObject.name) {
-      businessObject.name = translate('HTTP Task')
-    }
-
-    create.start(event, httpTask)
-  }
 
   assign(actions, {
     'hand-tool': {
@@ -197,15 +178,6 @@ F.prototype.getPaletteEntries = function () {
       'bpmn-icon-service',
       translate('Create Service Task')
     ),
-    'create.http-service-task': {
-      group: 'activity',
-      className: 'bpmn-icon-service',
-      title: translate('Create HTTP Task'),
-      action: {
-        dragstart: createHttpServiceTask,
-        click: createHttpServiceTask
-      }
-    },
     'create.data-object': createAction(
       'bpmn:DataObjectReference',
       'data-object',
diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js
index e9cb2d31..8a585888 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js
@@ -96,25 +96,6 @@ PaletteProvider.prototype.getPaletteEntries = function () {
     create.start(event, elementFactory.createParticipantShape())
   }
 
-  function createHttpServiceTask(event) {
-    const httpTask = elementFactory.createShape({
-      type: 'bpmn:ServiceTask'
-    })
-
-    const businessObject = httpTask.businessObject
-
-    if (typeof businessObject.set === 'function') {
-      businessObject.set('flowable:type', 'http')
-    } else {
-      businessObject['flowable:type'] = 'http'
-    }
-
-    if (!businessObject.name) {
-      businessObject.name = translate('HTTP Task')
-    }
-
-    create.start(event, httpTask)
-  }
 
   assign(actions, {
     'hand-tool': {
@@ -197,15 +178,6 @@ PaletteProvider.prototype.getPaletteEntries = function () {
       'bpmn-icon-service',
       translate('Create Service Task')
     ),
-    'create.http-service-task': {
-      group: 'activity',
-      className: 'bpmn-icon-service',
-      title: translate('Create HTTP Task'),
-      action: {
-        dragstart: createHttpServiceTask,
-        click: createHttpServiceTask
-      }
-    },
     'create.data-object': createAction(
       'bpmn:DataObjectReference',
       'data-object',

From d04a30fe41f0b6da0e79030c3019df5969b9eb46 Mon Sep 17 00:00:00 2001
From: zhanglc <zhanglc0618@gmail.com>
Date: Tue, 25 Nov 2025 11:31:47 +0800
Subject: [PATCH 03/16] typo

---
 .../package/penal/task/task-components/ServiceTask.vue    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
index cc4d2abf..37573c8c 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form-item label="执行方式" key="executeType">
+    <el-form-item label="执行类型" key="executeType">
       <el-select v-model="serviceTaskForm.executeType" @change="handleExecuteTypeChange">
         <el-option label="Java类" value="class" />
         <el-option label="表达式" value="expression" />
@@ -30,7 +30,11 @@
       prop="delegateExpression"
       key="execute-delegate"
     >
-      <el-input v-model="serviceTaskForm.delegateExpression" clearable @change="updateElementTask" />
+      <el-input
+        v-model="serviceTaskForm.delegateExpression"
+        clearable
+        @change="updateElementTask"
+      />
     </el-form-item>
     <template v-if="serviceTaskForm.executeType === 'http'">
       <el-form-item label="请求方法" key="http-method">

From fa856c938f1758b79b8dfaa460abd806b8a5147e Mon Sep 17 00:00:00 2001
From: sinkingsoul <286447685@qq.com>
Date: Mon, 3 Nov 2025 09:58:57 +0800
Subject: [PATCH 04/16] =?UTF-8?q?chore:=20=E5=88=A0=E9=99=A4=E6=AE=8B?=
 =?UTF-8?q?=E7=95=99=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bpmnProcessDesigner/package/designer/plugins/translate/zh.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
index 4ac5bb5c..d243ec45 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
@@ -43,7 +43,6 @@ export default {
   'Manual Task': '手工任务',
   'Business Rule Task': '业务规则任务',
   'Service Task': '服务任务',
-  'HTTP Task': 'HTTP任务',
   'Script Task': '脚本任务',
   'Call Activity': '调用活动',
   'Sub-Process (collapsed)': '子流程（折叠的）',

From e3e61359f9366c5c82a5a29d9f030f702ecf1990 Mon Sep 17 00:00:00 2001
From: sinkingsoul <286447685@qq.com>
Date: Thu, 6 Nov 2025 10:23:10 +0800
Subject: [PATCH 05/16] =?UTF-8?q?feat:=20http=E4=BB=BB=E5=8A=A1=E7=9A=84?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=85=A8=E9=83=A8=E5=88=97=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/task-components/ServiceTask.vue      | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
index 37573c8c..eda9168e 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
@@ -60,18 +60,24 @@
           clearable
         />
       </el-form-item>
-      <!--      <el-form-item label="禁止重定向" key="http-disallow-redirects">-->
-      <!--        <el-switch v-model="httpTaskForm.disallowRedirects" />-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="忽略异常" key="http-ignore-exception">-->
-      <!--        <el-switch v-model="httpTaskForm.ignoreException" />-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="瞬态保存响应参数" key="http-save-transient">-->
-      <!--        <el-switch v-model="httpTaskForm.saveResponseParametersTransient" />-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="JSON 保存响应变量" key="http-save-json">-->
-      <!--        <el-switch v-model="httpTaskForm.saveResponseVariableAsJson" />-->
-      <!--      </el-form-item>-->
+      <el-form-item label="禁止重定向" key="http-disallow-redirects">
+        <el-switch v-model="httpTaskForm.disallowRedirects" />
+      </el-form-item>
+      <el-form-item label="忽略异常" key="http-ignore-exception">
+        <el-switch v-model="httpTaskForm.ignoreException" />
+      </el-form-item>
+      <el-form-item label="保存响应参数" key="http-save-response">
+        <el-switch v-model="httpTaskForm.saveResponseParameters" />
+      </el-form-item>
+      <el-form-item label="瞬态保存响应参数" key="http-save-transient">
+        <el-switch v-model="httpTaskForm.saveResponseParametersTransient" />
+      </el-form-item>
+      <el-form-item label="保存响应参数" key="http-result-variable-prefix">
+        <el-input v-model="httpTaskForm.resultVariablePrefix" />
+      </el-form-item>
+      <el-form-item label="JSON 保存响应变量" key="http-save-json">
+        <el-switch v-model="httpTaskForm.saveResponseVariableAsJson" />
+      </el-form-item>
     </template>
   </div>
 </template>
@@ -94,12 +100,15 @@ const HTTP_FIELD_NAMES = [
   'requestHeaders',
   'disallowRedirects',
   'ignoreException',
+  'saveResponseParameters',
+  'resultVariablePrefix',
   'saveResponseParametersTransient',
   'saveResponseVariableAsJson'
 ]
 const HTTP_BOOLEAN_FIELDS = new Set([
   'disallowRedirects',
   'ignoreException',
+  'saveResponseParameters',
   'saveResponseParametersTransient',
   'saveResponseVariableAsJson'
 ])
@@ -115,8 +124,10 @@ const DEFAULT_HTTP_FORM = {
   requestMethod: 'GET',
   requestUrl: '',
   requestHeaders: 'Content-Type: application/json',
+  resultVariablePrefix: '',
   disallowRedirects: false,
   ignoreException: false,
+  saveResponseParameters: false,
   saveResponseParametersTransient: false,
   saveResponseVariableAsJson: false
 }

From c50e0dee8c76d6eea04b0121f1cd69dbf9037300 Mon Sep 17 00:00:00 2001
From: zhanglc <zhanglc0618@gmail.com>
Date: Tue, 18 Nov 2025 11:40:58 +0800
Subject: [PATCH 06/16] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DHTTP=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=B8=AD=E8=AF=B7=E6=B1=82=E5=A4=B4=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8EL=E8=A1=A8=E8=BE=BE=E5=BC=8F=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/task-components/ServiceTask.vue      | 51 ++++++++++++++-----
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
index eda9168e..3c8e37e3 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
@@ -139,22 +139,32 @@ const httpInitializing = ref(false)
 
 const bpmnInstances = () => (window as any)?.bpmnInstances
 
+// 判断字符串是否包含表达式
+const isExpression = (value: string): boolean => {
+  if (!value) return false
+  // 检测 ${...} 或 #{...} 格式的表达式
+  return /\${[^}]+}/.test(value) || /#{[^}]+}/.test(value)
+}
+
 const collectHttpExtensionInfo = () => {
   const businessObject = bpmnElement.value?.businessObject
   const extensionElements = businessObject?.extensionElements
   const httpFields = new Map<string, string>()
+  const httpFieldTypes = new Map<string, 'string' | 'expression'>()
   const otherExtensions: any[] = []
 
   extensionElements?.values?.forEach((item: any) => {
     if (item?.$type === flowableFieldType && HTTP_FIELD_NAMES.includes(item.name)) {
       const value = item.string ?? item.stringValue ?? item.expression ?? ''
+      const fieldType = item.expression ? 'expression' : 'string'
       httpFields.set(item.name, value)
+      httpFieldTypes.set(item.name, fieldType)
     } else {
       otherExtensions.push(item)
     }
   })
 
-  return { httpFields, otherExtensions }
+  return { httpFields, httpFieldTypes, otherExtensions }
 }
 
 const resetHttpDefaults = () => {
@@ -168,7 +178,7 @@ const resetHttpDefaults = () => {
 const resetHttpForm = () => {
   httpInitializing.value = true
   const { httpFields } = collectHttpExtensionInfo()
-  const nextForm: Record<string, any> = { ...DEFAULT_HTTP_FORM }
+  const nextForm = { ...DEFAULT_HTTP_FORM }
 
   HTTP_FIELD_NAMES.forEach((name) => {
     const stored = httpFields.get(name)
@@ -228,7 +238,11 @@ const updateHttpExtensions = (force = false) => {
     return
   }
 
-  const { httpFields: existingFields, otherExtensions } = collectHttpExtensionInfo()
+  const {
+    httpFields: existingFields,
+    httpFieldTypes: existingTypes,
+    otherExtensions
+  } = collectHttpExtensionInfo()
 
   const desiredEntries: [string, string][] = []
   HTTP_FIELD_NAMES.forEach((name) => {
@@ -246,21 +260,32 @@ const updateHttpExtensions = (force = false) => {
     desiredEntries.push([name, persisted])
   })
 
-  if (
-    !force &&
-    desiredEntries.length === existingFields.size &&
-    desiredEntries.every(([name, value]) => existingFields.get(name) === value)
-  ) {
-    return
+  // 检查是否有变化：不仅比较值，还要比较字段类型（string vs expression）
+  if (!force && desiredEntries.length === existingFields.size) {
+    let noChange = true
+    for (const [name, value] of desiredEntries) {
+      const existingValue = existingFields.get(name)
+      const existingType = existingTypes.get(name)
+      const currentType = isExpression(value) ? 'expression' : 'string'
+      if (existingValue !== value || existingType !== currentType) {
+        noChange = false
+        break
+      }
+    }
+    if (noChange) {
+      return
+    }
   }
 
   const moddle = bpmnInstances().moddle
-  const httpFieldElements = desiredEntries.map(([name, value]) =>
-    moddle.create(flowableFieldType, {
+  const httpFieldElements = desiredEntries.map(([name, value]) => {
+    // 根据值是否包含表达式来决定使用 string 还是 expression 属性
+    const isExpr = isExpression(value)
+    return moddle.create(flowableFieldType, {
       name,
-      string: value
+      ...(isExpr ? { expression: value } : { string: value })
     })
-  )
+  })
 
   updateElementExtensions(bpmnElement.value, [...otherExtensions, ...httpFieldElements])
 }

From d66cd5d209c52ab565b53cd3806028a1a2bd7b24 Mon Sep 17 00:00:00 2001
From: zhanglc <zhanglc0618@gmail.com>
Date: Tue, 18 Nov 2025 14:52:42 +0800
Subject: [PATCH 07/16] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96HTTP=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=AF=B7=E6=B1=82=E5=A4=B4=E8=BE=93=E5=85=A5=EF=BC=8C?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=94=AE=E5=80=BC=E5=AF=B9=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/task-components/HttpHeaderEditor.vue | 178 ++++++++++++++++++
 .../task/task-components/ServiceTask.vue      |  55 ++++--
 2 files changed, 219 insertions(+), 14 deletions(-)
 create mode 100644 src/components/bpmnProcessDesigner/package/penal/task/task-components/HttpHeaderEditor.vue

diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/HttpHeaderEditor.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/HttpHeaderEditor.vue
new file mode 100644
index 00000000..5d0a1334
--- /dev/null
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/HttpHeaderEditor.vue
@@ -0,0 +1,178 @@
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="编辑请求头"
+    width="600px"
+    :close-on-click-modal="false"
+    @close="handleClose"
+  >
+    <div class="header-editor">
+      <div class="header-list">
+        <div v-for="(item, index) in headerList" :key="index" class="header-item">
+          <el-input v-model="item.key" placeholder="请输入参数名" class="header-key" clearable />
+          <span class="separator">:</span>
+          <el-input
+            v-model="item.value"
+            placeholder="请输入参数值 (支持表达式 ${变量名})"
+            class="header-value"
+            clearable
+          />
+          <el-button
+            type="danger"
+            :icon="Delete"
+            circle
+            size="small"
+            @click="removeHeader(index)"
+          />
+        </div>
+      </div>
+      <el-button type="primary" :icon="Plus" class="add-btn" @click="addHeader">
+        添加请求头
+      </el-button>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="handleClose">取消</el-button>
+        <el-button type="primary" @click="handleSave">保存</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { Delete, Plus } from '@element-plus/icons-vue'
+
+defineOptions({ name: 'HttpHeaderEditor' })
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  headers: {
+    type: String,
+    default: ''
+  }
+})
+
+const emit = defineEmits(['update:modelValue', 'save'])
+
+interface HeaderItem {
+  key: string
+  value: string
+}
+
+const dialogVisible = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val)
+})
+
+const headerList = ref<HeaderItem[]>([])
+
+// 解析请求头字符串为列表
+const parseHeaders = (headersStr: string): HeaderItem[] => {
+  if (!headersStr || !headersStr.trim()) {
+    return [{ key: '', value: '' }]
+  }
+
+  const lines = headersStr.split('\n').filter((line) => line.trim())
+  const parsed = lines.map((line) => {
+    const colonIndex = line.indexOf(':')
+    if (colonIndex > 0) {
+      return {
+        key: line.substring(0, colonIndex).trim(),
+        value: line.substring(colonIndex + 1).trim()
+      }
+    }
+    return { key: line.trim(), value: '' }
+  })
+
+  return parsed.length > 0 ? parsed : [{ key: '', value: '' }]
+}
+
+// 将列表转换为请求头字符串
+const stringifyHeaders = (headers: HeaderItem[]): string => {
+  return headers
+    .filter((item) => item.key.trim())
+    .map((item) => `${item.key}: ${item.value}`)
+    .join('\n')
+}
+
+// 添加请求头
+const addHeader = () => {
+  headerList.value.push({ key: '', value: '' })
+}
+
+// 移除请求头
+const removeHeader = (index: number) => {
+  if (headerList.value.length === 1) {
+    // 至少保留一行
+    headerList.value = [{ key: '', value: '' }]
+  } else {
+    headerList.value.splice(index, 1)
+  }
+}
+
+// 保存
+const handleSave = () => {
+  const headersStr = stringifyHeaders(headerList.value)
+  emit('save', headersStr)
+  dialogVisible.value = false
+}
+
+// 关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+
+// 监听对话框打开，初始化数据
+watch(
+  () => props.modelValue,
+  (val) => {
+    if (val) {
+      headerList.value = parseHeaders(props.headers)
+    }
+  },
+  { immediate: true }
+)
+</script>
+
+<style lang="scss" scoped>
+.header-editor {
+  .header-list {
+    max-height: 400px;
+    overflow-y: auto;
+    margin-bottom: 16px;
+  }
+
+  .header-item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 12px;
+
+    .header-key {
+      flex: 0 0 180px;
+    }
+
+    .separator {
+      color: #606266;
+      font-weight: 500;
+    }
+
+    .header-value {
+      flex: 1;
+    }
+  }
+
+  .add-btn {
+    width: 100%;
+  }
+}
+
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+}
+</style>
diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
index 3c8e37e3..642c3c28 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
@@ -43,22 +43,34 @@
           <el-option label="POST" value="POST" />
           <el-option label="PUT" value="PUT" />
           <el-option label="DELETE" value="DELETE" />
-          <el-option label="PATCH" value="PATCH" />
-          <el-option label="HEAD" value="HEAD" />
-          <el-option label="OPTIONS" value="OPTIONS" />
+          <!--          <el-option label="PATCH" value="PATCH" />-->
+          <!--          <el-option label="HEAD" value="HEAD" />-->
+          <!--          <el-option label="OPTIONS" value="OPTIONS" />-->
         </el-select>
       </el-form-item>
       <el-form-item label="请求地址" key="http-url" prop="requestUrl">
         <el-input v-model="httpTaskForm.requestUrl" clearable />
       </el-form-item>
       <el-form-item label="请求头" key="http-headers">
-        <el-input
-          v-model="httpTaskForm.requestHeaders"
-          type="textarea"
-          resize="vertical"
-          :autosize="{ minRows: 2, maxRows: 4 }"
-          clearable
-        />
+        <div style="display: flex; gap: 8px; align-items: flex-start; width: 100%">
+          <el-input
+            v-model="httpTaskForm.requestHeaders"
+            type="textarea"
+            resize="vertical"
+            :autosize="{ minRows: 4, maxRows: 8 }"
+            readonly
+            placeholder="点击右侧编辑按钮添加请求头"
+            style="flex: 1; min-width: 0"
+          />
+          <el-button
+            type="primary"
+            :icon="Edit"
+            @click="showHeaderEditor = true"
+            style="flex-shrink: 0"
+          >
+            编辑
+          </el-button>
+        </div>
       </el-form-item>
       <el-form-item label="禁止重定向" key="http-disallow-redirects">
         <el-switch v-model="httpTaskForm.disallowRedirects" />
@@ -66,24 +78,34 @@
       <el-form-item label="忽略异常" key="http-ignore-exception">
         <el-switch v-model="httpTaskForm.ignoreException" />
       </el-form-item>
-      <el-form-item label="保存响应参数" key="http-save-response">
+      <el-form-item label="保存返回变量" key="http-save-response">
         <el-switch v-model="httpTaskForm.saveResponseParameters" />
       </el-form-item>
-      <el-form-item label="瞬态保存响应参数" key="http-save-transient">
+      <el-form-item label="是否瞬间变量" key="http-save-transient">
         <el-switch v-model="httpTaskForm.saveResponseParametersTransient" />
       </el-form-item>
-      <el-form-item label="保存响应参数" key="http-result-variable-prefix">
+      <el-form-item label="返回变量前缀" key="http-result-variable-prefix">
         <el-input v-model="httpTaskForm.resultVariablePrefix" />
       </el-form-item>
-      <el-form-item label="JSON 保存响应变量" key="http-save-json">
+      <el-form-item label="格式化返回为JSON" key="http-save-json">
         <el-switch v-model="httpTaskForm.saveResponseVariableAsJson" />
       </el-form-item>
     </template>
+
+    <!-- 请求头编辑器 -->
+    <HttpHeaderEditor
+      v-model="showHeaderEditor"
+      :headers="httpTaskForm.requestHeaders"
+      @save="handleHeadersSave"
+    />
   </div>
 </template>
 
 <script lang="ts" setup>
+import { Edit } from '@element-plus/icons-vue'
 import { updateElementExtensions } from '@/components/bpmnProcessDesigner/package/utils'
+import HttpHeaderEditor from './HttpHeaderEditor.vue'
+
 defineOptions({ name: 'ServiceTask' })
 const props = defineProps({
   id: String,
@@ -136,6 +158,7 @@ const serviceTaskForm = ref({ ...DEFAULT_TASK_FORM })
 const httpTaskForm = ref({ ...DEFAULT_HTTP_FORM })
 const bpmnElement = ref()
 const httpInitializing = ref(false)
+const showHeaderEditor = ref(false)
 
 const bpmnInstances = () => (window as any)?.bpmnInstances
 
@@ -341,6 +364,10 @@ const handleExecuteTypeChange = (value: string) => {
   updateElementTask()
 }
 
+const handleHeadersSave = (headersStr: string) => {
+  httpTaskForm.value.requestHeaders = headersStr
+}
+
 onBeforeUnmount(() => {
   bpmnElement.value = null
 })

From be35a27acaa0d757ddcdbad339c59e6b7d1e942a Mon Sep 17 00:00:00 2001
From: zhanglc <zhanglc0618@gmail.com>
Date: Wed, 19 Nov 2025 10:43:29 +0800
Subject: [PATCH 08/16] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96HTTP=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=B1=95=E7=8E=B0=EF=BC=8C=E7=8E=B0=E4=B8=BA=E5=8D=95=E8=A1=8C?=
 =?UTF-8?q?=E5=8D=95=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../penal/task/task-components/ServiceTask.vue    | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
index 642c3c28..fcd08f4c 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
@@ -38,15 +38,12 @@
     </el-form-item>
     <template v-if="serviceTaskForm.executeType === 'http'">
       <el-form-item label="请求方法" key="http-method">
-        <el-select v-model="httpTaskForm.requestMethod">
-          <el-option label="GET" value="GET" />
-          <el-option label="POST" value="POST" />
-          <el-option label="PUT" value="PUT" />
-          <el-option label="DELETE" value="DELETE" />
-          <!--          <el-option label="PATCH" value="PATCH" />-->
-          <!--          <el-option label="HEAD" value="HEAD" />-->
-          <!--          <el-option label="OPTIONS" value="OPTIONS" />-->
-        </el-select>
+        <el-radio-group v-model="httpTaskForm.requestMethod">
+          <el-radio-button label="GET" value="GET" />
+          <el-radio-button label="POST" value="POST" />
+          <el-radio-button label="PUT" value="PUT" />
+          <el-radio-button label="DELETE" value="DELETE" />
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="请求地址" key="http-url" prop="requestUrl">
         <el-input v-model="httpTaskForm.requestUrl" clearable />

From aa8b076f8fbb8f22c5ee5d89c1928a085105c8a6 Mon Sep 17 00:00:00 2001
From: sinkingsoul <286447685@qq.com>
Date: Wed, 5 Nov 2025 15:03:01 +0800
Subject: [PATCH 09/16] =?UTF-8?q?feat:=20=E4=BF=9D=E5=AD=98=E4=B8=BAhttp?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=9C=8D=E5=8A=A1=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=89=93=E5=BC=80http=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=80=89=E9=A1=B9=E5=92=8C=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/task/task-components/ServiceTask.vue    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
index fcd08f4c..c07e80b5 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ServiceTask.vue
@@ -216,7 +216,7 @@ const resetHttpForm = () => {
 
 const resetServiceTaskForm = () => {
   const businessObject = bpmnElement.value?.businessObject
-  const nextForm: Record<string, any> = { ...DEFAULT_TASK_FORM }
+  const nextForm = { ...DEFAULT_TASK_FORM }
 
   if (businessObject) {
     if (businessObject.class) {
@@ -233,6 +233,12 @@ const resetServiceTaskForm = () => {
     }
     if (businessObject.$attrs?.[flowableTypeKey] === 'http') {
       nextForm.executeType = 'http'
+    } else {
+      // 兜底：如缺少 flowable:type=http，但扩展里已有 HTTP 的字段，也认为是 HTTP
+      const { httpFields } = collectHttpExtensionInfo()
+      if (httpFields.size > 0) {
+        nextForm.executeType = 'http'
+      }
     }
   }
 

From be2c3f3fcd84f0f346b8acb4baf2815244fcbb56 Mon Sep 17 00:00:00 2001
From: zhangliaocensz <zhangliaocen@huayuninfo.com.cn>
Date: Fri, 17 Oct 2025 14:19:54 +0800
Subject: [PATCH 10/16] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=9B=A0=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6id=E4=B8=8D=E5=AF=B9=E6=B2=A1=E6=9C=89=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E7=A7=BB=E9=99=A4=E8=87=AA=E5=B8=A6=E7=9A=84=E5=AF=8C?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BB=84=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormCreate/src/useFormCreateDesigner.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/FormCreate/src/useFormCreateDesigner.ts b/src/components/FormCreate/src/useFormCreateDesigner.ts
index 6682004e..0d2e5f78 100644
--- a/src/components/FormCreate/src/useFormCreateDesigner.ts
+++ b/src/components/FormCreate/src/useFormCreateDesigner.ts
@@ -35,7 +35,7 @@ export const useFormCreateDesigner = async (designer: Ref) => {
     // 移除自带的上传组件规则，使用 uploadFileRule、uploadImgRule、uploadImgsRule 替代
     designer.value?.removeMenuItem('upload')
     // 移除自带的富文本组件规则，使用 editorRule 替代
-    designer.value?.removeMenuItem('fc-editor')
+    designer.value?.removeMenuItem('fcEditor')
     const components = [editorRule, uploadFileRule, uploadImgRule, uploadImgsRule]
     components.forEach((component) => {
       // 插入组件规则

From 1bc45bf486185ffc948fc5e38b14df825374729f Mon Sep 17 00:00:00 2001
From: beihai <soul.zhanglc@gmail.com>
Date: Wed, 29 Oct 2025 10:01:19 +0800
Subject: [PATCH 11/16] =?UTF-8?q?fix:=E6=B5=81=E7=A8=8B=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9B=91=E5=90=AC=E5=99=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=B8=AD=E4=BA=8B=E4=BB=B6=E9=80=89=E9=A1=B9=E6=B1=89=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/processListener/ProcessListenerForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/bpm/processListener/ProcessListenerForm.vue b/src/views/bpm/processListener/ProcessListenerForm.vue
index a9684dff..916998ed 100644
--- a/src/views/bpm/processListener/ProcessListenerForm.vue
+++ b/src/views/bpm/processListener/ProcessListenerForm.vue
@@ -39,8 +39,8 @@
         <el-select v-model="formData.event" placeholder="请选择事件">
           <el-option
             v-for="event in formData.type == 'execution'
-              ? ['start', 'end']
-              : ['create', 'assignment', 'complete', 'delete', 'update', 'timeout']"
+              ? ['开始', '结束']
+              : ['创建', '指派', '完成', '删除', '更新', '超时']"
             :label="event"
             :value="event"
             :key="event"

From 4534bd220cc0bfe9b602c7ccb6c38cdbbafebf93 Mon Sep 17 00:00:00 2001
From: sinkingsoul <286447685@qq.com>
Date: Mon, 3 Nov 2025 11:12:16 +0800
Subject: [PATCH 12/16] =?UTF-8?q?fix:=20=E4=BA=8B=E4=BB=B6=E7=BD=91?=
 =?UTF-8?q?=E5=85=B3=E7=BF=BB=E8=AF=91=E6=96=87=E4=BB=B6=E4=B8=AD=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E8=8B=B1=E6=96=87=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/designer/plugins/translate/zh.js                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
index d243ec45..4a368d46 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
@@ -109,7 +109,7 @@ export default {
   'Parallel Gateway': '并行网关',
   'Inclusive Gateway': '相容网关',
   'Complex Gateway': '复杂网关',
-  'Event based Gateway': '事件网关',
+  'Event-based Gateway': '事件网关',
   Transaction: '转运',
   'Sub Process': '子流程',
   'Event Sub Process': '事件子流程',

From e4e4dd640c8e25bee2985cc434789295af54fe1e Mon Sep 17 00:00:00 2001
From: sinkingsoul <286447685@qq.com>
Date: Mon, 10 Nov 2025 15:55:26 +0800
Subject: [PATCH 13/16] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=90?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=92=8C=E4=BA=8B=E4=BB=B6=E5=AD=90=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=8B=B1=E6=96=87=E6=A0=87=E7=AD=BE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/designer/plugins/translate/zh.js                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
index 4a368d46..9493062c 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
@@ -111,8 +111,8 @@ export default {
   'Complex Gateway': '复杂网关',
   'Event-based Gateway': '事件网关',
   Transaction: '转运',
-  'Sub Process': '子流程',
-  'Event Sub Process': '事件子流程',
+  'sub-process': '子流程',
+  'Event sub-process': '事件子流程',
   'Collapsed Pool': '折叠池',
   'Expanded Pool': '展开池',
 

From aae87f85acd06b2a5cce33230d9db621ac45b298 Mon Sep 17 00:00:00 2001
From: sinkingsoul <286447685@qq.com>
Date: Wed, 12 Nov 2025 15:48:03 +0800
Subject: [PATCH 14/16] =?UTF-8?q?chore:=20=20=E6=96=B0=E5=A2=9E=E2=80=9C?=
 =?UTF-8?q?=E6=94=B6=E7=BC=A9=E6=B1=A0/=E5=8F=82=E4=B8=8E=E8=80=85?=
 =?UTF-8?q?=E2=80=9D=E3=80=81=E2=80=9C=E5=B1=95=E5=BC=80=E6=B1=A0/?=
 =?UTF-8?q?=E5=8F=82=E4=B8=8E=E8=80=85=E2=80=9D=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/designer/plugins/translate/zh.js                   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
index 9493062c..c45ef30c 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
@@ -29,6 +29,9 @@ export default {
   'Create expanded SubProcess': '创建扩展子过程',
   'Create IntermediateThrowEvent/BoundaryEvent': '创建中间抛出事件/边界事件',
   'Create Pool/Participant': '创建池/参与者',
+  'Empty pool/participant(removes content)': '清空池/参与者（移除内容）',
+  'Empty pool/participant': '收缩池/参与者',
+  'Expanded pool/participant': '展开池/参与者',
   'Parallel Multi Instance': '并行多重事件',
   'Sequential Multi Instance': '时序多重事件',
   DataObjectReference: '数据对象参考',

From 045959583dbfcca6d20122d111e23f3186156180 Mon Sep 17 00:00:00 2001
From: sinkingsoul <286447685@qq.com>
Date: Fri, 14 Nov 2025 10:39:49 +0800
Subject: [PATCH 15/16] =?UTF-8?q?chore:=20=20=E6=96=B0=E5=A2=9E'Participan?=
 =?UTF-8?q?t=20Multiplicity':=20'=E5=8F=82=E4=B8=8E=E8=80=85=E5=A4=9A?=
 =?UTF-8?q?=E9=87=8D=E6=80=A7',=E3=80=81'Empty=20pool/participant=20(remov?=
 =?UTF-8?q?es=20content)':=20'=E6=B8=85=E7=A9=BA=E6=B1=A0/=E5=8F=82?=
 =?UTF-8?q?=E4=B8=8E=E8=80=85=EF=BC=88=E7=A7=BB=E9=99=A4=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=EF=BC=89'=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/designer/plugins/translate/zh.js                   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
index c45ef30c..91d774be 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
@@ -29,7 +29,8 @@ export default {
   'Create expanded SubProcess': '创建扩展子过程',
   'Create IntermediateThrowEvent/BoundaryEvent': '创建中间抛出事件/边界事件',
   'Create Pool/Participant': '创建池/参与者',
-  'Empty pool/participant(removes content)': '清空池/参与者（移除内容）',
+  'Participant Multiplicity': '参与者多重性',
+  'Empty pool/participant (removes content)': '清空池/参与者（移除内容）',
   'Empty pool/participant': '收缩池/参与者',
   'Expanded pool/participant': '展开池/参与者',
   'Parallel Multi Instance': '并行多重事件',

From c6f805a5cc1b927c93b9cd30e1de71dd087ba8db Mon Sep 17 00:00:00 2001
From: sinkingsoul <286447685@qq.com>
Date: Mon, 17 Nov 2025 09:20:28 +0800
Subject: [PATCH 16/16] =?UTF-8?q?chore:=20bpmn-js=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E7=BF=BB=E8=AF=91=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/designer/plugins/translate/zh.js          | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
index 91d774be..4407e664 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/translate/zh.js
@@ -10,7 +10,7 @@ export default {
   'Append Gateway': '追加网关',
   'Append Task': '追加任务',
   'Append Intermediate/Boundary Event': '追加中间抛出事件/边界事件',
-
+  TextAnnotation: '文本注释',
   'Activate the global connect tool': '激活全局连接工具',
   'Append {type}': '添加 {type}',
   'Add Lane above': '在上面添加道',
@@ -33,10 +33,12 @@ export default {
   'Empty pool/participant (removes content)': '清空池/参与者（移除内容）',
   'Empty pool/participant': '收缩池/参与者',
   'Expanded pool/participant': '展开池/参与者',
-  'Parallel Multi Instance': '并行多重事件',
-  'Sequential Multi Instance': '时序多重事件',
+  'Parallel Multi-Instance': '并行多重事件',
+  'Sequential Multi-Instance': '时序多重事件',
   DataObjectReference: '数据对象参考',
   DataStoreReference: '数据存储参考',
+  'Data object reference': '数据对象引用 ',
+  'Data store reference': '数据存储引用 ',
   Loop: '循环',
   'Ad-hoc': '即席',
   'Create {type}': '创建 {type}',
@@ -51,6 +53,9 @@ export default {
   'Call Activity': '调用活动',
   'Sub-Process (collapsed)': '子流程（折叠的）',
   'Sub-Process (expanded)': '子流程（展开的）',
+  'Ad-hoc sub-process': '即席子流程',
+  'Ad-hoc sub-process (collapsed)': '即席子流程（折叠的）',
+  'Ad-hoc sub-process (expanded)': '即席子流程（展开的）',
   'Start Event': '开始事件',
   StartEvent: '开始事件',
   'Intermediate Throw Event': '中间事件',