Explorar o código

refactor again

yohei0125 %!s(int64=4) %!d(string=hai) anos
pai
achega
c4a729e664
Modificáronse 1 ficheiros con 14 adicións e 4 borrados
  1. 14 4
      packages/app/src/server/service/page-operation.ts

+ 14 - 4
packages/app/src/server/service/page-operation.ts

@@ -37,26 +37,36 @@ class PageOperationService {
     if (isRecursively) {
       if (fromPathToOp != null && !isTrashPage(fromPathToOp)) {
         const fromFlag = fromPaths.some(p => isEitherOfPathAreaOverlap(p, fromPathToOp));
+        if (fromFlag) return false;
+
         const toFlag = toPaths.some(p => isEitherOfPathAreaOverlap(p, fromPathToOp));
-        if (fromFlag || toFlag) return false;
+        if (toFlag) return false;
       }
+
       if (toPathToOp != null && !isTrashPage(toPathToOp)) {
         const fromFlag = fromPaths.some(p => isPathAreaOverlap(p, toPathToOp));
+        if (fromFlag) return false;
+
         const toFlag = toPaths.some(p => isPathAreaOverlap(p, toPathToOp));
-        if (fromFlag || toFlag) return false;
+        if (toFlag) return false;
       }
 
     }
     else {
       if (fromPathToOp != null && !isTrashPage(fromPathToOp)) {
         const fromFlag = fromPaths.some(p => isPathAreaOverlap(p, fromPathToOp));
+        if (fromFlag) return false;
+
         const toFlag = toPaths.some(p => isPathAreaOverlap(p, fromPathToOp));
-        if (fromFlag || toFlag) return false;
+        if (toFlag) return false;
       }
+
       if (toPathToOp != null && !isTrashPage(toPathToOp)) {
         const fromFlag = fromPaths.some(p => isPathAreaOverlap(p, toPathToOp));
+        if (fromFlag) return false;
+
         const toFlag = toPaths.some(p => isPathAreaOverlap(p, toPathToOp));
-        if (fromFlag || toFlag) return false;
+        if (toFlag) return false;
       }
     }