Merge remote-tracking branch 'origin/master'

src/components/scWorkflow/nodeWrap.vue

@@ -21,6 +21,9 @@
 	<!-- 触发器 -->
 	<trigger v-if="nodeConfig.type == 7" v-model="nodeConfig" :disabled="disabled"></trigger>
 
+	<!-- 子流程 -->
+	<sub-process v-if="nodeConfig.type == 8" v-model="nodeConfig" :disabled="disabled"></sub-process>
+
 	<node-wrap v-if="nodeConfig.childNode" v-model="nodeConfig.childNode" :disabled="disabled"></node-wrap>
 </template>
 
@@ -31,6 +34,7 @@ import branch from './nodes/branch'
 import send from './nodes/send'
 import delayProcess from './nodes/delayProcess'
 import trigger from './nodes/trigger'
+import subProcess from './nodes/subProcess'
 
 export default {
 	components: {
@@ -39,7 +43,8 @@ export default {
 		branch,
 		send,
 		delayProcess,
-		trigger
+		trigger,
+		subProcess
 	},
 	props: {
 		modelValue: { type: Object, default: () => {} },

src/components/scWorkflow/nodes/addNode.vue

@@ -27,6 +27,10 @@
 							<el-icon style="color: #2bb58b" @click="addType(7)"><SetUp /></el-icon>
 							<p>触发器</p>
 						</li>
+						<li>
+							<el-icon style="color: #646cff" @click="addType(8)"><share /></el-icon>
+							<p>子流程</p>
+						</li>
 					</ul>
 				</div>
 			</el-popover>
@@ -35,6 +39,7 @@
 </template>
 
 <script>
+
 export default {
 	props: {
 		modelValue: { type: Object, default: () => {} },
@@ -125,6 +130,20 @@ export default {
 					},
 					childNode: this.modelValue
 				}
+			} else if (type === 8) {
+				node = {
+					nodeName: '子流程',
+					type: 8,
+					delayType: '1', // 延时类型
+					triggerType: '1', // 触发器类型： 立即执行('1') 延时执行('2')
+					// 一小时后触发 {"time": "1:h"} 单位【 d 天 h 时 m 分 】 发起后一小时三十分后触发 {"time": "01:30:00"}
+					extendConfig: {
+						time: '', // 立即执行 time不用设置
+						args: '',
+						trigger: ''
+					},
+					childNode: this.modelValue
+				}
 			}
 			node.nodeKey = 'flk' + Date.now()
 			this.$emit('update:modelValue', node)

src/components/scWorkflow/nodes/config.ts

@@ -140,6 +140,18 @@ export const delayProcessSelfOptions = [
 	}
 ]
 
+// 子流程
+export const subProcessType = [
+	{
+		label: '设置子流程',
+		value: '1'
+	},
+	{
+		label: '表单权限',
+		value: '2'
+	}
+]
+
 // export const approveSelfOptions_config = approveSelfOptions.reduce((res: { [key: string]: any }, { label, value }) => {
 // 	res[value] = label
 // 	return res

src/components/scWorkflow/nodes/send.vue

@@ -23,7 +23,7 @@
 			</div>
 		</div>
 		<add-node v-model="nodeConfig.childNode" :disabled="disabled"></add-node>
-		<el-drawer v-model="drawer" title="抄送人设置" destroy-on-close append-to-body :size="500" class="aDrawer">
+		<el-drawer v-model="drawer" title="抄送人设置" destroy-on-close append-to-body :size="600" class="aDrawer">
 			<template #header>
 				<div class="node-wrap-drawer__title">
 					<label v-show="!isEditTitle" @click="editTitle('nodeTitle')"

src/components/scWorkflow/nodes/subProcess.vue

@@ -1,13 +1,201 @@
 <template>
-$END$
+	<div class="node-wrap">
+		<!-- 节点显示 start -->
+		<div class="node-wrap-box" :class="[disabled ? 'node-wrap-box--disabled' : '', `node-wrap-box--${nodeConfig.local_status}`]">
+			<div class="title" style="background: #646cff">
+				<el-icon class="icon"><Clock /></el-icon>
+				<span v-show="!isEditTitle" class="title_label" @click="editTitle('box_nodeTitle')"
+					>{{ nodeConfig.nodeName }}<el-icon v-if="!disabled" class="edit-icon"><edit /></el-icon
+				></span>
+				<el-input
+					v-show="isEditTitle"
+					ref="box_nodeTitle"
+					v-model="nodeConfig.nodeName"
+					clearable
+					size="small"
+					@blur="saveTitle"
+					@keyup.enter="saveTitle"
+				></el-input>
+				<el-icon v-if="!disabled" class="close" @click.stop="delNode()"><close /></el-icon>
+			</div>
+			<div class="content" @click="show">
+				<span v-if="toText(nodeConfig)">{{ toText(nodeConfig) }}</span>
+				<span v-else class="placeholder">请选择子流程规则</span>
+			</div>
+		</div>
+		<!-- 节点显示 end -->
+
+		<!-- 添加节点 start -->
+		<add-node v-model="nodeConfig.childNode" :disabled="disabled"></add-node>
+		<!-- 添加节点 end -->
+
+		<!-- 打开侧边弹窗 start -->
+		<el-drawer v-model="drawer" title="子流程设置" destroy-on-close append-to-body :size="600" class="aDrawer">
+			<template #header>
+				<div class="node-wrap-drawer__title">
+					<label v-show="!isEditTitle" @click="editTitle('nodeTitle')"
+						>{{ form.nodeName }}<el-icon class="node-wrap-drawer__title-edit"><edit /></el-icon
+					></label>
+					<el-input v-show="isEditTitle" ref="nodeTitle" v-model="form.nodeName" clearable @blur="saveTitle" @keyup.enter="saveTitle"></el-input>
+				</div>
+			</template>
+			<el-container>
+				<el-main>
+					<div class="self-radio-group">
+						<el-radio-group v-model="radio1">
+							<el-radio-button v-for="v of subProcessType" :key="v.value" :label="v.value">{{ v.label }}</el-radio-button>
+						</el-radio-group>
+					</div>
+
+					<!-- 设置子流程 -->
+					<div v-show="radio1 === '1'">
+						<div class=""><el-text class="mx-1">选择子流程</el-text></div>
+						<div>
+							<el-select v-model="subProcessValue" placeholder="选择子流程" style="width: 240px; margin: 10px 20px 10px 0px">
+								<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+							</el-select>
+
+							<el-link :underline="false"
+								><el-icon class="el-icon--right"><View /></el-icon> 预览子流程</el-link
+							>
+						</div>
+					</div>
+
+					<!-- 表单设置 -->
+					<div v-show="radio1 === '2'">
+						<el-table ref="multipleTableRef" :data="form.extendConfig.formConfig" style="width: 100%" border>
+							<el-table-column property="label" label="表单字段" align="center" />
+							<el-table-column align="center">
+								<template #header>操作权限</template>
+								<template #default="scope">
+									<el-radio-group v-model="scope.row.opera">
+										<el-radio label="0" size="small">只读</el-radio>
+										<el-radio label="1" size="small">编辑</el-radio>
+										<el-radio label="2" size="small">隐藏</el-radio>
+									</el-radio-group>
+								</template>
+							</el-table-column>
+						</el-table>
+					</div>
+				</el-main>
+				<el-footer>
+					<el-button type="primary" @click="save">保存</el-button>
+					<el-button @click="drawer = false">取消</el-button>
+				</el-footer>
+			</el-container>
+		</el-drawer>
+		<!-- 打开侧边弹窗 end -->
+	</div>
 </template>
 
 <script>
+import addNode from './addNode'
+import { subProcessType } from './config'
+import { ElMessage } from 'element-plus'
+import { mapState } from 'pinia'
+import useFlowStore from '@/store/modules/flow'
+
 export default {
-name: "subProcess"
+	components: {
+		addNode
+	},
+	props: {
+		modelValue: { type: Object, default: () => {} },
+		disabled: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			nodeConfig: {},
+			drawer: false,
+			isEditTitle: false,
+			form: {},
+			radio1: '1',
+			subProcessType,
+			subProcessValue: '',
+			options: []
+		}
+	},
+	watch: {
+		modelValue() {
+			this.nodeConfig = this.modelValue
+		}
+	},
+	mounted() {
+		this.nodeConfig = this.modelValue
+	},
+	methods: {
+		show() {
+			if (this.disabled) return
+			this.form = {}
+			this.form = JSON.parse(JSON.stringify(this.nodeConfig))
+			const { formStructure } = JSON.parse(this.processForm)
+			const formConfig = this.form.extendConfig?.formConfig || []
+			const operateTable = (formStructure?.fields || []).map(item => {
+				let opera = '1'
+				formConfig.map(i => {
+					if (item.id === i.id) {
+						opera = i.opera
+					}
+				})
+				return { label: item.label, id: item.id, opera: opera }
+			})
+			this.form.extendConfig = { formConfig: operateTable }
+			this.drawer = true
+		},
+		editTitle(refName) {
+			if (this.disabled) return
+			this.isEditTitle = true
+			this.$nextTick(() => {
+				if (this.$refs[refName]) {
+					this.$refs[refName].focus()
+				}
+			})
+		},
+		saveTitle() {
+			this.isEditTitle = false
+		},
+		save() {
+			if (!this.form.extendConfig.trigger) {
+				return ElMessage.warning('请填写 TaskTrigger 实现 class')
+			}
+			if (this.form.triggerType === '2' && this.form.delayType === '1' && !Number(this.fixedDuration)) {
+				return ElMessage.warning('等待时间数值最小为1')
+			}
+			this.form.extendConfig.time =
+				this.form.triggerType === '2'
+					? this.form.delayType === '1'
+						? `${this.fixedDuration}:${this.fixedDurationType}`
+						: `${this.automaticComputed}`
+					: ''
+			this.$emit('update:modelValue', this.form)
+			this.drawer = false
+		},
+		delNode() {
+			this.$emit('update:modelValue', this.nodeConfig.childNode)
+		},
+		toText(nodeConfig) {
+			const { triggerType, delayType } = nodeConfig
+			if (triggerType === '1') {
+				return `立即执行`
+			} else if (triggerType === '2') {
+				if (delayType === '1') {
+					return `延迟执行，等待${this.fixedDuration}${mapTip[this.fixedDurationType]}`
+				} else if (delayType === '2') {
+					const tip = `延迟执行，至当天`
+					return !this.automaticComputed ? tip : `${tip}${this.automaticComputed}`
+				}
+			} else {
+				return false
+			}
+		}
+	},
+	computed: {
+		...mapState(useFlowStore, ['processForm']) //映射函数，取出processForm
+	}
 }
 </script>
 
-<style scoped>
-
-</style>
+<style></style>

src/components/scWorkflow/nodes/trigger.vue

@@ -30,7 +30,7 @@
 		<!-- 添加节点 end -->
 
 		<!-- 打开侧边弹窗 start -->
-		<el-drawer v-model="drawer" title="触发器设置" destroy-on-close append-to-body :size="500" class="aDrawer">
+		<el-drawer v-model="drawer" title="触发器设置" destroy-on-close append-to-body :size="600" class="aDrawer">
 			<template #header>
 				<div class="node-wrap-drawer__title">
 					<label v-show="!isEditTitle" @click="editTitle('nodeTitle')"

src/views/flow/create/components/FlowDesign.vue

@@ -1,5 +1,5 @@
 <script setup name="FlowDesign">
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, reactive } from 'vue'
 import ScWorkflow from '@/components/scWorkflow'
 import useFlowStore from '@/store/modules/flow'
 import { storeToRefs } from 'pinia'
@@ -24,6 +24,21 @@ let form = ref({
 	}
 })
 
+// 配置相关
+const zoom = ref(1)
+const marks = reactive({
+	1: 'min',
+	1.1: '1.1',
+	1.2: '1.2',
+	1.3: '1.3',
+	1.4: '1.4',
+	1.5: 'max'
+})
+
+const drawer = ref(false)
+
+// 配置相关
+
 // 接口保存审批流程
 const saveDesign = json => {
 	modelContent.value = JSON.stringify(form.value.processConfig)
@@ -54,5 +69,53 @@ defineExpose({
 </script>
 
 <template>
-	<ScWorkflow v-model="form.processConfig"></ScWorkflow>
+	<el-affix :offset="16" style="height: 74px; width: 100%">
+		<div class="btn-container">
+<!--			<el-button type="primary" @click="() => (drawer = true)"> 查看 JSON </el-button>-->
+			<div class="slider">
+				<el-button type="primary" icon="minus" style="margin-right: 16px; width: 32px" @click="zoom -= 0.1" />
+				<el-slider v-model="zoom" :marks="marks" :min="1" :max="1.5" :step="0.1" height="200px" />
+				<el-button type="primary" icon="plus" style="margin-left: 16px; width: 32px" @click="zoom += 0.1" />
+			</div>
+		</div>
+	</el-affix>
+	<div class="affix-container" :style="`transform: scale(${zoom})`" style="transform-origin: 0 0">
+		<ScWorkflow v-model="form.processConfig"></ScWorkflow>
+	</div>
+
+<!--	<el-drawer v-model="drawer" size="500px" class="drawer" :append-to-body="true" :modal="false" :with-header="false">-->
+<!--		<div style="height: 100vh">-->
+<!--			<div style="padding: 1px; background-color: #3883fa">-->
+<!--				<el-button type="primary" plain @click="copyParseJson"> 复制格式化后的 JSON </el-button>-->
+<!--				<el-button type="primary" plain @click="copyJson"> 复制压缩后的 JSON </el-button>-->
+<!--				<el-button type="primary" plain @click="drawer = false"> 关闭弹窗 </el-button>-->
+<!--			</div>-->
+<!--			<json-editor-vue v-model="data" class="editor" language="zh-CN" current-mode="view" />-->
+<!--		</div>-->
+<!--	</el-drawer>-->
 </template>
+
+<style>
+.flow-design-container {
+	width: 100%;
+	height: 100%;
+	background-color: #f6f8f9;
+}
+.affix-container {
+	display: flex;
+	justify-content: center;
+	flex-direction: row-reverse;
+}
+
+.btn-container {
+	display: flex;
+	height: 42px;
+	margin-left: 16px;
+}
+
+.slider {
+	margin-left: 16px;
+	width: 300px;
+	display: flex;
+}
+</style>