Sfoglia il codice sorgente

fix: 完成部门控件的条件节点判断

ZhaoJun 1 anno fa
parent
commit
3615429009

+ 22 - 0
src/components/Flow/components/judgeComponent/index.tsx

@@ -108,6 +108,8 @@ const RenderJudge = (props: any) => {
 
   const RenderComp = (item: FormItem) => {
     let component;
+    console.log(item);
+
     switch (item.componentName) {
       case ComponentName.Inner:
         component = (
@@ -133,6 +135,26 @@ const RenderJudge = (props: any) => {
         );
         break;
       case ComponentName.Depart:
+        component = (
+          <>
+            <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+              <div>{item.props.label}</div>
+              <DeleteOutlined onClick={() => handleDelete(item)} />
+            </div>
+            <TreeSelect
+              showSearch
+              multiple
+              allowClear
+              defaultValue={item.judge?.values?.map(item => item.origin)}
+              style={{ width: '100%' }}
+              placeholder="请选择部门"
+              treeData={depUserTree}
+              onChange={values => {
+                handleTreeChange(values, item);
+              }}
+            />
+          </>
+        );
         break;
       case ComponentName.Money:
       case ComponentName.Number:

+ 1 - 1
src/components/Flow/components/judgeModal/index.tsx

@@ -18,7 +18,7 @@ const AddCondition = (props: any) => {
     .filter((item: FormItem) => {
       return (
         (item.componentName == ComponentName.Inner ||
-          // item.componentName == 'DepartmentField' ||
+          item.componentName == ComponentName.Depart ||
           item.componentName == ComponentName.Select ||
           item.componentName == ComponentName.MultiSelect ||
           item.componentName == ComponentName.Number ||

+ 8 - 0
src/components/Flow/node/judgeNode/index.tsx

@@ -45,6 +45,14 @@ const JudgeRect = props => {
               .filter(item => item);
             text.push('发起人属于:' + list.join('或'));
             break;
+          case ComponentName.Depart:
+            const DeoPlist = judge?.values
+              .map(item => {
+                return getName(item.value, depUserTree);
+              })
+              .filter(item => item);
+            text.push(`${label}:` + DeoPlist.join('或'));
+            break;
           case ComponentName.Number:
             const type: Number = judge.values[0];
             const condition = judge.condition;

+ 0 - 1
src/components/Flow/node/registerNode.tsx

@@ -2,7 +2,6 @@ import React from 'react';
 import Rect, { RectServe } from './rect';
 import Circle, { CircleServe } from './circle';
 import AuditNode, { AuditServe } from './auditNode';
-
 import judgeNode, { judgeServe } from './judgeNode';
 
 export const registerNode = [