yohei0125 3 лет назад
Родитель
Сommit
c4a729e664
1 измененных файлов с 14 добавлено и 4 удалено
  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;
       }
     }