@shwfed/config 2.9.11 → 2.9.13

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

@@ -234,6 +234,73 @@ export declare function TableConfig(configure: (env: Environment) => void): Sche
             readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
         }[];
     } | undefined;
+    readonly bottomActions?: {
+        readonly size: "default" | "sm" | "xs";
+        readonly style?: string | undefined;
+        readonly gap: number;
+        readonly items: readonly (import("../actions/schema.js").RegistryItemValue | {
+            readonly disabled?: string | undefined;
+            readonly id: string;
+            readonly title: readonly [{
+                readonly locale: "zh";
+                readonly message: string;
+            }, ...{
+                readonly locale: "en" | "ja" | "ko";
+                readonly message: string;
+            }[]];
+            readonly icon?: string | undefined;
+            readonly hidden?: string | undefined;
+            readonly tooltip?: readonly [{
+                readonly locale: "zh";
+                readonly message: string;
+            }, ...{
+                readonly locale: "en" | "ja" | "ko";
+                readonly message: string;
+            }[]] | undefined;
+            readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
+            readonly action?: any;
+            readonly groupId: string;
+            readonly hideTitle?: boolean | undefined;
+        } | {
+            readonly id: string;
+            readonly title: readonly [{
+                readonly locale: "zh";
+                readonly message: string;
+            }, ...{
+                readonly locale: "en" | "ja" | "ko";
+                readonly message: string;
+            }[]];
+            readonly icon?: string | undefined;
+            readonly items: readonly (import("../actions/schema.js").RegistrySubItemValue | {
+                readonly disabled?: string | undefined;
+                readonly id: string;
+                readonly title: readonly [{
+                    readonly locale: "zh";
+                    readonly message: string;
+                }, ...{
+                    readonly locale: "en" | "ja" | "ko";
+                    readonly message: string;
+                }[]];
+                readonly icon?: string | undefined;
+                readonly hidden?: string | undefined;
+                readonly tooltip?: readonly [{
+                    readonly locale: "zh";
+                    readonly message: string;
+                }, ...{
+                    readonly locale: "en" | "ja" | "ko";
+                    readonly message: string;
+                }[]] | undefined;
+                readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
+                readonly action?: any;
+            })[];
+            readonly groupId: string;
+            readonly hideTitle?: boolean | undefined;
+        })[];
+        readonly groups: readonly {
+            readonly id: string;
+            readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
+        }[];
+    } | undefined;
     readonly rowKey?: string | undefined;
     readonly cellStyle?: string | undefined;
     readonly pagination?: {
@@ -441,6 +508,134 @@ export declare function TableConfig(configure: (env: Environment) => void): Sche
             readonly hideTitle?: boolean | undefined;
         }, never>>;
     }>>;
+    bottomActions: Schema.optional<Schema.Struct<{
+        size: Schema.optionalWith<Schema.Literal<["default", "sm", "xs"]>, {
+            default: () => "default";
+        }>;
+        gap: Schema.optionalWith<Schema.filter<Schema.filter<typeof Schema.Number>>, {
+            default: () => number;
+        }>;
+        style: Schema.optional<typeof Schema.String>;
+        groups: Schema.Array$<Schema.Struct<{
+            id: Schema.refine<string, typeof Schema.String>;
+            variant: Schema.optional<Schema.Literal<["default", "primary", "destructive", "ghost", "link"]>>;
+        }>>;
+        items: Schema.Array$<Schema.Schema<import("../actions/schema.js").RegistryItemValue | {
+            readonly disabled?: string | undefined;
+            readonly id: string;
+            readonly title: readonly [{
+                readonly locale: "zh";
+                readonly message: string;
+            }, ...{
+                readonly locale: "en" | "ja" | "ko";
+                readonly message: string;
+            }[]];
+            readonly icon?: string | undefined;
+            readonly hidden?: string | undefined;
+            readonly tooltip?: readonly [{
+                readonly locale: "zh";
+                readonly message: string;
+            }, ...{
+                readonly locale: "en" | "ja" | "ko";
+                readonly message: string;
+            }[]] | undefined;
+            readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
+            readonly action?: any;
+            readonly groupId: string;
+            readonly hideTitle?: boolean | undefined;
+        } | {
+            readonly id: string;
+            readonly title: readonly [{
+                readonly locale: "zh";
+                readonly message: string;
+            }, ...{
+                readonly locale: "en" | "ja" | "ko";
+                readonly message: string;
+            }[]];
+            readonly icon?: string | undefined;
+            readonly items: readonly (import("../actions/schema.js").RegistrySubItemValue | {
+                readonly disabled?: string | undefined;
+                readonly id: string;
+                readonly title: readonly [{
+                    readonly locale: "zh";
+                    readonly message: string;
+                }, ...{
+                    readonly locale: "en" | "ja" | "ko";
+                    readonly message: string;
+                }[]];
+                readonly icon?: string | undefined;
+                readonly hidden?: string | undefined;
+                readonly tooltip?: readonly [{
+                    readonly locale: "zh";
+                    readonly message: string;
+                }, ...{
+                    readonly locale: "en" | "ja" | "ko";
+                    readonly message: string;
+                }[]] | undefined;
+                readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
+                readonly action?: any;
+            })[];
+            readonly groupId: string;
+            readonly hideTitle?: boolean | undefined;
+        }, import("../actions/schema.js").RegistryItemValue | {
+            readonly id: string;
+            readonly title: readonly [{
+                readonly locale: "zh";
+                readonly message: string;
+            }, ...{
+                readonly locale: "en" | "ja" | "ko";
+                readonly message: string;
+            }[]];
+            readonly groupId: string;
+            readonly disabled?: string | undefined;
+            readonly icon?: string | undefined;
+            readonly hidden?: string | undefined;
+            readonly tooltip?: readonly [{
+                readonly locale: "zh";
+                readonly message: string;
+            }, ...{
+                readonly locale: "en" | "ja" | "ko";
+                readonly message: string;
+            }[]] | undefined;
+            readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
+            readonly action?: any;
+            readonly hideTitle?: boolean | undefined;
+        } | {
+            readonly id: string;
+            readonly title: readonly [{
+                readonly locale: "zh";
+                readonly message: string;
+            }, ...{
+                readonly locale: "en" | "ja" | "ko";
+                readonly message: string;
+            }[]];
+            readonly items: readonly (import("../actions/schema.js").RegistrySubItemValue | {
+                readonly id: string;
+                readonly title: readonly [{
+                    readonly locale: "zh";
+                    readonly message: string;
+                }, ...{
+                    readonly locale: "en" | "ja" | "ko";
+                    readonly message: string;
+                }[]];
+                readonly disabled?: string | undefined;
+                readonly icon?: string | undefined;
+                readonly hidden?: string | undefined;
+                readonly tooltip?: readonly [{
+                    readonly locale: "zh";
+                    readonly message: string;
+                }, ...{
+                    readonly locale: "en" | "ja" | "ko";
+                    readonly message: string;
+                }[]] | undefined;
+                readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
+                readonly action?: any;
+            })[];
+            readonly groupId: string;
+            readonly icon?: string | undefined;
+            readonly hideTitle?: boolean | undefined;
+        }, never>>;
+    }>>;
     query: Schema.optional<Schema.refine<{
         readonly style?: string | undefined;
         readonly id?: string | undefined;
@@ -684,6 +879,73 @@ export declare function createTableConfig(body: Omit<Schema.Schema.Type<ReturnTy
             readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
         }[];
     } | undefined;
+    bottomActions?: {
+        readonly size: "default" | "sm" | "xs";
+        readonly style?: string | undefined;
+        readonly gap: number;
+        readonly items: readonly (import("../actions/schema.js").RegistryItemValue | {
+            readonly disabled?: string | undefined;
+            readonly id: string;
+            readonly title: readonly [{
+                readonly locale: "zh";
+                readonly message: string;
+            }, ...{
+                readonly locale: "en" | "ja" | "ko";
+                readonly message: string;
+            }[]];
+            readonly icon?: string | undefined;
+            readonly hidden?: string | undefined;
+            readonly tooltip?: readonly [{
+                readonly locale: "zh";
+                readonly message: string;
+            }, ...{
+                readonly locale: "en" | "ja" | "ko";
+                readonly message: string;
+            }[]] | undefined;
+            readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
+            readonly action?: any;
+            readonly groupId: string;
+            readonly hideTitle?: boolean | undefined;
+        } | {
+            readonly id: string;
+            readonly title: readonly [{
+                readonly locale: "zh";
+                readonly message: string;
+            }, ...{
+                readonly locale: "en" | "ja" | "ko";
+                readonly message: string;
+            }[]];
+            readonly icon?: string | undefined;
+            readonly items: readonly (import("../actions/schema.js").RegistrySubItemValue | {
+                readonly disabled?: string | undefined;
+                readonly id: string;
+                readonly title: readonly [{
+                    readonly locale: "zh";
+                    readonly message: string;
+                }, ...{
+                    readonly locale: "en" | "ja" | "ko";
+                    readonly message: string;
+                }[]];
+                readonly icon?: string | undefined;
+                readonly hidden?: string | undefined;
+                readonly tooltip?: readonly [{
+                    readonly locale: "zh";
+                    readonly message: string;
+                }, ...{
+                    readonly locale: "en" | "ja" | "ko";
+                    readonly message: string;
+                }[]] | undefined;
+                readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
+                readonly action?: any;
+            })[];
+            readonly groupId: string;
+            readonly hideTitle?: boolean | undefined;
+        })[];
+        readonly groups: readonly {
+            readonly id: string;
+            readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
+        }[];
+    } | undefined;
     rowKey?: string | undefined;
     cellStyle?: string | undefined;
     pagination?: {
@@ -759,6 +1021,7 @@ export type TableConfigValue = Readonly<{
     groups: ReadonlyArray<ColumnGroupValue>;
     dataSource?: DataSourceValue;
     actions?: TableActionsValue;
+    bottomActions?: TableActionsValue;
     query?: FormConfigValue;
     rowKey?: string;
     cellStyle?: string;

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

@@ -306,8 +306,12 @@ export function TableConfig(configure) {
       description: "\u6570\u636E\u6E90\u914D\u7F6E"
     })),
     actions: Schema.optional(TableActions).annotations({
-      title: "\u64CD\u4F5C",
-      description: "\u8868\u683C\u9876\u90E8\u64CD\u4F5C\u6309\u94AE"
+      title: "\u4E0A\u65B9\u64CD\u4F5C",
+      description: "\u6E32\u67D3\u5728\u8868\u683C\u4E0A\u65B9\u7684\u64CD\u4F5C\u6309\u94AE"
+    }),
+    bottomActions: Schema.optional(TableActions).annotations({
+      title: "\u4E0B\u65B9\u64CD\u4F5C",
+      description: "\u6E32\u67D3\u5728\u8868\u683C\uFF08\u542B\u5206\u9875\u5668\uFF09\u4E0B\u65B9\u7684\u64CD\u4F5C\u6309\u94AE\uFF1B\u4E0E\u4E0A\u65B9\u64CD\u4F5C\u5171\u4EAB\u540C\u4E00\u4F5C\u7528\u57DF\uFF08`selected` / `query` / `sorts`\uFF09"
     }),
     query: Schema.optional(Query).annotations({
       title: "\u641C\u7D22\u6761\u4EF6",
@@ -329,8 +333,8 @@ export function TableConfig(configure) {
       title: "\u5206\u9875"
     }),
     persistQuery: Schema.optional(Schema.Boolean.annotations({
-      title: "\u641C\u7D22\u6761\u4EF6\u6301\u4E45\u5316",
-      description: "\u5F00\u542F\u540E\uFF0C\u641C\u7D22\u6761\u4EF6\u8868\u5355\u7684\u5F53\u524D\u503C\u4F1A\u5199\u5165\u6D4F\u89C8\u5668\u4F1A\u8BDD\u5B58\u50A8\uFF08sessionStorage\uFF09\uFF0C\u5237\u65B0\u9875\u9762\u540E\u81EA\u52A8\u6062\u590D\uFF0C\u76F4\u5230\u5173\u95ED\u6807\u7B7E\u9875\u6216\u79BB\u5F00\u7AD9\u70B9\u3002\u9700\u8981\u8868\u683C\u5DF2\u914D\u7F6E ID\u3002"
+      title: "\u4FDD\u7559\u641C\u7D22\u6761\u4EF6",
+      description: "\u6253\u5F00\u540E\uFF0C\u641C\u7D22\u6761\u4EF6\u4EC5\u5728\u7528\u6237\u5173\u95ED\u5F53\u524D\u9875\u7B7E\u65F6\u6E05\u7A7A"
     })),
     initialState: Schema.optional(InitialState)
   }).pipe(Schema.filter((cfg) => {

package/dist/runtime/components/ui/expression-editor/ExpressionEditor.vue

@@ -8,7 +8,7 @@ import CodeMirrorInput from "./CodeMirrorInput.vue";
 import { buildScopeLookup } from "./scope-refs";
 import { buildSelectionLookup } from "./selection-refs";
 import { buildStepLookup } from "./step-refs";
-import { buildScopeEntries, buildSelectionEntries, buildStepEntries, buildVarEntries } from "./picker-entries";
+import { buildScopeEntries, buildSelectionEntries, buildStepEntries, buildVarEntries, selectShadowedScopes } from "./picker-entries";
 import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "../command";
 import { InputGroup, InputGroupAddon, InputGroupButton } from "../input-group";
 import { Popover, PopoverContent, PopoverTrigger } from "../popover";
@@ -29,7 +29,7 @@ const scopeAncestry = useScopeAncestry();
 const selectionRoster = useSelectionRoster();
 const stepRoster = useStepRoster();
 const varEntries = computed(() => buildVarEntries(celContext, props.extraVars));
-const scopeEntries = computed(() => buildScopeEntries(scopeAncestry.value.slice(1)));
+const scopeEntries = computed(() => buildScopeEntries(selectShadowedScopes(scopeAncestry.value)));
 const selectionEntries = computed(() => buildSelectionEntries(selectionRoster.value));
 const stepEntries = computed(() => buildStepEntries(stepRoster.value));
 const scopeLookup = computed(() => buildScopeLookup(scopeAncestry.value));

package/dist/runtime/components/ui/expression-editor/picker-entries.d.ts

@@ -16,4 +16,5 @@ export type PickVarMeta = {
 export declare function buildVarEntries(celContext: Record<string, PickVarMeta>, extraVars?: Record<string, PickVarMeta>): PickEntry[];
 export declare function buildSelectionEntries(roster: ReadonlyArray<SelectionFieldRef>): PickEntry[];
 export declare function buildStepEntries(roster: ReadonlyArray<StepRef>): PickEntry[];
+export declare function selectShadowedScopes(ancestry: ReadonlyArray<ScopeAncestor>): ScopeAncestor[];
 export declare function buildScopeEntries(ancestry: ReadonlyArray<ScopeAncestor>): PickEntry[];

package/dist/runtime/components/ui/expression-editor/picker-entries.js

@@ -36,6 +36,18 @@ export function buildStepEntries(roster) {
     description: step.description
   }));
 }
+export function selectShadowedScopes(ancestry) {
+  const claimed = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const frame of ancestry) {
+    const members = frame.members.filter((m) => claimed.has(m.shortcut ?? m.key));
+    if (members.length > 0) out.push({ ...frame, members });
+    for (const s of frame.shadows ?? frame.members.map((m) => m.shortcut ?? m.key)) {
+      claimed.add(s);
+    }
+  }
+  return out;
+}
 export function buildScopeEntries(ancestry) {
   const out = [];
   for (const ancestor of ancestry) {

package/dist/runtime/components/ui/expression-editor/scope-refs.js

@@ -3,7 +3,7 @@ export function scopeOrigin(ancestor) {
   return ancestor.name ? `${ancestor.typeName}\u300C${ancestor.name}\u300D` : ancestor.typeName;
 }
 const SCOPE_REF_RE = new RegExp(
-  `${SCOPE_ADDRESS_VAR}\\[("(?:[^"\\\\]|\\\\.)*")\\]\\.([A-Za-z_$][\\w$]*)`,
+  `${SCOPE_ADDRESS_VAR}\\[("(?:[^"\\\\]|\\\\.)*")\\]\\.([A-Za-z_$][\\w$]*(?:\\["(?:[^"\\\\]|\\\\.)*"\\])?)`,
   "g"
 );
 export function scanScopeRefs(text) {

package/dist/runtime/utils/cel-context.d.ts

@@ -21,6 +21,16 @@ export type ScopeAncestorMember = Readonly<{
     /** CEL type shown as the picker badge. */
     type: string;
     description?: string;
+    /**
+     * The relative shortcut this member mirrors — used by the picker to decide if
+     * the member is worth offering cross-layer (it is, only when a nearer frame
+     * shadows that shortcut; otherwise the relative name already reaches it).
+     * Defaults to `key`. Set explicitly when the addressed key isn't the bare
+     * shortcut — a form's selection member has `key = selections["<uuid>"]` but
+     * `shortcut = "selections"`, since it's the relative `selections` map that an
+     * inner row/subform shadows.
+     */
+    shortcut?: string;
 }>;
 /** A scope-exposing ancestor instance, as seen by an expression-editor picker. */
 export type ScopeAncestor = Readonly<{
@@ -33,6 +43,17 @@ export type ScopeAncestor = Readonly<{
     /** Component type icon (from type metadata). */
     typeIcon?: string;
     members: ReadonlyArray<ScopeAncestorMember>;
+    /**
+     * The relative shortcut names this host *rebinds* at runtime — i.e. the
+     * shortcuts it shadows for everything below it. The picker uses this (not the
+     * host type) to decide which of a farther frame's members are genuinely
+     * shadowed and thus worth offering cross-layer. It is broader than `members`:
+     * a table offers only `row`/`index` cross-layer but its row-provider also
+     * rebinds `selections`, so a table must list `selections` here to (correctly)
+     * shadow an enclosing form's selection options. Defaults to the members'
+     * `shortcut`s when omitted.
+     */
+    shadows?: ReadonlyArray<string>;
 }>;
 /**
  * Contribute one scope-exposing ancestor frame. Descendant editors see it

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shwfed/config",
-  "version": "2.9.11",
+  "version": "2.9.13",
   "description": "Configurable UI for SHWFED",
   "type": "module",
   "publishConfig": {

package/dist/preview/assets/index-0vF7XQ-J.js

@@ -1 +0,0 @@
-import{ba as e}from"./index-Cyjm-GKs.js";import{bb as f,bc as r,bd as s}from"./index-Cyjm-GKs.js";export{f as TableConfig,r as createTableConfig,e as default,s as getColumnTechnicalKey};