浏览代码

fix: onverter issue : background_color

close #1977
Tienson Qin 4 年之前
父节点
当前提交
1f17da3b1f
共有 2 个文件被更改,包括 11 次插入6 次删除
  1. 8 5
      src/main/frontend/format/block.cljs
  2. 3 1
      src/main/frontend/util/property.cljs

+ 8 - 5
src/main/frontend/format/block.cljs

@@ -175,12 +175,15 @@
                    (remove string/blank?))
         properties (->> properties
                         (medley/map-kv (fn [k v]
-                                         (let [v (if (coll? v)
+                                         (let [k (-> (string/lower-case (name k))
+                                                     (string/replace " " "-")
+                                                     (string/replace "_" "-"))
+                                               k (if (contains? #{"custom_id" "custom-id"} k)
+                                                   "id"
+                                                   k)
+                                               v (if (coll? v)
                                                    v
-                                                   (let [k (name k)
-                                                         v (string/trim v)
-                                                         k (string/replace k " " "-")
-                                                         k (string/lower-case k)
+                                                   (let [v (string/trim v)
                                                          v (cond
                                                              (= v "true")
                                                              true

+ 3 - 1
src/main/frontend/util/property.cljs

@@ -265,7 +265,9 @@
                           (map (fn [text]
                                  (let [[k v] (util/split-first ":" (subs text 1))]
                                    (if (and k v)
-                                     (str k ":: " (string/trim v))
+                                     (let [k (string/replace k "_" "-")
+                                           k (if (contains? #{:id :custom_id :custom-id} (string/lower-case k)) "id" k)]
+                                       (str k ":: " (string/trim v)))
                                      text)))))
               after (subvec lines (inc end-idx))
               lines (concat before middle after)]