reactor:流程模板调整;

package.json

@@ -17,8 +17,8 @@
 	},
 	"dependencies": {
 		"@element-plus/icons-vue": "^2.0.10",
-		"@logicflow/core": "^2.0.9",
-		"@logicflow/extension": "^2.0.13",
+		"@logicflow/core": "^1.2.28",
+		"@logicflow/extension": "^1.2.28",
 		"@microsoft/signalr": "^7.0.0",
 		"@wangeditor-next/editor": "^5.6.2",
 		"@wangeditor-next/editor-for-vue": "^5.1.14",

src/components/LogicFlow/PropertySetting/end.vue

@@ -179,8 +179,8 @@ const props = defineProps({
 // 注意:ref不能与model一样，相同的话表单双向绑定将会失效
 const form = reactive<Record<string, any>>({
 	...props.modelValue, // 传入的数据
-	stepTypeName: '开始节点',
-	stepType: 1, // 节点类型(开始1 结束2)
+	stepTypeName: '结束节点',
+	stepType: 2, // 节点类型(开始1 结束2)
 	businessType: null, // 业务类型
 	handlerType: null, // 办理者类型
 	handlerTypeItemsOrigin: [], // 办理者类型

src/components/LogicFlow/index.vue

@@ -54,7 +54,7 @@ import { defineAsyncComponent, nextTick, onMounted, reactive, Ref, ref, unref, w
 import { useRoute, useRouter } from 'vue-router';
 import LogicFlow from '@logicflow/core';
 import { Control, DndPanel, Group, InsertNodeInPolyline, Menu, MiniMap, SelectionSelect, Snapshot } from '@logicflow/extension';
-import '@logicflow/core/lib/style/index.css';
+import '@logicflow/core/dist/style/index.css';
 import '@logicflow/extension/lib/style/index.css';
 import { SnakerFlowAdapter, SnakerFlowElement } from './snakerflow/index';
 import { NodeTypeEnum } from './enums';
@@ -164,12 +164,6 @@ const init = async () => {
 		},
 		...props.config,
 		...defaultConfig,
-		pluginsOptions: {
-			miniMap: {
-				...miniMapOptions,
-				showEdge: true,
-			},
-		},
 	});
 	// 初始化操作
 	initOp();
@@ -235,7 +229,8 @@ const initOp = () => {
 		//   );
 		// },
 		onClick: (lf: any, ev: any) => {
-			lf.extension.miniMap.show();
+			const position = lf.getPointByClient(ev.x, ev.y);
+			lf.extension.miniMap.show(position.domOverlayPosition.x - 120, position.domOverlayPosition.y + 35);
 		},
 	});
 	// 控制面板-暂存

src/components/LogicFlow/snakerflow/index.ts

@@ -34,7 +34,6 @@ class SnakerFlowAdapter {
       lf.graphModel.description = userData.description
       lf.graphModel.isMainHandlerShow = userData.isMainHandlerShow
       lf.graphModel.id = userData.id
-      console.log(userData,'userData')
       return userData
     }
     lf.adapterOut = (logicFlowData: any) => {

src/views/system/config/workflow/index.vue

@@ -4,8 +4,29 @@
 			<el-tabs v-model="state.activeName" @tab-change="handleClick">
 				<el-tab-pane label="流程业务" name="0" :disabled="state.loading"></el-tab-pane>
 				<el-tab-pane label="流程模板" name="1" :disabled="state.loading"></el-tab-pane>
-				<!--				<el-tab-pane label="流程实例" name="2"></el-tab-pane>-->
 			</el-tabs>
+			<el-form :model="state.queryParams" ref="ruleFormRef" inline @submit.native.prevent  v-if="state.activeName === '1'">
+				<el-form-item label="关键字查询" prop="Keyword">
+					<el-input
+						v-model="state.queryParams.Keyword"
+						placeholder="模板名称/模板编码"
+						clearable
+						@keyup.enter="handleQuery"
+						class="keyword-input"
+					/>
+				</el-form-item>
+				<el-form-item label="模板状态" prop="Status">
+					<el-select v-model="state.queryParams.Status" placeholder="请选择模板状态" @change="handleQuery" clearable>
+						<el-option v-for="item in state.statusList" :key="item.value" :label="item.label" :value="item.value" />
+					</el-select>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
+					<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
+						<SvgIcon name="ele-Refresh" class="mr5" />重置
+					</el-button>
+				</el-form-item>
+			</el-form>
 			<!--    流程业务      -->
 			<template v-if="state.activeName === '0'">
 				<vxe-toolbar
@@ -61,28 +82,7 @@
 			</template>
 			<!--    流程模板      -->
 			<template v-else>
-				<el-form :model="state.queryParams" ref="ruleFormRef" inline @submit.native.prevent>
-					<el-form-item label="关键字查询" prop="Keyword">
-						<el-input
-							v-model="state.queryParams.Keyword"
-							placeholder="模板名称/模板编码"
-							clearable
-							@keyup.enter="handleQuery"
-							class="keyword-input"
-						/>
-					</el-form-item>
-					<el-form-item label="模板状态" prop="Status">
-						<el-select v-model="state.queryParams.Status" placeholder="请选择模板状态" @change="handleQuery" clearable>
-							<el-option v-for="item in state.statusList" :key="item.value" :label="item.label" :value="item.value" />
-						</el-select>
-					</el-form-item>
-					<el-form-item>
-						<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
-						<el-button @click="resetQuery(ruleFormRef)" class="default-button" :loading="state.loading">
-							<SvgIcon name="ele-Refresh" class="mr5" />重置
-						</el-button>
-					</el-form-item>
-				</el-form>
+
 				<vxe-toolbar
 					ref="toolbarRef2"
 					:loading="state.loading"
@@ -151,14 +151,15 @@
 						</vxe-column>
 					</vxe-table>
 				</div>
-				<pagination
-					@pagination="queryList"
-					:total="state.total"
-					v-model:current-page="state.queryParams.PageIndex"
-					v-model:page-size="state.queryParams.PageSize"
-					:disabled="state.loading"
-				/>
 			</template>
+			<pagination
+				@pagination="queryList"
+				:total="state.total"
+				v-model:current-page="state.queryParams.PageIndex"
+				v-model:page-size="state.queryParams.PageSize"
+				:disabled="state.loading"
+				v-if="state.activeName === '1'"
+			/>
 		</div>
 		<!--  流程跳转 -->
 		<workflow-jump ref="workflowJumpRef" @updateList="queryList" />
@@ -180,7 +181,6 @@ import {
 	wfmodulesMatch,
 	workflowDelete,
 	workflowList,
-	workflowPaged,
 	// workflowTerminate,
 } from '@/api/system/workflow';
 
@@ -257,21 +257,6 @@ const queryList = () => {
 					state.loading = false;
 				});
 			break;
-		case '2':
-			req = {
-				...req,
-				ModuleCode: state.queryParams.ModuleCode,
-			};
-			workflowPaged(req)
-				.then((response: any) => {
-					state.tableData = response.result?.items ?? [];
-					state.total = response.result?.total ?? 0;
-					state.loading = false;
-				})
-				.catch(() => {
-					state.loading = false;
-				});
-			break;
 		default:
 			break;
 	}