@giteeteam/apps-team-components 1.1.4 → 1.2.0-alpha.1

package/dist/components/fields/actors/BaseField.d.ts

@@ -1 +1,8 @@
-export declare const formatUserOption: (actorData: any) => any;
+import type { ObjectId, User as UserTyped } from '../../../lib/types/models';
+type UserOption = {
+    label: string;
+    value: ObjectId;
+    key: string;
+};
+export declare const formatUserOption: (actorData: UserTyped) => UserOption;
+export {};

package/dist/components/fields/actors/BaseField.js

@@ -1,5 +1,5 @@
 import { userOptionAdapter } from '../../../lib/users';
-export const formatUserOption = actorData => {
+export const formatUserOption = (actorData) => {
     const isUserData = !!(actorData === null || actorData === void 0 ? void 0 : actorData.username) && (actorData === null || actorData === void 0 ? void 0 : actorData.enabled);
     if (isUserData)
         return userOptionAdapter(actorData);

package/dist/components/fields/data-quote/utils.d.ts

@@ -1,3 +1,5 @@
 import { Item } from '../../../lib/types/models';
 import { selectValue as selectValueProps } from '../dropdown/BaseField';
+export declare const DATA_QUOTE_OPTION_FORMAT_REG: RegExp;
+export declare const dataQuoteOptionFormat: (data: Item, display?: string) => selectValueProps;
 export declare const dataQuoteInit: (dates: Item[], value: string[], display?: string) => selectValueProps[];

package/dist/components/fields/data-quote/utils.js

@@ -1,26 +1,30 @@
+export const DATA_QUOTE_OPTION_FORMAT_REG = /{(\S+?)}/g;
+export const dataQuoteOptionFormat = (data, display) => {
+    var _a, _b, _c;
+    if (!data)
+        return undefined;
+    const dataCopy = {
+        ...data,
+        status: (_a = data.status) === null || _a === void 0 ? void 0 : _a.name,
+        itemType: (_b = data.itemType) === null || _b === void 0 ? void 0 : _b.name,
+    };
+    return {
+        label: display
+            ? display.replace(DATA_QUOTE_OPTION_FORMAT_REG, function (itemKey) {
+                const key = itemKey.slice(1, itemKey.length - 1);
+                return dataCopy[key] || (data.values && data.values[key]) || '';
+            })
+            : data.name,
+        value: data.objectId,
+        name: data.name,
+        key: data.key,
+        itemType: data.itemType,
+        icon: (_c = data === null || data === void 0 ? void 0 : data.itemType) === null || _c === void 0 ? void 0 : _c.icon,
+        values: data.values,
+    };
+};
 export const dataQuoteInit = (dates, value, display) => {
-    const regex = /({\S+?})/g;
-    const existedDatas = dates === null || dates === void 0 ? void 0 : dates.filter(data => value === null || value === void 0 ? void 0 : value.includes(data.objectId));
-    const dataInit = existedDatas === null || existedDatas === void 0 ? void 0 : existedDatas.map(existedData => {
-        var _a, _b, _c;
-        const dataCopy = {
-            ...existedData,
-            status: (_a = existedData.status) === null || _a === void 0 ? void 0 : _a.name,
-            itemType: (_b = existedData.itemType) === null || _b === void 0 ? void 0 : _b.name,
-        };
-        const values = existedData.values || {};
-        return {
-            label: display
-                ? display.replace(regex, function (itemKey) {
-                    const key = itemKey.slice(1, itemKey.length - 1);
-                    return dataCopy[key] || values[key] || '';
-                })
-                : existedData.name,
-            value: existedData.objectId,
-            itemType: existedData.itemType,
-            icon: (_c = existedData === null || existedData === void 0 ? void 0 : existedData.itemType) === null || _c === void 0 ? void 0 : _c.icon,
-            values: existedData.values,
-        };
-    });
+    const existedDataList = dates === null || dates === void 0 ? void 0 : dates.filter(data => value === null || value === void 0 ? void 0 : value.includes(data.objectId));
+    const dataInit = existedDataList === null || existedDataList === void 0 ? void 0 : existedDataList.map(existedData => dataQuoteOptionFormat(existedData, display));
     return dataInit;
 };

package/dist/components/fields/dropdown/BaseField.d.ts

@@ -2,5 +2,6 @@
 export interface selectValue {
     label: React.ReactNode;
     value: string | number;
+    [key: string]: any;
 }
 export declare const handleValue: (value: selectValue | string | number) => string | number;

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

@@ -29,6 +29,9 @@ interface FlowButtonProps {
     };
     hiddenPopover?: () => void;
     readonly?: boolean;
+    conditionKey: string;
+    fieldTypeConditionKey: string;
+    userConditionKey: string;
 }
 declare const _default: React.NamedExoticComponent<FlowButtonProps>;
 export default _default;

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

@@ -15,7 +15,7 @@ const CheckInStatus = {
     closed: 'closed',
     pending: 'pending',
 };
-const FlowButton = ({ loading, screenId, text, item, userId, roleIds, groupIds, workspaceRoleIds, authRoles, authUsers, authGroups, creatorAuth, authUserFields, authWorkSpaceRoles, scriptValidator, approval, checkIn, conditions = [], handleTransition, target, readonly, }) => {
+const FlowButton = ({ loading, screenId, text, item, userId, roleIds, groupIds, workspaceRoleIds, authRoles, authUsers, authGroups, creatorAuth, authUserFields, authWorkSpaceRoles, scriptValidator, approval, checkIn, conditions = [], handleTransition, target, readonly, conditionKey, fieldTypeConditionKey, userConditionKey, }) => {
     const [isCheck, setIsCheck] = useState(true);
     const [tip, setTip] = useState('');
     const checkApproval = useCallback(() => {
@@ -62,6 +62,7 @@ const FlowButton = ({ loading, screenId, text, item, userId, roleIds, groupIds,
             return;
         }
         const transition = {
+            conditionKey,
             parameters: {
                 fieldType: conditions,
                 permissionType: {
@@ -71,7 +72,9 @@ const FlowButton = ({ loading, screenId, text, item, userId, roleIds, groupIds,
                     workspaceRoles: authWorkSpaceRoles,
                     customFields: authUserFields,
                     creatorAuth,
+                    conditionKey: userConditionKey,
                 },
+                fieldTypeConditionKey,
             },
         };
         const checkResult = checkTransition(item, transition, { userId, roleIds, groupIds, workspaceRoleIds });
@@ -94,6 +97,9 @@ const FlowButton = ({ loading, screenId, text, item, userId, roleIds, groupIds,
         roleIds,
         groupIds,
         workspaceRoleIds,
+        conditionKey,
+        fieldTypeConditionKey,
+        userConditionKey,
     ]);
     useEffect(() => {
         checkAuth();

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

@@ -31,9 +31,13 @@ const TransitionPanel = ({ itemId, itemType, workspace, objectId, onTransitionSu
     const [fetching, setFetching] = useState(true);
     const [approval, setApproval] = useState(cloneDeep(DEFAULT_APPROVAL_DATA));
     const [checkIn, setCheckIn] = useState(cloneDeep(DEFAULT_CHECK_IN_DATA));
+    const newItem = useRef(itemId);
     useEffect(() => {
         setStatusId(objectId);
-    }, [objectId]);
+        return () => {
+            newItem.current = itemId;
+        };
+    }, [itemId, objectId]);
     const { checkTransitionScript, getWorkflowData, getItemStatus, runTransition } = useWorkflowConfig();
     const { currentUser } = useCurrentUser();
     const [groupIds, roleIds, workspaceRoleIds] = useWorkflowPermission((_a = itemData === null || itemData === void 0 ? void 0 : itemData.workspace) === null || _a === void 0 ? void 0 : _a.objectId);
@@ -95,14 +99,17 @@ const TransitionPanel = ({ itemId, itemType, workspace, objectId, onTransitionSu
         logger('updateWorkflowMessage', statusId);
         updateWorkflowMessage(workflowData, statusId);
     }, [statusId]);
-    const refreshItem = (status) => {
+    const refreshItem = useCallback((status) => {
+        if (newItem.current !== itemId) {
+            return;
+        }
         setStatusId(status.objectId);
         onTransitionSuccess === null || onTransitionSuccess === void 0 ? void 0 : onTransitionSuccess(status);
         itemMutate();
         proximaSdk.execute('updateStatusLog');
         proximaSdk.execute('updateApprovalInfo', status.objectId);
         proximaSdk.execute('updateCheckInInfo', status.objectId);
-    };
+    }, [itemId, itemMutate, onTransitionSuccess]);
     const submitHandle = useCallback(async (transitionText, itemDetail = null) => {
         const params = {
             workflowId: workflowData.objectId,
@@ -225,8 +232,8 @@ const TransitionPanel = ({ itemId, itemType, workspace, objectId, onTransitionSu
         refresh();
     });
     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", { 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 }, task.id));
+                            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+                            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, 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 }, 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/user/ReadView.js

@@ -14,7 +14,7 @@ const UserReadView = memo(({ value, readonly }) => {
         })) || EMPTY_ARRAY);
     }, [value]);
     const tooltipValues = useMemo(() => {
-        return value === null || value === void 0 ? void 0 : value.map((val) => {
+        return value === null || value === void 0 ? void 0 : value.map(val => {
             const item = userDataFormat(val);
             return generateUserDisplayName(item);
         });
@@ -22,7 +22,7 @@ const UserReadView = memo(({ value, readonly }) => {
     if (!displayValues.length) {
         return _jsx(EmptyField, { readonly: readonly, isUser: true });
     }
-    return _jsx(BaseOverflowTooltip, { title: tooltipValues.join(','), maxline: 1, children: displayValues });
+    return (_jsx(BaseOverflowTooltip, { title: tooltipValues.join(','), maxline: 1, children: displayValues }));
 });
 UserReadView.displayName = 'UserReadView';
 export default UserReadView;

package/dist/lib/array.d.ts

@@ -6,5 +6,5 @@ export declare const arrayDiff: (origin: Array<any>, target: Array<any>) => IDif
 export declare const serializationArrayByKey: (list: any[], keyPath: string) => Record<string, any> | null;
 export declare const createHash: () => number;
 export declare function parseArray(str: string): string[];
-export declare const getArrayValue: (value: any) => any[];
+export declare const getArrayValue: <T = any>(value: T) => T[];
 export {};

package/dist/lib/array.js

@@ -41,4 +41,4 @@ export function parseArray(str) {
     }
     return [];
 }
-export const getArrayValue = (value) => { var _a; return (_a = (isArray(value) ? value : [value])) === null || _a === void 0 ? void 0 : _a.filter(Boolean); };
+export const getArrayValue = (value) => { var _a; return (_a = ((isArray(value) ? value : [value]))) === null || _a === void 0 ? void 0 : _a.filter(Boolean); };

package/dist/lib/hooks/useI18n.d.ts

@@ -1,4 +1,3 @@
-declare const useI18n: () => {
-    t: (key: string, opts?: Record<string, any>) => string;
-};
+import { i18n } from '../i18n';
+declare const useI18n: () => Pick<typeof i18n, 't'>;
 export default useI18n;

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, } = ((_a = transition.parameters) === null || _a === void 0 ? void 0 : _a.permissionType) || {};
+    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 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;
@@ -128,12 +128,16 @@ export function checkUserPermission({ transition, userId, roleIds, groupIds, ite
     if (!hasUsers && !hasRoles && !hasGroups && !hasUserFields && !hasWorkspaceRoles && !creatorAuth) {
         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 {
-            return { result: true };
+            if (isAny) {
+                return { result: true };
+            }
         }
     }
     if (hasUsers) {
@@ -143,7 +147,9 @@ export function checkUserPermission({ transition, userId, roleIds, groupIds, ite
             tipText.push(`${i18n.t('libs.workflow.user')}：${tipUsers}`);
         }
         else {
-            return { result: true };
+            if (isAny) {
+                return { result: true };
+            }
         }
     }
     if (hasRoles) {
@@ -153,7 +159,9 @@ export function checkUserPermission({ transition, userId, roleIds, groupIds, ite
             tipText.push(`${i18n.t('libs.workflow.role')}：${tipRoles}`);
         }
         else {
-            return { result: true };
+            if (isAny) {
+                return { result: true };
+            }
         }
     }
     if (hasGroups) {
@@ -163,7 +171,9 @@ export function checkUserPermission({ transition, userId, roleIds, groupIds, ite
             tipText.push(`${i18n.t('libs.workflow.group')}：${tipGroup}`);
         }
         else {
-            return { result: true };
+            if (isAny) {
+                return { result: true };
+            }
         }
     }
     if (hasUserFields) {
@@ -194,7 +204,9 @@ export function checkUserPermission({ transition, userId, roleIds, groupIds, ite
             tipText.push(`${i18n.t('libs.workflow.userFields')}：${tipRoles}`);
         }
         else {
-            return { result: true };
+            if (isAny) {
+                return { result: true };
+            }
         }
     }
     if (hasWorkspaceRoles) {
@@ -206,7 +218,9 @@ export function checkUserPermission({ transition, userId, roleIds, groupIds, ite
             tipText.push(`${i18n.t('libs.workflow.workspaceRoles')}：${tipWorkspaceRoles}`);
         }
         else {
-            return { result: true };
+            if (isAny) {
+                return { result: true };
+            }
         }
     }
     if (tipText.length) {
@@ -215,8 +229,10 @@ export function checkUserPermission({ transition, userId, roleIds, groupIds, ite
     return { result: true };
 }
 export function checkItemCondition(transition, item) {
-    var _a, _b;
-    const conditions = ((_a = transition.parameters) === null || _a === void 0 ? void 0 : _a.fieldType) || [];
+    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';
     for (const i in conditions) {
         const { comparedValue, numberCompare, stringCompare, dropDownCompare, field, pickerType } = conditions[i];
         let fieldValue;
@@ -231,12 +247,12 @@ export function checkItemCondition(transition, item) {
             fieldValue = item[field.key].objectId;
         }
         else {
-            fieldValue = (_b = item.values) === null || _b === void 0 ? void 0 : _b[field.key];
+            fieldValue = (_c = item.values) === null || _c === void 0 ? void 0 : _c[field.key];
         }
         let sourceValue = null, targetValue = null;
         switch (field.componentType) {
             case CustomFieldComponentTypes.Number:
-            case CustomFieldComponentTypes.Date:
+            case CustomFieldComponentTypes.Date: {
                 targetValue = comparedValue;
                 if (field.componentType === CustomFieldComponentTypes.Date && NumberConditions.equalTo.key === numberCompare) {
                     targetValue = getFormat(targetValue || null, getDateType(pickerType));
@@ -251,6 +267,13 @@ export function checkItemCondition(transition, item) {
                             }),
                         };
                     }
+                    else {
+                        if (isAny) {
+                            return {
+                                result: true,
+                            };
+                        }
+                    }
                 }
                 else if (!numberToCompare(fieldValue, Number(targetValue), numberCompare)) {
                     if (isEmptyCondition(numberCompare)) {
@@ -275,7 +298,14 @@ export function checkItemCondition(transition, item) {
                         }),
                     };
                 }
-                break;
+                else {
+                    if (isAny) {
+                        return {
+                            result: true,
+                        };
+                    }
+                }
+            }
             case CustomFieldComponentTypes.Text:
             case CustomFieldComponentTypes.LongText:
                 targetValue = comparedValue;
@@ -299,7 +329,13 @@ export function checkItemCondition(transition, item) {
                         message,
                     };
                 }
-                break;
+                else {
+                    if (isAny) {
+                        return {
+                            result: true,
+                        };
+                    }
+                }
             case CustomFieldComponentTypes.User:
             case CustomFieldComponentTypes.Dropdown:
             case CustomFieldComponentTypes.File:
@@ -337,9 +373,13 @@ export function checkItemCondition(transition, item) {
                         }),
                     };
                 }
-                break;
-            default:
-                break;
+                else {
+                    if (isAny) {
+                        return {
+                            result: true,
+                        };
+                    }
+                }
         }
     }
     return { result: true };
@@ -347,16 +387,25 @@ export function checkItemCondition(transition, item) {
 export function checkTransition(item, transition, permissions) {
     if (!item || !transition)
         return { result: false };
+    const defaultConditionKey = (transition === null || transition === void 0 ? void 0 : transition.conditionKey) || 'all';
+    const isAll = defaultConditionKey === 'all';
     const roleCheck = checkUserPermission({
         transition,
         item,
         ...permissions,
     });
-    if (!roleCheck.result)
-        return roleCheck;
     const conditionCheck = checkItemCondition(transition, item);
-    if (!conditionCheck.result)
-        return conditionCheck;
+    if (isAll) {
+        if (!roleCheck.result)
+            return roleCheck;
+        if (!conditionCheck.result)
+            return conditionCheck;
+    }
+    else {
+        if (roleCheck.result || conditionCheck.result) {
+            return { result: true };
+        }
+    }
     return { result: true };
 }
 export const useWorkflowPermission = (workspaceId) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-team-components",
-  "version": "1.1.4",
+  "version": "1.2.0-alpha.1",
   "description": "Gitee team components",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -64,6 +64,7 @@
     "@emotion/cache": "^11.11.0",
     "@emotion/react": "^11.11.1",
     "debug": "^4.3.4",
+    "fs-extra": "^11.2.0",
     "lodash-es": "^4.17.21"
   }
 }