From 39eb77de04894cbcd74059bdf971c3049cb62c5f Mon Sep 17 00:00:00 2001 From: tiye Date: Tue, 10 Nov 2026 17:43:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20Markup=20=E5=88=B0=20Calci?= =?UTF-8?q?t=200.40.0=20=E5=B9=B6=E7=BA=A6=E6=9D=9F=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=BD=BD=E8=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- calcit.cirru | 31 ++++++++++++++++++------------- deps.cirru | 2 +- package.json | 2 +- yarn.lock | 10 +++++----- 5 files changed, 26 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 43a79bf..b69c1fc 100644 --- a/README.md +++ b/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 出现前不要将本分支当作已发布依赖。 diff --git a/calcit.cirru b/calcit.cirru index 3279eaf..0dfec74 100644 --- a/calcit.cirru +++ b/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 diff --git a/deps.cirru b/deps.cirru index f43b32c..7a5e176 100644 --- a/deps.cirru +++ b/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 diff --git a/package.json b/package.json index 731305a..0f39ebf 100644 --- a/package.json +++ b/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", diff --git a/yarn.lock b/yarn.lock index 66cb47e..1a89008 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,15 +12,15 @@ __metadata: languageName: node linkType: hard -"@calcit/procs@npm:0.38.0": - version: 0.38.0 - resolution: "@calcit/procs@npm:0.38.0" +"@calcit/procs@npm:0.40.0": + version: 0.40.0 + resolution: "@calcit/procs@npm:0.40.0" dependencies: "@calcit/finger-vec": "npm:0.1.1" "@calcit/ternary-tree": "npm:0.0.26" "@cirru/parser.ts": "npm:0.0.10" "@cirru/writer.ts": "npm:^0.1.9" - checksum: 10c0/8d1910cc739b1b23b5d5b549fb519053b2a578ab05f11814d28c09fbf4c18be5d3a14f52ff3b9bea4c9a3a42ab79d56a59021cd533d68ecc5e26e61da1e347ba + checksum: 10c0/4122eaa8d63fd57826d24c6c072dbd1cb6cdd2934dbfdb4fd0afc03f4aec73f07d71ccba246120c15e198134b7e92a324f1f1900b43c458b02e871354739cf84 languageName: node linkType: hard @@ -637,7 +637,7 @@ __metadata: version: 0.0.0-use.local resolution: "root-workspace-0b6124@workspace:." dependencies: - "@calcit/procs": "npm:0.38.0" + "@calcit/procs": "npm:0.40.0" bottom-tip: "npm:^0.1.5" vite: "npm:8.3.3" languageName: unknown