@giteeteam/apps-team-components 1.2.3-alpha.1 → 1.2.3

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

@@ -54,7 +54,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,
@@ -62,6 +62,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/SelectTransition.js

@@ -1,41 +1,15 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
-import { memo, useCallback, useEffect, useState } from 'react';
+import { memo } from 'react';
 import { ClassNames } from '@emotion/react';
 import { Spin } from 'antd';
-import useWorkflowConfig from '../../../lib/hooks/useWorkflowConfig';
 import { i18n } from '../../../lib/i18n';
 import { flowNextStyle, flowWrapperStyle, noPermissionStyle, spinStyle } from './style';
 import TransitionButton from './TransitionButton';
 import View from './View';
 const SelectTransition = ({ fetching, flowing, tasks, itemId, itemData, currentUser, workspace, setPopoverVisible, name, objectId, workflowData, roleIds, groupIds, workspaceRoleIds, approval, checkIn, handleTransition, readonly, flowHandlerActive, }) => {
-    const [init, setInit] = useState(false);
-    const { postCheckTransitions, hideDisabledStatusTransition } = useWorkflowConfig();
-    const [checkResultList, setCheckResultList] = useState([]);
-    const [hideIds, setHideIds] = useState([]);
-    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]);
-    const handleHide = useCallback(id => {
-        setHideIds(c => {
-            if (!c.includes(id)) {
-                return c.concat(id);
-            }
-            return c;
-        });
-    }, []);
-    const isAllHide = tasks.every(task => hideIds.includes(task.id));
-    return (_jsx(ClassNames, { children: ({ cx, css }) => (_jsxs(_Fragment, { children: [fetching ? (_jsx(Spin, { css: css(spinStyle) })) : tasks.length && !isAllHide ? (_jsx("div", { className: cx(css(flowNextStyle), `flow-next-global`), children: _jsx("div", { className: cx(css(flowWrapperStyle)), children: tasks.map(task => {
-                            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
-                            return (_jsx(TransitionButton, { itemId: itemId, loading: flowing, text: task.name, item: itemData, workspace: workspace, userId: currentUser.id, groupIds: groupIds, roleIds: roleIds, workspaceRoleIds: workspaceRoleIds, currentTaskId: task.id, authUsers: (_b = (_a = task.parameters) === null || _a === void 0 ? void 0 : _a.permissionType) === null || _b === void 0 ? void 0 : _b.users, authRoles: (_d = (_c = task.parameters) === null || _c === void 0 ? void 0 : _c.permissionType) === null || _d === void 0 ? void 0 : _d.roles, authGroups: (_f = (_e = task.parameters) === null || _e === void 0 ? void 0 : _e.permissionType) === null || _f === void 0 ? void 0 : _f.groups, authUserFields: (_h = (_g = task.parameters) === null || _g === void 0 ? void 0 : _g.permissionType) === null || _h === void 0 ? void 0 : _h.customFields, authWorkSpaceRoles: (_k = (_j = task.parameters) === null || _j === void 0 ? void 0 : _j.permissionType) === null || _k === void 0 ? void 0 : _k.workspaceRoles, creatorAuth: (_m = (_l = task.parameters) === null || _l === void 0 ? void 0 : _l.permissionType) === null || _m === void 0 ? void 0 : _m.creatorAuth, scriptValidator: (_o = task.parameters) === null || _o === void 0 ? void 0 : _o.scriptValidator, conditions: (_p = task.parameters) === null || _p === void 0 ? void 0 : _p.fieldType, screenId: (_r = (_q = task.parameters) === null || _q === void 0 ? void 0 : _q.screen) === null || _r === void 0 ? void 0 : _r.key, target: task.target, approval: approval, checkIn: checkIn, handleTransition: handleTransition, hiddenPopover: () => setPopoverVisible(false), readonly: readonly, flowHandlerActive: flowHandlerActive, conditionKey: (_s = task.parameters) === null || _s === void 0 ? void 0 : _s.conditionKey, fieldTypeConditionKey: (_t = task.parameters) === null || _t === void 0 ? void 0 : _t.fieldTypeConditionKey, userConditionKey: (_v = (_u = task.parameters) === null || _u === void 0 ? void 0 : _u.permissionType) === null || _v === void 0 ? void 0 : _v.conditionKey, conditionCheck: (_w = checkResultList.find(checkResult => checkResult.transitionId === task.id)) === null || _w === void 0 ? void 0 : _w.result, hideDisabledStatusTransition: hideDisabledStatusTransition, onHide: handleHide }, task.id));
+    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.map(task => {
+                            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+                            return (_jsx(TransitionButton, { itemId: itemId, loading: flowing, text: task.name, item: itemData, workspace: workspace, userId: currentUser.id, groupIds: groupIds, roleIds: roleIds, workspaceRoleIds: workspaceRoleIds, currentTaskId: task.id, authUsers: (_b = (_a = task.parameters) === null || _a === void 0 ? void 0 : _a.permissionType) === null || _b === void 0 ? void 0 : _b.users, authRoles: (_d = (_c = task.parameters) === null || _c === void 0 ? void 0 : _c.permissionType) === null || _d === void 0 ? void 0 : _d.roles, authGroups: (_f = (_e = task.parameters) === null || _e === void 0 ? void 0 : _e.permissionType) === null || _f === void 0 ? void 0 : _f.groups, authUserFields: (_h = (_g = task.parameters) === null || _g === void 0 ? void 0 : _g.permissionType) === null || _h === void 0 ? void 0 : _h.customFields, authWorkSpaceRoles: (_k = (_j = task.parameters) === null || _j === void 0 ? void 0 : _j.permissionType) === null || _k === void 0 ? void 0 : _k.workspaceRoles, creatorAuth: (_m = (_l = task.parameters) === null || _l === void 0 ? void 0 : _l.permissionType) === null || _m === void 0 ? void 0 : _m.creatorAuth, scriptValidator: (_o = task.parameters) === null || _o === void 0 ? void 0 : _o.scriptValidator, conditions: (_p = task.parameters) === null || _p === void 0 ? void 0 : _p.fieldType, screenId: (_r = (_q = task.parameters) === null || _q === void 0 ? void 0 : _q.screen) === null || _r === void 0 ? void 0 : _r.key, target: task.target, approval: approval, checkIn: checkIn, handleTransition: handleTransition, hiddenPopover: () => setPopoverVisible(false), readonly: readonly, flowHandlerActive: flowHandlerActive }, 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

@@ -23,22 +23,13 @@ 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;
     };
     hiddenPopover?: () => void;
     readonly?: boolean;
-    conditionKey: string;
-    fieldTypeConditionKey: string;
-    userConditionKey: string;
     flowHandlerActive?: boolean;
-    conditionCheck?: {
-        result: boolean;
-        message: string;
-    };
-    hideDisabledStatusTransition?: string;
-    onHide?: (id: string) => void;
 }
 declare const _default: React.NamedExoticComponent<FlowButtonProps>;
 export default _default;

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

@@ -4,7 +4,7 @@ import { ClassNames, css } from '@emotion/react';
 import { Tooltip } from 'antd';
 import { WorkFlowStatusColor } from '../../../lib/global';
 import { i18n } from '../../../lib/i18n';
-import { checkFlowHandler } from '../../../lib/workflow';
+import { checkTransition } from '../../../lib/workflow';
 import BaseOverflowTooltip from '../../common/overflow-tooltip/BaseOverflowTooltip';
 import { flowBtnStyle, flowStateStyle, iconStyle, notAllowedStyle, pointerStyle, stateBoxStyle, tipLineStyle, tooltipStyle, } from './style';
 const ApprovalStatus = {
@@ -15,10 +15,9 @@ const CheckInStatus = {
     closed: 'closed',
     pending: 'pending',
 };
-const FlowButton = ({ loading, screenId, text, item, userId, authRoles, authUsers, authGroups, creatorAuth, authUserFields, authWorkSpaceRoles, scriptValidator, approval, checkIn, conditions = [], handleTransition, target, readonly, conditionKey, fieldTypeConditionKey, userConditionKey, flowHandlerActive, conditionCheck, hideDisabledStatusTransition, onHide, currentTaskId, }) => {
+const FlowButton = ({ loading, screenId, text, item, userId, roleIds, groupIds, workspaceRoleIds, authRoles, authUsers, authGroups, creatorAuth, authUserFields, authWorkSpaceRoles, scriptValidator, approval, checkIn, conditions = [], handleTransition, target, readonly, flowHandlerActive, }) => {
     const [isCheck, setIsCheck] = useState(true);
     const [tip, setTip] = useState('');
-    const [hide, setHide] = useState(false);
     const checkApproval = useCallback(() => {
         var _a;
         if (!approval.requireApproval)
@@ -63,7 +62,6 @@ const FlowButton = ({ loading, screenId, text, item, userId, authRoles, authUser
             return;
         }
         const transition = {
-            conditionKey,
             parameters: {
                 fieldType: conditions,
                 permissionType: {
@@ -73,25 +71,15 @@ const FlowButton = ({ loading, screenId, text, item, userId, authRoles, authUser
                     workspaceRoles: authWorkSpaceRoles,
                     customFields: authUserFields,
                     creatorAuth,
-                    conditionKey: userConditionKey,
                 },
-                fieldTypeConditionKey,
             },
         };
-        let checkResult = checkFlowHandler(item, transition, { userId }, flowHandlerActive);
-        if (!checkResult) {
-            checkResult = conditionCheck;
-        }
-        if (!(checkResult === null || checkResult === void 0 ? void 0 : checkResult.result)) {
-            setTip(checkResult === null || checkResult === void 0 ? void 0 : checkResult.message);
+        const checkResult = checkTransition(item, transition, { userId, roleIds, groupIds, workspaceRoleIds }, flowHandlerActive);
+        if (!checkResult.result) {
+            setTip(checkResult.message);
             setIsCheck(false);
-            if (hideDisabledStatusTransition === 'enabled') {
-                setHide(true);
-                onHide(currentTaskId);
-            }
         }
     }, [
-        hideDisabledStatusTransition,
         checkApproval,
         validateCheckIn,
         conditions,
@@ -103,13 +91,10 @@ const FlowButton = ({ loading, screenId, text, item, userId, authRoles, authUser
         creatorAuth,
         item,
         userId,
-        conditionKey,
-        fieldTypeConditionKey,
-        userConditionKey,
+        roleIds,
+        groupIds,
+        workspaceRoleIds,
         flowHandlerActive,
-        conditionCheck,
-        onHide,
-        currentTaskId,
     ]);
     useEffect(() => {
         checkAuth();
@@ -132,9 +117,9 @@ const FlowButton = ({ loading, screenId, text, item, userId, authRoles, authUser
     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 }) })) : hide ? null : (_jsx(Tooltip, { title: tipContent, placement: "right", children: _jsx("div", { className: cx(css(flowBtnStyle), css(notAllowedStyle)), children: _jsx(OverflowText, { text: text, target: 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 }) }) }));
         } }));
 };
 export default memo(FlowButton);

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

@@ -171,13 +171,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);
@@ -220,8 +223,9 @@ const TransitionPanel = ({ itemId, itemType, workspace, objectId, onTransitionSu
         }
     }, [
         flowHandlerActive,
-        transitionStep,
         setFlowing,
+        transitionStep,
+        workflowData.transitions,
         tasks,
         itemId,
         itemType,

package/dist/lib/contexts/workflowConfig.d.ts

@@ -5,8 +5,6 @@ export interface IWorkflowConfig {
     getWorkflowData?: (itemId: string) => Promise<any>;
     runTransition?: (params: Record<string, any>) => Promise<any>;
     getItemStatus?: (itemId: string) => Promise<any>;
-    postCheckTransitions?: (params: Record<string, any>[]) => Promise<any>;
-    hideDisabledStatusTransition?: string;
 }
 export interface IWorkflowConfigContext {
     workflow?: IWorkflowConfig;

package/dist/lib/workflow.d.ts

@@ -107,6 +107,5 @@ interface CheckUserPermissionParams {
 export declare function checkUserPermission({ transition, userId, roleIds, groupIds, item, workspaceRoleIds, }: CheckUserPermissionParams): ResultType;
 export declare function checkItemCondition(transition: TransitionProps, item: ItemResultProps): ResultType;
 export declare function checkTransition(item: ItemResultProps, transition: TransitionProps, permissions: WorkflowPermissionType, flowHandlerActive?: boolean): ResultType;
-export declare function checkFlowHandler(item: ItemResultProps, transition: TransitionProps, permissions: WorkflowPermissionType, flowHandlerActive?: boolean): ResultType;
 export declare const useWorkflowPermission: (workspaceId: ObjectId) => [ObjectId[], ObjectId[], ObjectId[]];
 export {};

package/dist/lib/workflow.js

@@ -118,7 +118,7 @@ function listToCompare(list1, list2, compareString) {
 export function checkUserPermission({ transition, userId, roleIds, groupIds, item, workspaceRoleIds, }) {
     var _a, _b, _c;
     const values = (item === null || item === void 0 ? void 0 : item.values) || {};
-    const { users: authUsers, roles: authRoles, groups: authGroups, customFields: authUserFields, workspaceRoles: authWorkspaceRoles, creatorAuth, conditionKey, } = ((_a = transition.parameters) === null || _a === void 0 ? void 0 : _a.permissionType) || {};
+    const { users: authUsers, roles: authRoles, groups: authGroups, customFields: authUserFields, workspaceRoles: authWorkspaceRoles, creatorAuth, } = ((_a = transition.parameters) === null || _a === void 0 ? void 0 : _a.permissionType) || {};
     const hasUsers = (authUsers === null || authUsers === void 0 ? void 0 : authUsers.length) > 0;
     const hasRoles = (authRoles === null || authRoles === void 0 ? void 0 : authRoles.length) > 0;
     const hasGroups = (authGroups === null || authGroups === void 0 ? void 0 : authGroups.length) > 0;
@@ -126,18 +126,14 @@ export function checkUserPermission({ transition, userId, roleIds, groupIds, ite
     const hasWorkspaceRoles = (authWorkspaceRoles === null || authWorkspaceRoles === void 0 ? void 0 : authWorkspaceRoles.length) > 0;
     const tipText = [];
     if (!hasUsers && !hasRoles && !hasGroups && !hasUserFields && !hasWorkspaceRoles && !creatorAuth) {
-        return { result: true, isEmpty: true };
+        return { result: true };
     }
-    const defaultConditionKey = conditionKey || 'any';
-    const isAny = defaultConditionKey === 'any';
     if (creatorAuth) {
         if (![(_b = item.createdBy) === null || _b === void 0 ? void 0 : _b.objectId, (_c = item.createdBy) === null || _c === void 0 ? void 0 : _c.id].includes(userId)) {
             tipText.push(i18n.t('pages.workflow.default.userType.creatorAuth'));
         }
         else {
-            if (isAny) {
-                return { result: true };
-            }
+            return { result: true };
         }
     }
     if (hasUsers) {
@@ -147,9 +143,7 @@ export function checkUserPermission({ transition, userId, roleIds, groupIds, ite
             tipText.push(`${i18n.t('libs.workflow.user')}：${tipUsers}`);
         }
         else {
-            if (isAny) {
-                return { result: true };
-            }
+            return { result: true };
         }
     }
     if (hasRoles) {
@@ -159,9 +153,7 @@ export function checkUserPermission({ transition, userId, roleIds, groupIds, ite
             tipText.push(`${i18n.t('libs.workflow.role')}：${tipRoles}`);
         }
         else {
-            if (isAny) {
-                return { result: true };
-            }
+            return { result: true };
         }
     }
     if (hasGroups) {
@@ -171,9 +163,7 @@ export function checkUserPermission({ transition, userId, roleIds, groupIds, ite
             tipText.push(`${i18n.t('libs.workflow.group')}：${tipGroup}`);
         }
         else {
-            if (isAny) {
-                return { result: true };
-            }
+            return { result: true };
         }
     }
     if (hasUserFields) {
@@ -204,9 +194,7 @@ export function checkUserPermission({ transition, userId, roleIds, groupIds, ite
             tipText.push(`${i18n.t('libs.workflow.userFields')}：${tipRoles}`);
         }
         else {
-            if (isAny) {
-                return { result: true };
-            }
+            return { result: true };
         }
     }
     if (hasWorkspaceRoles) {
@@ -218,9 +206,7 @@ export function checkUserPermission({ transition, userId, roleIds, groupIds, ite
             tipText.push(`${i18n.t('libs.workflow.workspaceRoles')}：${tipWorkspaceRoles}`);
         }
         else {
-            if (isAny) {
-                return { result: true };
-            }
+            return { result: true };
         }
     }
     if (tipText.length) {
@@ -229,13 +215,8 @@ export function checkUserPermission({ transition, userId, roleIds, groupIds, ite
     return { result: true };
 }
 export function checkItemCondition(transition, item) {
-    var _a, _b, _c;
-    const defaultConditionKey = ((_a = transition === null || transition === void 0 ? void 0 : transition.parameters) === null || _a === void 0 ? void 0 : _a.fieldTypeConditionKey) || 'all';
-    const conditions = ((_b = transition.parameters) === null || _b === void 0 ? void 0 : _b.fieldType) || [];
-    const isAny = defaultConditionKey === 'any';
-    if (!conditions.length) {
-        return { result: true, isEmpty: true };
-    }
+    var _a, _b;
+    const conditions = ((_a = transition.parameters) === null || _a === void 0 ? void 0 : _a.fieldType) || [];
     for (const i in conditions) {
         const { comparedValue, numberCompare, stringCompare, dropDownCompare, field, pickerType } = conditions[i];
         let fieldValue;
@@ -250,7 +231,7 @@ export function checkItemCondition(transition, item) {
             fieldValue = item[field.key].objectId;
         }
         else {
-            fieldValue = (_c = item.values) === null || _c === void 0 ? void 0 : _c[field.key];
+            fieldValue = (_b = item.values) === null || _b === void 0 ? void 0 : _b[field.key];
         }
         let sourceValue = null, targetValue = null;
         switch (field.componentType) {
@@ -270,13 +251,6 @@ export function checkItemCondition(transition, item) {
                             }),
                         };
                     }
-                    else {
-                        if (isAny) {
-                            return {
-                                result: true,
-                            };
-                        }
-                    }
                 }
                 else if (!numberToCompare(fieldValue, Number(targetValue), numberCompare)) {
                     if (isEmptyCondition(numberCompare)) {
@@ -290,7 +264,7 @@ export function checkItemCondition(transition, item) {
                     }
                     let showValue = comparedValue;
                     if (field.componentType === CustomFieldComponentTypes.Date) {
-                        showValue = getFormat(comparedValue, getDateType(pickerType));
+                        showValue = getFormat(comparedValue, getDateType('dateTime'));
                     }
                     return {
                         result: false,
@@ -301,13 +275,6 @@ export function checkItemCondition(transition, item) {
                         }),
                     };
                 }
-                else {
-                    if (isAny) {
-                        return {
-                            result: true,
-                        };
-                    }
-                }
                 break;
             case CustomFieldComponentTypes.Text:
             case CustomFieldComponentTypes.LongText:
@@ -332,13 +299,6 @@ export function checkItemCondition(transition, item) {
                         message,
                     };
                 }
-                else {
-                    if (isAny) {
-                        return {
-                            result: true,
-                        };
-                    }
-                }
                 break;
             case CustomFieldComponentTypes.User:
             case CustomFieldComponentTypes.Dropdown:
@@ -377,13 +337,8 @@ export function checkItemCondition(transition, item) {
                         }),
                     };
                 }
-                else {
-                    if (isAny) {
-                        return {
-                            result: true,
-                        };
-                    }
-                }
+                break;
+            default:
                 break;
         }
     }
@@ -393,8 +348,6 @@ export function checkTransition(item, transition, permissions, flowHandlerActive
     var _a, _b;
     if (!item || !transition)
         return { result: false };
-    const defaultConditionKey = (transition === null || transition === void 0 ? void 0 : transition.conditionKey) || 'all';
-    const isAll = defaultConditionKey === 'all';
     if (flowHandlerActive && ((_b = (_a = item === null || item === void 0 ? void 0 : item.values) === null || _a === void 0 ? void 0 : _a.flowHandler) === null || _b === void 0 ? void 0 : _b.length)) {
         const flowHandler = item.values.flowHandler;
         const flowUser = flowHandler.find(user => user.value === permissions.userId);
@@ -414,50 +367,12 @@ export function checkTransition(item, transition, permissions, flowHandlerActive
         item,
         ...permissions,
     });
+    if (!roleCheck.result)
+        return roleCheck;
     const conditionCheck = checkItemCondition(transition, item);
-    if (isAll) {
-        if (!roleCheck.result)
-            return roleCheck;
-        if (!conditionCheck.result)
-            return conditionCheck;
-        return { result: true };
-    }
-    else {
-        const conditionList = [roleCheck, conditionCheck];
-        const notEmpty = conditionList.filter(item => !item.isEmpty);
-        if ((notEmpty === null || notEmpty === void 0 ? void 0 : notEmpty.length) > 0) {
-            const hasPass = notEmpty.find(item => item.result);
-            if (hasPass) {
-                return { result: true };
-            }
-            else {
-                const notPass = notEmpty.find(item => !item.result);
-                return notPass;
-            }
-        }
-        else {
-            return { result: true };
-        }
-    }
-}
-export function checkFlowHandler(item, transition, permissions, flowHandlerActive) {
-    var _a, _b;
-    if (!item || !transition)
-        return { result: false };
-    if (flowHandlerActive && ((_b = (_a = item === null || item === void 0 ? void 0 : item.values) === null || _a === void 0 ? void 0 : _a.flowHandler) === null || _b === void 0 ? void 0 : _b.length)) {
-        const flowHandler = item.values.flowHandler;
-        const flowUser = flowHandler.find(user => user.value === permissions.userId);
-        if (flowUser) {
-            return { result: true };
-        }
-        else {
-            const tipUsers = flowHandler.map(user => user.label).join('、');
-            return {
-                result: false,
-                message: i18n.t('libs.default.tipText', { text: `${i18n.t('libs.workflow.flowHandler')}：${tipUsers}` }),
-            };
-        }
-    }
+    if (!conditionCheck.result)
+        return conditionCheck;
+    return { result: true };
 }
 export const useWorkflowPermission = (workspaceId) => {
     const [roles, setRoles] = useState([]);

package/package.json

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