@devtable/dashboard 14.50.1 → 14.50.2

package/dist/components/filter/filter-date-range/widget/calendar.d.ts

@@ -2,9 +2,9 @@ import { DateRangeValue } from '../../../../model';
 type Props = {
     value: DateRangeValue;
     onChange: (v: DateRangeValue) => void;
-    close: () => void;
+    onClose: () => void;
     max_days: number;
     allowSingleDateInRange: boolean;
 };
-export declare const Calendar: ({ value, onChange, close, max_days, allowSingleDateInRange }: Props) => import('./react/jsx-runtime').JSX.Element;
+export declare const Calendar: ({ value, onChange, onClose, max_days, allowSingleDateInRange }: Props) => import('./react/jsx-runtime').JSX.Element;
 export {};

package/dist/components/filter/filter-date-range/widget/shortcuts/index.d.ts

@@ -1,4 +1,7 @@
 import { DateRangeValue } from '../../../../../model';
-export declare const Shortcuts: ({ onChange }: {
+type Props = {
     onChange: (v: DateRangeValue) => void;
-}) => import('./react/jsx-runtime').JSX.Element;
+    onClose: () => void;
+};
+export declare const Shortcuts: ({ onChange, onClose }: Props) => import('./react/jsx-runtime').JSX.Element;
+export {};

package/dist/components/filter/filter-merico-date-range/widget/calendar/calendar.d.ts

@@ -2,7 +2,7 @@ import { DateRangeValue_Value, MericoDateRangeValue } from '../../../../../model
 type Props = {
     value: MericoDateRangeValue;
     onChange: (v: DateRangeValue_Value) => void;
-    close: () => void;
+    onClose: () => void;
 };
-export declare const Calendar: ({ value, onChange, close }: Props) => string | import('./react/jsx-runtime').JSX.Element;
+export declare const Calendar: ({ value, onChange, onClose }: Props) => string | import('./react/jsx-runtime').JSX.Element;
 export {};

package/dist/components/filter/filter-merico-date-range/widget/shortcuts/index.d.ts

@@ -2,6 +2,7 @@ import { MericoDateRangeValue } from '../../../../../model';
 type Props = {
     step: string;
     onChange: (v: MericoDateRangeValue) => void;
+    onClose: () => void;
 };
-export declare const Shortcuts: ({ onChange, step }: Props) => import('./react/jsx-runtime').JSX.Element;
+export declare const Shortcuts: ({ onChange, step, onClose }: Props) => import('./react/jsx-runtime').JSX.Element;
 export {};

package/dist/dashboard.es.js

@@ -2504,7 +2504,7 @@ function ug() {
   } = E.useContext(Ps);
   return e ? document.getElementById(e) : null;
 }
-const Es = "14.50.1", hg = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const Es = "14.50.2", hg = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   version: Es
 }, Symbol.toStringTag, { value: "Module" }));
@@ -28999,7 +28999,7 @@ const qT = (e) => new OT(e), FT = ({
 ] })), BT = ({
   value: e,
   onChange: t,
-  close: n,
+  onClose: n,
   max_days: a,
   allowSingleDateInRange: i
 }) => {
@@ -29047,15 +29047,16 @@ const qT = (e) => new OT(e), FT = ({
     /* @__PURE__ */ r(A, { variant: "dashed", my: 10 })
   ] }) : null;
 }, HT = ({
-  onChange: e
+  onChange: e,
+  onClose: t
 }) => {
   const {
-    t,
-    i18n: n
-  } = y(), a = (l) => () => {
-    const s = l();
-    e(s);
-  }, i = k(() => Ld(), []), o = n.language === "zh";
+    t: n,
+    i18n: a
+  } = y(), i = (s) => () => {
+    const c = s();
+    e(c), t();
+  }, o = k(() => Ld(), []), l = a.language === "zh";
   return /* @__PURE__ */ u(F, { children: [
     /* @__PURE__ */ r(A, { variant: "dashed", my: 10 }),
     /* @__PURE__ */ r(w, { withTableBorder: !1, sx: {
@@ -29073,16 +29074,16 @@ const qT = (e) => new OT(e), FT = ({
       td: {
         paddingLeft: "1px"
       }
-    }, children: /* @__PURE__ */ r(w.Tbody, { children: Object.entries(i).map(([l, s]) => /* @__PURE__ */ u(w.Tr, { children: [
+    }, children: /* @__PURE__ */ r(w.Tbody, { children: Object.entries(o).map(([s, c]) => /* @__PURE__ */ u(w.Tr, { children: [
       /* @__PURE__ */ r(w.Th, { children: /* @__PURE__ */ r(z, { size: "xs", c: "#555", fw: 500, sx: {
         textAlignLast: "justify"
-      }, children: t(`filter.widget.date_range.shortcut.${l}.label`) }) }),
-      s.map(({
-        key: c,
-        value: d,
-        getRange: h
-      }) => /* @__PURE__ */ r(w.Td, { children: /* @__PURE__ */ r(L, { size: "compact-xs", variant: "subtle", onClick: a(h), children: t(`filter.widget.date_range.shortcut.${l}.${o ? "full." : ""}${c}`) }) }, c))
-    ] }, l)) }) })
+      }, children: n(`filter.widget.date_range.shortcut.${s}.label`) }) }),
+      c.map(({
+        key: d,
+        value: h,
+        getRange: p
+      }) => /* @__PURE__ */ r(w.Td, { children: /* @__PURE__ */ r(L, { size: "compact-xs", variant: "subtle", onClick: i(p), children: n(`filter.widget.date_range.shortcut.${s}.${l ? "full." : ""}${d}`) }) }, d))
+    ] }, s)) }) })
   ] });
 }, rl = (e) => ({
   label: {
@@ -29158,8 +29159,8 @@ const qT = (e) => new OT(e), FT = ({
     ] }),
     /* @__PURE__ */ u(Ye.Dropdown, { p: "sm", children: [
       /* @__PURE__ */ r(QT, { max_days: i }),
-      /* @__PURE__ */ r(BT, { value: n, onChange: a, close: p, allowSingleDateInRange: o, max_days: i }),
-      /* @__PURE__ */ r(HT, { onChange: a })
+      /* @__PURE__ */ r(BT, { value: n, onChange: a, onClose: p, allowSingleDateInRange: o, max_days: i }),
+      /* @__PURE__ */ r(HT, { onChange: a, onClose: p })
     ] })
   ] });
 }, yu = {
@@ -29713,7 +29714,7 @@ const lD = (e, t, n) => {
 }, gD = ({
   value: e,
   onChange: t,
-  close: n
+  onClose: n
 }) => {
   const a = (o) => {
     const [l, s] = o, c = to(l, e.step), d = no(s, e.step);
@@ -29737,7 +29738,7 @@ const lD = (e, t, n) => {
     count: a
   });
   return /* @__PURE__ */ r(ae, { label: i, children: /* @__PURE__ */ r(Bt, { size: "sm", variant: "light", children: a }) });
-}, bD = "_begin_wqt18_1", yD = "_end_wqt18_27", _D = "_step_wqt18_53", va = {
+}, bD = "_begin_1cder_1", yD = "_end_1cder_27", _D = "_step_1cder_52", va = {
   begin: bD,
   end: yD,
   step: _D
@@ -29771,15 +29772,16 @@ const lD = (e, t, n) => {
   } });
 }, vD = ({
   onChange: e,
-  step: t
+  step: t,
+  onClose: n
 }) => {
   const {
-    t: n,
-    i18n: a
-  } = y(), i = (s) => () => {
-    const c = s(t);
-    e(c);
-  }, o = k(() => Gd(t), [t]), l = a.language === "zh";
+    t: a,
+    i18n: i
+  } = y(), o = (c) => () => {
+    const d = c(t);
+    e(d), n();
+  }, l = k(() => Gd(t), [t]), s = i.language === "zh";
   return /* @__PURE__ */ u(F, { children: [
     /* @__PURE__ */ r(A, { variant: "dashed", my: 10 }),
     /* @__PURE__ */ r(w, { withTableBorder: !1, sx: {
@@ -29797,16 +29799,16 @@ const lD = (e, t, n) => {
       td: {
         paddingLeft: "1px"
       }
-    }, children: /* @__PURE__ */ r(w.Tbody, { children: Object.entries(o).map(([s, c]) => /* @__PURE__ */ u(w.Tr, { children: [
+    }, children: /* @__PURE__ */ r(w.Tbody, { children: Object.entries(l).map(([c, d]) => /* @__PURE__ */ u(w.Tr, { children: [
       /* @__PURE__ */ r(w.Th, { w: 80, children: /* @__PURE__ */ r(z, { size: "xs", c: "#555", fw: 500, sx: {
         textAlignLast: "justify"
-      }, children: n(`filter.widget.date_range.shortcut.${s}.label`) }) }),
-      c.map(({
-        key: d,
-        value: h,
-        getRange: p
-      }) => /* @__PURE__ */ r(w.Td, { children: /* @__PURE__ */ r(L, { size: "compact-xs", variant: "subtle", onClick: i(p), children: n(`filter.widget.date_range.shortcut.${s}.${l ? "full." : ""}${d}`) }) }, d))
-    ] }, s)) }) })
+      }, children: a(`filter.widget.date_range.shortcut.${c}.label`) }) }),
+      d.map(({
+        key: h,
+        value: p,
+        getRange: g
+      }) => /* @__PURE__ */ r(w.Td, { children: /* @__PURE__ */ r(L, { size: "compact-xs", variant: "subtle", onClick: o(g), children: a(`filter.widget.date_range.shortcut.${c}.${s ? "full." : ""}${h}`) }) }, h))
+    ] }, c)) }) })
   ] });
 }, al = (e) => ({
   label: {
@@ -29851,12 +29853,12 @@ const lD = (e, t, n) => {
       /* @__PURE__ */ r(Ye.Target, { children: /* @__PURE__ */ r($, { label: e, labelProps: {
         title: e
       }, required: t, leftSection: /* @__PURE__ */ r(Kl, { size: 16 }), placeholder: l("filter.widget.date_range.start_date"), readOnly: !0, disabled: o, value: g, onFocus: c, styles: al(s), className: va.begin }) }),
-      /* @__PURE__ */ r($, { label: /* @__PURE__ */ r(R, { children: " " }), leftSection: /* @__PURE__ */ r(Yl, { size: 16, onClick: c }), placeholder: l("filter.widget.date_range.end_date"), readOnly: !0, disabled: !h || o, value: b, onFocus: c, styles: al(s), className: va.end }),
+      /* @__PURE__ */ r($, { label: /* @__PURE__ */ r(R, { children: " " }), leftSection: /* @__PURE__ */ r(Yl, { size: 16, onClick: c }), placeholder: l("filter.widget.date_range.end_date"), readOnly: !0, disabled: o, value: b, onFocus: c, styles: al(s), className: va.end }),
       /* @__PURE__ */ r(vu, { className: va.step, value: n.step, onChange: x, label: /* @__PURE__ */ r(_, { justify: "flex-end", children: /* @__PURE__ */ r(fD, { begin: h, end: p }) }) })
     ] }),
     /* @__PURE__ */ u(Ye.Dropdown, { p: "sm", children: [
-      /* @__PURE__ */ r(gD, { value: n, onChange: v, close: d }),
-      /* @__PURE__ */ r(vD, { onChange: a, step: n.step })
+      /* @__PURE__ */ r(gD, { value: n, onChange: v, onClose: d }),
+      /* @__PURE__ */ r(vD, { onChange: a, step: n.step, onClose: d })
     ] })
   ] });
 }, xu = {
@@ -30451,9 +30453,7 @@ function e6(e) {
   const [t, n] = H(null);
   return N(() => {
     n(null);
-  }, [e]), N(() => {
-    console.log(t);
-  }, [t]), {
+  }, [e]), {
     echartsOptions: t,
     setEchartsOptions: n
   };
@@ -34954,8 +34954,9 @@ const kI = D(() => {
       /* @__PURE__ */ r(q, { data: a, label: t("filter.widget.date_range.default_by_shortcut"), value: n.default_shortcut, onChange: c, placeholder: t("filter.widget.date_range.default_by_shortcut_placeholder"), clearable: !0, sx: {
         flexGrow: 1
       }, maxDropdownHeight: 500 }),
-      /* @__PURE__ */ r(Tp, { type: "range", label: t("filter.widget.date_range.default_value"), value: o, onChange: s, valueFormat: n.inputFormat, required: n.required, allowSingleDateInRange: !0, numberOfColumns: 2, w: "50%", disabled: !!n.default_shortcut })
+      /* @__PURE__ */ r(Tp, { type: "range", label: t("filter.widget.date_range.default_value"), value: o, onChange: s, valueFormat: n.inputFormat, allowSingleDateInRange: !0, numberOfColumns: 2, w: "50%", disabled: !!n.default_shortcut })
     ] }),
+    n.required && !n.default_shortcut && n.default_value.every((h) => !h) && /* @__PURE__ */ r(z, { size: "xs", mt: -10, ta: "center", children: "快捷方式与具体日期范围二选一，且必填" }),
     /* @__PURE__ */ r(yn, { filter: e })
   ] });
 }), OI = {