From 01be1d32802ca49292da4d49fe453e7bd2439da7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com>
Date: Tue, 11 Jun 2024 10:18:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=A1=A8=E5=8D=95=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/PropertiesPanel.vue         |  2 ++
 .../package/penal/startEvent/index.vue        | 18 ++++++++++++-----
 .../package/penal/userTask/index.vue          |  7 +++++++
 .../demo/onlineform/formCall/CreateFlow.vue   | 10 +++++++++-
 src/views/demo/workflow/create/preview.vue    | 20 +++++++++++++++++--
 .../demo/workflow/task/process/audit.vue      | 20 +++++++++++++++++--
 src/views/demo/workflow/task/process/look.vue | 10 +++++++++-
 .../demo/workflow/task/uncompletedTask.vue    |  2 +-
 8 files changed, 77 insertions(+), 12 deletions(-)

diff --git a/src/components/ProcessDesigner/package/penal/PropertiesPanel.vue b/src/components/ProcessDesigner/package/penal/PropertiesPanel.vue
index 5925bf3a..ff1e2766 100644
--- a/src/components/ProcessDesigner/package/penal/PropertiesPanel.vue
+++ b/src/components/ProcessDesigner/package/penal/PropertiesPanel.vue
@@ -229,6 +229,7 @@
           authFields: [],
           messageType: '',
           isInit: true,
+          formTitle: '',
         };
         break;
       case 'bpmn:EndEvent':
@@ -256,6 +257,7 @@
           formRelations: [],
           formType: '1',
           formCode: '',
+          formTitle: '',
           formVerison: '',
           formRelationId: '',
           formUrl: '',
diff --git a/src/components/ProcessDesigner/package/penal/startEvent/index.vue b/src/components/ProcessDesigner/package/penal/startEvent/index.vue
index 5004707e..9b1d7b34 100644
--- a/src/components/ProcessDesigner/package/penal/startEvent/index.vue
+++ b/src/components/ProcessDesigner/package/penal/startEvent/index.vue
@@ -62,6 +62,9 @@
                 :options="data.formRelations"
               />
             </a-space-compact>
+            <a-space-compact block>
+              <a-input v-model:value="node.formTitle" placeholder="请输入表单标题" />
+            </a-space-compact>
           </a-space>
         </a-tab-pane>
         <a-tab-pane key="2" tab="系统表单">
@@ -73,6 +76,9 @@
                 @change="updateWfData('formUrl')"
               />
             </a-space-compact>
+            <a-space-compact block>
+              <a-input v-model:value="node.formTitle" placeholder="请输入PC端表单标题" />
+            </a-space-compact>
             <a-space-compact block>
               <a-input
                 v-model:value="node.formAppUrl"
@@ -262,6 +268,7 @@
   onMounted(() => {
     if (props.element.type == 'bpmn:StartEvent') {
       const currentNode = flowWfDataStore.getWfDataNode(props.element.id);
+      console.log(currentNode);
       if (currentNode) {
         node.value = currentNode;
       } else {
@@ -285,6 +292,7 @@
   function tabsChange() {
     data.formName = '';
     node.value.formCode = '';
+    node.value.formTitle = '';
     node.value.formVerison = '';
     node.value.formRelationId = '';
     node.value.formUrl = '';
@@ -340,13 +348,13 @@
         obj.label = `${optionsElement.label} - ${childrenElement.label}`;
         obj.fieldName = childrenElement.componentProps.fieldName;
         result.push(obj);
-        if(childrenElement.component === 'CardGroup'){
-          result = cardComponentChild(childrenElement.componentProps.options, result)
+        if (childrenElement.component === 'CardGroup') {
+          result = cardComponentChild(childrenElement.componentProps.options, result);
         }
       });
     });
-    return result
-  }
+    return result;
+  };
   function loadFormScheme(strScheme, isChange) {
     const scheme = JSON.parse(strScheme);
     let fields: any[] = [];
@@ -462,7 +470,7 @@
             obj.fieldName = element.componentProps.fieldName;
             obj.label = `卡片组-${element.label}`;
             fields.push(obj);
-            fields = cardComponentChild(element.componentProps.options, fields)
+            fields = cardComponentChild(element.componentProps.options, fields);
           }
         },
       );
diff --git a/src/components/ProcessDesigner/package/penal/userTask/index.vue b/src/components/ProcessDesigner/package/penal/userTask/index.vue
index 1552eddf..d923908e 100644
--- a/src/components/ProcessDesigner/package/penal/userTask/index.vue
+++ b/src/components/ProcessDesigner/package/penal/userTask/index.vue
@@ -206,6 +206,9 @@
                     :options="data.formRelations"
                   />
                 </a-space-compact>
+                <a-space-compact block>
+                  <a-input v-model:value="node.formTitle" placeholder="请输入表单标题" />
+                </a-space-compact>
               </a-space>
             </a-tab-pane>
             <a-tab-pane key="2" tab="系统表单">
@@ -217,6 +220,9 @@
                     @change="updateWfData('formUrl')"
                   />
                 </a-space-compact>
+                <a-space-compact block>
+                  <a-input v-model:value="node.formTitle" placeholder="请输入PC端表单标题" />
+                </a-space-compact>
                 <a-space-compact block>
                   <a-input
                     v-model:value="node.formAppUrl"
@@ -848,6 +854,7 @@
   // 切换自定义表单和系统表单
   function tabsChange() {
     data.formName = '';
+    node.value.formTitle = '';
     node.value.formCode = '';
     node.value.formVerison = '';
     node.value.formRelationId = '';
diff --git a/src/views/demo/onlineform/formCall/CreateFlow.vue b/src/views/demo/onlineform/formCall/CreateFlow.vue
index 98a5a929..702dfb48 100644
--- a/src/views/demo/onlineform/formCall/CreateFlow.vue
+++ b/src/views/demo/onlineform/formCall/CreateFlow.vue
@@ -21,7 +21,15 @@
       </a-button>
     </div>
     <a-tabs v-model:activeKey="activeName" @change="changeActive">
-      <a-tab-pane key="form" tab="表单信息" v-if="formVisble">
+      <a-tab-pane
+        key="form"
+        :tab="
+          designerData.formCurrentNode.formTitle
+            ? designerData.formCurrentNode.formTitle
+            : '表单信息'
+        "
+        v-if="formVisble"
+      >
         <FormViewer
           ref="formBoxRef"
           :formConfig="formConfig"
diff --git a/src/views/demo/workflow/create/preview.vue b/src/views/demo/workflow/create/preview.vue
index c28f323b..42788c48 100644
--- a/src/views/demo/workflow/create/preview.vue
+++ b/src/views/demo/workflow/create/preview.vue
@@ -17,7 +17,15 @@
       </a-button>
     </div>
     <a-tabs v-model:activeKey="activeName" @change="changeActive">
-      <a-tab-pane key="form" tab="表单信息" v-if="formVisble">
+      <a-tab-pane
+        key="form"
+        :tab="
+          designerData.formCurrentNode.formTitle
+            ? designerData.formCurrentNode.formTitle
+            : '表单信息'
+        "
+        v-if="formVisble"
+      >
         <FormViewer
           ref="formBoxRef"
           :formConfig="formConfig"
@@ -25,7 +33,15 @@
           v-if="formVisble"
         />
       </a-tab-pane>
-      <a-tab-pane key="form" tab="系统表单信息" v-if="formUrlVisble">
+      <a-tab-pane
+        key="form"
+        :tab="
+          designerData.formCurrentNode.formTitle
+            ? designerData.formCurrentNode.formTitle
+            : '系统表单信息'
+        "
+        v-if="formUrlVisble"
+      >
         <AsyncComponent ref="pcForm" />
       </a-tab-pane>
       <a-tab-pane key="flow" tab="流程信息" force-render>
diff --git a/src/views/demo/workflow/task/process/audit.vue b/src/views/demo/workflow/task/process/audit.vue
index 0e85939f..31d91160 100644
--- a/src/views/demo/workflow/task/process/audit.vue
+++ b/src/views/demo/workflow/task/process/audit.vue
@@ -10,7 +10,15 @@
       <a-layout>
         <a-layout-content>
           <a-tabs v-model:activeKey="activeName" @change="changeActive">
-            <a-tab-pane key="form" tab="表单信息" v-if="formVisble">
+            <a-tab-pane
+              key="form"
+              :tab="
+                designerData.formCurrentNode.formTitle
+                  ? designerData.formCurrentNode.formTitle
+                  : '表单信息'
+              "
+              v-if="formVisble"
+            >
               <FormViewer
                 ref="formBoxRef"
                 :formConfig="formConfig"
@@ -21,7 +29,15 @@
                 v-if="formVisble"
               />
             </a-tab-pane>
-            <a-tab-pane key="form" tab="系统表单信息" v-if="formUrlVisble">
+            <a-tab-pane
+              key="form"
+              :tab="
+                designerData.formCurrentNode.formTitle
+                  ? designerData.formCurrentNode.formTitle
+                  : '系统表单信息'
+              "
+              v-if="formUrlVisble"
+            >
               <AsyncComponent ref="pcForm" />
             </a-tab-pane>
             <a-tab-pane key="flow" tab="流程信息" force-render>
diff --git a/src/views/demo/workflow/task/process/look.vue b/src/views/demo/workflow/task/process/look.vue
index 6d00f950..79d7b3ad 100644
--- a/src/views/demo/workflow/task/process/look.vue
+++ b/src/views/demo/workflow/task/process/look.vue
@@ -13,7 +13,15 @@
       <a-layout>
         <a-layout-content>
           <a-tabs v-model:activeKey="activeName" @change="changeActive">
-            <a-tab-pane key="form" tab="表单信息" v-if="formVisble">
+            <a-tab-pane
+              key="form"
+              :tab="
+                designerData.formCurrentNode.formTitle
+                  ? designerData.formCurrentNode.formTitle
+                  : '表单信息'
+              "
+              v-if="formVisble"
+            >
               <FormViewer
                 ref="formBoxRef"
                 :formConfig="formConfig"
diff --git a/src/views/demo/workflow/task/uncompletedTask.vue b/src/views/demo/workflow/task/uncompletedTask.vue
index 8b8b7445..d56cce16 100644
--- a/src/views/demo/workflow/task/uncompletedTask.vue
+++ b/src/views/demo/workflow/task/uncompletedTask.vue
@@ -71,7 +71,7 @@
   const auditOpen = ref(false);
   const previewOpen = ref(false);
   const childRecord = ref();
-
+  // searchInfo.name = 'deded';
   const [registerTable, { reload }] = useTable({
     api: getLoadMyUncompletedPage,
     columns: [