@giteeteam/apps-team-components 1.4.0 → 1.4.2

package/README.md

@@ -22,6 +22,6 @@ pnpm storybook
 
 # 1.3.x版本
 - team最低版本为4.23.0
- 
+
 # 1.4.x版本
 - team最低版本为4.24.0

package/dist/components/fields/status/SelectFlowHandler.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { NodeItemProps } from '../../../lib/types/workflow';
 interface SelectFlowHandlerProps {
     itemId: string;
     onBack: () => void;
@@ -7,7 +8,7 @@ interface SelectFlowHandlerProps {
     loading: boolean;
     loadingUser: boolean;
     fetchUsers: (itemId: string, status: string, keyword?: string) => Promise<void>;
-    handleTransition: (updateTask: string, screenId: string, script: string, flowHandler?: Array<{
+    handleTransition: (updateTask: string, screenId: string, script: string, target: NodeItemProps, flowHandler?: Array<{
         label: string;
         value: string;
     }>) => void;

package/dist/components/fields/status/SelectFlowHandler.js

@@ -55,7 +55,7 @@ const SelectFlowHandler = ({ itemId, task, onBack, users, loading, loadingUser,
             label: user.nickname ? `${user.nickname}(${user.username})` : user.username,
             value: user.objectId,
         }));
-        handleTransition(task.name, (_b = (_a = task.parameters) === null || _a === void 0 ? void 0 : _a.screen) === null || _b === void 0 ? void 0 : _b.key, (_c = task.parameters) === null || _c === void 0 ? void 0 : _c.scriptValidator, submitUsers);
+        handleTransition(task.name, (_b = (_a = task.parameters) === null || _a === void 0 ? void 0 : _a.screen) === null || _b === void 0 ? void 0 : _b.key, (_c = task.parameters) === null || _c === void 0 ? void 0 : _c.scriptValidator, task.target, submitUsers);
     }, [
         handleTransition,
         selectedUserIds.length,
@@ -63,6 +63,7 @@ const SelectFlowHandler = ({ itemId, task, onBack, users, loading, loadingUser,
         task.name,
         (_b = (_a = task.parameters) === null || _a === void 0 ? void 0 : _a.screen) === null || _b === void 0 ? void 0 : _b.key,
         (_c = task.parameters) === null || _c === void 0 ? void 0 : _c.scriptValidator,
+        task.target,
     ]);
     const OverflowText = () => {
         var _a, _b;

package/dist/components/fields/status/SelectTransition.d.ts

@@ -14,7 +14,7 @@ interface SelectTransitionProps {
     workflowData: WorkflowDataProps;
     approval: ApprovalData;
     checkIn: CheckInData;
-    handleTransition: (updateTask: string, screenId: string, script: string) => void;
+    handleTransition: (updateTask: string, screenId: string, script: string, target?: any) => void;
     readonly: boolean;
     flowHandlerActive?: boolean;
 }

package/dist/components/fields/status/SelectTransition.js

@@ -1,116 +1,18 @@
 import { jsx, jsxs, Fragment } from '@emotion/react/jsx-runtime';
-import { useState, useCallback, useEffect, memo } from 'react';
+import { memo } from 'react';
 import { ClassNames } from '@emotion/react';
 import { Spin } from 'antd';
-import useWorkflowConfig from '../../../lib/hooks/useWorkflowConfig.js';
 import { i18n } from '../../../lib/i18n.js';
-import { checkFlowHandler } from '../../../lib/workflow.js';
 import { spinStyle, flowNextStyle, flowWrapperStyle, noPermissionStyle } from './style/index.js';
 import TransitionButton from './TransitionButton.js';
 import View from './View.js';
 
-const ApprovalStatus = {
-    approved: 'approved',
-    rejected: 'rejected',
-};
-const CheckInStatus = {
-    closed: 'closed',
-    pending: 'pending',
-};
-const SelectTransition = ({ fetching, flowing, tasks, itemId, itemData, currentUser, setPopoverVisible, name, objectId, workflowData, approval, checkIn, handleTransition, readonly, flowHandlerActive, }) => {
-    const [transitionList, setTransitionList] = useState([]);
-    const [checkResultList, setCheckResultList] = useState([]);
-    const [init, setInit] = useState(false);
-    const { postCheckTransitions, hideDisabledStatusTransition } = useWorkflowConfig();
-    const checkApproval = useCallback(({ text }) => {
-        var _a;
-        if (!approval.requireApproval)
-            return [true];
-        const approvedTransitions = approval.transition.approved.map(approved => approved.label);
-        const rejectedTransitions = approval.transition.rejected.map(rejected => rejected.label);
-        const unrestrictedTransitions = ((_a = approval.transition.unrestricted) === null || _a === void 0 ? void 0 : _a.map(unrestricted => unrestricted.label)) || [];
-        if ((ApprovalStatus.approved === approval.approvalStatus && approvedTransitions.includes(text)) ||
-            (ApprovalStatus.rejected === approval.approvalStatus && rejectedTransitions.includes(text))) {
-            return [true];
-        }
-        if (![ApprovalStatus.approved, ApprovalStatus.rejected].includes(approval.approvalStatus) &&
-            (unrestrictedTransitions === null || unrestrictedTransitions === void 0 ? void 0 : unrestrictedTransitions.includes(text))) {
-            if (!approval.startApproval) {
-                return [true];
-            }
-            else {
-                return [false, i18n.t('pages.fields.view.unrestrictedStatus')];
-            }
-        }
-        return [false, i18n.t('pages.fields.view.approvalStatus')];
-    }, [approval]);
-    const validateCheckIn = useCallback(() => {
-        if (!checkIn.requireCheckIn)
-            return true;
-        if (checkIn.checkInStatus !== CheckInStatus.pending) {
-            return true;
-        }
-        return false;
-    }, [checkIn]);
-    const checkOneTransition = useCallback(({ text, conditionCheck }) => {
-        const [checkApprovalResult, checkApprovalMessage] = checkApproval({ text });
-        if (!checkApprovalResult) {
-            return {
-                result: false,
-                message: checkApprovalMessage,
-            };
-        }
-        if (!validateCheckIn()) {
-            return {
-                result: false,
-                message: i18n.t('pages.fields.view.checkInStatus'),
-            };
-        }
-        const checkResult = checkFlowHandler(itemData, { userId: currentUser.id }, flowHandlerActive);
-        if (checkResult && !checkResult.result) {
-            return checkResult;
-        }
-        if (!(conditionCheck === null || conditionCheck === void 0 ? void 0 : conditionCheck.result) && conditionCheck) {
-            if (hideDisabledStatusTransition === 'enabled') {
-                return { result: false, isHide: true };
-            }
-            return conditionCheck;
-        }
-        return { result: true };
-    }, [checkApproval, currentUser, flowHandlerActive, hideDisabledStatusTransition, validateCheckIn, itemData]);
-    useEffect(() => {
-        if (!init && workflowData.objectId && tasks.length && postCheckTransitions && itemId) {
-            setInit(true);
-            postCheckTransitions(tasks.map(_transition => ({
-                transitionId: _transition.id,
-                itemId,
-                workflowId: workflowData.objectId,
-            }))).then(_checkResultList => {
-                setCheckResultList(_checkResultList);
-            });
-        }
-    }, [init, itemId, workflowData, postCheckTransitions, tasks, itemData]);
-    useEffect(() => {
-        const _transitionList = [];
-        if (checkResultList.length === 0)
-            return;
-        tasks.forEach(task => {
-            var _a;
-            const conditionCheck = (_a = checkResultList.find(checkResult => checkResult.transitionId === task.id)) === null || _a === void 0 ? void 0 : _a.result;
-            const allResult = checkOneTransition({ text: task.name, conditionCheck });
-            _transitionList.push({
-                data: task,
-                checkResult: allResult,
-            });
-        });
-        setTransitionList(_transitionList);
-    }, [checkResultList, checkOneTransition, itemData, tasks]);
-    return (jsx(ClassNames, { children: ({ cx, css }) => (jsxs(Fragment, { children: [fetching ? (jsx(Spin, { css: css(spinStyle) })) : transitionList.length ? (jsx("div", { className: cx(css(flowNextStyle), `flow-next-global`), children: jsx("div", { className: cx(css(flowWrapperStyle)), children: transitionList
+const SelectTransition = ({ fetching, flowing, tasks, setPopoverVisible, name, objectId, workflowData, handleTransition, readonly, }) => {
+    return (jsx(ClassNames, { children: ({ cx, css }) => (jsxs(Fragment, { children: [fetching ? (jsx(Spin, { css: css(spinStyle) })) : tasks.length ? (jsx("div", { className: cx(css(flowNextStyle), `flow-next-global`), children: jsx("div", { className: cx(css(flowWrapperStyle)), children: tasks
                             .filter(_task => { var _a; return !((_a = _task === null || _task === void 0 ? void 0 : _task.checkResult) === null || _a === void 0 ? void 0 : _a.isHide); })
-                            .map(_task => {
+                            .map(task => {
                             var _a, _b, _c;
-                            const { data: task, checkResult } = _task;
-                            return (jsx(TransitionButton, { loading: flowing, text: task.name, scriptValidator: (_a = task.parameters) === null || _a === void 0 ? void 0 : _a.scriptValidator, screenId: (_c = (_b = task.parameters) === null || _b === void 0 ? void 0 : _b.screen) === null || _c === void 0 ? void 0 : _c.key, target: task.target, handleTransition: handleTransition, readonly: readonly, conditionCheck: checkResult }, task.id));
+                            return (jsx(TransitionButton, { loading: flowing, text: task.name, scriptValidator: (_a = task.parameters) === null || _a === void 0 ? void 0 : _a.scriptValidator, screenId: (_c = (_b = task.parameters) === null || _b === void 0 ? void 0 : _b.screen) === null || _c === void 0 ? void 0 : _c.key, target: task.target, handleTransition: handleTransition, readonly: readonly, conditionCheck: task === null || task === void 0 ? void 0 : task.checkResult }, task.id));
                         }) }) })) : (jsx("span", { onClick: () => {
                         setPopoverVisible(false);
                     }, css: css(noPermissionStyle), children: i18n.t('pages.fields.view.noWorkflowOrAuth') })), jsx(View, { workflowData: workflowData, hiddenPopover: () => setPopoverVisible(false), name: name, objectId: objectId })] })) }));

package/dist/components/fields/status/TransitionButton.d.ts

@@ -5,7 +5,7 @@ interface TransitionButtonProps {
     text: string;
     screenId: string;
     scriptValidator: string;
-    handleTransition: (updateTask: string, screenId: string, script: string) => void;
+    handleTransition: (updateTask: string, screenId: string, script: string, target: NodeItemProps) => void;
     target: NodeItemProps & {
         type?: string;
     };

package/dist/components/fields/status/TransitionButton.js

@@ -27,7 +27,7 @@ const TransitionButton = ({ loading, screenId, text, scriptValidator, handleTran
     return (jsx(ClassNames, { children: ({ cx, css }) => {
             return conditionCheck ? ((conditionCheck === null || conditionCheck === void 0 ? void 0 : conditionCheck.result) && !readonly ? (jsx("div", { className: cx(css(flowBtnStyle), loading ? css(notAllowedStyle) : css(pointerStyle)), onClick: () => {
                     if (!loading) {
-                        handleTransition(text, screenId, scriptValidator);
+                        handleTransition(text, screenId, scriptValidator, target);
                     }
                 }, children: jsx(OverflowText, { text: text, target: target }) })) : (jsx(Tooltip, { title: tipContent, placement: "right", children: jsx("div", { className: cx(css(flowBtnStyle), css(notAllowedStyle)), children: jsx(OverflowText, { text: text, target: target }) }) }))) : null;
         } }));

package/dist/components/fields/status/TransitionPanel.js

@@ -8,7 +8,7 @@ import { cloneDeep } from 'lodash-es';
 import useCurrentUser from '../../../lib/hooks/useCurrentUser.js';
 import useWorkflowConfig from '../../../lib/hooks/useWorkflowConfig.js';
 import { i18n } from '../../../lib/i18n.js';
-import { useWorkflowPermission, getScriptUser } from '../../../lib/workflow.js';
+import { useWorkflowPermission, checkFlowHandler, getScriptUser } from '../../../lib/workflow.js';
 import { useItem } from '../../item/hooks.js';
 import SelectFlowHandler from './SelectFlowHandler.js';
 import SelectTransition from './SelectTransition.js';
@@ -27,6 +27,14 @@ const DEFAULT_APPROVAL_DATA = {
     startApproval: false,
 };
 const DEFAULT_CHECK_IN_DATA = { requireCheckIn: false, checkInStatus: '', transition: null };
+const ApprovalStatus = {
+    approved: 'approved',
+    rejected: 'rejected',
+};
+const CheckInStatus = {
+    closed: 'closed',
+    pending: 'pending',
+};
 const TransitionPanel = ({ itemId, itemType, workspace, objectId, onTransitionSuccess, name, readonly, setPopoverVisible, isProcessing, flowing, setFlowing, flowHandlerActive, flowUsers, loadingFlowUsers, fetchFlowUsers, }) => {
     var _a;
     const [updateTransitionText, setUpdateTransitionText] = useState('');
@@ -46,12 +54,69 @@ const TransitionPanel = ({ itemId, itemType, workspace, objectId, onTransitionSu
             newItem.current = itemId;
         };
     }, [itemId, objectId]);
-    const { checkTransitionScript, getWorkflowData, getItemStatus, runTransition } = useWorkflowConfig();
+    const { checkTransitionScript, getWorkflowData, getItemStatus, runTransition, postCheckTransitions, hideDisabledStatusTransition, } = useWorkflowConfig();
     const { currentUser } = useCurrentUser();
     const [groupIds, , workspaceRoleIds] = useWorkflowPermission((_a = itemData === null || itemData === void 0 ? void 0 : itemData.workspace) === null || _a === void 0 ? void 0 : _a.objectId);
     const [tasks, setTasks] = useState([]);
     const [workflowData, setWorkflowData] = useState({ nodes: [], transitions: [] });
-    const updateWorkflowMessage = useCallback((workflowData, statusId) => {
+    const [checkResultList, setCheckResultList] = useState([]);
+    const checkApproval = useCallback(({ text }) => {
+        var _a;
+        if (!approval.requireApproval)
+            return [true];
+        const approvedTransitions = approval.transition.approved.map(approved => approved.label);
+        const rejectedTransitions = approval.transition.rejected.map(rejected => rejected.label);
+        const unrestrictedTransitions = ((_a = approval.transition.unrestricted) === null || _a === void 0 ? void 0 : _a.map(unrestricted => unrestricted.label)) || [];
+        if ((ApprovalStatus.approved === approval.approvalStatus && approvedTransitions.includes(text)) ||
+            (ApprovalStatus.rejected === approval.approvalStatus && rejectedTransitions.includes(text))) {
+            return [true];
+        }
+        if (![ApprovalStatus.approved, ApprovalStatus.rejected].includes(approval.approvalStatus) &&
+            (unrestrictedTransitions === null || unrestrictedTransitions === void 0 ? void 0 : unrestrictedTransitions.includes(text))) {
+            if (!approval.startApproval) {
+                return [true];
+            }
+            else {
+                return [false, i18n.t('pages.fields.view.unrestrictedStatus')];
+            }
+        }
+        return [false, i18n.t('pages.fields.view.approvalStatus')];
+    }, [approval]);
+    const validateCheckIn = useCallback(() => {
+        if (!checkIn.requireCheckIn)
+            return true;
+        if (checkIn.checkInStatus !== CheckInStatus.pending) {
+            return true;
+        }
+        return false;
+    }, [checkIn]);
+    const checkOneTransition = useCallback(({ text, conditionCheck }) => {
+        const [checkApprovalResult, checkApprovalMessage] = checkApproval({ text });
+        if (!checkApprovalResult) {
+            return {
+                result: false,
+                message: checkApprovalMessage,
+            };
+        }
+        if (!validateCheckIn()) {
+            return {
+                result: false,
+                message: i18n.t('pages.fields.view.checkInStatus'),
+            };
+        }
+        const checkResult = checkFlowHandler(itemData, { userId: currentUser.id }, flowHandlerActive);
+        if (checkResult && !checkResult.result) {
+            return checkResult;
+        }
+        if (!(conditionCheck === null || conditionCheck === void 0 ? void 0 : conditionCheck.result) && conditionCheck) {
+            if (hideDisabledStatusTransition === 'enabled') {
+                return { result: false, isHide: true };
+            }
+            return conditionCheck;
+        }
+        return { result: true };
+    }, [checkApproval, currentUser, flowHandlerActive, hideDisabledStatusTransition, validateCheckIn, itemData]);
+    const getTheTargetTransitions = useCallback(({ workflowData, statusId }) => {
         var _a;
         if (workflowData && statusId) {
             const transitions = workflowData.transitions || [];
@@ -65,6 +130,12 @@ const TransitionPanel = ({ itemId, itemType, workspace, objectId, onTransitionSu
                 arr[i].target.type = nodes[index].key || nodes[index].statusType;
             }
             const list = ((_a = workflowData.transitions) === null || _a === void 0 ? void 0 : _a.filter(transition => transition.source.key === statusId)) || [];
+            return list;
+        }
+    }, []);
+    const updateWorkflowMessage = useCallback((workflowData, statusId, checkResultList) => {
+        const list = getTheTargetTransitions({ workflowData, statusId });
+        if (list.length > 0) {
             const sortList = list.map(item => {
                 var _a;
                 const propertiesListItem = (_a = item.properties) === null || _a === void 0 ? void 0 : _a.find(v => v.key === PROPERTY_ACTION_SORT_KEY);
@@ -77,12 +148,21 @@ const TransitionPanel = ({ itemId, itemType, workspace, objectId, onTransitionSu
                 return item;
             });
             sortList.sort((item1, item2) => item1.orderNumber - item2.orderNumber);
-            setTasks(sortList);
+            const _sortList = sortList.map(_task => {
+                var _a;
+                const conditionCheck = (_a = checkResultList.find(_checkResult => _checkResult.transitionId === _task.id)) === null || _a === void 0 ? void 0 : _a.result;
+                const allResult = checkOneTransition({ text: _task.name, conditionCheck });
+                return {
+                    ..._task,
+                    checkResult: allResult,
+                };
+            });
+            setTasks(_sortList);
             const { approval, checkIn } = getWorkflowConfig(workflowData, statusId);
             setApproval(approval);
             setCheckIn(checkIn);
         }
-    }, []);
+    }, [checkOneTransition, getTheTargetTransitions]);
     const refresh = useCallback(async () => {
         try {
             if (!itemId) {
@@ -92,21 +172,38 @@ const TransitionPanel = ({ itemId, itemType, workspace, objectId, onTransitionSu
             const workflowData = await (getWorkflowData === null || getWorkflowData === void 0 ? void 0 : getWorkflowData(itemId));
             if (workflowData) {
                 setWorkflowData(workflowData);
-                updateWorkflowMessage(workflowData, statusId);
+                const targetList = getTheTargetTransitions({ workflowData, statusId });
+                if (targetList.length > 0) {
+                    const checkResultList = await postCheckTransitions(targetList.map(_transition => ({
+                        transitionId: _transition.id,
+                        itemId,
+                        workflowId: workflowData.objectId,
+                    })));
+                    setCheckResultList(checkResultList);
+                    updateWorkflowMessage(workflowData, statusId, checkResultList);
+                }
             }
         }
         finally {
             setFetching(false);
         }
-    }, [itemId, statusId, updateWorkflowMessage, getWorkflowData]);
+    }, [
+        itemId,
+        itemData,
+        statusId,
+        updateWorkflowMessage,
+        getWorkflowData,
+        postCheckTransitions,
+        getTheTargetTransitions,
+    ]);
     useEffect(() => {
         logger('refresh workflow');
         refresh();
     }, []);
     useEffect(() => {
         logger('updateWorkflowMessage', statusId);
-        updateWorkflowMessage(workflowData, statusId);
-    }, [statusId]);
+        updateWorkflowMessage(workflowData, statusId, checkResultList);
+    }, [statusId, workflowData, checkResultList, itemData]);
     const refreshItem = useCallback((status) => {
         if (newItem.current !== itemId) {
             return;
@@ -172,13 +269,16 @@ const TransitionPanel = ({ itemId, itemType, workspace, objectId, onTransitionSu
     const submitTransition = useCallback(async (itemDetail) => {
         await submitHandle(updateTransitionText, itemDetail);
     }, [submitHandle, updateTransitionText]);
-    const handleTransition = useCallback(async (transitionText, screenId, scriptValidator, flowHandler) => {
+    const handleTransition = useCallback(async (transitionText, screenId, scriptValidator, target, flowHandler) => {
         if (flowHandlerActive) {
             if (transitionStep === TransitionStepType.SelectTransition) {
-                setCurrentFlowHandler(undefined);
-                setFlowTask(tasks.find(task => task.name === transitionText));
-                setTransitionStep(TransitionStepType.SelectFlowHandler);
-                return;
+                const nextStateTransition = workflowData.transitions.find(t => t.source.id === target.key);
+                if (nextStateTransition) {
+                    setCurrentFlowHandler(undefined);
+                    setFlowTask(tasks.find(task => task.name === transitionText));
+                    setTransitionStep(TransitionStepType.SelectFlowHandler);
+                    return;
+                }
             }
             else {
                 console.info('flowHandler', flowHandler);
@@ -221,8 +321,9 @@ const TransitionPanel = ({ itemId, itemType, workspace, objectId, onTransitionSu
         }
     }, [
         flowHandlerActive,
-        transitionStep,
         setFlowing,
+        transitionStep,
+        workflowData.transitions,
         tasks,
         itemId,
         itemType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-team-components",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Gitee team components",
   "main": "./dist/index.js",
   "module": "./dist/index.js",