Merge branch 'qingban' of http://maven.jgiot.com:7012/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

src/api/flow/index.ts

@@ -17,9 +17,7 @@ export function getFlowDataInfo(id: string) {
   });
 }
 
-export function addRoleUser(
-    queryParams: object
-) {
+export function addRoleUser(queryParams: object) {
   return request({
     url: "/api/v1/flowRole/add",
     method: "post",
@@ -27,30 +25,33 @@ export function addRoleUser(
   });
 }
 
-export function queryRoleUser(
-    queryParams: object
-) {
+export function queryRoleUser(queryParams: object) {
   return request({
     url: "/api/v1/flowRole/userPage",
     method: "post",
     data: queryParams,
   });
 }
-export function delRoleUser(
-    queryParams: object
-){
+export function delRoleUser(queryParams: object) {
   return request({
     url: "/api/v1/flowRole/delUser",
     method: "post",
     data: queryParams,
   });
 }
-export function delRole(
-    queryParams: object
-){
+export function delRole(queryParams: object) {
   return request({
     url: "/api/v1/flowRole/delRole",
     method: "post",
     data: queryParams,
   });
 }
+
+// 获取流程角色列表
+export function getRoleList(queryParams: object) {
+  return request({
+    url: "/api/v1/flowRole/list",
+    method: "post",
+    data: {},
+  });
+}

src/components/MyFlow/src/leftDrags/workflow/configs.ts

@@ -3,23 +3,23 @@ import { ref } from "vue";
 import { HJNodeType } from "../../types/comTypes";
 
 export const dragNodes = ref<HJInterNodeData[]>([
-  {
-    type: HJNodeType.workFlow,
-    data: {
-      label: "发起人",
-      // handles: [
-      //     {
-      //         type: 'source',
-      //         position: HJPosition.Bottom,
-      //
-      //     },
-      //     {
-      //         type: 'target',
-      //         position: HJPosition.Top,
-      //     }
-      // ]
-    },
-  },
+  // {
+  //   type: HJNodeType.workFlow,
+  //   data: {
+  //     label: "发起人",
+  //     // handles: [
+  //     //     {
+  //     //         type: 'source',
+  //     //         position: HJPosition.Bottom,
+  //     //
+  //     //     },
+  //     //     {
+  //     //         type: 'target',
+  //     //         position: HJPosition.Top,
+  //     //     }
+  //     // ]
+  //   },
+  // },
   {
     type: HJNodeType.workFlow,
     data: {

src/views/flow/definition/com/edit.vue

@@ -12,7 +12,7 @@ import HJFlow from "@/components/MyFlow";
 
 import type { ComponentSize, FormInstance, FormRules } from "element-plus";
 import { getUserTree } from "@/api/system/user";
-import { getFlowDataInfo, saveFlowData } from "@/api/flow";
+import { getFlowDataInfo, getRoleList, saveFlowData } from "@/api/flow";
 
 const formSize = ref<ComponentSize>("default");
 const ruleFormRef = ref<FormInstance>();
@@ -87,6 +87,10 @@ onMounted(() => {
       flowRef.value && flowRef.value.initFlow(nodes.value, edges.value);
     } catch (e) {}
   });
+
+  getRoleList().then((res) => {
+    candidateGroupsOptions.value = res.data;
+  });
 });
 
 // ======= 信息展示 =======
@@ -220,8 +224,8 @@ const testGetCurrentData = () => {
           <el-tree-select
             v-model="formData.candidateGroups"
             :data="candidateGroupsOptions"
+            :props="{ label: 'roleName', value: 'roleName' }"
             filterable
-            multiple
           />
         </el-form-item>