升级 Markup 到 Calcit 0.40.0 并约束编辑操作载荷

README.md

@@ -6,7 +6,7 @@ Demo http://repo.respo-mvc.org/markup/ .
 
 ### Usages
 
-本次候选 **0.0.5** 配对正式 Calcit / `@calcit/procs` **0.38.0**。
+本次候选 **0.0.5** 配对正式 Calcit / `@calcit/procs` **0.40.0**。
 消费者需重新安装完整依赖图、生成 JS 并完整刷新页面。Content 输入、Run、Reel 调试工具、
 存档 key 和格式保持；Demo 不新增 Markdown 解析功能。UI/Reel 跨 minor 升级可能有样式差异。
 0.0.5 尚未发布，正式 tag 出现前不要将本分支当作已发布依赖。

calcit.cirru

@@ -22,19 +22,22 @@
                       try-decode-map-as value $ List respo.schema/CoordKey
                       (:ok checked) checked
                       (:err _) (raise "|Expected List cursor")
-                state $ match (get states :data)
-                  (:some value)
-                    or value $ {} $ :content |
-                  (:none)
-                    {} $ :content |
-                content $ .unwrap $ get
-                  &merge
-                    {} $ :content nil
-                    if (struct? state) (&struct:to-map state) (decode-map-as state 'Map)
-                  , :content
+                state $ let
+                    raw $ match (get states :data)
+                      (:some value)
+                        or value $ {} $ :content |
+                      (:none)
+                        {} $ :content |
+                  if (struct? raw) (&struct:to-map raw)
+                    decode-map-as raw $ Map Dynamic Dynamic
+                content $ get state :content
               div
                 {} $ :class-name $ str-spaced css/global css/row
-                textarea $ {} (:value content) (:placeholder |Content)
+                textarea $ {}
+                  :value $ match content
+                    (:some value) value
+                    (:none) (Option :none)
+                  :placeholder |Content
                   :class-name $ str-spaced css/expand css/textarea
                   :style $ {} $ :height |320px
                   :on-input $ fn (e d!)
@@ -52,7 +55,9 @@
                       hint-fn $ Fn respo.schema/RespoEvent
                         Fn app.schema/Op $ -> Unit
                         -> Unit
-                      println content
+                      match content
+                        (:some value) (println value)
+                        (:none) (println nil)
                 if dev?
                   Option :some $ comp-typed-reel (>> states :reel) reel ({}) on-control!
                   Option :none
@@ -189,7 +194,7 @@
       :defs $ {}
         'Op $ %{} 'CodeEntry (:doc |)
           :code $ quote $ defenum Op
-            :states (List respo.schema/CoordKey) Dynamic
+            :states (List respo.schema/CoordKey) (Map Dynamic Dynamic)
             :hydrate-storage app.schema/Store
           :examples $ []
           :schema $ quote EnumDef

deps.cirru

@@ -1,5 +1,5 @@
 
-{} (:calcit-version |0.38.0)
+{} (:calcit-version |0.40.0)
   :version |0.0.5
   :dependencies $ {} (|Respo/reel.calcit |0.11.0)
     |Respo/respo-ui.calcit |0.15.2

package.json

@@ -1,7 +1,7 @@
 {
   "packageManager": "yarn@4.18.0",
   "dependencies": {
-    "@calcit/procs": "0.38.0"
+    "@calcit/procs": "0.40.0"
   },
   "devDependencies": {
     "bottom-tip": "^0.1.5",