@shwfed/config 2.4.1 → 2.5.0

package/dist/preview/assets/{runtime-Ch3JIgUQ.js → runtime-BRMGkqSr.js}

@@ -1 +1 @@
-import{_ as s}from"./definition.vue_vue_type_script_setup_true_lang-D8NPPbjZ.js";import{d as c,aq as o,aE as i,e as r,u as f,ap as u,o as p}from"./index-DUDlWaQI.js";const g=c({name:"ShwfedEventDispatchActionRuntime",__name:"runtime",props:{buttonId:{},config:{}},setup(e){const n=e,t=u(),a=o(()=>i(t,n.config.triggers));return(m,d)=>(p(),r(s,{"action-id":e.buttonId,effect:f(a)},null,8,["action-id","effect"]))}});export{g as default};
+import{_ as s}from"./definition.vue_vue_type_script_setup_true_lang-uJFJXxli.js";import{d as c,aq as o,aE as i,e as r,u as f,ap as u,o as p}from"./index-x-77enex.js";const g=c({name:"ShwfedEventDispatchActionRuntime",__name:"runtime",props:{buttonId:{},config:{}},setup(e){const n=e,t=u(),a=o(()=>i(t,n.config.triggers));return(m,d)=>(p(),r(s,{"action-id":e.buttonId,effect:f(a)},null,8,["action-id","effect"]))}});export{g as default};

package/dist/preview/assets/{runtime-BwR_BbTu.js → runtime-CHLboM_z.js}

@@ -1 +1 @@
-import{d as i,aq as f,as as r,au as u,e as d,u as m,al as l,am as p,ao as _,o as g}from"./index-DUDlWaQI.js";import{_ as h}from"./definition.vue_vue_type_script_setup_true_lang-D8NPPbjZ.js";const B=i({name:"ShwfedNavigationActionRuntime",__name:"runtime",props:{buttonId:{},config:{}},setup(e){const t=e,o=_(),c=(n,a)=>l(n,{...p(o),...a}),s=f(()=>r(c(t.config.url),n=>u(()=>{window.open(n,t.config.mode)})));return(n,a)=>(g(),d(h,{"action-id":e.buttonId,effect:m(s)},null,8,["action-id","effect"]))}});export{B as default};
+import{d as i,aq as f,as as r,au as u,e as d,u as m,al as l,am as p,ao as _,o as g}from"./index-x-77enex.js";import{_ as h}from"./definition.vue_vue_type_script_setup_true_lang-uJFJXxli.js";const B=i({name:"ShwfedNavigationActionRuntime",__name:"runtime",props:{buttonId:{},config:{}},setup(e){const t=e,o=_(),c=(n,a)=>l(n,{...p(o),...a}),s=f(()=>r(c(t.config.url),n=>u(()=>{window.open(n,t.config.mode)})));return(n,a)=>(g(),d(h,{"action-id":e.buttonId,effect:m(s)},null,8,["action-id","effect"]))}});export{B as default};

package/dist/preview/assets/{runtime-BQSwNpLC.js → runtime-CeHdesjP.js}

@@ -1 +1 @@
-import{d as u,ae as i,e as l,u as p,$ as m,o as d,k as f,ah as _,ai as k,al as w,am as x,ao as g}from"./index-DUDlWaQI.js";const B=u({name:"ShwfedMarkdownItemRuntime",__name:"runtime",props:{config:{}},setup(n){const o=n,{locale:s}=i(),t=g(),c=(e,a)=>w(e,{...x(t),...a}),r=m(()=>{const e=_(o.config.content,s.value)??"";return k(e,c)});return(e,a)=>(d(),l(p(f),{"data-slot":"buttons-markdown",source:r.value,class:"prose prose-sm prose-zinc px-1"},null,8,["source"]))}});export{B as default};
+import{d as u,ae as i,e as l,u as p,$ as m,o as d,k as f,ah as _,ai as k,al as w,am as x,ao as g}from"./index-x-77enex.js";const B=u({name:"ShwfedMarkdownItemRuntime",__name:"runtime",props:{config:{}},setup(n){const o=n,{locale:s}=i(),t=g(),c=(e,a)=>w(e,{...x(t),...a}),r=m(()=>{const e=_(o.config.content,s.value)??"";return k(e,c)});return(e,a)=>(d(),l(p(f),{"data-slot":"buttons-markdown",source:r.value,class:"prose prose-sm prose-zinc px-1"},null,8,["source"]))}});export{B as default};

package/dist/preview/assets/{runtime-D34aQN00.js → runtime-D4_9FCLy.js}

@@ -1 +1 @@
-import{d as s,ae as p,av as x,af as M,ah as c,aw as T,ax as N,e as b,w as d,u,a0 as k,a1 as w,ap as L,au as S,o as A,f as I,ay as z,g as f,az as F,aA as H,a7 as V,ao as $,aB as r,aC as m,aD as j}from"./index-DUDlWaQI.js";import{_ as K}from"./definition.vue_vue_type_script_setup_true_lang-D8NPPbjZ.js";const D=s({name:"ShwfedModalLayoutActionRuntime",__name:"runtime",props:{buttonId:{},config:{},buttonTitle:{}},setup(t){const n=t,{locale:l}=p(),v=e=>{},h=$(),i=w(r,void 0),g=L(),o=k(null),C=x(n.buttonId,{close:()=>S(()=>{o.value?.()})},g),y=s({name:"ModalBoundaryBridge",setup(e,{slots:a}){return H(h),m(j,C),i&&m(r,i),()=>a.default?.()}}),E=(e,a)=>V()?.(e,a),_=M(function*(){const e=c(n.config.modalTitle,l.value)??c(n.buttonTitle,l.value)??"",{modal:a,close:B}=yield*T({title:e,width:n.config.modalWidth});o.value=()=>N(B()),yield*a,o.value=null});return(e,a)=>(A(),b(K,{"action-id":t.buttonId,effect:u(_)},{default:d(()=>[I("div",{style:z(t.config.modalMinHeight?`min-height: ${t.config.modalMinHeight}`:void 0)},[f(u(y),null,{default:d(()=>[f(F,{"slot-value":t.config.slot,configure:v,"find-entry":E},null,8,["slot-value"])]),_:1})],4)]),_:1},8,["action-id","effect"]))}});export{D as default};
+import{d as s,ae as p,av as x,af as M,ah as c,aw as T,ax as N,e as b,w as d,u,a0 as k,a1 as w,ap as L,au as S,o as A,f as I,ay as z,g as f,az as F,aA as H,a7 as V,ao as $,aB as r,aC as m,aD as j}from"./index-x-77enex.js";import{_ as K}from"./definition.vue_vue_type_script_setup_true_lang-uJFJXxli.js";const D=s({name:"ShwfedModalLayoutActionRuntime",__name:"runtime",props:{buttonId:{},config:{},buttonTitle:{}},setup(t){const n=t,{locale:l}=p(),v=e=>{},h=$(),i=w(r,void 0),g=L(),o=k(null),C=x(n.buttonId,{close:()=>S(()=>{o.value?.()})},g),y=s({name:"ModalBoundaryBridge",setup(e,{slots:a}){return H(h),m(j,C),i&&m(r,i),()=>a.default?.()}}),E=(e,a)=>V()?.(e,a),_=M(function*(){const e=c(n.config.modalTitle,l.value)??c(n.buttonTitle,l.value)??"",{modal:a,close:B}=yield*T({title:e,width:n.config.modalWidth});o.value=()=>N(B()),yield*a,o.value=null});return(e,a)=>(A(),b(K,{"action-id":t.buttonId,effect:u(_)},{default:d(()=>[I("div",{style:z(t.config.modalMinHeight?`min-height: ${t.config.modalMinHeight}`:void 0)},[f(u(y),null,{default:d(()=>[f(F,{"slot-value":t.config.slot,configure:v,"find-entry":E},null,8,["slot-value"])]),_:1})],4)]),_:1},8,["action-id","effect"]))}});export{D as default};

package/dist/preview/assets/{runtime-aPt-bW3F.js → runtime-DHBTDws7.js}

@@ -1 +1 @@
-import{d as l,ae as u,af as g,ag as m,ah as d,ai as p,aj as x,ak as k,e as E,u as _,al as h,am as w,an as C,ao as I,ap as j,o as v}from"./index-DUDlWaQI.js";import{_ as y}from"./definition.vue_vue_type_script_setup_true_lang-D8NPPbjZ.js";const q=l({name:"ShwfedHttpRequestConfirmActionRuntime",__name:"runtime",props:{buttonId:{},config:{}},setup(s){const e=s,{locale:c}=u(),i=I(),t=(n,o)=>h(n,{...w(i),...o}),r=j(),a=C(),f=g(function*(){if(a&&!(yield*m(()=>a())))return;const n=d(e.config.markdown,c.value)??"",o=p(n,t);(yield*x({content:o,icon:e.config.icon,color:e.config.color}))||(yield*k(e.config.expression,t,{messageExpression:e.config.messageExpression,resultExpression:e.config.resultExpression,channel:r,triggers:{success:e.config.onSuccess,warning:e.config.onWarning,error:e.config.onError,info:e.config.onInfo}}))});return(n,o)=>(v(),E(y,{"action-id":s.buttonId,effect:_(f)},null,8,["action-id","effect"]))}});export{q as default};
+import{d as l,ae as u,af as g,ag as m,ah as d,ai as p,aj as x,ak as k,e as E,u as _,al as h,am as w,an as C,ao as I,ap as j,o as v}from"./index-x-77enex.js";import{_ as y}from"./definition.vue_vue_type_script_setup_true_lang-uJFJXxli.js";const q=l({name:"ShwfedHttpRequestConfirmActionRuntime",__name:"runtime",props:{buttonId:{},config:{}},setup(s){const e=s,{locale:c}=u(),i=I(),t=(n,o)=>h(n,{...w(i),...o}),r=j(),a=C(),f=g(function*(){if(a&&!(yield*m(()=>a())))return;const n=d(e.config.markdown,c.value)??"",o=p(n,t);(yield*x({content:o,icon:e.config.icon,color:e.config.color}))||(yield*k(e.config.expression,t,{messageExpression:e.config.messageExpression,resultExpression:e.config.resultExpression,channel:r,triggers:{success:e.config.onSuccess,warning:e.config.onWarning,error:e.config.onError,info:e.config.onInfo}}))});return(n,o)=>(v(),E(y,{"action-id":s.buttonId,effect:_(f)},null,8,["action-id","effect"]))}});export{q as default};

package/dist/preview/assets/{runtime-a9TOQRwD.js → runtime-DJHpCLnr.js}

@@ -1 +1 @@
-import{_ as o}from"./definition.vue_vue_type_script_setup_true_lang-D8NPPbjZ.js";import{d as n,e as a,u as c,o as f,at as i}from"./index-DUDlWaQI.js";const _=n({name:"ShwfedPrototypeActionRuntime",__name:"runtime",props:{buttonId:{},config:{}},setup(t){const e=i;return(r,s)=>(f(),a(o,{"action-id":t.buttonId,effect:c(e)},null,8,["action-id","effect"]))}});export{_ as default};
+import{_ as o}from"./definition.vue_vue_type_script_setup_true_lang-uJFJXxli.js";import{d as n,e as a,u as c,o as f,at as i}from"./index-x-77enex.js";const _=n({name:"ShwfedPrototypeActionRuntime",__name:"runtime",props:{buttonId:{},config:{}},setup(t){const e=i;return(r,s)=>(f(),a(o,{"action-id":t.buttonId,effect:c(e)},null,8,["action-id","effect"]))}});export{_ as default};

package/dist/preview/assets/{runtime-Cunk4vOs.js → runtime-DKq86fZU.js}

@@ -1 +1 @@
-import{d as l,aH as g,aq as A,as as y,aE as _,e as h,u as S,al as b,am as j,ap as k,aI as C,o as B,ao as E}from"./index-DUDlWaQI.js";import{_ as I}from"./definition.vue_vue_type_script_setup_true_lang-D8NPPbjZ.js";const F=l({name:"ShwfedStateWriteActionRuntime",__name:"runtime",props:{buttonId:{},config:{}},setup(r){const s=r,i=E(),f=(e,t)=>b(e,{...j(i),...t}),n=g(),o=n.kind==="form"&&n.parent?n.parent:n,u=k(),m=C((e,t,a)=>{if(Array.isArray(e[t])&&Array.isArray(a))return e[t]=a,!0});function c(e){return typeof e=="object"&&e!==null&&!Array.isArray(e)}function p(e,t){return c(e)&&c(t)?m({...t},e):t}const d=A(()=>y(f(s.config.expression),e=>{for(const t of Object.keys(e)){const a=p(o.getAt(t),e[t]);o.setAt(t,a)}return _(u,s.config.onSuccess)}));return(e,t)=>(B(),h(I,{"action-id":r.buttonId,effect:S(d)},null,8,["action-id","effect"]))}});export{F as default};
+import{d as l,aH as g,aq as A,as as y,aE as _,e as h,u as S,al as b,am as j,ap as k,aI as C,o as B,ao as E}from"./index-x-77enex.js";import{_ as I}from"./definition.vue_vue_type_script_setup_true_lang-uJFJXxli.js";const F=l({name:"ShwfedStateWriteActionRuntime",__name:"runtime",props:{buttonId:{},config:{}},setup(r){const s=r,i=E(),f=(e,t)=>b(e,{...j(i),...t}),n=g(),o=n.kind==="form"&&n.parent?n.parent:n,u=k(),m=C((e,t,a)=>{if(Array.isArray(e[t])&&Array.isArray(a))return e[t]=a,!0});function c(e){return typeof e=="object"&&e!==null&&!Array.isArray(e)}function p(e,t){return c(e)&&c(t)?m({...t},e):t}const d=A(()=>y(f(s.config.expression),e=>{for(const t of Object.keys(e)){const a=p(o.getAt(t),e[t]);o.setAt(t,a)}return _(u,s.config.onSuccess)}));return(e,t)=>(B(),h(I,{"action-id":r.buttonId,effect:S(d)},null,8,["action-id","effect"]))}});export{F as default};

package/dist/preview/assets/{runtime-CjvZcU7X.js → runtime-DjpjaNec.js}

@@ -1 +1 @@
-import{d as E,aq as _,af as S,au as r,aE as m,aF as j,aG as v,e as x,u as B,al as L,am as b,ap as k,ao as C,o as R}from"./index-DUDlWaQI.js";import{_ as T}from"./definition.vue_vue_type_script_setup_true_lang-D8NPPbjZ.js";const O=E({name:"ShwfedHttpDownloadActionRuntime",__name:"runtime",props:{buttonId:{},config:{}},setup(d){const c=d,g=C(),t=(e,n)=>L(e,{...b(g),...n}),l=k(),p=new Set(["success","error","warning","info"]);function f(e){const n=URL.createObjectURL(e),o=document.createElement("a");o.href=n,o.download=e.name,document.body.appendChild(o),o.click(),o.remove(),URL.revokeObjectURL(n)}const y=_(()=>S(function*(){const{template:e,messageExpression:n,resultExpression:o}=c.config,u=yield*t(e.request);if(!e.download){const s=yield*u.file();return yield*r(()=>f(s)),yield*m(l,c.config.onSuccess)}const a={json:yield*u.json()},i=o===void 0?"success":yield*j(t(o,a),s=>p.has(s)?s:"success");if(n!==void 0){const s=yield*t(n,a);yield*r(()=>v[i](s))}if(i==="success"||i==="info"){const h=yield*(yield*t(e.download,a)).file();yield*r(()=>f(h))}const w={success:c.config.onSuccess,warning:c.config.onWarning,error:c.config.onError,info:c.config.onInfo};return yield*m(l,w[i])}));return(e,n)=>(R(),x(T,{"action-id":d.buttonId,effect:B(y)},null,8,["action-id","effect"]))}});export{O as default};
+import{d as E,aq as _,af as S,au as r,aE as m,aF as j,aG as v,e as x,u as B,al as L,am as b,ap as k,ao as C,o as R}from"./index-x-77enex.js";import{_ as T}from"./definition.vue_vue_type_script_setup_true_lang-uJFJXxli.js";const O=E({name:"ShwfedHttpDownloadActionRuntime",__name:"runtime",props:{buttonId:{},config:{}},setup(d){const c=d,g=C(),t=(e,n)=>L(e,{...b(g),...n}),l=k(),p=new Set(["success","error","warning","info"]);function f(e){const n=URL.createObjectURL(e),o=document.createElement("a");o.href=n,o.download=e.name,document.body.appendChild(o),o.click(),o.remove(),URL.revokeObjectURL(n)}const y=_(()=>S(function*(){const{template:e,messageExpression:n,resultExpression:o}=c.config,u=yield*t(e.request);if(!e.download){const s=yield*u.file();return yield*r(()=>f(s)),yield*m(l,c.config.onSuccess)}const a={json:yield*u.json()},i=o===void 0?"success":yield*j(t(o,a),s=>p.has(s)?s:"success");if(n!==void 0){const s=yield*t(n,a);yield*r(()=>v[i](s))}if(i==="success"||i==="info"){const h=yield*(yield*t(e.download,a)).file();yield*r(()=>f(h))}const w={success:c.config.onSuccess,warning:c.config.onWarning,error:c.config.onError,info:c.config.onInfo};return yield*m(l,w[i])}));return(e,n)=>(R(),x(T,{"action-id":d.buttonId,effect:B(y)},null,8,["action-id","effect"]))}});export{O as default};

package/dist/preview/assets/{runtime-BP7zXnyG.js → runtime-ZQryOEKm.js}

@@ -1 +1 @@
-import{d as u,aq as p,ag as g,ar as a,as as m,ak as l,e as d,u as x,al as E,am as _,an as h,ao as C,ap as k,o as q}from"./index-DUDlWaQI.js";import{_ as v}from"./definition.vue_vue_type_script_setup_true_lang-D8NPPbjZ.js";const R=u({name:"ShwfedHttpRequestActionRuntime",__name:"runtime",props:{buttonId:{},config:{}},setup(o){const e=o,c=C(),i=(n,s)=>E(n,{..._(c),...s}),r=k(),t=h(),f=p(()=>{const n=t?g(()=>t()):a(!0);return m(n,s=>s?l(e.config.expression,i,{messageExpression:e.config.messageExpression,resultExpression:e.config.resultExpression,channel:r,triggers:{success:e.config.onSuccess,warning:e.config.onWarning,error:e.config.onError,info:e.config.onInfo}}):a(void 0))});return(n,s)=>(q(),d(v,{"action-id":o.buttonId,effect:x(f)},null,8,["action-id","effect"]))}});export{R as default};
+import{d as u,aq as p,ag as g,ar as a,as as m,ak as l,e as d,u as x,al as E,am as _,an as h,ao as C,ap as k,o as q}from"./index-x-77enex.js";import{_ as v}from"./definition.vue_vue_type_script_setup_true_lang-uJFJXxli.js";const R=u({name:"ShwfedHttpRequestActionRuntime",__name:"runtime",props:{buttonId:{},config:{}},setup(o){const e=o,c=C(),i=(n,s)=>E(n,{..._(c),...s}),r=k(),t=h(),f=p(()=>{const n=t?g(()=>t()):a(!0);return m(n,s=>s?l(e.config.expression,i,{messageExpression:e.config.messageExpression,resultExpression:e.config.resultExpression,channel:r,triggers:{success:e.config.onSuccess,warning:e.config.onWarning,error:e.config.onError,info:e.config.onInfo}}):a(void 0))});return(n,s)=>(q(),d(v,{"action-id":o.buttonId,effect:x(f)},null,8,["action-id","effect"]))}});export{R as default};

package/dist/preview/index.html

@@ -10,8 +10,8 @@
          `--primary`, the primary button variant renders as transparent. */
       body { --primary: #009689; }
     </style>
-    <script type="module" crossorigin src="./assets/index-DUDlWaQI.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-65eB1l4r.css">
+    <script type="module" crossorigin src="./assets/index-x-77enex.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-7MVXgV5n.css">
   </head>
   <body>
     <div id="app"></div>

package/dist/runtime/components/config/blocks/2026-05-06/com.shwfed.block.table/schema.d.ts

@@ -217,9 +217,9 @@ export declare function schema(configure: (env: Environment) => void, _blockRef:
             default: () => never[];
         }>;
         dataSource: Schema.optional<Schema.Struct<{
-            total: Schema.optional<Schema.Schema<string, string, never>>;
             request: Schema.optional<Schema.Schema<string, string, never>>;
             data: Schema.Schema<string, string, never>;
+            total: Schema.optional<Schema.Schema<string, string, never>>;
         }>>;
         actions: Schema.optional<Schema.Struct<{
             size: Schema.optionalWith<Schema.Literal<["default", "sm", "xs"]>, {

package/dist/runtime/components/form/index.vue

@@ -10,6 +10,7 @@ import {
   provideCELContext
 } from "../../utils/cel-context";
 import FormUnitRenderer from "./FormUnitRenderer.vue";
+import { buildFormRuntimeScope } from "./utils/cel-scope";
 import { provideCommitBus } from "./utils/commit-bus";
 import { provideDerivedQuiescence, useDerived } from "./utils/derived";
 import { useFormHistory } from "./utils/history";
@@ -27,24 +28,10 @@ const props = defineProps({
 const configure = props.configure ?? (() => {
 });
 void configure;
-provideCELContext({
-  form: {
-    type: "dyn",
-    label: "form",
-    description: "\u5F53\u524D\u8868\u5355\u72B6\u6001",
-    value: () => state.value ?? {}
-  },
-  // Same thunk pattern: `now` stays live (fresh Date at click time, not at
-  // provide time). Must be a `TZDate`: CEL's type registry maps the `Date`
-  // type to the `TZDate` constructor exactly, so a plain `new Date()` fails
-  // the constructor lookup.
-  now: {
-    type: "Date",
-    label: "now",
-    description: "\u5F53\u524D\u65E5\u671F/\u65F6\u95F4",
-    value: () => new TZDate()
-  }
-});
+provideCELContext(buildFormRuntimeScope({
+  form: () => state.value ?? {},
+  now: () => new TZDate()
+}));
 const inherited = injectCELContext();
 const $cel = (expression, context) => _rawCel(expression, { ...celBindings(inherited), ...context });
 const formState = provideFormState(state);

package/dist/runtime/components/form/schema.d.ts

@@ -1,6 +1,7 @@
 import { Schema } from 'effect';
 import type { Environment } from '../../vendor/cel-js/lib/index.js';
 import type { InitialSource } from './utils/initial.js';
+import { registerFormVariablesIfAbsent } from './utils/form-vars.js';
 import { type LayoutSetValue } from '../../share/layout.js';
 export { commonFieldFields } from './utils/common.js';
 export { getStructFieldTitle, getStructFieldDescription } from './utils/schema-meta.js';
@@ -69,16 +70,7 @@ export declare function FormUnit(configure: (env: Environment) => void): Schema.
         }>;
     }>>>;
 }>>;
-/**
- * Register the form-wide `now` / `form` live variables on `env`, skipping any
- * already declared. Idempotent so it composes safely from either side: a
- * `FormConfig` nested inside another (the `table` form field embeds a table
- * whose `query` is its own sub-form, and the embedding `configure` advertises
- * the same pair) would otherwise register `form` twice on one env and the CEL
- * registry throws `'form' is already registered`. Mirrors
- * `registerRowVariablesIfAbsent`.
- */
-export declare function registerFormVariablesIfAbsent(env: Environment): void;
+export { registerFormVariablesIfAbsent };
 export declare function FormConfig(configure: (env: Environment) => void): Schema.refine<{
     readonly style?: string | undefined;
     readonly initial?: {

package/dist/runtime/components/form/schema.js

@@ -1,6 +1,7 @@
 import { Schema } from "effect";
 import { Expression } from "../../share/expression.js";
 import { allFieldSchemas } from "./utils/resolve.js";
+import { registerFormVariablesIfAbsent } from "./utils/form-vars.js";
 import { md } from "../../share/markdown.js";
 import {
   LayoutSet,
@@ -37,11 +38,7 @@ export function FormUnit(configure) {
     description: "\u4E00\u7EC4\u8868\u5355\u5B57\u6BB5\u53CA\u5176\u5E03\u5C40"
   });
 }
-export function registerFormVariablesIfAbsent(env) {
-  const declared = new Set(env.getDefinitions().variables.map((v) => v.name));
-  if (!declared.has("now")) env.registerVariable("now", "Date", { label: "\u5F53\u524D\u65F6\u95F4", description: "\u5F53\u524D\u65E5\u671F/\u65F6\u95F4" });
-  if (!declared.has("form")) env.registerVariable("form", "dyn", { label: "\u8868\u5355\u503C", description: "\u5F53\u524D\u8868\u5355\u72B6\u6001" });
-}
+export { registerFormVariablesIfAbsent };
 export function FormConfig(configure) {
   const formConfigure = (env) => {
     registerFormVariablesIfAbsent(env);

package/dist/runtime/components/form/utils/cel-scope.d.ts

@@ -2,12 +2,21 @@ import { Environment } from '../../../vendor/cel-js/lib/index.js';
 import type { CELContext } from '../../../utils/cel-context.js';
 /**
  * Builds the CEL variable scope advertised to a form's expression editors and
- * AI assists. Seeds the form-wide `form` / `now` live variables, then probes a
- * throwaway `Environment` with the host's `configure` to surface any
- * host-registered variables (their type / label / description).
+ * AI assists. Probes the form-wide `form` / `now` registrar
+ * (`registerFormVariablesIfAbsent` — the single source of truth, also feeding
+ * every field's expression validator) plus the host's `configure` to surface
+ * host-registered variables.
  *
  * Values are left `undefined` — this scope is for designer-time advertising
  * and prompt rendering, never evaluation. Extracted from `form/config.vue` so
  * the field-list AI button can reuse the exact same scope.
  */
 export declare function buildFormCelScope(configure: (env: Environment) => void): CELContext;
+/**
+ * Builds the runtime form-wide scope provided by `form/index.vue`. The `form` /
+ * `now` metadata (type/label/description) is probed from the same
+ * `registerFormVariablesIfAbsent` registrar as the designer scope above, so the
+ * two can't drift; `values` overlays the live evaluation thunks the designer
+ * scope leaves `undefined`, keyed by variable name.
+ */
+export declare function buildFormRuntimeScope(values: Record<string, () => unknown>): CELContext;

package/dist/runtime/components/form/utils/cel-scope.js

@@ -1,24 +1,10 @@
 import { Environment } from "../../../vendor/cel-js/lib/index.js";
-export function buildFormCelScope(configure) {
+import { registerFormVariablesIfAbsent } from "./form-vars.js";
+function probeCELContext(register) {
   const probe = new Environment({ unlistedVariablesAreDyn: false });
   const baseline = new Set(probe.getDefinitions().variables.map((v) => v.name));
-  configure(probe);
-  const out = {
-    form: {
-      type: "dyn",
-      label: "\u8868\u5355\u503C",
-      description: "\u5F53\u524D\u8868\u5355\u72B6\u6001",
-      value: void 0
-    },
-    // Mirrors the runtime `now` binding in `form/index.vue`. Editors and
-    // prompts never evaluate, so we leave `value` undefined.
-    now: {
-      type: "Date",
-      label: "now",
-      description: "\u5F53\u524D\u65E5\u671F/\u65F6\u95F4",
-      value: void 0
-    }
-  };
+  register(probe);
+  const out = {};
   for (const v of probe.getDefinitions().variables) {
     if (baseline.has(v.name)) continue;
     out[v.name] = {
@@ -30,3 +16,16 @@ export function buildFormCelScope(configure) {
   }
   return out;
 }
+export function buildFormCelScope(configure) {
+  return probeCELContext((env) => {
+    registerFormVariablesIfAbsent(env);
+    configure(env);
+  });
+}
+export function buildFormRuntimeScope(values) {
+  const out = probeCELContext(registerFormVariablesIfAbsent);
+  for (const [name, value] of Object.entries(values)) {
+    if (out[name]) out[name].value = value;
+  }
+  return out;
+}

package/dist/runtime/components/form/utils/form-vars.d.ts

@@ -0,0 +1,19 @@
+import type { Environment } from '../../../vendor/cel-js/lib/index.js';
+/**
+ * Register the form-wide `now` / `form` live variables on `env`, skipping any
+ * already declared. Idempotent so it composes safely from either side: a
+ * `FormConfig` nested inside another (the `table` form field embeds a table
+ * whose `query` is its own sub-form, and the embedding `configure` advertises
+ * the same pair) would otherwise register `form` twice on one env and the CEL
+ * registry throws `'form' is already registered`. Mirrors
+ * `registerRowVariablesIfAbsent`.
+ *
+ * This is the single source of truth for the `form` / `now` metadata: the
+ * schema's expression validators register it here, the designer-time picker
+ * probes it (`buildFormCelScope`), and the runtime scope derives its
+ * type/label/description from it too (`buildFormRuntimeScope`). Lives in this
+ * dependency-light module — not `schema.ts` — so the scope helpers can import it
+ * without pulling `utils/resolve` (and its `import.meta.glob`) into per-folder
+ * unit tests. `schema.ts` re-exports it for existing call sites.
+ */
+export declare function registerFormVariablesIfAbsent(env: Environment): void;

package/dist/runtime/components/form/utils/form-vars.js

@@ -0,0 +1,5 @@
+export function registerFormVariablesIfAbsent(env) {
+  const declared = new Set(env.getDefinitions().variables.map((v) => v.name));
+  if (!declared.has("now")) env.registerVariable("now", "Date", { label: "\u5F53\u524D\u65F6\u95F4", description: "\u5F53\u524D\u65E5\u671F/\u65F6\u95F4" });
+  if (!declared.has("form")) env.registerVariable("form", "dyn", { label: "\u8868\u5355\u503C", description: "\u5F53\u524D\u8868\u5355\u72B6\u6001" });
+}

package/dist/runtime/components/table/columns/2026-04-14/com.shwfed.table.column.date/config.vue

@@ -3,7 +3,6 @@ import { computed } from "vue";
 import { Icon } from "@iconify/vue";
 import { format as formatDate } from "date-fns";
 import { Input } from "../../../../ui/input";
-import { Switch } from "../../../../ui/switch";
 import { Separator } from "../../../../ui/separator";
 import { Field, FieldLabel } from "../../../../ui/field";
 import { Locale } from "../../../../ui/locale";
@@ -199,14 +198,10 @@ const dateFormatExample = computed(() => {
     <Separator />
     <div class="flex flex-wrap gap-x-8 gap-y-3">
       <Field
-        orientation="horizontal"
-        class="w-auto gap-2"
+        orientation="vertical"
+        class="w-full max-w-xs"
       >
-        <Switch
-          :model-value="value.enableSorting ?? false"
-          @update:model-value="(v) => value.enableSorting = v"
-        />
-        <FieldLabel class="text-sm text-zinc-600">
+        <FieldLabel class="text-xs text-zinc-500">
           <template
             v-if="fieldDescription('enableSorting')"
             #tooltip
@@ -219,6 +214,23 @@ const dateFormatExample = computed(() => {
           </template>
           {{ fieldTitle("enableSorting") }}
         </FieldLabel>
+        <InputGroup>
+          <InputGroupInput
+            :model-value="value.sortKey"
+            placeholder="例：created_at"
+            @update:model-value="(v) => value.sortKey = v || void 0"
+          />
+          <InputGroupAddon align="inline-end">
+            <InputGroupButton
+              :variant="value.enableSorting ? 'primary' : 'ghost'"
+              size="xs"
+              @click="value.enableSorting = !value.enableSorting"
+            >
+              <Icon :icon="value.enableSorting ? 'fluent:arrow-sort-up-16-regular' : 'fluent:arrow-sort-16-regular'" />
+              {{ fieldTitle("enableSorting") }}
+            </InputGroupButton>
+          </InputGroupAddon>
+        </InputGroup>
       </Field>
     </div>
   </div>

package/dist/runtime/components/table/columns/2026-04-14/com.shwfed.table.column.date/schema.d.ts

@@ -22,6 +22,7 @@ export declare function schema(configure: (env: Environment) => void): Schema.St
     }>]>;
     accessor: Schema.Schema<string, string, never>;
     enableSorting: Schema.optional<Schema.SchemaClass<boolean, boolean, never>>;
+    sortKey: Schema.optional<Schema.refine<string, typeof Schema.String>>;
     size: Schema.optional<Schema.refine<number, Schema.filter<typeof Schema.Number>>>;
     grow: Schema.optional<Schema.SchemaClass<boolean, boolean, never>>;
     tooltip: Schema.optional<Schema.TupleType<readonly [Schema.Struct<{

package/dist/runtime/components/table/columns/2026-04-14/com.shwfed.table.column.icon/config.vue

@@ -2,7 +2,6 @@
 import { computed } from "vue";
 import { Icon } from "@iconify/vue";
 import { ExpressionEditor } from "../../../../ui/expression-editor";
-import { Switch } from "../../../../ui/switch";
 import { Separator } from "../../../../ui/separator";
 import { Field, FieldLabel } from "../../../../ui/field";
 import { Locale } from "../../../../ui/locale";
@@ -189,14 +188,10 @@ const ROW_VARS = {
     <Separator />
     <div class="flex flex-wrap gap-x-8 gap-y-3">
       <Field
-        orientation="horizontal"
-        class="w-auto gap-2"
+        orientation="vertical"
+        class="w-full max-w-xs"
       >
-        <Switch
-          :model-value="value.enableSorting ?? false"
-          @update:model-value="(v) => value.enableSorting = v"
-        />
-        <FieldLabel class="text-sm text-zinc-600">
+        <FieldLabel class="text-xs text-zinc-500">
           <template
             v-if="fieldDescription('enableSorting')"
             #tooltip
@@ -209,6 +204,23 @@ const ROW_VARS = {
           </template>
           {{ fieldTitle("enableSorting") }}
         </FieldLabel>
+        <InputGroup>
+          <InputGroupInput
+            :model-value="value.sortKey"
+            placeholder="例：created_at"
+            @update:model-value="(v) => value.sortKey = v || void 0"
+          />
+          <InputGroupAddon align="inline-end">
+            <InputGroupButton
+              :variant="value.enableSorting ? 'primary' : 'ghost'"
+              size="xs"
+              @click="value.enableSorting = !value.enableSorting"
+            >
+              <Icon :icon="value.enableSorting ? 'fluent:arrow-sort-up-16-regular' : 'fluent:arrow-sort-16-regular'" />
+              {{ fieldTitle("enableSorting") }}
+            </InputGroupButton>
+          </InputGroupAddon>
+        </InputGroup>
       </Field>
     </div>
   </div>

package/dist/runtime/components/table/columns/2026-04-14/com.shwfed.table.column.icon/schema.d.ts

@@ -22,6 +22,7 @@ export declare function schema(configure: (env: Environment) => void): Schema.St
         message: Schema.SchemaClass<string, string, never>;
     }>]>;
     enableSorting: Schema.optional<Schema.SchemaClass<boolean, boolean, never>>;
+    sortKey: Schema.optional<Schema.refine<string, typeof Schema.String>>;
     size: Schema.optional<Schema.refine<number, Schema.filter<typeof Schema.Number>>>;
     grow: Schema.optional<Schema.SchemaClass<boolean, boolean, never>>;
     tooltip: Schema.optional<Schema.TupleType<readonly [Schema.Struct<{

package/dist/runtime/components/table/columns/2026-04-14/com.shwfed.table.column.number/config.vue

@@ -2,7 +2,6 @@
 import { computed } from "vue";
 import { Icon } from "@iconify/vue";
 import { Input } from "../../../../ui/input";
-import { Switch } from "../../../../ui/switch";
 import { Separator } from "../../../../ui/separator";
 import { Field, FieldLabel } from "../../../../ui/field";
 import { Locale } from "../../../../ui/locale";
@@ -267,14 +266,10 @@ function onPreserveDigitsChange(v) {
     <Separator />
     <div class="flex flex-wrap gap-x-8 gap-y-3">
       <Field
-        orientation="horizontal"
-        class="w-auto gap-2"
+        orientation="vertical"
+        class="w-full max-w-xs"
       >
-        <Switch
-          :model-value="value.enableSorting ?? false"
-          @update:model-value="(v) => value.enableSorting = v"
-        />
-        <FieldLabel class="text-sm text-zinc-600">
+        <FieldLabel class="text-xs text-zinc-500">
           <template
             v-if="fieldDescription('enableSorting')"
             #tooltip
@@ -287,6 +282,23 @@ function onPreserveDigitsChange(v) {
           </template>
           {{ fieldTitle("enableSorting") }}
         </FieldLabel>
+        <InputGroup>
+          <InputGroupInput
+            :model-value="value.sortKey"
+            placeholder="例：created_at"
+            @update:model-value="(v) => value.sortKey = v || void 0"
+          />
+          <InputGroupAddon align="inline-end">
+            <InputGroupButton
+              :variant="value.enableSorting ? 'primary' : 'ghost'"
+              size="xs"
+              @click="value.enableSorting = !value.enableSorting"
+            >
+              <Icon :icon="value.enableSorting ? 'fluent:arrow-sort-up-16-regular' : 'fluent:arrow-sort-16-regular'" />
+              {{ fieldTitle("enableSorting") }}
+            </InputGroupButton>
+          </InputGroupAddon>
+        </InputGroup>
       </Field>
     </div>
   </div>

package/dist/runtime/components/table/columns/2026-04-14/com.shwfed.table.column.number/schema.d.ts

@@ -26,6 +26,7 @@ export declare function schema(configure: (env: Environment) => void): Schema.St
     }>]>;
     accessor: Schema.Schema<string, string, never>;
     enableSorting: Schema.optional<Schema.SchemaClass<boolean, boolean, never>>;
+    sortKey: Schema.optional<Schema.refine<string, typeof Schema.String>>;
     size: Schema.optional<Schema.refine<number, Schema.filter<typeof Schema.Number>>>;
     grow: Schema.optional<Schema.SchemaClass<boolean, boolean, never>>;
     tooltip: Schema.optional<Schema.TupleType<readonly [Schema.Struct<{

package/dist/runtime/components/table/columns/2026-04-14/com.shwfed.table.column.text/config.vue

@@ -3,7 +3,6 @@ import { computed } from "vue";
 import { Icon } from "@iconify/vue";
 import { Input } from "../../../../ui/input";
 import { ExpressionEditor } from "../../../../ui/expression-editor";
-import { Switch } from "../../../../ui/switch";
 import { Separator } from "../../../../ui/separator";
 import { Field, FieldLabel } from "../../../../ui/field";
 import { Locale } from "../../../../ui/locale";
@@ -229,14 +228,10 @@ const copyExpressionModel = computed({
     <Separator />
     <div class="flex flex-wrap gap-x-8 gap-y-3">
       <Field
-        orientation="horizontal"
-        class="w-auto gap-2"
+        orientation="vertical"
+        class="w-full max-w-xs"
       >
-        <Switch
-          :model-value="value.enableSorting ?? false"
-          @update:model-value="(v) => value.enableSorting = v"
-        />
-        <FieldLabel class="text-sm text-zinc-600">
+        <FieldLabel class="text-xs text-zinc-500">
           <template
             v-if="fieldDescription('enableSorting')"
             #tooltip
@@ -249,6 +244,23 @@ const copyExpressionModel = computed({
           </template>
           {{ fieldTitle("enableSorting") }}
         </FieldLabel>
+        <InputGroup>
+          <InputGroupInput
+            :model-value="value.sortKey"
+            placeholder="例：created_at"
+            @update:model-value="(v) => value.sortKey = v || void 0"
+          />
+          <InputGroupAddon align="inline-end">
+            <InputGroupButton
+              :variant="value.enableSorting ? 'primary' : 'ghost'"
+              size="xs"
+              @click="value.enableSorting = !value.enableSorting"
+            >
+              <Icon :icon="value.enableSorting ? 'fluent:arrow-sort-up-16-regular' : 'fluent:arrow-sort-16-regular'" />
+              {{ fieldTitle("enableSorting") }}
+            </InputGroupButton>
+          </InputGroupAddon>
+        </InputGroup>
       </Field>
     </div>
   </div>

package/dist/runtime/components/table/columns/2026-04-14/com.shwfed.table.column.text/schema.d.ts

@@ -25,6 +25,7 @@ export declare function schema(configure: (env: Environment) => void): Schema.St
     }>]>;
     accessor: Schema.Schema<string, string, never>;
     enableSorting: Schema.optional<Schema.SchemaClass<boolean, boolean, never>>;
+    sortKey: Schema.optional<Schema.refine<string, typeof Schema.String>>;
     size: Schema.optional<Schema.refine<number, Schema.filter<typeof Schema.Number>>>;
     grow: Schema.optional<Schema.SchemaClass<boolean, boolean, never>>;
     tooltip: Schema.optional<Schema.TupleType<readonly [Schema.Struct<{

package/dist/runtime/components/table/columns/2026-05-13/com.shwfed.table.column.switch/config.vue

@@ -2,7 +2,6 @@
 import { computed } from "vue";
 import { Icon } from "@iconify/vue";
 import { ExpressionEditor } from "../../../../ui/expression-editor";
-import { Switch } from "../../../../ui/switch";
 import { Separator } from "../../../../ui/separator";
 import { Field, FieldLabel } from "../../../../ui/field";
 import { Locale } from "../../../../ui/locale";
@@ -279,14 +278,10 @@ function updateTriggers(next) {
     <Separator />
     <div class="flex flex-wrap gap-x-8 gap-y-3">
       <Field
-        orientation="horizontal"
-        class="w-auto gap-2"
+        orientation="vertical"
+        class="w-full max-w-xs"
       >
-        <Switch
-          :model-value="value.enableSorting ?? false"
-          @update:model-value="(v) => value.enableSorting = v"
-        />
-        <FieldLabel class="text-sm text-zinc-600">
+        <FieldLabel class="text-xs text-zinc-500">
           <template
             v-if="fieldDescription('enableSorting')"
             #tooltip
@@ -299,6 +294,23 @@ function updateTriggers(next) {
           </template>
           {{ fieldTitle("enableSorting") }}
         </FieldLabel>
+        <InputGroup>
+          <InputGroupInput
+            :model-value="value.sortKey"
+            placeholder="例：created_at"
+            @update:model-value="(v) => value.sortKey = v || void 0"
+          />
+          <InputGroupAddon align="inline-end">
+            <InputGroupButton
+              :variant="value.enableSorting ? 'primary' : 'ghost'"
+              size="xs"
+              @click="value.enableSorting = !value.enableSorting"
+            >
+              <Icon :icon="value.enableSorting ? 'fluent:arrow-sort-up-16-regular' : 'fluent:arrow-sort-16-regular'" />
+              {{ fieldTitle("enableSorting") }}
+            </InputGroupButton>
+          </InputGroupAddon>
+        </InputGroup>
       </Field>
     </div>
   </div>

package/dist/runtime/components/table/columns/2026-05-13/com.shwfed.table.column.switch/schema.d.ts

@@ -28,6 +28,7 @@ export declare function schema(configure: (env: Environment) => void): Schema.St
     }>]>;
     accessor: Schema.Schema<string, string, never>;
     enableSorting: Schema.optional<Schema.SchemaClass<boolean, boolean, never>>;
+    sortKey: Schema.optional<Schema.refine<string, typeof Schema.String>>;
     size: Schema.optional<Schema.refine<number, Schema.filter<typeof Schema.Number>>>;
     grow: Schema.optional<Schema.SchemaClass<boolean, boolean, never>>;
     tooltip: Schema.optional<Schema.TupleType<readonly [Schema.Struct<{

package/dist/runtime/components/table/columns/2026-05-13/com.shwfed.table.column.switch.remote/config.vue

@@ -2,7 +2,6 @@
 import { computed } from "vue";
 import { Icon } from "@iconify/vue";
 import { ExpressionEditor } from "../../../../ui/expression-editor";
-import { Switch } from "../../../../ui/switch";
 import { Separator } from "../../../../ui/separator";
 import { Field, FieldLabel } from "../../../../ui/field";
 import { Locale } from "../../../../ui/locale";
@@ -279,14 +278,10 @@ function updateTriggers(next) {
     <Separator />
     <div class="flex flex-wrap gap-x-8 gap-y-3">
       <Field
-        orientation="horizontal"
-        class="w-auto gap-2"
+        orientation="vertical"
+        class="w-full max-w-xs"
       >
-        <Switch
-          :model-value="value.enableSorting ?? false"
-          @update:model-value="(v) => value.enableSorting = v"
-        />
-        <FieldLabel class="text-sm text-zinc-600">
+        <FieldLabel class="text-xs text-zinc-500">
           <template
             v-if="fieldDescription('enableSorting')"
             #tooltip
@@ -299,6 +294,23 @@ function updateTriggers(next) {
           </template>
           {{ fieldTitle("enableSorting") }}
         </FieldLabel>
+        <InputGroup>
+          <InputGroupInput
+            :model-value="value.sortKey"
+            placeholder="例：created_at"
+            @update:model-value="(v) => value.sortKey = v || void 0"
+          />
+          <InputGroupAddon align="inline-end">
+            <InputGroupButton
+              :variant="value.enableSorting ? 'primary' : 'ghost'"
+              size="xs"
+              @click="value.enableSorting = !value.enableSorting"
+            >
+              <Icon :icon="value.enableSorting ? 'fluent:arrow-sort-up-16-regular' : 'fluent:arrow-sort-16-regular'" />
+              {{ fieldTitle("enableSorting") }}
+            </InputGroupButton>
+          </InputGroupAddon>
+        </InputGroup>
       </Field>
     </div>
   </div>