@shwfed/config 2.3.17 → 2.3.19

package/dist/runtime/components/table/config.vue

@@ -161,6 +161,9 @@ function configureTableActions(env) {
   env.registerVariable("selected", "list<dyn>", {
     description: "\u5F53\u524D\u5DF2\u52FE\u9009\u7684\u6240\u6709\u884C\uFF08`row` \u7684\u6570\u7EC4\uFF09"
   });
+  env.registerVariable("query", "dyn", {
+    description: "\u6E32\u67D3\u5728\u8868\u683C\u4E0A\u65B9\u7684\u641C\u7D22\u6761\u4EF6\u8868\u5355\u5F53\u524D\u72B6\u6001\uFF1B\u672A\u914D\u7F6E\u65F6\u4E3A\u7A7A\u5BF9\u8C61"
+  });
 }
 function configureTableQuery(env) {
   configure(env);

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

@@ -27,6 +27,7 @@ import ShwfedActions from "../actions/components/group.vue";
 import ShwfedForm from "../form/index.vue";
 import { evaluateInitial } from "../form/utils/initial";
 import { provideTableInstanceId } from "./utils/instance";
+import { provideSharedFetchLayer } from "./utils/shared-fetch";
 import { provideEventTarget } from "../../share/event-bus";
 import { findColumn } from "./utils/resolve";
 import { interpolateMarkdown } from "./utils/runtime";
@@ -257,6 +258,7 @@ provideCELContext({
     }
   }
 });
+provideSharedFetchLayer();
 const hasDragHandleColumn = computed(() => (config.value?.columns ?? []).some((c) => c.type === DRAG_HANDLE_COLUMN_TYPE));
 const reorderDisabledReason = computed(() => {
   if (!hasDragHandleColumn.value) return null;

package/dist/runtime/components/table/utils/shared-fetch.d.ts

@@ -0,0 +1,30 @@
+import { Layer } from 'effect';
+import { Fetch } from 'fx-fetch';
+/**
+ * Table-scoped `Fetch` Layer. Cells that fetch options through `Fetch.layer`
+ * fan out to one request per row; this layer dedupes by request signature so
+ * identical GETs collapse to a single in-flight call shared across every cell.
+ * Non-GET requests bypass the cache entirely (writes must never dedupe — two
+ * rows toggling concurrently must hit the server twice).
+ *
+ * The signature mirrors `HttpRequestBuilder.describe()`: URL, method, sorted
+ * headers. Bodies are intentionally ignored — GETs do not carry them in this
+ * codebase, and including them would force a representation choice for the
+ * `Promise<Blob>` body that fx-fetch lazy-reads.
+ */
+type SharedFetchLayer = Layer.Layer<Fetch.Fetch, never, never>;
+export declare function makeCachedFetchLayer(): SharedFetchLayer;
+/**
+ * Mounts a cache instance scoped to the calling component's scope and provides
+ * it to descendants. Call once from the table host. The cache is dropped on
+ * unmount so a table that remounts starts fresh — no leaked Promises tying
+ * the old instance's responses to the new one.
+ */
+export declare function provideSharedFetchLayer(): SharedFetchLayer;
+/**
+ * Returns the table-scoped shared Fetch layer, or the default `Fetch.layer`
+ * when no host has provided one (e.g. a column rendered standalone in a unit
+ * test or outside a table). The fallback keeps the runtime self-contained.
+ */
+export declare function useSharedFetchLayer(): SharedFetchLayer;
+export {};

package/dist/runtime/components/table/utils/shared-fetch.js

@@ -0,0 +1,42 @@
+import { Effect, Layer } from "effect";
+import { Fetch, Request as FxRequest, Url } from "fx-fetch";
+import { inject, onScopeDispose, provide } from "vue";
+const KEY = Symbol("shwfed-table:shared-fetch-layer");
+function signatureOf(request) {
+  const headers = FxRequest.toHeadersRecord(request);
+  const sortedHeaders = Object.keys(headers).sort().map((name) => [name, headers[name]]);
+  return JSON.stringify({
+    url: Url.format(FxRequest.getUrl(request)),
+    method: request.method,
+    headers: sortedHeaders
+  });
+}
+export function makeCachedFetchLayer() {
+  const cache = /* @__PURE__ */ new Map();
+  const service = (request) => {
+    if (request.method !== "GET") return Fetch.FetchLive(request);
+    const key = signatureOf(request);
+    const existing = cache.get(key);
+    if (existing) return existing;
+    let pending;
+    const cached = Effect.async((resume) => {
+      if (!pending) pending = Effect.runPromise(Effect.exit(Fetch.FetchLive(request)));
+      pending.then((exit) => {
+        resume(exit);
+      });
+    });
+    cache.set(key, cached);
+    return cached;
+  };
+  return Layer.succeed(Fetch.Fetch, service);
+}
+export function provideSharedFetchLayer() {
+  const layer = makeCachedFetchLayer();
+  provide(KEY, layer);
+  onScopeDispose(() => {
+  });
+  return layer;
+}
+export function useSharedFetchLayer() {
+  return inject(KEY, Fetch.layer);
+}

package/dist/runtime/components/ui/calendar/Calendar.vue

@@ -3,7 +3,8 @@ import { CalendarDate, getLocalTimeZone, today } from "@internationalized/date";
 import { reactiveOmit, useNavigatorLanguage, useVModel } from "@vueuse/core";
 import { CalendarRoot, useDateFormatter, useForwardPropsEmits } from "reka-ui";
 import { toDate } from "reka-ui/date";
-import { computed } from "vue";
+import { computed, watch } from "vue";
+import { useI18n } from "vue-i18n";
 import { cn } from "../../../utils/cn";
 import { buttonVariants } from "../button";
 import { CalendarCell, CalendarCellTrigger, CalendarGrid, CalendarGridBody, CalendarGridHead, CalendarGridRow, CalendarHeadCell, CalendarHeader, CalendarHeading, CalendarNextButton, CalendarPrevButton } from ".";
@@ -45,8 +46,12 @@ const placeholder = useVModel(props, "placeholder", emits, {
   defaultValue: props.defaultPlaceholder ?? today(getLocalTimeZone())
 });
 const navLocale = useNavigatorLanguage();
-const locale = computed(() => props.locale ?? navLocale.language.value ?? "en");
+const { locale: i18nLocale } = useI18n({ useScope: "global", inheritLocale: true });
+const locale = computed(() => props.locale ?? i18nLocale.value ?? navLocale.language.value ?? "en");
 const formatter = useDateFormatter(locale.value);
+watch(locale, (next) => {
+  formatter.setLocale(next);
+});
 const forwarded = useForwardPropsEmits(delegatedProps, emits);
 const weekStartsOn = computed(() => {
   const lang = navLocale.language.value;
@@ -112,7 +117,7 @@ function isPickerDateDisabled(date) {
     <!-- Month picker grid (month-only / month-and-year) -->
     <div
       v-if="layout === 'month'"
-      class="grid grid-cols-4 gap-1 mt-4"
+      class="grid grid-cols-4 gap-1 mt-4 w-full"
     >
       <button
         v-for="m in 12"
@@ -134,7 +139,7 @@ function isPickerDateDisabled(date) {
     <!-- Year picker grid -->
     <div
       v-else-if="layout === 'year'"
-      class="grid grid-cols-4 gap-1 mt-4"
+      class="grid grid-cols-4 gap-1 mt-4 w-full"
     >
       <button
         v-for="i in 12"

package/dist/runtime/components/ui/date-range-picker/DateRangePickerMonthPanel.vue

@@ -1,6 +1,7 @@
 <script setup>
 import { Icon } from "@iconify/vue";
 import { MonthRangePicker } from "reka-ui/namespaced";
+import { useI18n } from "vue-i18n";
 import { cn } from "../../../utils/cn";
 defineOptions({ name: "UiDateRangePickerMonthPanel" });
 const props = defineProps({
@@ -9,6 +10,7 @@ const props = defineProps({
   class: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true }
 });
 const emits = defineEmits(["update:modelValue"]);
+const { locale } = useI18n({ useScope: "global", inheritLocale: true });
 function handleUpdate(value) {
   emits("update:modelValue", value);
 }
@@ -22,6 +24,7 @@ function handleUpdate(value) {
     :model-value="props.modelValue"
     :default-placeholder="props.modelValue?.start"
     :is-month-disabled="props.isDateDisabled"
+    :locale="locale"
     @update:model-value="handleUpdate"
   >
     <MonthRangePicker.Header class="pt-2 pb-2 relative">
@@ -36,7 +39,7 @@ function handleUpdate(value) {
       <MonthRangePicker.Heading class="text-sm font-medium text-center w-full" />
     </MonthRangePicker.Header>
 
-    <MonthRangePicker.Grid class="mt-4">
+    <MonthRangePicker.Grid class="mt-4 w-full">
       <MonthRangePicker.GridBody>
         <MonthRangePicker.GridRow
           v-for="(row, rIdx) in grid.rows"

package/dist/runtime/components/ui/date-range-picker/DateRangePickerYearPanel.vue

@@ -1,6 +1,7 @@
 <script setup>
 import { Icon } from "@iconify/vue";
 import { YearRangePicker } from "reka-ui/namespaced";
+import { useI18n } from "vue-i18n";
 import { cn } from "../../../utils/cn";
 defineOptions({ name: "UiDateRangePickerYearPanel" });
 const props = defineProps({
@@ -9,6 +10,7 @@ const props = defineProps({
   class: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true }
 });
 const emits = defineEmits(["update:modelValue"]);
+const { locale } = useI18n({ useScope: "global", inheritLocale: true });
 function handleUpdate(value) {
   emits("update:modelValue", value);
 }
@@ -22,6 +24,7 @@ function handleUpdate(value) {
     :model-value="props.modelValue"
     :default-placeholder="props.modelValue?.start"
     :is-year-disabled="props.isDateDisabled"
+    :locale="locale"
     @update:model-value="handleUpdate"
   >
     <YearRangePicker.Header class="pt-2 pb-2 relative">
@@ -36,7 +39,7 @@ function handleUpdate(value) {
       <YearRangePicker.Heading class="text-sm font-medium text-center w-full" />
     </YearRangePicker.Header>
 
-    <YearRangePicker.Grid class="mt-4">
+    <YearRangePicker.Grid class="mt-4 w-full">
       <YearRangePicker.GridBody>
         <YearRangePicker.GridRow
           v-for="(row, rIdx) in grid.rows"

package/dist/runtime/components/ui/range-calendar/RangeCalendar.vue

@@ -2,6 +2,7 @@
 import { reactiveOmit, useNavigatorLanguage } from "@vueuse/core";
 import { RangeCalendarRoot, useForwardPropsEmits } from "reka-ui";
 import { computed } from "vue";
+import { useI18n } from "vue-i18n";
 import { cn } from "../../../utils/cn";
 import { RangeCalendarCell, RangeCalendarCellTrigger, RangeCalendarGrid, RangeCalendarGridBody, RangeCalendarGridHead, RangeCalendarGridRow, RangeCalendarHeadCell, RangeCalendarHeader, RangeCalendarHeading, RangeCalendarNextButton, RangeCalendarPrevButton } from ".";
 const props = defineProps({
@@ -40,7 +41,8 @@ const emits = defineEmits(["update:modelValue", "update:validModelValue", "updat
 const delegatedProps = reactiveOmit(props, "class");
 const forwarded = useForwardPropsEmits(delegatedProps, emits);
 const navLocale = useNavigatorLanguage();
-const locale = computed(() => props.locale ?? navLocale.language.value ?? "en");
+const { locale: i18nLocale } = useI18n({ useScope: "global", inheritLocale: true });
+const locale = computed(() => props.locale ?? i18nLocale.value ?? navLocale.language.value ?? "en");
 </script>
 
 <template>

package/package.json

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