@giteeteam/apps-team-components 1.3.2 → 1.3.4

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

@@ -18,7 +18,7 @@ interface SelectTransitionProps {
     workspaceRoleIds: string[];
     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/TransitionButton.d.ts

@@ -23,7 +23,7 @@ interface FlowButtonProps {
     conditions?: ConditionType[];
     approval: ApprovalData;
     checkIn: CheckInData;
-    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

@@ -118,7 +118,7 @@ const FlowButton = ({ loading, screenId, text, item, userId, roleIds, groupIds,
     return (jsx(ClassNames, { children: ({ cx, css }) => {
             return isCheck && !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 }) }) }));
         } }));

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

@@ -172,13 +172,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 +224,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.3.2",
+  "version": "1.3.4",
   "description": "Gitee team components",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -100,7 +100,7 @@
     "debug": "^4.3.4",
     "js-cookie": "^3.0.5",
     "lodash-es": "^4.17.21",
-    "query-string": "^9.1.0",
+    "query-string": "7.1.3",
     "react-overlays": "^5.2.1",
     "react-window": "^1.8.10"
   },