@giteeteam/apps-team-components 1.2.2-alpha.3 → 1.2.2

package/dist/icons/svg/DottedCircle.svg

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg t="1702526505381" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-  p-id="14633" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <path
-    d="M681.919574 995.136018l-33.919979-96.63994a408.447745 408.447745 0 0 1-130.239919 23.039986l-6.911995 0.064h-4.159998l-1.279999 102.399936H511.99968c59.519963 0 116.735927-10.175994 169.919894-28.863982zM243.839848 821.632126l-67.071958 77.375952a511.74368 511.74368 0 0 0 153.151904 91.647943l36.479977-95.67994a409.343744 409.343744 0 0 1-122.559923-73.343955z m709.503556-49.919968l-88.191945-52.031968a412.159742 412.159742 0 0 1-92.927942 108.671932l65.15196 78.975951a514.559678 514.559678 0 0 0 115.967927-135.679915zM107.391933 576.00028l-101.183937 15.87199c9.471994 60.415962 29.439982 117.311927 58.111964 168.767895l89.471944-49.855969a406.079746 406.079746 0 0 1-46.399971-134.783916zM1023.99936 512.00032c0-29.439982-2.495998-58.239964-7.231995-86.207946l-100.927937 17.087989a412.991742 412.991742 0 0 1-0.896 143.359911l100.735937 18.303988c5.439997-30.015981 8.319995-60.927962 8.319995-92.543942zM74.175954 246.400486a508.799682 508.799682 0 0 0-64.63996 166.399896l100.543937 19.775988a406.399746 406.399746 0 0 1 51.583968-132.927917L74.239954 246.400486z m882.303448 11.327993a514.431678 514.431678 0 0 0-114.303928-137.087914l-66.111959 78.271951a412.031742 412.031742 0 0 1 91.583943 109.759931l88.831944-50.943968z m-607.99962-231.039856A510.975681 510.975681 0 0 0 191.99988 112.38457l63.99996 79.87195a408.575745 408.575745 0 0 1 125.247922-68.543957L348.543782 26.688623zM511.99968 0.00064v102.399936c48.63997 0 95.99994 8.447995 140.607912 24.767985l35.199978-96.19194A511.039681 511.039681 0 0 0 511.99968 0.00064z"
-    p-id="14634"></path>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<svg t="1702526505381" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
+  p-id="14633" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <path
+    d="M681.919574 995.136018l-33.919979-96.63994a408.447745 408.447745 0 0 1-130.239919 23.039986l-6.911995 0.064h-4.159998l-1.279999 102.399936H511.99968c59.519963 0 116.735927-10.175994 169.919894-28.863982zM243.839848 821.632126l-67.071958 77.375952a511.74368 511.74368 0 0 0 153.151904 91.647943l36.479977-95.67994a409.343744 409.343744 0 0 1-122.559923-73.343955z m709.503556-49.919968l-88.191945-52.031968a412.159742 412.159742 0 0 1-92.927942 108.671932l65.15196 78.975951a514.559678 514.559678 0 0 0 115.967927-135.679915zM107.391933 576.00028l-101.183937 15.87199c9.471994 60.415962 29.439982 117.311927 58.111964 168.767895l89.471944-49.855969a406.079746 406.079746 0 0 1-46.399971-134.783916zM1023.99936 512.00032c0-29.439982-2.495998-58.239964-7.231995-86.207946l-100.927937 17.087989a412.991742 412.991742 0 0 1-0.896 143.359911l100.735937 18.303988c5.439997-30.015981 8.319995-60.927962 8.319995-92.543942zM74.175954 246.400486a508.799682 508.799682 0 0 0-64.63996 166.399896l100.543937 19.775988a406.399746 406.399746 0 0 1 51.583968-132.927917L74.239954 246.400486z m882.303448 11.327993a514.431678 514.431678 0 0 0-114.303928-137.087914l-66.111959 78.271951a412.031742 412.031742 0 0 1 91.583943 109.759931l88.831944-50.943968z m-607.99962-231.039856A510.975681 510.975681 0 0 0 191.99988 112.38457l63.99996 79.87195a408.575745 408.575745 0 0 1 125.247922-68.543957L348.543782 26.688623zM511.99968 0.00064v102.399936c48.63997 0 95.99994 8.447995 140.607912 24.767985l35.199978-96.19194A511.039681 511.039681 0 0 0 511.99968 0.00064z"
+    p-id="14634"></path>
+</svg>

package/dist/icons/svg/HollowCircle.svg

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	viewBox="0 0 10 10" style="enable-background:new 0 0 10 10;" xml:space="preserve">
-<path d="M5,0C2.2,0,0,2.2,0,5s2.2,5,5,5s5-2.2,5-5S7.8,0,5,0z M5,8C3.3,8,2,6.7,2,5s1.3-3,3-3s3,1.3,3,3S6.7,8,5,8z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	viewBox="0 0 10 10" style="enable-background:new 0 0 10 10;" xml:space="preserve">
+<path d="M5,0C2.2,0,0,2.2,0,5s2.2,5,5,5s5-2.2,5-5S7.8,0,5,0z M5,8C3.3,8,2,6.7,2,5s1.3-3,3-3s3,1.3,3,3S6.7,8,5,8z"/>
+</svg>

package/dist/icons/svg/Workflow.svg

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<path d="M111.4,88.1c-7.5,0-14.46,4.82-16.61,11.79H38.03c-8.57,0-15.53-6.97-15.53-15.53
-	c0-8.57,6.97-14.99,15.53-14.99h52.49c14.46,0,26.25-11.79,26.25-26.25s-11.79-26.25-26.25-26.25H33.75
-	C31.61,9.91,25.18,5.09,17.14,5.09C8.04,5.09,0,13.12,0,22.23s8.04,17.14,17.14,17.14c7.5,0,14.46-4.82,16.61-11.79h56.23
-	c8.57,0,15.53,6.97,15.53,15.53s-6.42,15.53-14.99,15.53h-52.5c-14.46,0-26.25,11.79-26.25,26.25s11.79,26.25,26.25,26.25h56.23
-	c2.14,6.97,8.57,11.79,16.61,11.79c9.64,0,17.14-8.04,17.14-17.14S120.51,88.1,111.4,88.1z M17.15,29.18
-	c-3.22,0-6.42-3.22-6.42-6.97s3.22-6.42,6.42-6.42s6.42,3.22,6.42,6.42S20.9,29.18,17.15,29.18z M111.4,112.21
-	c-3.75,0-6.42-3.22-6.42-6.42c0-3.21,3.22-6.42,6.42-6.42c3.21,0,6.42,3.22,6.42,6.42C117.83,108.99,114.62,112.21,111.4,112.21z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
+<path d="M111.4,88.1c-7.5,0-14.46,4.82-16.61,11.79H38.03c-8.57,0-15.53-6.97-15.53-15.53
+	c0-8.57,6.97-14.99,15.53-14.99h52.49c14.46,0,26.25-11.79,26.25-26.25s-11.79-26.25-26.25-26.25H33.75
+	C31.61,9.91,25.18,5.09,17.14,5.09C8.04,5.09,0,13.12,0,22.23s8.04,17.14,17.14,17.14c7.5,0,14.46-4.82,16.61-11.79h56.23
+	c8.57,0,15.53,6.97,15.53,15.53s-6.42,15.53-14.99,15.53h-52.5c-14.46,0-26.25,11.79-26.25,26.25s11.79,26.25,26.25,26.25h56.23
+	c2.14,6.97,8.57,11.79,16.61,11.79c9.64,0,17.14-8.04,17.14-17.14S120.51,88.1,111.4,88.1z M17.15,29.18
+	c-3.22,0-6.42-3.22-6.42-6.97s3.22-6.42,6.42-6.42s6.42,3.22,6.42,6.42S20.9,29.18,17.15,29.18z M111.4,112.21
+	c-3.75,0-6.42-3.22-6.42-6.42c0-3.21,3.22-6.42,6.42-6.42c3.21,0,6.42,3.22,6.42,6.42C117.83,108.99,114.62,112.21,111.4,112.21z"/>
+</svg>

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,12 +231,12 @@ 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) {
             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));
@@ -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)) {
@@ -301,14 +275,7 @@ export function checkItemCondition(transition, item) {
                         }),
                     };
                 }
-                else {
-                    if (isAny) {
-                        return {
-                            result: true,
-                        };
-                    }
-                }
-            }
+                break;
             case CustomFieldComponentTypes.Text:
             case CustomFieldComponentTypes.LongText:
                 targetValue = comparedValue;
@@ -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,31 +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 };
-        }
-    }
+    if (!conditionCheck.result)
+        return conditionCheck;
+    return { result: true };
 }
 export const useWorkflowPermission = (workspaceId) => {
     const [roles, setRoles] = useState([]);

package/package.json

@@ -1,70 +1,69 @@
-{
-  "name": "@giteeteam/apps-team-components",
-  "version": "1.2.2-alpha.3",
-  "description": "Gitee team components",
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "scripts": {
-    "prepare": "husky install && pnpm build",
-    "build": "rm -rf dist && tsc && cp -r src/icons/svg dist/icons/svg",
-    "publish:alpha": "npm publish --tag alpha",
-    "prepack": "pnpm build",
-    "prepublish": "pnpm build",
-    "prepublishOnly": "pnpm build",
-    "lint": "eslint . --ext ts --ext tsx --ext js --ext json",
-    "pre-commit": "lint-staged",
-    "husky": "husky"
-  },
-  "files": [
-    "dist"
-  ],
-  "lint-staged": {
-    "*.@(js|ts|tsx|json)": [
-      "prettier --write",
-      "pnpm lint --fix --quiet"
-    ]
-  },
-  "publishConfig": {
-    "conventionalCommits": true,
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "sideEffects": false,
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@types/node": "18",
-    "@types/react": "18.2.23",
-    "@types/react-dom": "^18.2.14",
-    "@typescript-eslint/eslint-plugin": "^6.4.1",
-    "@typescript-eslint/parser": "^6.4.1",
-    "eslint": "^8.55.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-simple-import-sort": "^10.0.0",
-    "husky": "^8.0.3",
-    "lint-staged": "^15.2.0",
-    "prettier": "^3.0.3",
-    "typescript": "^5.2.2"
-  },
-  "peerDependencies": {
-    "@ant-design/icons": "^5.2.6",
-    "@giteeteam/proxima-sdk-js": "^0.7.1",
-    "antd": "^5.7.3",
-    "dayjs": "^1.11.10",
-    "react": "^17.0.2 || ^18.2.0",
-    "react-dom": "^17.0.2 || ^18.2.0",
-    "recoil": "^0.7.7",
-    "swr": "^1.1.0"
-  },
-  "dependencies": {
-    "@emotion/cache": "^11.11.0",
-    "@emotion/react": "^11.11.1",
-    "debug": "^4.3.4",
-    "fs-extra": "^11.2.0",
-    "lodash-es": "^4.17.21"
-  }
-}
+{
+  "name": "@giteeteam/apps-team-components",
+  "version": "1.2.2",
+  "description": "Gitee team components",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "scripts": {
+    "prepare": "husky install && pnpm build",
+    "build": "rm -rf dist && tsc && cp -r src/icons/svg dist/icons/svg",
+    "publish:alpha": "npm publish --tag alpha",
+    "prepack": "pnpm build",
+    "prepublish": "pnpm build",
+    "prepublishOnly": "pnpm build",
+    "lint": "eslint . --ext ts --ext tsx --ext js --ext json",
+    "pre-commit": "lint-staged",
+    "husky": "husky"
+  },
+  "files": [
+    "dist"
+  ],
+  "lint-staged": {
+    "*.@(js|ts|tsx|json)": [
+      "prettier --write",
+      "pnpm lint --fix --quiet"
+    ]
+  },
+  "publishConfig": {
+    "conventionalCommits": true,
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "sideEffects": false,
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/node": "18",
+    "@types/react": "18.2.23",
+    "@types/react-dom": "^18.2.14",
+    "@typescript-eslint/eslint-plugin": "^6.4.1",
+    "@typescript-eslint/parser": "^6.4.1",
+    "eslint": "^8.55.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-simple-import-sort": "^10.0.0",
+    "husky": "^8.0.3",
+    "lint-staged": "^15.2.0",
+    "prettier": "^3.0.3",
+    "typescript": "^5.2.2"
+  },
+  "peerDependencies": {
+    "@ant-design/icons": "^5.2.6",
+    "@giteeteam/proxima-sdk-js": "^0.7.1",
+    "antd": "^5.7.3",
+    "dayjs": "^1.11.10",
+    "react": "^17.0.2 || ^18.2.0",
+    "react-dom": "^17.0.2 || ^18.2.0",
+    "recoil": "^0.7.7",
+    "swr": "^1.1.0"
+  },
+  "dependencies": {
+    "@emotion/cache": "^11.11.0",
+    "@emotion/react": "^11.11.1",
+    "debug": "^4.3.4",
+    "lodash-es": "^4.17.21"
+  }
+}