@giteeteam/apps-team-components 1.2.2-alpha.2 → 1.2.2-alpha.4

package/dist/lib/workflow.js

@@ -255,7 +255,7 @@ export function checkItemCondition(transition, item) {
         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));
@@ -290,7 +290,7 @@ export function checkItemCondition(transition, item) {
                     }
                     let showValue = comparedValue;
                     if (field.componentType === CustomFieldComponentTypes.Date) {
-                        showValue = getFormat(comparedValue, getDateType('dateTime'));
+                        showValue = getFormat(comparedValue, getDateType(pickerType));
                     }
                     return {
                         result: false,
@@ -308,7 +308,7 @@ export function checkItemCondition(transition, item) {
                         };
                     }
                 }
-            }
+                break;
             case CustomFieldComponentTypes.Text:
             case CustomFieldComponentTypes.LongText:
                 targetValue = comparedValue;
@@ -426,9 +426,13 @@ export function checkTransition(item, transition, permissions, flowHandlerActive
         const conditionList = [roleCheck, conditionCheck];
         const notEmpty = conditionList.filter(item => !item.isEmpty);
         if ((notEmpty === null || notEmpty === void 0 ? void 0 : notEmpty.length) > 0) {
-            const [notEmptyCondition] = notEmpty;
-            if (!notEmptyCondition.result) {
-                return notEmptyCondition;
+            const hasPass = notEmpty.find(item => item.result);
+            if (hasPass) {
+                return { result: true };
+            }
+            else {
+                const notPass = notEmpty.find(item => !item.result);
+                return notPass;
             }
         }
         else {

package/package.json

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