Merge remote-tracking branch 'origin/master'

src/assets/icons/auth-product.svg

@@ -0,0 +1 @@
+<svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M512 924.458667L0 380.416l195.541333-280.874667h632.917334L1024 380.416l-512 544z" fill="#388FDF"></path><path d="M303.274667 380.416L512 924.416 0 380.458667h303.274667z" fill="#388FDF"></path><path d="M0 380.416l195.541333-280.874667h632.917334L1024 380.416H0z" fill="#489CEA" p-id="5482"></path><path d="M0 380.416l195.541333-280.874667 107.733334 280.874667H0z" fill="#489CEA"></path><path d="M195.541333 99.541333L512 924.458667l316.458667-824.917334H195.541333z" fill="#83BBFF"></path><path d="M303.274667 380.416h417.450666L512 99.541333 303.274667 380.416z" fill="#B7D7FF"></path><path d="M303.274667 380.416L195.584 99.541333H512L303.274667 380.416z" fill="#83BBFF"></path><path d="M512 924.458667L303.274667 380.416h417.450666L512 924.416z" fill="#489CEA"></path></svg>

src/assets/icons/authProduct.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1713131183567" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5479" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><path d="M512 924.458667L0 380.416l195.541333-280.874667h632.917334L1024 380.416l-512 544z" fill="#388FDF" p-id="5480"></path><path d="M303.274667 380.416L512 924.416 0 380.458667h303.274667z" fill="#388FDF" p-id="5481"></path><path d="M0 380.416l195.541333-280.874667h632.917334L1024 380.416H0z" fill="#489CEA" p-id="5482"></path><path d="M0 380.416l195.541333-280.874667 107.733334 280.874667H0z" fill="#489CEA" p-id="5483"></path><path d="M195.541333 99.541333L512 924.458667l316.458667-824.917334H195.541333z" fill="#83BBFF" p-id="5484"></path><path d="M303.274667 380.416h417.450666L512 99.541333 303.274667 380.416z" fill="#B7D7FF" p-id="5485"></path><path d="M303.274667 380.416L195.584 99.541333H512L303.274667 380.416z" fill="#83BBFF" p-id="5486"></path><path d="M512 924.458667L303.274667 380.416h417.450666L512 924.416z" fill="#489CEA" p-id="5487"></path></svg>

src/assets/icons/auto-copy.svg

@@ -0,0 +1 @@
+<svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path d="M512 1024a512 512 0 1 0 0-1024 512 512 0 1 0 0 1024z m-113.2-398.8c62.4 62.4 163.8 62.4 226.2 0 18.8-18.8 49.2-18.8 67.8 0s18.8 49.2 0 67.8c-100 100-262 100-362 0s-100-262 0-362 262-100 362 0c18.8 18.8 18.8 49.2 0 67.8s-49.2 18.8-67.8 0c-62.4-62.4-163.8-62.4-226.2 0s-62.4 163.8 0 226.2z" fill="#17abe3"></path></svg>

src/assets/icons/auto-jump.svg

@@ -0,0 +1 @@
+<svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" id="mx_n_1717822744090" width="200" height="200"><path d="M511.441658 3.031002c-281.883159 0-510.484499 228.441813-510.4845 510.484499s228.441813 510.484499 510.4845 510.484499 510.484499-228.441813 510.484499-510.484499-228.60134-510.484499-510.484499-510.484499z m251.333852 512.478579L575.172457 700.959028c-3.908397 3.908397-9.172768 5.184608-14.43714 2.552422-5.264371-2.552422-7.896557-6.460819-7.896557-11.645427V566.079452c-43.311419 5.184608-178.350522 31.107649-234.82287 130.971179-1.276211 5.184608-6.540583 7.816794-10.528742 7.816794h-3.908397c-5.264371-1.276211-9.172768-7.816794-9.172769-13.001402 0-2.632186 17.069325-220.465493 258.432778-241.203926V322.323103c0-5.184608 2.632186-10.369216 7.896557-11.645427 5.264371-2.632186 10.528743-1.276211 14.43714 2.552422l187.52329 184.173236c5.344135 5.184608 5.344135 12.921639 0.079763 18.106247z" fill="#db639b"></path></svg>

src/components/Flow/FlowTypeDot.vue

@@ -24,7 +24,7 @@
 				<svg-icon icon-class="approval" />
 			</template>
 			<template v-else-if="type === 2">
-				<svg-icon icon-class="in-progress" />
+				<svg-icon icon-class="auto-copy" />
 			</template>
 			<template v-else-if="type === 3">
 				<svg-icon icon-class="approval" />
@@ -35,8 +35,11 @@
 			<template v-else-if="type === 15">
 				<svg-icon icon-class="cancel" />
 			</template>
+			<template v-else-if="type === 19">
+				<svg-icon icon-class="auto-jump" />
+			</template>
 			<template v-else>
-				<svg-icon icon-class="approval" />
+				<svg-icon icon-class="in-progress" />
 			</template>
 		</div>
 	</div>

src/views/approve/components/approvedContent.vue

@@ -373,9 +373,9 @@ const getTaskDetail = () => {
 			const activeList = data.processApprovals
 			activeList.forEach(v => {
 				v.local_timestamp = v.id && formatTimestamp(v.createTime)
-				const _content = v.content // JSON.parse(v.content || '{}')
-				v.local_nodeUserList = _content.nodeUserList || []
-				v.local_nodeRoleList = _content.nodeRoleList || []
+				const _content = v.content
+				v.local_nodeUserList = _content?.nodeUserList || []
+				v.local_nodeRoleList = _content?.nodeRoleList || []
 				v.local_content = _content?.opinion
 			})
 			activeData.value = activeList