From d4f117442204dfeee5f915d9873285d56745a648 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Wed, 14 Jun 2023 15:52:30 +0800
Subject: [PATCH] =?UTF-8?q?clay=20:=20=E6=9B=B4=E6=94=B9=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flowable-engine-web/package.json                 |  1 +
 flowable-engine-web/src/api/common.js            |  4 ++--
 flowable-engine-web/src/api/listener.js          | 10 +++++-----
 flowable-engine-web/src/api/processDefinition.js | 16 ++++++++--------
 flowable-engine-web/src/api/processInstance.js   | 12 ++++++------
 flowable-engine-web/src/api/task.js              | 12 ++++++------
 .../src/components/common/Comment.vue            |  2 +-
 .../src/views/admin/layout/FormDesign.vue        |  2 ++
 .../views/common/form/components/ImageUpload.vue |  4 ++--
 .../src/views/common/process/nodes/AddNode.vue   | 13 +++++++++++++
 .../src/views/workspace/DisposalTask.vue         |  1 -
 11 files changed, 46 insertions(+), 31 deletions(-)
 create mode 100644 flowable-engine-web/src/views/common/process/nodes/AddNode.vue

diff --git a/flowable-engine-web/package.json b/flowable-engine-web/package.json
index 206e7d3..f4be60e 100644
--- a/flowable-engine-web/package.json
+++ b/flowable-engine-web/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "axios": "^0.20.0",
     "clipboard": "^2.0.6",
+    "codemirror": "^6.0.1",
     "core-js": "^3.6.5",
     "element-ui": "^2.15.8",
     "less": "^3.12.2",
diff --git a/flowable-engine-web/src/api/common.js b/flowable-engine-web/src/api/common.js
index ccefbb6..062b6ac 100644
--- a/flowable-engine-web/src/api/common.js
+++ b/flowable-engine-web/src/api/common.js
@@ -4,14 +4,14 @@ import request from '@/api/request.js'
 export function deleteFile(fileId) {
     // 删除文件
     return request({
-        url: '/flowable/process/file/' + fileId,
+        url: '/workflow/process/file/' + fileId,
         method: 'delete',
     })
 }
 
 export function getProcessListener(type) {
     return request({
-        url: `/flowable/process/listener/option/${type}`,
+        url: `/workflow/process/listener/option/${type}`,
         method: 'get',
     })
 }
diff --git a/flowable-engine-web/src/api/listener.js b/flowable-engine-web/src/api/listener.js
index 08c517e..9bdcfb2 100644
--- a/flowable-engine-web/src/api/listener.js
+++ b/flowable-engine-web/src/api/listener.js
@@ -8,7 +8,7 @@ import request from '@/api/request.js'
 // 获取系统内置监听器列表
 export function getListenerList(param) {
     return request({
-        url: "/flowable/process/listener",
+        url: "/workflow/process/listener",
         method: "get",
         data: param
     })
@@ -16,14 +16,14 @@ export function getListenerList(param) {
 // 获取系统内置监听器详细信息
 export function getListenerById(id) {
     return request({
-        url: "/flowable/process/listener/"+id,
+        url: "/workflow/process/listener/"+id,
         method: "get"
     })
 }
 // 新增系统内置监听器
 export function addListener(param) {
     return request({
-        url: "/flowable/process/listener",
+        url: "/workflow/process/listener",
         method: "post",
         data: param
     })
@@ -31,7 +31,7 @@ export function addListener(param) {
 // 修改系统内置监听器
 export function updateListener(param) {
     return request({
-        url: '/flowable/process/listener',
+        url: '/workflow/process/listener',
         method: "put",
         data: param
     })
@@ -39,7 +39,7 @@ export function updateListener(param) {
 //删除系统内置监听器
 export function deleteListener(idList) {
     return request({
-        url: "/flowable/process/listener/" + idList,
+        url: "/workflow/process/listener/" + idList,
         method: "delete",
     })
 }
diff --git a/flowable-engine-web/src/api/processDefinition.js b/flowable-engine-web/src/api/processDefinition.js
index 700e7fd..7ded771 100644
--- a/flowable-engine-web/src/api/processDefinition.js
+++ b/flowable-engine-web/src/api/processDefinition.js
@@ -7,7 +7,7 @@ import request from '@/api/request.js'
  */
 export function getProcessDefinitionList(param) {
     return request({
-        url: "/flowable/process/definition",
+        url: "/workflow/process/definition",
         method: "get",
         params: param
     })
@@ -15,14 +15,14 @@ export function getProcessDefinitionList(param) {
 
 export function getProcessDefinitionInfo(deploymentId) {
     return request({
-        url: "/flowable/process/definition/" + deploymentId,
+        url: "/workflow/process/definition/" + deploymentId,
         method: "get",
     })
 }
 
 export function getInitiateInfo(processDefinitionKey) {
     return request({
-        url: "/flowable/process/definition/key/" + processDefinitionKey,
+        url: "/workflow/process/definition/key/" + processDefinitionKey,
         method: "get",
     })
 }
@@ -30,21 +30,21 @@ export function getInitiateInfo(processDefinitionKey) {
 
 export function getHistoryVersion(processDefinitionKey) {
     return request({
-        url: "/flowable/process/definition/history/" + processDefinitionKey,
+        url: "/workflow/process/definition/history/" + processDefinitionKey,
         method: "get",
     })
 }
 
 export function deleteHistoryVersion(deploymentId) {
     return request({
-        url: "/flowable/process/definition/" + deploymentId,
+        url: "/workflow/process/definition/" + deploymentId,
         method: "delete",
     })
 }
 
 export function suspendProcessDefinition(processDefinitionId) {
     return request({
-        url: "/flowable/process/definition/suspend",
+        url: "/workflow/process/definition/suspend",
         method: "put",
         data: processDefinitionId
     })
@@ -52,7 +52,7 @@ export function suspendProcessDefinition(processDefinitionId) {
 
 export function activateProcessDefinition(processDefinitionId) {
     return request({
-        url: "/flowable/process/definition/activate",
+        url: "/workflow/process/definition/activate",
         method: "put",
         data: processDefinitionId
     })
@@ -60,7 +60,7 @@ export function activateProcessDefinition(processDefinitionId) {
 
 export function addProcessDefinition(param) {
     return request({
-        url: "/flowable/process/definition",
+        url: "/workflow/process/definition",
         method: "post",
         data: param
     })
diff --git a/flowable-engine-web/src/api/processInstance.js b/flowable-engine-web/src/api/processInstance.js
index 8d6109c..2d3ba0d 100644
--- a/flowable-engine-web/src/api/processInstance.js
+++ b/flowable-engine-web/src/api/processInstance.js
@@ -7,14 +7,14 @@ import request from '@/api/request.js'
  */
 export function startProcessInstance(param) {
     return request({
-        url: "/flowable/process/instance/start",
+        url: "/workflow/process/instance/start",
         method: "post",
         data: param
     })
 }
 export function restartProcessInstance(param) {
     return request({
-        url: "/flowable/process/instance/restart",
+        url: "/workflow/process/instance/restart",
         method: "post",
         data: param
     })
@@ -22,21 +22,21 @@ export function restartProcessInstance(param) {
 
 export function getAboutInstanceList() {
     return request({
-        url: "/flowable/process/instance/about",
+        url: "/workflow/process/instance/about",
         method: "get",
     })
 }
 
 export function getInitiatedInstanceList() {
     return request({
-        url: "/flowable/process/instance/self",
+        url: "/workflow/process/instance/self",
         method: "get",
     })
 }
 
 export function getInitiatedInstanceInfo(processInstanceId) {
     return request({
-        url: "/flowable/process/instance/info/"+processInstanceId,
+        url: "/workflow/process/instance/info/"+processInstanceId,
         method: "get",
     })
 }
@@ -44,7 +44,7 @@ export function getInitiatedInstanceInfo(processInstanceId) {
 
 export function getInitiatedInstanceReInfo(instanceId) {
     return request({
-        url: "/flowable/process/instance/re/info/"+instanceId,
+        url: "/workflow/process/instance/re/info/"+instanceId,
         method: "get",
     })
 }
diff --git a/flowable-engine-web/src/api/task.js b/flowable-engine-web/src/api/task.js
index 491ddb1..e9a01bf 100644
--- a/flowable-engine-web/src/api/task.js
+++ b/flowable-engine-web/src/api/task.js
@@ -4,27 +4,27 @@ import request from '@/api/request.js'
 
 export function getTaskList() {
     return request({
-        url: "/flowable/process/task",
+        url: "/workflow/process/task",
         method: "get",
     })
 }
 
 export function getTaskInfo(taskId) {
     return request({
-        url: "/flowable/process/task/"+taskId,
+        url: "/workflow/process/task/"+taskId,
         method: "get",
     })
 }
 export function completeTask(params) {
     return request({
-        url: "/flowable/process/task/complete",
+        url: "/workflow/process/task/complete",
         method: "put",
         data: params
     })
 }
 export function refuseTask(params) {
     return request({
-        url: "/flowable/process/task/refuse",
+        url: "/workflow/process/task/refuse",
         method: "put",
         data: params
     })
@@ -32,7 +32,7 @@ export function refuseTask(params) {
 
 export function rollBackTask(params) {
     return request({
-        url: "/flowable/process/task/rollback",
+        url: "/workflow/process/task/rollback",
         method: "put",
         data: params
     })
@@ -40,7 +40,7 @@ export function rollBackTask(params) {
 
 export function addComment(params) {
     return request({
-        url: "/flowable/process/task/comment",
+        url: "/workflow/process/task/comment",
         method: "post",
         data: params
     })
diff --git a/flowable-engine-web/src/components/common/Comment.vue b/flowable-engine-web/src/components/common/Comment.vue
index 46b11d2..219527d 100644
--- a/flowable-engine-web/src/components/common/Comment.vue
+++ b/flowable-engine-web/src/components/common/Comment.vue
@@ -135,7 +135,7 @@ export default {
       attachmentList: [],
       disabled: false,
       uploadParams: {},
-      uploadFileUrl: getBaseUrl() + "/flowable/process/file",
+      uploadFileUrl: getBaseUrl() + "/workflow/process/file",
       headers: {
         authorization: localStorage.getItem("token")
       },
diff --git a/flowable-engine-web/src/views/admin/layout/FormDesign.vue b/flowable-engine-web/src/views/admin/layout/FormDesign.vue
index f64c4be..a88027c 100644
--- a/flowable-engine-web/src/views/admin/layout/FormDesign.vue
+++ b/flowable-engine-web/src/views/admin/layout/FormDesign.vue
@@ -85,6 +85,8 @@
         <form-component-config/>
       </div>
     </el-aside>
+
+
     <w-dialog clickClose closeFree width="800px" :showFooter="false" :border="false" title="表单预览"
               v-model="viewFormVisible">
       <el-radio-group v-model="formPreviewModel" @change="formPreviewModelChange">
diff --git a/flowable-engine-web/src/views/common/form/components/ImageUpload.vue b/flowable-engine-web/src/views/common/form/components/ImageUpload.vue
index fda0fff..a37f5c2 100644
--- a/flowable-engine-web/src/views/common/form/components/ImageUpload.vue
+++ b/flowable-engine-web/src/views/common/form/components/ImageUpload.vue
@@ -18,7 +18,7 @@
                    :auto-upload="true"
                    :on-success="handleUploadSuccess"
                    :before-upload="beforeUpload">
-          <i slot="default" class="el-icon-plus"></i>
+          <i slot="default" class="el-icon-plus"></i>v
           <div slot="file" slot-scope="{file}">
             <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
             <label class="el-upload-list__item-status-label">
@@ -103,7 +103,7 @@ export default {
     return {
       fileList: [],
       disabled: false,
-      uploadFileUrl: getBaseUrl() + "/flowable/process/file",
+      uploadFileUrl: getBaseUrl() + "/workflow/process/file",
       headers: {
         authorization: localStorage.getItem("token")
       },
diff --git a/flowable-engine-web/src/views/common/process/nodes/AddNode.vue b/flowable-engine-web/src/views/common/process/nodes/AddNode.vue
new file mode 100644
index 0000000..db4690f
--- /dev/null
+++ b/flowable-engine-web/src/views/common/process/nodes/AddNode.vue
@@ -0,0 +1,13 @@
+<template>
+<el-button size="small" round class="add-branch-btn-el" @click=""
+</template>
+
+<script>
+export default {
+  name: "AddNode"
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/flowable-engine-web/src/views/workspace/DisposalTask.vue b/flowable-engine-web/src/views/workspace/DisposalTask.vue
index 4fd640e..8e99aa8 100644
--- a/flowable-engine-web/src/views/workspace/DisposalTask.vue
+++ b/flowable-engine-web/src/views/workspace/DisposalTask.vue
@@ -172,7 +172,6 @@ export default {
         that.taskData = res.data;
         that.$store.state.design = that.taskData;
         that.$store.state.userTaskOption = that.taskData.userTaskOption;
-
         console.log(that.taskData.userTaskOption,"that.taskData.userTaskOption")
         this.loading = false;
       });