@giteeteam/apps-team-components 1.11.1 → 1.11.2

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

@@ -62,24 +62,25 @@ const TransitionPanel = ({ itemId, itemType, workspace, objectId, onTransitionSu
     const [workflowData, setWorkflowData] = useState({ nodes: [], transitions: [] });
     const [checkResultList, setCheckResultList] = useState([]);
     const checkApproval = useCallback(({ text }) => {
-        var _a;
+        var _a, _b;
         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)) || [];
+        const noResultRestrictions = ((_b = approval.transition.noResultRestriction) === null || _b === void 0 ? void 0 : _b.map(i => i.label)) || [];
+        const unionStatus = [ApprovalStatus.approved, ApprovalStatus.rejected];
         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) &&
+        if (!approval.startApproval &&
+            !unionStatus.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 [true];
+        }
+        if (noResultRestrictions.includes(text)) {
+            return approval.startApproval ? [true] : [false, i18n.t('pages.fields.view.noResultRestrictedStatus')];
         }
         return [false, i18n.t('pages.fields.view.approvalStatus')];
     }, [approval]);

package/dist/locales/index.d.ts

@@ -17,6 +17,7 @@ export declare const en: {
     'pages.fields.view.noWorkflowOrAuth': string;
     'pages.fields.view.viewWorkflow': string;
     'pages.fields.view.unrestrictedStatus': string;
+    'pages.fields.view.noResultRestrictedStatus': string;
     'pages.fields.view.approvalStatus': string;
     'pages.fields.view.checkInStatus': string;
     'pages.fields.view.readonlyStatus': string;
@@ -87,6 +88,7 @@ export declare const zh: {
     'pages.fields.view.noWorkflowOrAuth': string;
     'pages.fields.view.viewWorkflow': string;
     'pages.fields.view.unrestrictedStatus': string;
+    'pages.fields.view.noResultRestrictedStatus': string;
     'pages.fields.view.approvalStatus': string;
     'pages.fields.view.checkInStatus': string;
     'pages.fields.view.readonlyStatus': string;
@@ -157,6 +159,7 @@ export declare const ru: {
     'pages.fields.view.noWorkflowOrAuth': string;
     'pages.fields.view.viewWorkflow': string;
     'pages.fields.view.unrestrictedStatus': string;
+    'pages.fields.view.noResultRestrictedStatus': string;
     'pages.fields.view.approvalStatus': string;
     'pages.fields.view.checkInStatus': string;
     'pages.fields.view.readonlyStatus': string;

package/dist/locales/index.js

@@ -17,6 +17,7 @@ const en = {
     'pages.fields.view.noWorkflowOrAuth': `Current state doesn't allow workflow or has no permission`,
     'pages.fields.view.viewWorkflow': 'View workflow diagram',
     'pages.fields.view.unrestrictedStatus': 'This transition can only be clicked before approval',
+    'pages.fields.view.noResultRestrictedStatus': 'This transition can only be clicked after approval',
     'pages.fields.view.approvalStatus': 'The transition needs approval',
     'pages.fields.view.checkInStatus': 'The transition needs check-in',
     'pages.fields.view.readonlyStatus': 'Read only status, please contact the administrator for configuration.',
@@ -87,6 +88,7 @@ const zh = {
     'pages.fields.view.noWorkflowOrAuth': '当前状态无法继续流转或者没有权限',
     'pages.fields.view.viewWorkflow': '查看工作流图',
     'pages.fields.view.unrestrictedStatus': '该流转动作只有未审批前才可点击',
+    'pages.fields.view.noResultRestrictedStatus': '该流转动作只有审批过才可点击',
     'pages.fields.view.approvalStatus': '该流转需要审批完成后才能流转',
     'pages.fields.view.checkInStatus': '该流转需要签到完成后才能流转',
     'pages.fields.view.readonlyStatus': '只读状态，请联系管理员配置。',
@@ -156,7 +158,8 @@ const ru = {
     'pages.fields.default.noItemType': 'Тип задачи не указан',
     'pages.fields.view.noWorkflowOrAuth': `Текущее состояние не допускает рабочий процесс или не имеет разрешения`,
     'pages.fields.view.viewWorkflow': 'Посмотреть схему рабочего процесса',
-    'pages.fields.view.unrestrictedStatus': 'This transition can only be clicked before approval',
+    'pages.fields.view.unrestrictedStatus': 'Этот переход можно нажать только до утверждения',
+    'pages.fields.view.noResultRestrictedStatus': 'Этот переход можно нажать только после утверждения',
     'pages.fields.view.approvalStatus': 'Данный перевод требует подтверждения',
     'pages.fields.view.checkInStatus': 'The transition needs check-in',
     'pages.fields.view.readonlyStatus': 'Статус только для чтения, пожалуйста, свяжитесь с администратором для настройки.',

package/package.json

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