Prechádzať zdrojové kódy

feat: process rename to executor

lanjianrong 3 rokov pred
rodič
commit
4415bcdd3e

+ 10 - 10
src/pages/Business/Process/index.tsx

@@ -3,7 +3,7 @@ import { startTransition, useMemo, useState } from 'react'
 import { PageContainer } from '@ant-design/pro-layout'
 import { BusinessType, ExecutorSetType } from '@/enums/gc'
 import useScripts from './hooks/useScripts'
-import { Button } from 'antd'
+import { Button, Tag } from 'antd'
 import ProTable, { ProColumnType } from '@ant-design/pro-table'
 import LeftMenu from '../RuleCode/components/LeftMenu'
 import { connect } from '@umijs/max'
@@ -12,12 +12,12 @@ import { BusinessModelState } from '../model'
 export const menuOptions = [{ label: '预算业务审批', value: BusinessType.BUDGET }]
 
 type ProcessProps = {
-  processMap: {
+  executorMap: {
     [key: string]: API.ExecutorItem[]
   }
 }
 
-const Process: React.FC<ProcessProps> = ({ processMap }) => {
+const Process: React.FC<ProcessProps> = ({ executorMap }) => {
   const [state, setState] = useState({
     activeKey: ''
   })
@@ -27,8 +27,8 @@ const Process: React.FC<ProcessProps> = ({ processMap }) => {
 
   const list = useMemo(() => {
     if (!state.activeKey) return []
-    return processMap?.[state.activeKey] || []
-  }, [state.activeKey, processMap])
+    return executorMap?.[state.activeKey] || []
+  }, [state.activeKey, executorMap?.[state.activeKey]])
 
   const columns: ProColumnType<API.ExecutorItem>[] = [
     {
@@ -49,14 +49,14 @@ const Process: React.FC<ProcessProps> = ({ processMap }) => {
       }
     },
     {
-      dataIndex: 'members',
+      dataIndex: 'membersName',
       title: '成员',
       onHeaderCell: () => ({ style: { textAlign: 'center' } }),
       ellipsis: true,
       renderText: (_, record) => (
         <div className="children:mx-1">
-          {record?.members?.value?.map(item => (
-            <span key={item?.ID}>{item?.name}</span>
+          {record?.membersName?.map(item => (
+            <Tag key={item}>{item}</Tag>
           ))}
         </div>
       )
@@ -87,7 +87,7 @@ const Process: React.FC<ProcessProps> = ({ processMap }) => {
     const [gatherID, businessType] = key.split('_')
     setState({ ...state, activeKey: key })
     startTransition(() => {
-      !processMap?.[state.activeKey] && query({ gatherID, businessType, pageSize: 214000 })
+      !executorMap?.[state.activeKey] && query({ gatherID, businessType, pageSize: 214000 })
     })
   }
   return (
@@ -118,5 +118,5 @@ const Process: React.FC<ProcessProps> = ({ processMap }) => {
 }
 
 export default connect(({ business }: { business: BusinessModelState }) => ({
-  processMap: business.processMap
+  executorMap: business.executorMap
 }))(Process)

+ 1 - 1
src/pages/Business/Step/components/Flow/components/Edge/BaseEdge.tsx

@@ -95,7 +95,7 @@ export default ({ id, source, target, path, centerY, sourceX, style }: BaseEdgeP
       type: 'set_flow_process',
       payload: addNodes(flowStore.process, source, insertNodes)
     })
-    flowStore.flowInstance?.fitView({ duration: 280 })
+    // flowStore.flowInstance?.fitView({ duration: 280 })
   }
 
   return (