Răsfoiți Sursa

enhance(rtc): add :block/original-name sync support (2)

rcmerci 2 ani în urmă
părinte
comite
a2e27a0007

+ 2 - 1
src/main/frontend/db/rtc/core.cljs

@@ -241,7 +241,8 @@
 (defn apply-remote-update-page-ops
   [repo update-page-ops]
   (doseq [{:keys [self page-name original-name] :as op-value} update-page-ops]
-    (let [old-page-original-name (:block/original-name (db/pull repo [:block/name] [:block/uuid (uuid self)]))
+    (let [old-page-original-name (:block/original-name
+                                  (db/pull repo [:block/original-name] [:block/uuid (uuid self)]))
           exist-page (db/pull repo [:block/uuid] [:block/name page-name])]
       (cond
           ;; same name but different uuid

+ 4 - 2
src/main/frontend/db/rtc/db_listener.cljs

@@ -51,7 +51,8 @@
             {[_e _a block-uuid _t add1?] :block/uuid
              [_e _a _v _t add2?]  :block/name
              [_e _a _v _t add3?]  :block/parent
-             [_e _a _v _t add4?]  :block/left} attr->datom
+             [_e _a _v _t add4?]  :block/left
+             [_e _a _v _t add5?]  :block/original-name} attr->datom
             ops (cond
                   (and (not add1?) block-uuid
                        (not add2?) (contains? updated-key-set :block/name))
@@ -69,7 +70,8 @@
                               (or add3? add4?)
                               (conj [:move])
 
-                              (and (contains? updated-key-set :block/name) add2?)
+                              (or (and (contains? updated-key-set :block/name) add2?)
+                                  (and (contains? updated-key-set :block/original-name) add5?))
                               (conj [:update-page]))
                         update-op (->>
                                    (keep