@das-fed/upf-ui 6.4.0-dev.288 → 6.4.0-dev.290

package/packages/components/date-picker/index.js

@@ -1,45 +1,45 @@
-import { withInstall as Ce } from "@das-fed/upf-utils/with-install/index";
-import { defineComponent as xe, useCssVars as ze, ref as o, watch as oe, computed as u, useAttrs as Xe, onBeforeUnmount as De, openBlock as y, createElementBlock as $, normalizeClass as Le, unref as i, normalizeStyle as ue, createVNode as D, withCtx as h, withDirectives as Ie, createBlock as ne, mergeProps as we, createSlots as _e, renderSlot as L, normalizeProps as Pe, guardReactiveProps as Ee, createElementVNode as j, toDisplayString as te, Fragment as be, createCommentVNode as C, nextTick as ve, createTextVNode as je, renderList as He, withModifiers as et } from "vue";
-import { ConfigProvider as Fe, DatePicker as tt, RangePicker as rt, Dropdown as lt, Menu as at, MenuItem as ot, TimePicker as nt, TimeRangePicker as ut } from "ant-design-vue";
-import { DasAutoRegisterIcon as qe, DasIcon as pe } from "@das-fed/upf-ui/packages/components/icon/index";
-import { DasTooltip as Be } from "@das-fed/upf-ui/packages/components/tooltip/index";
-import { DasErrorOverlayModel as Me } from "@das-fed/upf-ui/packages/components/error-overlay-model/index";
-import { useModelValue as ie } from "@das-fed/upf-utils/vue";
-import { vHoverInside as Ve } from "@das-fed/upf-utils/directive/hoverInside/index";
-import { useZIndex as Re } from "@das-fed/upf-utils/hooks/popup-manager/use-zindex";
-import { currentLang as A, loadLocale as Ae, t as Ze, setI18nRule as it } from "@das-fed/upf-web/packages/i18n/index";
-import { calcTextWidth as Ne } from "@das-fed/upf-utils/common-tools";
-import { isTimeZonePickerModeEnabled as M, getTimeZoneDayjs as st, resolvePickerTimeZone as dt, toTimeZonePickerValue as Se, fromTimeZonePickerValue as We } from "@das-fed/upf-utils/common-tools/timezone-format";
+import { withInstall as Ae } from "@das-fed/upf-utils/with-install/index";
+import { defineComponent as Ee, useCssVars as Be, ref as u, watch as ce, computed as a, useAttrs as Re, onBeforeUnmount as qe, openBlock as k, createElementBlock as V, normalizeClass as Ve, unref as d, normalizeStyle as he, createVNode as F, withCtx as y, withDirectives as Ne, createBlock as fe, mergeProps as Ie, createSlots as vt, renderSlot as L, normalizeProps as Ke, guardReactiveProps as He, createElementVNode as Q, toDisplayString as oe, Fragment as De, createCommentVNode as x, nextTick as Te, createTextVNode as ot, renderList as lt, withModifiers as ft } from "vue";
+import { ConfigProvider as Ue, DatePicker as pt, RangePicker as mt, Dropdown as ht, Menu as yt, MenuItem as kt, TimePicker as bt, TimeRangePicker as gt } from "ant-design-vue";
+import { DasAutoRegisterIcon as rt, DasIcon as Se } from "@das-fed/upf-ui/packages/components/icon/index";
+import { DasTooltip as Xe } from "@das-fed/upf-ui/packages/components/tooltip/index";
+import { DasErrorOverlayModel as Oe } from "@das-fed/upf-ui/packages/components/error-overlay-model/index";
+import { useModelValue as ye } from "@das-fed/upf-utils/vue";
+import { vHoverInside as We } from "@das-fed/upf-utils/directive/hoverInside/index";
+import { useZIndex as Ge } from "@das-fed/upf-utils/hooks/popup-manager/use-zindex";
+import { currentLang as Y, loadLocale as Je, t as $e, setI18nRule as Tt } from "@das-fed/upf-web/packages/i18n/index";
+import { calcTextWidth as Qe } from "@das-fed/upf-utils/common-tools";
+import { isTimeZonePickerModeEnabled as P, getTimeZoneDayjs as Le, resolvePickerTimeZone as Pe, toTimeZonePickerValue as Fe, fromTimeZonePickerValue as _e } from "@das-fed/upf-utils/common-tools/timezone-format";
 import "ant-design-vue/es/date-picker/style/css";
 import "ant-design-vue/es/config-provider/style/css";
-import { DasDatePicker as Ue } from "@das-fed/upf-ui/packages/components/date-picker/index";
-import Ke from "dayjs";
+import Me from "dayjs";
+import { DasDatePicker as nt } from "@das-fed/upf-ui/packages/components/date-picker/index";
 import "ant-design-vue/es/dropdown/style/css";
 import "ant-design-vue/es/menu/style/css";
-import { DasIconDengdai as ct } from "@das-fed/upf-ui/packages/icons/dengdai/index";
+import { DasIconDengdai as wt } from "@das-fed/upf-ui/packages/icons/dengdai/index";
 import "ant-design-vue/es/time-picker/style/css"
 import '@das-fed/upf-ui/packages/components/date-picker/style.css';
 ;
-const Ye = {
+const ut = {
   now: ".ant-picker-now-btn",
   today: ".ant-picker-today-btn"
-}, Oe = (t) => {
-  const w = t.target;
-  return w instanceof Element ? w.closest(Ye.now) ? "now" : w.closest(Ye.today) ? "today" : "" : "";
-}, Ge = (t, w) => {
-  if (!w || !M(t)) return null;
-  const a = st()().tz(dt(t));
-  return w === "today" ? a.startOf("day") : a;
-}, Je = (t, w, a) => Ge(w, a) || t, Qe = (t, w, a) => {
-  const e = Ge(w, a);
-  return !e || !Array.isArray(t) ? t : t.map((k) => k && e);
-}, me = (t, w, a) => typeof document > "u" ? !1 : w && !a ? (document.addEventListener("click", t, !0), !0) : !w && a ? (document.removeEventListener("click", t, !0), !1) : a, vt = { class: "ant-picker-cell-inner" }, ft = {
+}, et = (r) => {
+  const S = r.target;
+  return S instanceof Element ? S.closest(ut.now) ? "now" : S.closest(ut.today) ? "today" : "" : "";
+}, it = (r, S) => {
+  if (!S || !P(r)) return null;
+  const l = Le()().tz(Pe(r));
+  return S === "today" ? l.startOf("day") : l;
+}, st = (r, S, l) => it(S, l) || r, dt = (r, S, l) => {
+  const e = it(S, l);
+  return !e || !Array.isArray(r) ? r : r.map((b) => b && e);
+}, Ce = (r, S, l) => typeof document > "u" ? !1 : S && !l ? (document.addEventListener("click", r, !0), !0) : !S && l ? (document.removeEventListener("click", r, !0), !1) : l, Zt = {
   key: 0,
   class: "das-date-picker-error-label-content"
-}, pt = {
+}, St = {
   name: "DasDatePicker"
-}, mt = /* @__PURE__ */ xe({
-  ...pt,
+}, Ct = /* @__PURE__ */ Ee({
+  ...St,
   props: {
     timeZoneMode: {},
     timeZone: {},
@@ -50,6 +50,9 @@ const Ye = {
     size: { default: "middle" },
     width: { default: "230px" },
     height: {},
+    format: {},
+    valueFormat: {},
+    showTime: {},
     showToday: { type: Boolean, default: !1 },
     disabled: { type: Boolean, default: !1 },
     isView: { type: Boolean, default: !1 },
@@ -65,220 +68,264 @@ const Ye = {
     formSize: {}
   },
   emits: ["change", "openChange", "update:model-value", "update:error"],
-  setup(t, { expose: w, emit: a }) {
-    ze((l) => ({
-      v20e1fc18: U.value,
-      v2efb7a8e: K.value
+  setup(r, { expose: S, emit: l }) {
+    Be((t) => ({
+      v6aec5fd8: O.value,
+      v4e5ebd56: we.value
     }));
-    const e = t, k = a;
-    qe({
+    const e = r, b = l;
+    rt({
       right: import("@das-fed/upf-ui/packages/icons/right"),
       left: import("@das-fed/upf-ui/packages/icons/left"),
       "double-arrow-left": import("@das-fed/upf-ui/packages/icons/double-arrow-left"),
       "double-arrow-right": import("@das-fed/upf-ui/packages/icons/double-arrow-right"),
       riqixuanze: import("@das-fed/upf-ui/packages/icons/riqixuanze")
     });
-    const N = o(void 0);
-    oe(A, async () => {
-      N.value = await Ae(A.value);
+    const j = u(void 0);
+    ce(Y, async () => {
+      j.value = await Je(Y.value);
     }, { immediate: !0 });
-    const P = u(() => `date-picker-${A.value}`), c = o(null), O = o(null), v = o(""), V = o(!1), E = Xe(), W = u(() => e.size === "table" || e.size === "middle" || e.size === "default" ? "middle" : e.size), Z = ie(e, "modelValue"), x = ie(e, "error"), S = u(() => ({
+    const A = a(() => `date-picker-${Y.value}`), f = u(null), G = u(null), p = u(""), M = u(!1), Z = Re(), E = a(() => e.size === "table" || e.size === "middle" || e.size === "default" ? "middle" : e.size), q = ye(e, "modelValue"), J = ye(e, "error"), w = a(() => String(Z.picker ?? "date")), N = a(() => e.format ?? Z.format), I = a(() => e.showTime ?? Z.showTime ?? Z["show-time"]), K = a(() => e.valueFormat ?? Z.valueFormat ?? Z["value-format"]), R = a(() => ({
       timeZoneMode: e.timeZoneMode,
       timeZone: e.timeZone,
       useClientTimeZone: e.useClientTimeZone,
-      timeZoneValueFormat: e.timeZoneValueFormat
-    })), H = u(() => Se(Z.value, S.value)), se = u(() => M(S.value) ? void 0 : E.valueFormat), Q = u(() => e.isView ? e.noSetDefaultVal ? "" : "-" : e.placeholder || Ze("请选择日期")), re = u(() => ({
+      // timeZoneValueFormat 是最高优先级；未传时兼容旧业务继续使用 valueFormat 控制输出。
+      timeZoneValueFormat: e.timeZoneValueFormat ?? K.value
+    })), H = a(() => P(R.value)), pe = a(() => {
+      if (!H.value) return Z;
+      const { valueFormat: t, "value-format": i, ...s } = Z;
+      return s;
+    }), _ = a(() => Fe(q.value, R.value)), le = a(() => H.value ? void 0 : K.value), ne = a(() => H.value ? "das-ui-time-zone-picker-dropdown" : ""), ue = a(() => !I.value), ee = a(() => H.value ? Le()().tz(Pe(R.value)).format("YYYY-MM-DD") : ""), h = (t) => {
+      var i;
+      return Array.isArray(t) ? t.map(h) : t != null && t.format ? {
+        text: t.format("YYYY-MM-DD HH:mm:ss.SSS Z"),
+        iso: (i = t.toISOString) == null ? void 0 : i.call(t),
+        isDayjs: !0
+      } : t;
+    }, m = (t, i = {}) => {
+      typeof window > "u" || window.__UPF_DATE_PICKER_TZ_DEBUG__;
+    }, B = (t, i) => {
+      if (!ue.value || !H.value) return t;
+      if (w.value === "date" && typeof i == "string" && i)
+        return Le()(i).tz(Pe(R.value), !0);
+      if (Me.isDayjs(t)) return t.startOf("day");
+      if (t == null || t === "") return t;
+      const s = Me(t);
+      return s.isValid() ? s.startOf("day") : t;
+    }, ie = (t) => {
+      var i;
+      return !ee.value || !((i = t == null ? void 0 : t.isValid) != null && i.call(t)) ? !1 : t.format("YYYY-MM-DD") === ee.value;
+    }, ve = a(() => e.isView ? e.noSetDefaultVal ? "" : "-" : e.placeholder || $e("请选择日期")), C = a(() => ({
       width: e.width
-    })), U = u(() => e.width ? e.width : "230px"), _ = u(() => e.formSize), K = u(() => e.height ? e.height : _.value ? {
+    })), O = a(() => e.width ? e.width : "230px"), se = a(() => e.formSize), we = a(() => e.height ? e.height : se.value ? {
       small: "24px",
       default: "32px",
       large: "40px"
-    }[_.value] : "auto"), Y = o(3e3), le = u(() => ({
-      "z-index": Y.value
-    })), F = o(!1), R = o({
+    }[se.value] : "auto"), U = u(3e3), Ze = a(() => ({
+      "z-index": U.value
+    })), $ = u(!1), de = u({
       display: "block",
       color: "var(--upf-color-error)",
       "white-space": "break-spaces"
-    }), f = o(!1), b = o(""), m = u(() => H.value ? b.value : Q.value), g = () => {
-      const l = e.size === "table" ? 12 : 14;
-      return Ne(Q.value, l);
-    }, B = () => {
-      var p;
-      const l = (p = c.value) == null ? void 0 : p.$el.querySelector(".ant-picker-input>input");
-      return H.value ? l == null ? void 0 : l.scrollWidth : g();
-    }, de = () => {
-      var r;
-      const l = (r = c.value) == null ? void 0 : r.$el.querySelector(".ant-picker-input>input");
-      return l ? (b.value = l.getAttribute("value"), l.removeAttribute("title"), (l == null ? void 0 : l.offsetWidth) ?? 0) : 0;
-    }, X = o(0), ee = o(0);
-    oe(() => [Q.value, H.value], () => {
-      ve(() => {
-        X.value = de(), ee.value = B(), (X.value === ee.value || ee.value - X.value < 1) && (f.value = !1);
+    }), z = u(!1), D = u(""), ke = a(() => _.value ? D.value : ve.value), xe = () => {
+      const t = e.size === "table" ? 12 : 14;
+      return Qe(ve.value, t);
+    }, be = () => {
+      var i;
+      const t = (i = f.value) == null ? void 0 : i.$el.querySelector(".ant-picker-input>input");
+      return _.value ? t == null ? void 0 : t.scrollWidth : xe();
+    }, ze = () => {
+      var s;
+      const t = (s = f.value) == null ? void 0 : s.$el.querySelector(".ant-picker-input>input");
+      return t ? (D.value = t.getAttribute("value"), t.removeAttribute("title"), (t == null ? void 0 : t.offsetWidth) ?? 0) : 0;
+    }, X = u(0), me = u(0);
+    ce(() => [ve.value, _.value], () => {
+      Te(() => {
+        X.value = ze(), me.value = be(), (X.value === me.value || me.value - X.value < 1) && (z.value = !1);
       });
     });
-    const z = o();
-    oe(
+    const n = u();
+    ce(
       () => {
-        var l;
-        return (l = O.value) == null ? void 0 : l.$tooltipRef.popperRef.contentRef;
+        var t;
+        return (t = G.value) == null ? void 0 : t.$tooltipRef.popperRef.contentRef;
       },
-      (l) => {
-        l && (l.addEventListener("mouseenter", function() {
-          f.value = !0, z.value && clearTimeout(z.value);
-        }), l.addEventListener("mouseleave", function() {
-          z.value = setTimeout(() => {
-            f.value = !1;
+      (t) => {
+        t && (t.addEventListener("mouseenter", function() {
+          z.value = !0, n.value && clearTimeout(n.value);
+        }), t.addEventListener("mouseleave", function() {
+          n.value = setTimeout(() => {
+            z.value = !1;
           }, 200);
         }));
       }
     );
-    const he = (l) => {
-      l && (Y.value = Re().nextZIndex()), l ? fe() : ce(), k("openChange", l), A.value === "en-US" && ve(() => {
-        const p = document == null ? void 0 : document.querySelectorAll(".ant-picker-ok > .ant-btn > span");
-        for (let r of p)
-          r && (r.innerText = "OK");
+    const c = (t) => {
+      t && (U.value = Ge().nextZIndex()), t ? W() : te(), b("openChange", t), Y.value === "en-US" && Te(() => {
+        const i = document == null ? void 0 : document.querySelectorAll(".ant-picker-ok > .ant-btn > span");
+        for (let s of i)
+          s && (s.innerText = "OK");
       });
-    }, G = (l) => {
-      M(S.value) && (v.value = Oe(l));
-    }, fe = () => {
-      v.value = "", V.value = me(
-        G,
-        M(S.value),
-        V.value
+    }, g = (t) => {
+      P(R.value) && (p.value = et(t));
+    }, W = () => {
+      p.value = "", M.value = Ce(
+        g,
+        P(R.value),
+        M.value
       );
-    }, ce = () => {
-      V.value = me(G, !1, V.value);
+    }, te = () => {
+      M.value = Ce(g, !1, M.value);
     };
-    De(() => {
-      ce(), v.value = "";
+    qe(() => {
+      te(), p.value = "";
     });
-    const ye = () => {
-      X.value = de(), ee.value = B(), X.value === ee.value || ee.value - X.value < 1 ? f.value = !1 : (f.value = !0, z.value && clearTimeout(z.value)), F.value = !0;
-    }, ke = () => {
-      z.value = setTimeout(() => {
-        f.value = !1;
-      }, 200), F.value = !1;
-    }, ge = (l, p) => {
-      l ? ye() : ke();
-    }, Te = (l, p) => {
-      x.value = !1, k("update:error", x.value);
-      const r = Je(l, S.value, v.value);
-      v.value = "";
-      const s = M(S.value) ? We(r, S.value) : r, T = M(S.value) && s != null ? String(s) : p;
-      k("update:model-value", s), k("change", s, T);
+    const re = () => {
+      X.value = ze(), me.value = be(), X.value === me.value || me.value - X.value < 1 ? z.value = !1 : (z.value = !0, n.value && clearTimeout(n.value)), $.value = !0;
+    }, tt = () => {
+      n.value = setTimeout(() => {
+        z.value = !1;
+      }, 200), $.value = !1;
+    }, je = (t, i) => {
+      t ? re() : tt();
+    }, at = (t, i) => {
+      J.value = !1, b("update:error", J.value);
+      const s = st(t, R.value, p.value);
+      p.value = "";
+      const T = B(s, i);
+      m("change:before-format", {
+        rawDateType: typeof t,
+        rawDateIsDayjs: Me.isDayjs(t),
+        rawDate: h(t),
+        rawDateString: i,
+        shortcutDateType: typeof s,
+        shortcutDateIsDayjs: Me.isDayjs(s),
+        shortcutDate: h(s),
+        normalizedDate: h(T)
+      });
+      const ae = H.value ? _e(T, R.value) : T, ge = H.value && ae != null ? String(ae) : i;
+      m("change:emit", {
+        nextValue: h(ae),
+        nextDateString: ge
+      }), b("update:model-value", ae), b("change", ae, ge);
     };
-    return w({
-      $datePicker: c,
+    return S({
+      $datePicker: f,
       blur: () => {
-        c.value.blur();
+        f.value.blur();
       },
       focus: () => {
-        c.value.focus();
+        f.value.focus();
       }
-    }), (l, p) => (y(), $(
+    }), (t, i) => (k(), V(
       "div",
       {
-        class: Le(["das-ui-date-picker", [t.borderType, e.isView ? "readonly" : "", i(x) ? "is-error" : ""]]),
-        style: ue(re.value)
+        class: Ve(["das-ui-date-picker", [r.borderType, e.isView ? "readonly" : "", d(J) ? "is-error" : ""]]),
+        style: he(C.value)
       },
       [
-        D(i(Fe), { locale: N.value }, {
-          default: h(() => [
-            D(i(Be), {
+        F(d(Ue), { locale: j.value }, {
+          default: y(() => [
+            F(d(Xe), {
               ref_key: "inputTooltipRef",
-              ref: O,
+              ref: G,
               placement: "top",
               trigger: "hover",
-              visible: f.value,
-              disabled: !t.isTooltip,
-              content: m.value
+              visible: z.value,
+              disabled: !r.isTooltip,
+              content: ke.value
             }, {
-              default: h(() => {
-                var r;
+              default: y(() => {
+                var s;
                 return [
-                  Ie((y(), ne(i(tt), we({
-                    key: P.value,
+                  Ne((k(), fe(d(pt), Ie({
+                    key: A.value,
                     ref_key: "$datePicker",
-                    ref: c
-                  }, l.$attrs, {
-                    value: H.value,
-                    valueFormat: se.value,
-                    size: W.value,
-                    locale: (r = N.value) == null ? void 0 : r.DatePicker,
-                    dropdownClassName: "das-ui-date-picker-dropdown " + t.dropdownClassName,
-                    placeholder: Q.value,
-                    showToday: t.showToday,
-                    bordered: t.borderType === "bordered",
+                    ref: f
+                  }, pe.value, {
+                    value: _.value,
+                    format: N.value,
+                    valueFormat: le.value,
+                    size: E.value,
+                    locale: (s = j.value) == null ? void 0 : s.DatePicker,
+                    dropdownClassName: "das-ui-date-picker-dropdown " + ne.value + " " + r.dropdownClassName,
+                    placeholder: ve.value,
+                    showToday: r.showToday,
+                    showTime: I.value,
+                    bordered: r.borderType === "bordered",
                     disabled: e.disabled || e.isView,
-                    style: re.value,
-                    popupStyle: le.value,
-                    onChange: Te,
-                    onOpenChange: he
-                  }), _e({
-                    dateRender: h((s) => [
-                      L(l.$slots, "dateRender", Pe(Ee(s)), () => [
-                        j(
+                    style: C.value,
+                    popupStyle: Ze.value,
+                    onChange: at,
+                    onOpenChange: c
+                  }), vt({
+                    dateRender: y((T) => [
+                      L(t.$slots, "dateRender", Ke(He(T)), () => [
+                        Q(
                           "div",
-                          vt,
-                          te(s.current.date()),
-                          1
-                          /* TEXT */
+                          {
+                            class: Ve(["ant-picker-cell-inner", { "das-time-zone-picker-cell-today": ie(T.current) }])
+                          },
+                          oe(T.current.date()),
+                          3
+                          /* TEXT, CLASS */
                         )
                       ], !0)
                     ]),
-                    nextIcon: h(() => [
-                      L(l.$slots, "nextIcon", {}, () => [
-                        D(i(pe), {
+                    nextIcon: y(() => [
+                      L(t.$slots, "nextIcon", {}, () => [
+                        F(d(Se), {
                           icon: "right",
                           size: "medium"
                         })
                       ], !0)
                     ]),
-                    prevIcon: h(() => [
-                      L(l.$slots, "prevIcon", {}, () => [
-                        D(i(pe), {
+                    prevIcon: y(() => [
+                      L(t.$slots, "prevIcon", {}, () => [
+                        F(d(Se), {
                           icon: "left",
                           size: "medium"
                         })
                       ], !0)
                     ]),
-                    superNextIcon: h(() => [
-                      L(l.$slots, "superNextIcon", {}, () => [
-                        D(i(pe), {
+                    superNextIcon: y(() => [
+                      L(t.$slots, "superNextIcon", {}, () => [
+                        F(d(Se), {
                           icon: "double-arrow-right",
                           size: "medium"
                         })
                       ], !0)
                     ]),
-                    superPrevIcon: h(() => [
-                      L(l.$slots, "superPrevIcon", {}, () => [
-                        D(i(pe), {
+                    superPrevIcon: y(() => [
+                      L(t.$slots, "superPrevIcon", {}, () => [
+                        F(d(Se), {
                           icon: "double-arrow-left",
                           size: "medium"
                         })
                       ], !0)
                     ]),
-                    suffixIcon: h(() => [
-                      L(l.$slots, "suffixIcon", {}, () => [
-                        D(i(pe), {
+                    suffixIcon: y(() => [
+                      L(t.$slots, "suffixIcon", {}, () => [
+                        F(d(Se), {
                           class: "das-suffix-icon",
                           icon: "riqixuanze",
-                          size: "medium"
+                          size: "medium",
+                          "icon-color": "#666666"
                         })
                       ], !0)
                     ]),
                     _: 2
                     /* DYNAMIC */
                   }, [
-                    l.$slots.renderExtraFooter ? {
+                    t.$slots.renderExtraFooter ? {
                       name: "renderExtraFooter",
-                      fn: h(() => [
-                        L(l.$slots, "renderExtraFooter", {}, void 0, !0)
+                      fn: y(() => [
+                        L(t.$slots, "renderExtraFooter", {}, void 0, !0)
                       ]),
                       key: "0"
                     } : void 0
-                  ]), 1040, ["value", "valueFormat", "size", "locale", "dropdownClassName", "placeholder", "showToday", "bordered", "disabled", "style", "popupStyle"])), [
-                    [i(Ve), ge]
+                  ]), 1040, ["value", "format", "valueFormat", "size", "locale", "dropdownClassName", "placeholder", "showToday", "showTime", "bordered", "disabled", "style", "popupStyle"])), [
+                    [d(We), je]
                   ])
                 ];
               }),
@@ -289,51 +336,51 @@ const Ye = {
           _: 3
           /* FORWARDED */
         }, 8, ["locale"]),
-        t.error && t.errorLabel ? (y(), $(
-          be,
+        r.error && r.errorLabel ? (k(), V(
+          De,
           { key: 0 },
           [
-            t.errorMode === "default" ? (y(), $("div", ft, [
-              j(
+            r.errorMode === "default" ? (k(), V("div", Zt, [
+              Q(
                 "span",
                 {
-                  style: ue(R.value)
+                  style: he(de.value)
                 },
-                te(t.errorLabel),
+                oe(r.errorLabel),
                 5
                 /* TEXT, STYLE */
               )
-            ])) : C("v-if", !0),
-            t.errorMode === "overlay" && F.value ? (y(), ne(i(Me), {
+            ])) : x("v-if", !0),
+            r.errorMode === "overlay" && $.value ? (k(), fe(d(Oe), {
               key: 1,
-              errorLabel: t.errorLabel,
+              errorLabel: r.errorLabel,
               getEl: () => {
-                var r;
-                return (r = c.value) == null ? void 0 : r.$el;
+                var s;
+                return (s = f.value) == null ? void 0 : s.$el;
               },
-              errorModelZIndex: t.errorModelZIndex
-            }, null, 8, ["errorLabel", "getEl", "errorModelZIndex"])) : C("v-if", !0)
+              errorModelZIndex: r.errorModelZIndex
+            }, null, 8, ["errorLabel", "getEl", "errorModelZIndex"])) : x("v-if", !0)
           ],
           64
           /* STABLE_FRAGMENT */
-        )) : C("v-if", !0)
+        )) : x("v-if", !0)
       ],
       6
       /* CLASS, STYLE */
     ));
   }
-}), $e = (t, w) => {
-  const a = t.__vccOpts || t;
-  for (const [e, k] of w)
-    a[e] = k;
-  return a;
-}, ht = /* @__PURE__ */ $e(mt, [["__scopeId", "data-v-d5f86340"]]), yt = { class: "date-range-separator" }, kt = {
+}), Ye = (r, S) => {
+  const l = r.__vccOpts || r;
+  for (const [e, b] of S)
+    l[e] = b;
+  return l;
+}, xt = /* @__PURE__ */ Ye(Ct, [["__scopeId", "data-v-e5f3f0c4"]]), zt = { class: "date-range-separator" }, Dt = {
   key: 0,
   class: "das-date-picker-error-label-content"
-}, bt = {
+}, Mt = {
   name: "DasDateRangePicker"
-}, gt = /* @__PURE__ */ xe({
-  ...bt,
+}, Vt = /* @__PURE__ */ Ee({
+  ...Mt,
   props: {
     timeZoneMode: {},
     timeZone: {},
@@ -363,145 +410,146 @@ const Ye = {
     formSize: {}
   },
   emits: ["change", "openChange", "update:model-value", "update:error"],
-  setup(t, { emit: w }) {
-    ze((f) => ({
-      v0af6faf2: E.value,
-      v19f5de9b: V.value
+  setup(r, { emit: S }) {
+    Be((h) => ({
+      v1347d54f: Z.value,
+      v91bc76c4: M.value
     }));
-    const a = t, e = w, k = Xe(), N = u(() => a.placeholder ?? [Ze("开始日期"), Ze("结束日期")]), P = ie(a, "modelValue"), c = ie(a, "error"), O = u(() => ({
-      timeZoneMode: a.timeZoneMode,
-      timeZone: a.timeZone,
-      useClientTimeZone: a.useClientTimeZone,
-      timeZoneValueFormat: a.timeZoneValueFormat
-    })), v = u(() => {
-      var f, b;
-      return M(O.value) ? [
-        Se((f = P.value) == null ? void 0 : f[0], O.value),
-        Se((b = P.value) == null ? void 0 : b[1], O.value)
-      ] : P.value;
-    }), V = u(() => a.width ? a.width : "230px"), E = u(() => a.height ? a.height : "auto"), W = u(() => ({ ...k, ...a.prevAttrs })), Z = u(() => ({ ...k, ...a.nextAttrs })), x = o(), S = o(!1), H = o({
+    const l = r, e = S, b = Re(), j = a(() => l.placeholder ?? [$e("开始日期"), $e("结束日期")]), A = ye(l, "modelValue"), f = ye(l, "error"), G = a(() => ({
+      timeZoneMode: l.timeZoneMode,
+      timeZone: l.timeZone,
+      useClientTimeZone: l.useClientTimeZone,
+      // 与内部 DatePicker 保持同一优先级：timeZoneValueFormat 优先，未传回退 valueFormat。
+      timeZoneValueFormat: l.timeZoneValueFormat ?? l.valueFormat
+    })), p = a(() => {
+      var h, m;
+      return P(G.value) ? [
+        Fe((h = A.value) == null ? void 0 : h[0], G.value),
+        Fe((m = A.value) == null ? void 0 : m[1], G.value)
+      ] : A.value;
+    }), M = a(() => l.width ? l.width : "230px"), Z = a(() => l.height ? l.height : "auto"), E = a(() => ({ ...b, ...l.prevAttrs })), q = a(() => ({ ...b, ...l.nextAttrs })), J = u(), w = u(!1), N = u({
       display: "block",
       color: "var(--upf-color-error)",
       "white-space": "break-spaces"
-    }), se = () => {
-      S.value = !0;
-    }, Q = () => {
-      S.value = !1;
-    }, re = (f, b) => {
-      f ? se() : Q();
-    }, U = (f, b) => {
-      e("openChange", f, b), A.value === "en-US" && ve(() => {
-        const m = document == null ? void 0 : document.querySelectorAll(".ant-picker-ok > .ant-btn > span");
-        for (let g of m)
-          g && (g.innerText = "OK");
+    }), I = () => {
+      w.value = !0;
+    }, K = () => {
+      w.value = !1;
+    }, R = (h, m) => {
+      h ? I() : K();
+    }, H = (h, m) => {
+      e("openChange", h, m), Y.value === "en-US" && Te(() => {
+        const B = document == null ? void 0 : document.querySelectorAll(".ant-picker-ok > .ant-btn > span");
+        for (let ie of B)
+          ie && (ie.innerText = "OK");
       });
-    }, _ = u(() => {
-      let f = a.valueFormat ? a.valueFormat : a.format;
+    }, pe = a(() => {
+      let h = l.valueFormat ? l.valueFormat : l.format;
       return [
-        v.value[0] ? Ke.isDayjs(v.value[0]) ? v.value[0].format(f) : v.value[0] : "",
-        v.value[1] ? Ke.isDayjs(v.value[1]) ? v.value[1].format(f) : v.value[1] : ""
+        p.value[0] ? Me.isDayjs(p.value[0]) ? p.value[0].format(h) : p.value[0] : "",
+        p.value[1] ? Me.isDayjs(p.value[1]) ? p.value[1].format(h) : p.value[1] : ""
       ];
-    }), K = (f) => a.disabledDate && a.disabledDate(f) === !0 ? !0 : !!(v.value[1] && f.isAfter(v.value[1], a.disabledUnit || void 0)), Y = (f) => a.disabledDate && a.disabledDate(f) === !0 ? !0 : !!(v.value[0] && f.isBefore(v.value[0], a.disabledUnit || void 0)), le = u(() => ({
-      width: a.width
-    })), F = (f, b) => {
-      c.value = !1, e("update:model-value", P.value), e("change", P.value, _.value);
-    }, R = (f, b) => {
-      c.value = !1, e("update:model-value", P.value), e("change", P.value, _.value);
+    }), _ = (h) => l.disabledDate && l.disabledDate(h) === !0 ? !0 : !!(p.value[1] && h.isAfter(p.value[1], l.disabledUnit || void 0)), le = (h) => l.disabledDate && l.disabledDate(h) === !0 ? !0 : !!(p.value[0] && h.isBefore(p.value[0], l.disabledUnit || void 0)), ne = a(() => ({
+      width: l.width
+    })), ue = (h, m) => {
+      f.value = !1, e("update:model-value", A.value), e("change", A.value, pe.value);
+    }, ee = (h, m) => {
+      f.value = !1, e("update:model-value", A.value), e("change", A.value, pe.value);
     };
-    return (f, b) => Ie((y(), $(
+    return (h, m) => Ne((k(), V(
       "div",
       {
         class: "das-ui-date-range-picker",
-        style: ue(le.value),
+        style: he(ne.value),
         ref_key: "$dateRange",
-        ref: x
+        ref: J
       },
       [
-        D(i(Ue), we(W.value, {
-          modelValue: i(P)[0],
-          "onUpdate:modelValue": b[0] || (b[0] = (m) => i(P)[0] = m),
-          size: a.size,
-          valueFormat: a.valueFormat,
-          timeZoneMode: a.timeZoneMode,
-          timeZone: a.timeZone,
-          useClientTimeZone: a.useClientTimeZone,
-          timeZoneValueFormat: a.timeZoneValueFormat,
-          borderType: a.borderType,
-          error: i(c),
-          width: a.itemWidth,
-          "disabled-date": K,
-          placeholder: N.value[0],
-          onChange: F,
-          onOpenChange: b[1] || (b[1] = (m) => U(m, "before"))
+        F(d(nt), Ie(E.value, {
+          modelValue: d(A)[0],
+          "onUpdate:modelValue": m[0] || (m[0] = (B) => d(A)[0] = B),
+          size: l.size,
+          valueFormat: l.valueFormat,
+          timeZoneMode: l.timeZoneMode,
+          timeZone: l.timeZone,
+          useClientTimeZone: l.useClientTimeZone,
+          timeZoneValueFormat: l.timeZoneValueFormat,
+          borderType: l.borderType,
+          error: d(f),
+          width: l.itemWidth,
+          "disabled-date": _,
+          placeholder: j.value[0],
+          onChange: ue,
+          onOpenChange: m[1] || (m[1] = (B) => H(B, "before"))
         }), null, 16, ["modelValue", "size", "valueFormat", "timeZoneMode", "timeZone", "useClientTimeZone", "timeZoneValueFormat", "borderType", "error", "width", "placeholder"]),
-        L(f.$slots, "separator", {}, () => [
-          j(
+        L(h.$slots, "separator", {}, () => [
+          Q(
             "span",
-            yt,
-            te(a.separator),
+            zt,
+            oe(l.separator),
             1
             /* TEXT */
           )
         ], !0),
-        D(i(Ue), we(Z.value, {
-          modelValue: i(P)[1],
-          "onUpdate:modelValue": b[2] || (b[2] = (m) => i(P)[1] = m),
-          size: a.size,
-          valueFormat: a.valueFormat,
-          timeZoneMode: a.timeZoneMode,
-          timeZone: a.timeZone,
-          useClientTimeZone: a.useClientTimeZone,
-          timeZoneValueFormat: a.timeZoneValueFormat,
-          borderType: a.borderType,
-          error: i(c),
-          width: a.itemWidth,
-          "disabled-date": Y,
-          placeholder: N.value[1],
-          onChange: R,
-          onOpenChange: b[3] || (b[3] = (m) => U(m, "after"))
+        F(d(nt), Ie(q.value, {
+          modelValue: d(A)[1],
+          "onUpdate:modelValue": m[2] || (m[2] = (B) => d(A)[1] = B),
+          size: l.size,
+          valueFormat: l.valueFormat,
+          timeZoneMode: l.timeZoneMode,
+          timeZone: l.timeZone,
+          useClientTimeZone: l.useClientTimeZone,
+          timeZoneValueFormat: l.timeZoneValueFormat,
+          borderType: l.borderType,
+          error: d(f),
+          width: l.itemWidth,
+          "disabled-date": le,
+          placeholder: j.value[1],
+          onChange: ee,
+          onOpenChange: m[3] || (m[3] = (B) => H(B, "after"))
         }), null, 16, ["modelValue", "size", "valueFormat", "timeZoneMode", "timeZone", "useClientTimeZone", "timeZoneValueFormat", "borderType", "error", "width", "placeholder"]),
-        t.error && t.errorLabel ? (y(), $(
-          be,
+        r.error && r.errorLabel ? (k(), V(
+          De,
           { key: 0 },
           [
-            t.errorMode === "default" ? (y(), $("div", kt, [
-              j(
+            r.errorMode === "default" ? (k(), V("div", Dt, [
+              Q(
                 "span",
                 {
-                  style: ue(H.value)
+                  style: he(N.value)
                 },
-                te(t.errorLabel),
+                oe(r.errorLabel),
                 5
                 /* TEXT, STYLE */
               )
-            ])) : C("v-if", !0),
-            t.errorMode === "overlay" && S.value ? (y(), ne(i(Me), {
+            ])) : x("v-if", !0),
+            r.errorMode === "overlay" && w.value ? (k(), fe(d(Oe), {
               key: 1,
-              errorLabel: t.errorLabel,
-              getEl: () => x.value,
-              errorModelZIndex: t.errorModelZIndex
-            }, null, 8, ["errorLabel", "getEl", "errorModelZIndex"])) : C("v-if", !0)
+              errorLabel: r.errorLabel,
+              getEl: () => J.value,
+              errorModelZIndex: r.errorModelZIndex
+            }, null, 8, ["errorLabel", "getEl", "errorModelZIndex"])) : x("v-if", !0)
           ],
           64
           /* STABLE_FRAGMENT */
-        )) : C("v-if", !0)
+        )) : x("v-if", !0)
       ],
       4
       /* STYLE */
     )), [
-      [i(Ve), re]
+      [d(We), R]
     ]);
   }
-}), Tt = /* @__PURE__ */ $e(gt, [["__scopeId", "data-v-1e54ac00"]]), wt = { class: "ant-picker-cell-inner" }, Zt = { class: "das-picker-footer-extra" }, St = {
+}), It = /* @__PURE__ */ Ye(Vt, [["__scopeId", "data-v-85002b49"]]), $t = { class: "das-picker-footer-extra" }, Ft = {
   key: 0,
   class: "das-picker-ranges"
-}, Ct = { class: "das-picker-preset-span" }, xt = ["onClick"], zt = {
+}, Lt = { class: "das-picker-preset-span" }, Pt = ["onClick"], At = {
   key: 0,
   class: "das-date-picker-error-label-content"
-}, It = {
+}, Et = {
   name: "DasRangePicker"
-}, Mt = /* @__PURE__ */ xe({
-  ...It,
+}, Bt = /* @__PURE__ */ Ee({
+  ...Et,
   props: {
     timeZoneMode: {},
     timeZone: {},
@@ -531,229 +579,245 @@ const Ye = {
     formSize: {}
   },
   emits: ["change", "openChange", "update:model-value", "update:error"],
-  setup(t, { expose: w, emit: a }) {
-    ze((r) => ({
-      v4a24af5f: se.value,
-      v3ebb7aa4: re.value
+  setup(r, { expose: S, emit: l }) {
+    Be((o) => ({
+      ae2b9438: h.value,
+      v5a8d8cc9: B.value
     }));
-    const e = t, k = a;
-    qe({
+    const e = r, b = l;
+    rt({
       fold: import("@das-fed/upf-ui/packages/icons/fold"),
       riqixuanze: import("@das-fed/upf-ui/packages/icons/riqixuanze")
     });
-    const N = o(void 0);
-    oe(A, async () => {
-      N.value = await Ae(A.value);
+    const j = u(void 0);
+    ce(Y, async () => {
+      j.value = await Je(Y.value);
     }, { immediate: !0 });
-    const P = u(() => `range-picker-${A.value}`), c = o(null), O = o(null), v = o(""), V = o(!1), E = u(() => e.size === "table" || e.size === "middle" || e.size === "default" ? "middle" : e.size), W = ie(e, "modelValue"), Z = ie(e, "error"), x = u(() => ({
+    const A = a(() => `range-picker-${Y.value}`), f = u(null), G = u(null), p = u(""), M = u(!1), Z = Re(), E = a(() => e.size === "table" || e.size === "middle" || e.size === "default" ? "middle" : e.size), q = ye(e, "modelValue"), J = ye(e, "error"), w = a(() => e.valueFormat ?? Z.valueFormat ?? Z["value-format"]), N = a(() => ({
       timeZoneMode: e.timeZoneMode,
       timeZone: e.timeZone,
       useClientTimeZone: e.useClientTimeZone,
-      timeZoneValueFormat: e.timeZoneValueFormat
-    })), S = u(() => {
-      if (!(!Array.isArray(W.value) || W.value.length !== 2))
-        return M(x.value) ? W.value.map((r) => Se(r, x.value)) : W.value;
-    }), H = u(() => M(x.value) ? void 0 : e.valueFormat), se = u(() => e.width ? e.width : "230px"), Q = u(() => e.formSize), re = u(() => e.height ? e.height : Q.value ? {
+      // timeZoneValueFormat 是最高优先级；未传时兼容旧业务继续使用 valueFormat 控制输出。
+      timeZoneValueFormat: e.timeZoneValueFormat ?? w.value
+    })), I = a(() => {
+      if (!(!Array.isArray(q.value) || q.value.length !== 2))
+        return P(N.value) ? q.value.map((o) => Fe(o, N.value)) : q.value;
+    }), K = a(() => P(N.value)), R = a(() => String(Z.picker ?? "date")), H = a(() => {
+      if (!K.value) return Z;
+      const { valueFormat: o, "value-format": t, ...i } = Z;
+      return i;
+    }), pe = a(() => K.value ? void 0 : w.value), _ = a(
+      () => K.value ? "das-ui-time-zone-picker-dropdown" : ""
+    ), le = a(() => !e.showTime), ne = a(() => K.value ? Le()().tz(Pe(N.value)).format("YYYY-MM-DD") : ""), ue = (o) => {
+      var t;
+      return !ne.value || !((t = o == null ? void 0 : o.isValid) != null && t.call(o)) ? !1 : o.format("YYYY-MM-DD") === ne.value;
+    }, ee = (o, t) => !Array.isArray(o) || !le.value || !K.value ? o : R.value === "date" && Array.isArray(t) ? o.map((i, s) => {
+      const T = t[s];
+      return !i || !T ? i : Le()(T).tz(Pe(N.value), !0);
+    }) : o.map((i) => i != null && i.format ? i.startOf("day") : i), h = a(() => e.width ? e.width : "230px"), m = a(() => e.formSize), B = a(() => e.height ? e.height : m.value ? {
       small: "24px",
       default: "32px",
       large: "40px"
-    }[Q.value] : "auto"), U = o(3e3), _ = u(() => ({
-      "z-index": U.value
-    })), K = o(!1), Y = o({
+    }[m.value] : "auto"), ie = u(3e3), ve = a(() => ({
+      "z-index": ie.value
+    })), C = u(!1), O = u({
       display: "block",
       color: "var(--upf-color-error)",
       "white-space": "break-spaces"
-    }), le = u(() => {
-      var r;
-      return e.isView ? e.noSetDefaultVal ? ["", ""] : ["-", "-"] : (r = e.placeholder) == null ? void 0 : r.map((s) => Ze(s));
-    }), F = u(() => ({
+    }), se = a(() => {
+      var o;
+      return e.isView ? e.noSetDefaultVal ? ["", ""] : ["-", "-"] : (o = e.placeholder) == null ? void 0 : o.map((t) => $e(t));
+    }), we = a(() => ({
       width: e.width
-    })), R = o(!1), f = o(["", ""]), b = o("~"), m = u(() => {
-      var r;
-      return (r = S.value) != null && r.length && S.value[0] && S.value[1] ? f.value.join(" " + b.value + " ") : le.value.join(" " + b.value + " ");
-    }), g = o([0, 0]), B = o([0, 0]), de = () => {
-      var I;
-      let r = [];
-      const s = (I = c.value) == null ? void 0 : I.$el.querySelectorAll(".ant-picker-input>input");
-      if (!s)
-        return r = [0, 0], r;
-      let T = [];
-      for (let J of s) {
-        T.push(J.getAttribute("value") || "");
-        let ae = (J == null ? void 0 : J.offsetWidth) ?? 0;
-        r.push(ae);
+    })), U = u(!1), Ze = u(["", ""]), $ = u("~"), de = a(() => {
+      var o;
+      return (o = I.value) != null && o.length && I.value[0] && I.value[1] ? Ze.value.join(" " + $.value + " ") : se.value.join(" " + $.value + " ");
+    }), z = u([0, 0]), D = u([0, 0]), ke = () => {
+      var s;
+      let o = [];
+      const t = (s = f.value) == null ? void 0 : s.$el.querySelectorAll(".ant-picker-input>input");
+      if (!t)
+        return o = [0, 0], o;
+      let i = [];
+      for (let T of t) {
+        i.push(T.getAttribute("value") || "");
+        let ae = (T == null ? void 0 : T.offsetWidth) ?? 0;
+        o.push(ae);
       }
-      return f.value = T, r;
-    }, X = (r) => {
-      const s = e.size === "table" ? 12 : 14;
-      return Ne(r, s);
-    }, ee = () => {
-      var T;
-      let r = [];
-      return ((T = c.value) == null ? void 0 : T.$el.querySelectorAll(".ant-picker-input>input")).forEach((I, J) => {
+      return Ze.value = i, o;
+    }, xe = (o) => {
+      const t = e.size === "table" ? 12 : 14;
+      return Qe(o, t);
+    }, be = () => {
+      var i;
+      let o = [];
+      return ((i = f.value) == null ? void 0 : i.$el.querySelectorAll(".ant-picker-input>input")).forEach((s, T) => {
         var ae;
-        (ae = S.value) != null && ae.length && S.value[0] && S.value[0] ? r.push(I == null ? void 0 : I.scrollWidth) : r.push(X(le.value[J]));
-      }), r;
+        (ae = I.value) != null && ae.length && I.value[0] && I.value[0] ? o.push(s == null ? void 0 : s.scrollWidth) : o.push(xe(se.value[T]));
+      }), o;
     };
-    oe(() => [le.value, S.value], () => {
-      ve(() => {
-        g.value = de(), B.value = ee(), (g.value[0] === B.value[0] || B.value[0] - g.value[0] < 1) && (g.value[1] === B.value[1] || B.value[1] - g.value[1] < 1) && (R.value = !1);
+    ce(() => [se.value, I.value], () => {
+      Te(() => {
+        z.value = ke(), D.value = be(), (z.value[0] === D.value[0] || D.value[0] - z.value[0] < 1) && (z.value[1] === D.value[1] || D.value[1] - z.value[1] < 1) && (U.value = !1);
       });
     });
-    const z = o();
-    oe(
+    const X = u();
+    ce(
       () => {
-        var r;
-        return (r = O.value) == null ? void 0 : r.$tooltipRef.popperRef.contentRef;
+        var o;
+        return (o = G.value) == null ? void 0 : o.$tooltipRef.popperRef.contentRef;
       },
-      (r) => {
-        r && (r.addEventListener("mouseenter", function() {
-          R.value = !0, z.value && clearTimeout(z.value);
-        }), r.addEventListener("mouseleave", function() {
-          z.value = setTimeout(() => {
-            R.value = !1;
+      (o) => {
+        o && (o.addEventListener("mouseenter", function() {
+          U.value = !0, X.value && clearTimeout(X.value);
+        }), o.addEventListener("mouseleave", function() {
+          X.value = setTimeout(() => {
+            U.value = !1;
           }, 200);
         }));
       }
     );
-    const he = (r) => {
-      r && (U.value = Re().nextZIndex()), r ? fe() : ce(), k("openChange", r), A.value === "en-US" && ve(() => {
-        const s = document == null ? void 0 : document.querySelectorAll(".ant-picker-ok > .ant-btn > span");
-        for (let T of s)
-          T && (T.innerText = "OK");
+    const me = (o) => {
+      o && (ie.value = Ge().nextZIndex()), o ? n() : c(), b("openChange", o), Y.value === "en-US" && Te(() => {
+        const t = document == null ? void 0 : document.querySelectorAll(".ant-picker-ok > .ant-btn > span");
+        for (let i of t)
+          i && (i.innerText = "OK");
       });
-    }, G = (r) => {
-      M(x.value) && (v.value = Oe(r));
-    }, fe = () => {
-      v.value = "", V.value = me(
-        G,
-        M(x.value),
-        V.value
+    }, v = (o) => {
+      P(N.value) && (p.value = et(o));
+    }, n = () => {
+      p.value = "", M.value = Ce(
+        v,
+        P(N.value),
+        M.value
       );
-    }, ce = () => {
-      V.value = me(G, !1, V.value);
+    }, c = () => {
+      M.value = Ce(v, !1, M.value);
     };
-    De(() => {
-      ce(), v.value = "";
+    qe(() => {
+      c(), p.value = "";
     });
-    const ye = () => {
-      g.value = de(), B.value = ee(), (g.value[0] === B.value[0] || B.value[0] - g.value[0] < 1) && (g.value[1] === B.value[1] || B.value[1] - g.value[1] < 1) ? R.value = !1 : (R.value = !0, z.value && clearTimeout(z.value)), K.value = !0;
-    }, ke = () => {
-      z.value = setTimeout(() => {
-        R.value = !1;
-      }, 200), K.value = !1;
-    }, ge = (r, s) => {
-      r ? ye() : ke();
-    }, Te = (r, s) => {
-      const T = Qe(r, x.value, v.value);
-      v.value = "";
-      const I = M(x.value) && Array.isArray(T) ? T.map((ae) => ae && We(ae, x.value)) : T, J = M(x.value) && Array.isArray(I) ? I.map((ae) => ae == null ? "" : String(ae)) : s;
-      k("update:error", Z.value), k("update:model-value", I), k("change", I, J);
-    }, d = (r, s) => {
-      if (Z.value = !1, r === null) {
-        k("update:model-value", [null, null]), k("change", [null, null], s);
+    const g = () => {
+      z.value = ke(), D.value = be(), (z.value[0] === D.value[0] || D.value[0] - z.value[0] < 1) && (z.value[1] === D.value[1] || D.value[1] - z.value[1] < 1) ? U.value = !1 : (U.value = !0, X.value && clearTimeout(X.value)), C.value = !0;
+    }, W = () => {
+      X.value = setTimeout(() => {
+        U.value = !1;
+      }, 200), C.value = !1;
+    }, te = (o, t) => {
+      o ? g() : W();
+    }, re = (o, t) => {
+      const i = dt(o, N.value, p.value);
+      p.value = "";
+      const s = ee(i, t), T = K.value && Array.isArray(s) ? s.map((ge) => ge && _e(ge, N.value)) : s, ae = K.value && Array.isArray(T) ? T.map((ge) => ge == null ? "" : String(ge)) : t;
+      b("update:error", J.value), b("update:model-value", T), b("change", T, ae);
+    }, tt = (o, t) => {
+      if (J.value = !1, o === null) {
+        b("update:model-value", [null, null]), b("change", [null, null], t);
         return;
       }
-      Te(r, s);
-    }, n = (r) => {
-      Z.value = !1, Te(r.value, [r.value[0].format(e.format), r.value[1].format(e.format)]), c.value.blur();
+      re(o, t);
+    }, je = (o) => {
+      J.value = !1, re(o.value, [o.value[0].format(e.format), o.value[1].format(e.format)]), f.value.blur();
     };
-    return w({
-      $rangePicker: c,
+    return S({
+      $rangePicker: f,
       blur: () => {
-        c.value.blur();
+        f.value.blur();
       },
       focus: () => {
-        c.value.focus();
+        f.value.focus();
       }
-    }), (r, s) => (y(), $(
+    }), (o, t) => (k(), V(
       "div",
       {
-        class: Le(["das-ui-range-picker", [t.borderType, e.isView ? "readonly" : "", i(Z) ? "is-error" : ""]]),
-        style: ue(F.value)
+        class: Ve(["das-ui-range-picker", [r.borderType, e.isView ? "readonly" : "", d(J) ? "is-error" : ""]]),
+        style: he(we.value)
       },
       [
-        D(i(Fe), { locale: N.value }, {
-          default: h(() => [
-            D(i(Be), {
+        F(d(Ue), { locale: j.value }, {
+          default: y(() => [
+            F(d(Xe), {
               ref_key: "inputTooltipRef",
-              ref: O,
+              ref: G,
               placement: "top",
               trigger: "hover",
-              visible: R.value,
-              disabled: !t.isTooltip,
-              content: m.value
+              visible: U.value,
+              disabled: !r.isTooltip,
+              content: de.value
             }, {
-              default: h(() => {
-                var T;
+              default: y(() => {
+                var i;
                 return [
-                  Ie((y(), ne(i(rt), we({
-                    key: P.value,
+                  Ne((k(), fe(d(mt), Ie({
+                    key: A.value,
                     ref_key: "$rangePicker",
-                    ref: c
-                  }, r.$attrs, {
-                    value: S.value,
+                    ref: f
+                  }, H.value, {
+                    value: I.value,
                     size: E.value,
-                    locale: (T = N.value) == null ? void 0 : T.DatePicker,
-                    valueFormat: H.value,
-                    dropdownClassName: "das-ui-range-picker-dropdown " + t.dropdownClassName,
-                    placeholder: le.value,
-                    showToday: t.showToday,
-                    showTime: t.showTime,
-                    bordered: t.borderType === "bordered",
+                    locale: (i = j.value) == null ? void 0 : i.DatePicker,
+                    valueFormat: pe.value,
+                    dropdownClassName: "das-ui-range-picker-dropdown " + _.value + " " + r.dropdownClassName,
+                    placeholder: se.value,
+                    showToday: r.showToday,
+                    showTime: r.showTime,
+                    bordered: r.borderType === "bordered",
                     disabled: e.disabled || e.isView,
-                    style: F.value,
-                    popupStyle: _.value,
-                    onChange: d,
-                    onOpenChange: he
+                    style: we.value,
+                    popupStyle: ve.value,
+                    onChange: tt,
+                    onOpenChange: me
                   }), {
-                    dateRender: h((I) => [
-                      L(r.$slots, "dateRender", Pe(Ee(I)), () => [
-                        j(
+                    dateRender: y((s) => [
+                      L(o.$slots, "dateRender", Ke(He(s)), () => [
+                        Q(
                           "div",
-                          wt,
-                          te(I.current.date()),
-                          1
-                          /* TEXT */
+                          {
+                            class: Ve(["ant-picker-cell-inner", { "das-time-zone-picker-cell-today": ue(s.current) }])
+                          },
+                          oe(s.current.date()),
+                          3
+                          /* TEXT, CLASS */
                         )
                       ], !0)
                     ]),
-                    nextIcon: h(() => [
-                      C(' <slot name="nextIcon"> '),
-                      s[1] || (s[1] = je(
+                    nextIcon: y(() => [
+                      x(' <slot name="nextIcon"> '),
+                      t[1] || (t[1] = ot(
                         " XX ",
                         -1
                         /* CACHED */
                       )),
-                      C(" </slot> ")
+                      x(" </slot> ")
                     ]),
-                    prevIcon: h(() => [
-                      L(r.$slots, "prevIcon", {}, () => [
-                        C(' <das-icon icon="left"></das-icon> ')
+                    prevIcon: y(() => [
+                      L(o.$slots, "prevIcon", {}, () => [
+                        x(' <das-icon icon="left"></das-icon> ')
                       ], !0)
                     ]),
-                    superNextIcon: h(() => [
-                      L(r.$slots, "superNextIcon", {}, () => [
-                        C(' <das-icon icon="double-arrow-right"></das-icon> ')
+                    superNextIcon: y(() => [
+                      L(o.$slots, "superNextIcon", {}, () => [
+                        x(' <das-icon icon="double-arrow-right"></das-icon> ')
                       ], !0)
                     ]),
-                    superPrevIcon: h(() => [
-                      L(r.$slots, "superPrevIcon", {}, () => [
-                        C(' <das-icon icon="double-arrow-left"></das-icon> ')
+                    superPrevIcon: y(() => [
+                      L(o.$slots, "superPrevIcon", {}, () => [
+                        x(' <das-icon icon="double-arrow-left"></das-icon> ')
                       ], !0)
                     ]),
-                    suffixIcon: h(() => [
-                      L(r.$slots, "suffixIcon", {}, () => [
-                        D(i(pe), {
+                    suffixIcon: y(() => [
+                      L(o.$slots, "suffixIcon", {}, () => [
+                        F(d(Se), {
                           class: "das-suffix-icon",
                           icon: "riqixuanze",
-                          size: "medium"
+                          size: "medium",
+                          "icon-color": "#666666"
                         })
                       ], !0)
                     ]),
-                    separator: h(() => [
-                      L(r.$slots, "separator", {}, () => [
-                        s[2] || (s[2] = j(
+                    separator: y(() => [
+                      L(o.$slots, "separator", {}, () => [
+                        t[2] || (t[2] = Q(
                           "div",
                           { style: { padding: "0 8px" } },
                           "~",
@@ -762,19 +826,19 @@ const Ye = {
                         ))
                       ], !0)
                     ]),
-                    renderExtraFooter: h(() => [
-                      j("div", Zt, [
-                        L(r.$slots, "renderExtraFooter", {}, void 0, !0)
+                    renderExtraFooter: y(() => [
+                      Q("div", $t, [
+                        L(o.$slots, "renderExtraFooter", {}, void 0, !0)
                       ]),
-                      t.showTime || t.ranges && t.ranges.length ? (y(), $("div", St, [
-                        (y(!0), $(
-                          be,
+                      r.showTime || r.ranges && r.ranges.length ? (k(), V("div", Ft, [
+                        (k(!0), V(
+                          De,
                           null,
-                          He(t.ranges, (I) => (y(), $("div", {
+                          lt(r.ranges, (s) => (k(), V("div", {
                             class: "das-picker-preset",
-                            key: I.key
+                            key: s.key
                           }, [
-                            C(` <el-dropdown v-if="item.type==='dropdown' && item.children.length" trigger="click" :teleported="false" placement='bottom-end'>\r
+                            x(` <el-dropdown v-if="item.type==='dropdown' && item.children.length" trigger="click" :teleported="false" placement='bottom-end'>\r
                  \r
                     <span class="das-picker-preset-span" >\r
                         {{ item.key }}<das-icon icon="fold" size='mini'></das-icon>\r
@@ -791,31 +855,31 @@ const Ye = {
                     </el-dropdown-menu>\r
                   </template>\r
                 </el-dropdown> `),
-                            I.type === "dropdown" && I.children.length ? (y(), ne(
-                              i(lt),
+                            s.type === "dropdown" && s.children.length ? (k(), fe(
+                              d(ht),
                               {
                                 key: 0,
                                 trigger: ["click"]
                               },
                               {
-                                overlay: h(() => [
-                                  D(
-                                    i(at),
+                                overlay: y(() => [
+                                  F(
+                                    d(yt),
                                     null,
                                     {
-                                      default: h(() => [
-                                        (y(!0), $(
-                                          be,
+                                      default: y(() => [
+                                        (k(!0), V(
+                                          De,
                                           null,
-                                          He(I.children, (J) => (y(), ne(i(ot), {
-                                            key: J.key,
-                                            onClick: (ae) => n(J)
+                                          lt(s.children, (T) => (k(), fe(d(kt), {
+                                            key: T.key,
+                                            onClick: (ae) => je(T)
                                           }, {
-                                            default: h(() => [
-                                              (y(), $(
+                                            default: y(() => [
+                                              (k(), V(
                                                 "span",
-                                                { key: J },
-                                                te(J.key),
+                                                { key: T },
+                                                oe(T.key),
                                                 1
                                                 /* TEXT */
                                               ))
@@ -834,19 +898,19 @@ const Ye = {
                                     /* DYNAMIC_SLOTS */
                                   )
                                 ]),
-                                default: h(() => [
-                                  j("a", {
+                                default: y(() => [
+                                  Q("a", {
                                     class: "ant-dropdown-link",
-                                    onClick: s[0] || (s[0] = et(() => {
+                                    onClick: t[0] || (t[0] = ft(() => {
                                     }, ["prevent"]))
                                   }, [
-                                    j("span", Ct, [
-                                      je(
-                                        te(I.key) + " ",
+                                    Q("span", Lt, [
+                                      ot(
+                                        oe(s.key) + " ",
                                         1
                                         /* TEXT */
                                       ),
-                                      D(i(pe), {
+                                      F(d(Se), {
                                         icon: "fold",
                                         size: "mini",
                                         style: { display: "inline-block" }
@@ -859,24 +923,24 @@ const Ye = {
                               },
                               1024
                               /* DYNAMIC_SLOTS */
-                            )) : (y(), $("span", {
+                            )) : (k(), V("span", {
                               key: 1,
                               class: "das-picker-preset-span",
-                              onClick: (J) => n(I)
-                            }, te(I.key), 9, xt))
+                              onClick: (T) => je(s)
+                            }, oe(s.key), 9, Pt))
                           ]))),
                           128
                           /* KEYED_FRAGMENT */
                         )),
-                        C(` <div class="das-picker-ok">\r
+                        x(` <div class="das-picker-ok">\r
                 <das-button btnType="primary" size="middle">Ok</das-button>\r
               </div> `)
-                      ])) : C("v-if", !0)
+                      ])) : x("v-if", !0)
                     ]),
                     _: 3
                     /* FORWARDED */
                   }, 16, ["value", "size", "locale", "valueFormat", "dropdownClassName", "placeholder", "showToday", "showTime", "bordered", "disabled", "style", "popupStyle"])), [
-                    [i(Ve), ge]
+                    [d(We), te]
                   ])
                 ];
               }),
@@ -887,52 +951,52 @@ const Ye = {
           _: 3
           /* FORWARDED */
         }, 8, ["locale"]),
-        C(` <div\r
+        x(` <div\r
       :class="[errorMode === 'default' ? 'das-date-picker-error-label-content' : 'das-date-picker-overlay-error-label-content', 'das-picker-label-content']"\r
       v-if="(errorMode === 'default' || (errorMode === 'overlay' && isHoverInInput)) && currError && !!errorLabel"\r
     >\r
       <span v-if="currError" class="das-picker-error-label label" :title="errorLabel">{{ errorLabel }}</span>\r
     </div> `),
-        t.error && t.errorLabel ? (y(), $(
-          be,
+        r.error && r.errorLabel ? (k(), V(
+          De,
           { key: 0 },
           [
-            t.errorMode === "default" ? (y(), $("div", zt, [
-              j(
+            r.errorMode === "default" ? (k(), V("div", At, [
+              Q(
                 "span",
                 {
-                  style: ue(Y.value)
+                  style: he(O.value)
                 },
-                te(t.errorLabel),
+                oe(r.errorLabel),
                 5
                 /* TEXT, STYLE */
               )
-            ])) : C("v-if", !0),
-            t.errorMode === "overlay" && K.value ? (y(), ne(i(Me), {
+            ])) : x("v-if", !0),
+            r.errorMode === "overlay" && C.value ? (k(), fe(d(Oe), {
               key: 1,
-              errorLabel: t.errorLabel,
+              errorLabel: r.errorLabel,
               getEl: () => {
-                var T;
-                return (T = c.value) == null ? void 0 : T.$el;
+                var i;
+                return (i = f.value) == null ? void 0 : i.$el;
               },
-              errorModelZIndex: t.errorModelZIndex
-            }, null, 8, ["errorLabel", "getEl", "errorModelZIndex"])) : C("v-if", !0)
+              errorModelZIndex: r.errorModelZIndex
+            }, null, 8, ["errorLabel", "getEl", "errorModelZIndex"])) : x("v-if", !0)
           ],
           64
           /* STABLE_FRAGMENT */
-        )) : C("v-if", !0)
+        )) : x("v-if", !0)
       ],
       6
       /* CLASS, STYLE */
     ));
   }
-}), Vt = /* @__PURE__ */ $e(Mt, [["__scopeId", "data-v-30c858ea"]]), $t = { class: "ant-picker-cell-inner" }, Dt = {
+}), Rt = /* @__PURE__ */ Ye(Bt, [["__scopeId", "data-v-d992f10c"]]), Nt = { class: "ant-picker-cell-inner" }, Ot = {
   key: 0,
   class: "das-date-picker-error-label-content"
-}, Lt = {
+}, Wt = {
   name: "DasDatePicker"
-}, Pt = /* @__PURE__ */ xe({
-  ...Lt,
+}, Yt = /* @__PURE__ */ Ee({
+  ...Wt,
   props: {
     timeZoneMode: {},
     timeZone: {},
@@ -958,167 +1022,173 @@ const Ye = {
     formSize: {}
   },
   emits: ["change", "openChange", "update:model-value", "update:error"],
-  setup(t, { expose: w, emit: a }) {
-    ze((d) => ({
-      v2f888276: S.value,
-      v056d2008: Q.value
+  setup(r, { expose: S, emit: l }) {
+    Be((v) => ({
+      e0a13a8a: K.value,
+      v4c6dfad2: pe.value
     }));
-    const e = t, k = a, N = o(void 0);
-    oe(A, async () => {
-      N.value = await Ae(A.value);
+    const e = r, b = l, j = u(void 0);
+    ce(Y, async () => {
+      j.value = await Je(Y.value);
     }, { immediate: !0 });
-    const P = u(() => `time-picker-${A.value}`), c = o(null), O = o(null), v = o(""), V = o(!1), E = ie(e, "modelValue"), W = ie(e, "error"), Z = u(() => ({
+    const A = a(() => `time-picker-${Y.value}`), f = u(null), G = u(null), p = u(""), M = u(!1), Z = Re(), E = ye(e, "modelValue"), q = ye(e, "error"), J = a(() => Z.valueFormat ?? Z["value-format"]), w = a(() => ({
       timeZoneMode: e.timeZoneMode,
       timeZone: e.timeZone,
       useClientTimeZone: e.useClientTimeZone,
-      timeZoneValueFormat: e.timeZoneValueFormat
-    })), x = u(() => Se(E.value, Z.value)), S = u(() => e.width ? e.width : "230px"), H = u(() => e.formSize), se = u(() => e.size === "large" ? "large" : e.size === "small" || e.size === "table" ? "small" : "middle"), Q = u(() => e.height ? e.height : H.value ? {
+      // timeZoneValueFormat 是最高优先级；未传时兼容旧业务继续使用 valueFormat 控制输出。
+      timeZoneValueFormat: e.timeZoneValueFormat ?? J.value
+    })), N = a(() => {
+      if (!P(w.value)) return Z;
+      const { valueFormat: v, "value-format": n, ...c } = Z;
+      return c;
+    }), I = a(() => Fe(E.value, w.value)), K = a(() => e.width ? e.width : "230px"), R = a(() => e.formSize), H = a(() => e.size === "large" ? "large" : e.size === "small" || e.size === "table" ? "small" : "middle"), pe = a(() => e.height ? e.height : R.value ? {
       small: "24px",
       default: "32px",
       large: "40px"
-    }[H.value] : "auto"), re = u(() => ({
+    }[R.value] : "auto"), _ = a(() => ({
       width: e.width
-    })), U = u(() => e.isView ? e.noSetDefaultVal ? "" : "-" : Ze(e.placeholder)), _ = o(3e3), K = u(() => ({
-      "z-index": _.value
-    })), Y = o(!1), le = o({
+    })), le = a(() => e.isView ? e.noSetDefaultVal ? "" : "-" : $e(e.placeholder)), ne = u(3e3), ue = a(() => ({
+      "z-index": ne.value
+    })), ee = u(!1), h = u({
       display: "block",
       color: "var(--upf-color-error)",
       "white-space": "break-spaces"
-    }), F = (d) => {
-      d && (_.value = Re().nextZIndex()), d ? f() : b(), k("openChange", d), String(A.value).startsWith("en") && ve(() => {
+    }), m = (v) => {
+      v && (ne.value = Ge().nextZIndex()), v ? ie() : ve(), b("openChange", v), String(Y.value).startsWith("en") && Te(() => {
         const n = document == null ? void 0 : document.querySelectorAll(".ant-picker-ok > .ant-btn > span");
-        for (let l of n)
-          l && (l.innerText = "OK");
+        for (let c of n)
+          c && (c.innerText = "OK");
       });
-    }, R = (d) => {
-      M(Z.value) && (v.value = Oe(d));
-    }, f = () => {
-      v.value = "", V.value = me(
-        R,
-        M(Z.value),
-        V.value
+    }, B = (v) => {
+      P(w.value) && (p.value = et(v));
+    }, ie = () => {
+      p.value = "", M.value = Ce(
+        B,
+        P(w.value),
+        M.value
       );
-    }, b = () => {
-      V.value = me(R, !1, V.value);
+    }, ve = () => {
+      M.value = Ce(B, !1, M.value);
     };
-    De(() => {
-      b(), v.value = "";
+    qe(() => {
+      ve(), p.value = "";
     });
-    const m = o(!1), g = o(""), B = u(() => x.value ? g.value : U.value), de = () => {
-      const d = e.size === "table" ? 12 : 14;
-      return Ne(U.value, d);
-    }, X = () => {
+    const C = u(!1), O = u(""), se = a(() => I.value ? O.value : le.value), we = () => {
+      const v = e.size === "table" ? 12 : 14;
+      return Qe(le.value, v);
+    }, U = () => {
       var n;
-      const d = (n = c.value) == null ? void 0 : n.$el.querySelector(".ant-picker-input>input");
-      return x.value ? d == null ? void 0 : d.scrollWidth : de();
-    }, ee = () => {
-      var l;
-      const d = (l = c.value) == null ? void 0 : l.$el.querySelector(".ant-picker-input>input");
-      return d ? (g.value = d.getAttribute("value"), d.removeAttribute("title"), (d == null ? void 0 : d.offsetWidth) ?? 0) : 0;
-    }, q = o(0), z = o(0);
-    oe(() => [U.value, x.value], () => {
-      ve(() => {
-        q.value = ee(), z.value = X(), (q.value === z.value || z.value - q.value < 1) && (m.value = !1);
+      const v = (n = f.value) == null ? void 0 : n.$el.querySelector(".ant-picker-input>input");
+      return I.value ? v == null ? void 0 : v.scrollWidth : we();
+    }, Ze = () => {
+      var c;
+      const v = (c = f.value) == null ? void 0 : c.$el.querySelector(".ant-picker-input>input");
+      return v ? (O.value = v.getAttribute("value"), v.removeAttribute("title"), (v == null ? void 0 : v.offsetWidth) ?? 0) : 0;
+    }, $ = u(0), de = u(0);
+    ce(() => [le.value, I.value], () => {
+      Te(() => {
+        $.value = Ze(), de.value = U(), ($.value === de.value || de.value - $.value < 1) && (C.value = !1);
       });
     });
-    const G = o();
-    oe(
+    const D = u();
+    ce(
       () => {
-        var d;
-        return (d = O.value) == null ? void 0 : d.$tooltipRef.popperRef.contentRef;
+        var v;
+        return (v = G.value) == null ? void 0 : v.$tooltipRef.popperRef.contentRef;
       },
-      (d) => {
-        d && (d.addEventListener("mouseenter", function() {
-          m.value = !0, G.value && clearTimeout(G.value);
-        }), d.addEventListener("mouseleave", function() {
-          G.value = setTimeout(() => {
-            m.value = !1;
+      (v) => {
+        v && (v.addEventListener("mouseenter", function() {
+          C.value = !0, D.value && clearTimeout(D.value);
+        }), v.addEventListener("mouseleave", function() {
+          D.value = setTimeout(() => {
+            C.value = !1;
           }, 200);
         }));
       }
     );
-    const fe = () => {
-      q.value = ee(), z.value = X(), q.value === z.value || z.value - q.value < 1 ? m.value = !1 : (m.value = !0, G.value && clearTimeout(G.value)), Y.value = !0;
-    }, ce = () => {
-      G.value = setTimeout(() => {
-        m.value = !1;
-      }, 200), Y.value = !1;
-    }, ye = (d) => {
-      d ? fe() : ce();
-    }, ke = (d, n) => {
-      W.value = !1, k("update:error", W.value);
-      const l = Je(d, Z.value, v.value);
-      v.value = "";
-      const p = M(Z.value) ? We(l, Z.value) : l, r = M(Z.value) && p != null ? String(p) : n;
-      k("update:model-value", p), k("change", p, r);
+    const ke = () => {
+      $.value = Ze(), de.value = U(), $.value === de.value || de.value - $.value < 1 ? C.value = !1 : (C.value = !0, D.value && clearTimeout(D.value)), ee.value = !0;
+    }, xe = () => {
+      D.value = setTimeout(() => {
+        C.value = !1;
+      }, 200), ee.value = !1;
+    }, be = (v) => {
+      v ? ke() : xe();
+    }, ze = (v, n) => {
+      q.value = !1, b("update:error", q.value);
+      const c = st(v, w.value, p.value);
+      p.value = "";
+      const g = P(w.value) ? _e(c, w.value) : c, W = P(w.value) && g != null ? String(g) : n;
+      b("update:model-value", g), b("change", g, W);
     };
-    return w({
-      $timePicker: c,
+    return S({
+      $timePicker: f,
       blur: () => {
-        c.value.blur();
+        f.value.blur();
       },
       focus: () => {
-        c.value.focus();
+        f.value.focus();
       }
-    }), (d, n) => (y(), $(
+    }), (v, n) => (k(), V(
       "div",
       {
-        class: Le(["das-ui-time-picker", [t.borderType, e.isView ? "readonly" : "", i(W) ? "is-error" : ""]]),
-        style: ue(re.value)
+        class: Ve(["das-ui-time-picker", [r.borderType, e.isView ? "readonly" : "", d(q) ? "is-error" : ""]]),
+        style: he(_.value)
       },
       [
-        D(i(Fe), { locale: N.value }, {
-          default: h(() => [
-            D(i(Be), {
+        F(d(Ue), { locale: j.value }, {
+          default: y(() => [
+            F(d(Xe), {
               ref_key: "inputTooltipRef",
-              ref: O,
+              ref: G,
               placement: "top",
               trigger: "hover",
-              visible: m.value,
-              disabled: !t.isTooltip,
-              content: B.value
+              visible: C.value,
+              disabled: !r.isTooltip,
+              content: se.value
             }, {
-              default: h(() => [
-                Ie((y(), ne(i(nt), we({
-                  key: P.value,
+              default: y(() => [
+                Ne((k(), fe(d(bt), Ie({
+                  key: A.value,
                   ref_key: "$timePicker",
-                  ref: c
-                }, d.$attrs, {
-                  value: x.value,
-                  size: se.value,
-                  popupClassName: "das-ui-time-picker-dropdown " + t.dropdownClassName,
-                  showNow: t.showNow,
-                  bordered: t.borderType === "bordered",
-                  placeholder: U.value,
+                  ref: f
+                }, N.value, {
+                  value: I.value,
+                  size: H.value,
+                  popupClassName: "das-ui-time-picker-dropdown " + r.dropdownClassName,
+                  showNow: r.showNow,
+                  bordered: r.borderType === "bordered",
+                  placeholder: le.value,
                   disabled: e.disabled || e.isView,
-                  style: re.value,
-                  popupStyle: K.value,
-                  onChange: ke,
-                  onOpenChange: F
+                  style: _.value,
+                  popupStyle: ue.value,
+                  onChange: ze,
+                  onOpenChange: m
                 }), {
-                  dateRender: h((l) => [
-                    L(d.$slots, "dateRender", Pe(Ee(l)), () => [
-                      j(
+                  dateRender: y((c) => [
+                    L(v.$slots, "dateRender", Ke(He(c)), () => [
+                      Q(
                         "div",
-                        $t,
-                        te(l.current.date()),
+                        Nt,
+                        oe(c.current.date()),
                         1
                         /* TEXT */
                       )
                     ], !0)
                   ]),
-                  suffixIcon: h(() => [
-                    L(d.$slots, "suffixIcon", {}, () => [
-                      D(i(ct), {
+                  suffixIcon: y(() => [
+                    L(v.$slots, "suffixIcon", {}, () => [
+                      F(d(wt), {
                         class: "das-suffix-icon",
-                        size: "medium"
+                        size: "medium",
+                        iconColor: "#666666"
                       })
                     ], !0)
                   ]),
                   _: 3
                   /* FORWARDED */
                 }, 16, ["value", "size", "popupClassName", "showNow", "bordered", "placeholder", "disabled", "style", "popupStyle"])), [
-                  [i(Ve), ye]
+                  [d(We), be]
                 ])
               ]),
               _: 3
@@ -1128,31 +1198,31 @@ const Ye = {
           _: 3
           /* FORWARDED */
         }, 8, ["locale"]),
-        t.error && t.errorLabel ? (y(), $(
-          be,
+        r.error && r.errorLabel ? (k(), V(
+          De,
           { key: 0 },
           [
-            t.errorMode === "default" ? (y(), $("div", Dt, [
-              j(
+            r.errorMode === "default" ? (k(), V("div", Ot, [
+              Q(
                 "span",
                 {
-                  style: ue(le.value)
+                  style: he(h.value)
                 },
-                te(t.errorLabel),
+                oe(r.errorLabel),
                 5
                 /* TEXT, STYLE */
               )
-            ])) : C("v-if", !0),
-            t.errorMode === "overlay" && Y.value ? (y(), ne(i(Me), {
+            ])) : x("v-if", !0),
+            r.errorMode === "overlay" && ee.value ? (k(), fe(d(Oe), {
               key: 1,
-              errorLabel: t.errorLabel,
+              errorLabel: r.errorLabel,
               getEl: () => {
-                var l;
-                return (l = c.value) == null ? void 0 : l.$el;
+                var c;
+                return (c = f.value) == null ? void 0 : c.$el;
               },
-              errorModelZIndex: t.errorModelZIndex
-            }, null, 8, ["errorLabel", "getEl", "errorModelZIndex"])) : C("v-if", !0),
-            C(` <template v-else-if="errorMode === 'overlay' && isHoverInInput">\r
+              errorModelZIndex: r.errorModelZIndex
+            }, null, 8, ["errorLabel", "getEl", "errorModelZIndex"])) : x("v-if", !0),
+            x(` <template v-else-if="errorMode === 'overlay' && isHoverInInput">\r
         <teleport to="body" v-if="teleported">\r
           <div ref="$errorModel" :style="errorModelStyle">\r
             <span :style="errorLabelStyle">{{ errorLabel }}</span>\r
@@ -1166,19 +1236,19 @@ const Ye = {
           ],
           64
           /* STABLE_FRAGMENT */
-        )) : C("v-if", !0)
+        )) : x("v-if", !0)
       ],
       6
       /* CLASS, STYLE */
     ));
   }
-}), Et = /* @__PURE__ */ $e(Pt, [["__scopeId", "data-v-7c2bcad5"]]), Ft = { class: "ant-picker-cell-inner" }, Bt = {
+}), jt = /* @__PURE__ */ Ye(Yt, [["__scopeId", "data-v-5d351731"]]), qt = { class: "ant-picker-cell-inner" }, Kt = {
   key: 0,
   class: "das-date-picker-error-label-content"
-}, Rt = {
+}, Ht = {
   name: "DasDatePicker"
-}, At = /* @__PURE__ */ xe({
-  ...Rt,
+}, Ut = /* @__PURE__ */ Ee({
+  ...Ht,
   props: {
     timeZoneMode: {},
     timeZone: {},
@@ -1204,189 +1274,195 @@ const Ye = {
     formSize: {}
   },
   emits: ["change", "openChange", "update:model-value", "update:error"],
-  setup(t, { expose: w, emit: a }) {
-    ze((n) => ({
-      v70cdb73a: S.value,
-      v11bc6e2a: Q.value
-    })), qe({
+  setup(r, { expose: S, emit: l }) {
+    Be((n) => ({
+      f466b758: K.value,
+      v19f8ec59: pe.value
+    })), rt({
       dengdai: import("@das-fed/upf-ui/packages/icons/dengdai")
     });
-    const e = t, k = a, N = o(void 0);
-    oe(A, async () => {
-      N.value = await Ae(A.value);
+    const e = r, b = l, j = u(void 0);
+    ce(Y, async () => {
+      j.value = await Je(Y.value);
     }, { immediate: !0 });
-    const P = u(() => `time-range-picker-${A.value}`), c = o(null), O = o(null), v = o(""), V = o(!1), E = ie(e, "modelValue"), W = ie(e, "error"), Z = u(() => ({
+    const A = a(() => `time-range-picker-${Y.value}`), f = u(null), G = u(null), p = u(""), M = u(!1), Z = Re(), E = ye(e, "modelValue"), q = ye(e, "error"), J = a(() => Z.valueFormat ?? Z["value-format"]), w = a(() => ({
       timeZoneMode: e.timeZoneMode,
       timeZone: e.timeZone,
       useClientTimeZone: e.useClientTimeZone,
-      timeZoneValueFormat: e.timeZoneValueFormat
-    })), x = u(() => !Array.isArray(E.value) || !M(Z.value) ? E.value : E.value.map((n) => Se(n, Z.value))), S = u(() => e.width ? e.width : "230px"), H = u(() => e.formSize), se = u(() => e.size === "large" ? "large" : e.size === "small" || e.size === "table" ? "small" : "middle"), Q = u(() => e.height ? e.height : H.value ? {
+      // timeZoneValueFormat 是最高优先级；未传时兼容旧业务继续使用 valueFormat 控制输出。
+      timeZoneValueFormat: e.timeZoneValueFormat ?? J.value
+    })), N = a(() => {
+      if (!P(w.value)) return Z;
+      const { valueFormat: n, "value-format": c, ...g } = Z;
+      return g;
+    }), I = a(() => !Array.isArray(E.value) || !P(w.value) ? E.value : E.value.map((n) => Fe(n, w.value))), K = a(() => e.width ? e.width : "230px"), R = a(() => e.formSize), H = a(() => e.size === "large" ? "large" : e.size === "small" || e.size === "table" ? "small" : "middle"), pe = a(() => e.height ? e.height : R.value ? {
       small: "24px",
       default: "32px",
       large: "40px"
-    }[H.value] : "auto"), re = o(3e3), U = u(() => ({
-      "z-index": re.value
-    })), _ = u(() => ({
+    }[R.value] : "auto"), _ = u(3e3), le = a(() => ({
+      "z-index": _.value
+    })), ne = a(() => ({
       width: e.width
-    })), K = u(() => {
+    })), ue = a(() => {
       var n;
-      return e.isView ? e.noSetDefaultVal ? ["", ""] : ["-", "-"] : (n = e.placeholder) == null ? void 0 : n.map((l) => Ze(l));
-    }), Y = o(!1), le = o({
+      return e.isView ? e.noSetDefaultVal ? ["", ""] : ["-", "-"] : (n = e.placeholder) == null ? void 0 : n.map((c) => $e(c));
+    }), ee = u(!1), h = u({
       display: "block",
       color: "var(--upf-color-error)",
       "white-space": "break-spaces"
-    }), F = o(!1), R = o(["", ""]), f = o("~"), b = u(() => {
+    }), m = u(!1), B = u(["", ""]), ie = u("~"), ve = a(() => {
       var n;
-      return (n = E.value) != null && n.length && E.value[0] && E.value[1] ? R.value.join(" " + f.value + " ") : K.value.join(" " + f.value + " ");
-    }), m = o([0, 0]), g = o([0, 0]), B = () => {
-      var r;
+      return (n = E.value) != null && n.length && E.value[0] && E.value[1] ? B.value.join(" " + ie.value + " ") : ue.value.join(" " + ie.value + " ");
+    }), C = u([0, 0]), O = u([0, 0]), se = () => {
+      var W;
       let n = [];
-      const l = (r = c.value) == null ? void 0 : r.$el.querySelectorAll(".ant-picker-input>input");
-      if (!l)
+      const c = (W = f.value) == null ? void 0 : W.$el.querySelectorAll(".ant-picker-input>input");
+      if (!c)
         return n = [0, 0], n;
-      let p = [];
-      for (let s of l) {
-        p.push(s.getAttribute("value") || "");
-        let T = (s == null ? void 0 : s.offsetWidth) ?? 0;
-        n.push(T);
+      let g = [];
+      for (let te of c) {
+        g.push(te.getAttribute("value") || "");
+        let re = (te == null ? void 0 : te.offsetWidth) ?? 0;
+        n.push(re);
       }
-      return R.value = p, n;
-    }, de = (n) => {
-      const l = e.size === "table" ? 12 : 14;
-      return Ne(n, l);
-    }, X = () => {
-      var p;
+      return B.value = g, n;
+    }, we = (n) => {
+      const c = e.size === "table" ? 12 : 14;
+      return Qe(n, c);
+    }, U = () => {
+      var g;
       let n = [];
-      return ((p = c.value) == null ? void 0 : p.$el.querySelectorAll(".ant-picker-input>input")).forEach((r, s) => {
-        E.value.length && E.value[0] && E.value[0] ? n.push(r == null ? void 0 : r.scrollWidth) : n.push(de(K.value[s]));
+      return ((g = f.value) == null ? void 0 : g.$el.querySelectorAll(".ant-picker-input>input")).forEach((W, te) => {
+        E.value.length && E.value[0] && E.value[0] ? n.push(W == null ? void 0 : W.scrollWidth) : n.push(we(ue.value[te]));
       }), n;
     };
-    oe(() => [K.value, E.value], () => {
-      ve(() => {
-        m.value = B(), g.value = X(), (m.value[0] === g.value[0] || g.value[0] - m.value[0] < 1) && (m.value[1] === g.value[1] || g.value[1] - m.value[1] < 1) && (F.value = !1);
+    ce(() => [ue.value, E.value], () => {
+      Te(() => {
+        C.value = se(), O.value = U(), (C.value[0] === O.value[0] || O.value[0] - C.value[0] < 1) && (C.value[1] === O.value[1] || O.value[1] - C.value[1] < 1) && (m.value = !1);
       });
     });
-    const q = o();
-    oe(
+    const $ = u();
+    ce(
       () => {
         var n;
-        return (n = O.value) == null ? void 0 : n.$tooltipRef.popperRef.contentRef;
+        return (n = G.value) == null ? void 0 : n.$tooltipRef.popperRef.contentRef;
       },
       (n) => {
         n && (n.addEventListener("mouseenter", function() {
-          F.value = !0, q.value && clearTimeout(q.value);
+          m.value = !0, $.value && clearTimeout($.value);
         }), n.addEventListener("mouseleave", function() {
-          q.value = setTimeout(() => {
-            F.value = !1;
+          $.value = setTimeout(() => {
+            m.value = !1;
           }, 200);
         }));
       }
     );
-    const z = (n) => {
-      n && (re.value = Re().nextZIndex()), n ? G() : fe(), k("openChange", n), String(A.value).startsWith("en") && ve(() => {
-        const l = document == null ? void 0 : document.querySelectorAll(".ant-picker-ok > .ant-btn > span");
-        for (let p of l)
-          p && (p.innerText = "OK");
+    const de = (n) => {
+      n && (_.value = Ge().nextZIndex()), n ? D() : ke(), b("openChange", n), String(Y.value).startsWith("en") && Te(() => {
+        const c = document == null ? void 0 : document.querySelectorAll(".ant-picker-ok > .ant-btn > span");
+        for (let g of c)
+          g && (g.innerText = "OK");
       });
-    }, he = (n) => {
-      M(Z.value) && (v.value = Oe(n));
-    }, G = () => {
-      v.value = "", V.value = me(
-        he,
-        M(Z.value),
-        V.value
+    }, z = (n) => {
+      P(w.value) && (p.value = et(n));
+    }, D = () => {
+      p.value = "", M.value = Ce(
+        z,
+        P(w.value),
+        M.value
       );
-    }, fe = () => {
-      V.value = me(he, !1, V.value);
+    }, ke = () => {
+      M.value = Ce(z, !1, M.value);
     };
-    De(() => {
-      fe(), v.value = "";
+    qe(() => {
+      ke(), p.value = "";
     });
-    const ce = () => {
-      m.value = B(), g.value = X(), (m.value[0] === g.value[0] || g.value[0] - m.value[0] < 1) && (m.value[1] === g.value[1] || g.value[1] - m.value[1] < 1) ? F.value = !1 : (F.value = !0, q.value && clearTimeout(q.value)), Y.value = !0;
-    }, ye = () => {
-      q.value = setTimeout(() => {
-        F.value = !1;
-      }, 200), Y.value = !1;
-    }, ke = (n) => {
-      n ? ce() : ye();
-    }, ge = (n, l) => {
-      if (W.value = !1, n === null) {
-        k("update:model-value", [null, null]), k("change", [null, null], Array.isArray(l) ? l.join(" ~ ") : l);
+    const xe = () => {
+      C.value = se(), O.value = U(), (C.value[0] === O.value[0] || O.value[0] - C.value[0] < 1) && (C.value[1] === O.value[1] || O.value[1] - C.value[1] < 1) ? m.value = !1 : (m.value = !0, $.value && clearTimeout($.value)), ee.value = !0;
+    }, be = () => {
+      $.value = setTimeout(() => {
+        m.value = !1;
+      }, 200), ee.value = !1;
+    }, ze = (n) => {
+      n ? xe() : be();
+    }, X = (n, c) => {
+      if (q.value = !1, n === null) {
+        b("update:model-value", [null, null]), b("change", [null, null], Array.isArray(c) ? c.join(" ~ ") : c);
         return;
       }
-      const p = Qe(n, Z.value, v.value);
-      v.value = "";
-      const r = M(Z.value) && Array.isArray(p) ? p.map((T) => T && We(T, Z.value)) : p, s = M(Z.value) && Array.isArray(r) ? r.map((T) => T == null ? "" : String(T)).join(" ~ ") : Array.isArray(l) ? l.join(" ~ ") : l;
-      k("update:error", W.value), k("update:model-value", r), k("change", r, s);
+      const g = dt(n, w.value, p.value);
+      p.value = "";
+      const W = P(w.value) && Array.isArray(g) ? g.map((re) => re && _e(re, w.value)) : g, te = P(w.value) && Array.isArray(W) ? W.map((re) => re == null ? "" : String(re)).join(" ~ ") : Array.isArray(c) ? c.join(" ~ ") : c;
+      b("update:error", q.value), b("update:model-value", W), b("change", W, te);
     };
-    return w({
-      $timeRangePicker: c,
+    return S({
+      $timeRangePicker: f,
       blur: () => {
-        c.value.blur();
+        f.value.blur();
       },
       focus: () => {
-        c.value.focus();
+        f.value.focus();
       }
-    }), (n, l) => (y(), $(
+    }), (n, c) => (k(), V(
       "div",
       {
-        class: Le(["das-ui-time-range-picker", [t.borderType, e.isView ? "readonly" : "", i(W) ? "is-error" : ""]]),
-        style: ue(_.value)
+        class: Ve(["das-ui-time-range-picker", [r.borderType, e.isView ? "readonly" : "", d(q) ? "is-error" : ""]]),
+        style: he(ne.value)
       },
       [
-        D(i(Fe), { locale: N.value }, {
-          default: h(() => [
-            D(i(Be), {
+        F(d(Ue), { locale: j.value }, {
+          default: y(() => [
+            F(d(Xe), {
               ref_key: "inputTooltipRef",
-              ref: O,
+              ref: G,
               placement: "top",
               trigger: "hover",
-              visible: F.value,
-              disabled: !t.isTooltip,
-              content: b.value
+              visible: m.value,
+              disabled: !r.isTooltip,
+              content: ve.value
             }, {
-              default: h(() => [
-                Ie((y(), ne(i(ut), we({
-                  key: P.value,
+              default: y(() => [
+                Ne((k(), fe(d(gt), Ie({
+                  key: A.value,
                   ref_key: "$timeRangePicker",
-                  ref: c
-                }, n.$attrs, {
-                  value: x.value,
-                  size: se.value,
-                  popupClassName: "das-ui-time-range-picker-dropdown " + t.dropdownClassName,
-                  showNow: t.showNow,
-                  bordered: t.borderType === "bordered",
-                  placeholder: K.value,
+                  ref: f
+                }, N.value, {
+                  value: I.value,
+                  size: H.value,
+                  popupClassName: "das-ui-time-range-picker-dropdown " + r.dropdownClassName,
+                  showNow: r.showNow,
+                  bordered: r.borderType === "bordered",
+                  placeholder: ue.value,
                   disabled: e.disabled || e.isView,
-                  style: _.value,
-                  popupStyle: U.value,
-                  onChange: ge,
-                  onOpenChange: z
+                  style: ne.value,
+                  popupStyle: le.value,
+                  onChange: X,
+                  onOpenChange: de
                 }), {
-                  dateRender: h((p) => [
-                    L(n.$slots, "dateRender", Pe(Ee(p)), () => [
-                      j(
+                  dateRender: y((g) => [
+                    L(n.$slots, "dateRender", Ke(He(g)), () => [
+                      Q(
                         "div",
-                        Ft,
-                        te(p.current.date()),
+                        qt,
+                        oe(g.current.date()),
                         1
                         /* TEXT */
                       )
                     ], !0)
                   ]),
-                  suffixIcon: h(() => [
+                  suffixIcon: y(() => [
                     L(n.$slots, "suffixIcon", {}, () => [
-                      D(i(pe), {
+                      F(d(Se), {
                         class: "das-suffix-icon",
                         icon: "dengdai",
-                        size: "medium"
+                        size: "medium",
+                        "icon-color": "#666666"
                       })
                     ], !0)
                   ]),
-                  separator: h(() => [
+                  separator: y(() => [
                     L(n.$slots, "separator", {}, () => [
-                      l[0] || (l[0] = j(
+                      c[0] || (c[0] = Q(
                         "div",
                         { style: { padding: "0 8px" } },
                         "~",
@@ -1398,7 +1474,7 @@ const Ye = {
                   _: 3
                   /* FORWARDED */
                 }, 16, ["value", "size", "popupClassName", "showNow", "bordered", "placeholder", "disabled", "style", "popupStyle"])), [
-                  [i(Ve), ke]
+                  [d(We), ze]
                 ])
               ]),
               _: 3
@@ -1408,40 +1484,40 @@ const Ye = {
           _: 3
           /* FORWARDED */
         }, 8, ["locale"]),
-        t.error && t.errorLabel ? (y(), $(
-          be,
+        r.error && r.errorLabel ? (k(), V(
+          De,
           { key: 0 },
           [
-            t.errorMode === "default" ? (y(), $("div", Bt, [
-              j(
+            r.errorMode === "default" ? (k(), V("div", Kt, [
+              Q(
                 "span",
                 {
-                  style: ue(le.value)
+                  style: he(h.value)
                 },
-                te(t.errorLabel),
+                oe(r.errorLabel),
                 5
                 /* TEXT, STYLE */
               )
-            ])) : C("v-if", !0),
-            t.errorMode === "overlay" && Y.value ? (y(), ne(i(Me), {
+            ])) : x("v-if", !0),
+            r.errorMode === "overlay" && ee.value ? (k(), fe(d(Oe), {
               key: 1,
-              errorLabel: t.errorLabel,
+              errorLabel: r.errorLabel,
               getEl: () => {
-                var p;
-                return (p = c.value) == null ? void 0 : p.$el;
+                var g;
+                return (g = f.value) == null ? void 0 : g.$el;
               },
-              errorModelZIndex: t.errorModelZIndex
-            }, null, 8, ["errorLabel", "getEl", "errorModelZIndex"])) : C("v-if", !0)
+              errorModelZIndex: r.errorModelZIndex
+            }, null, 8, ["errorLabel", "getEl", "errorModelZIndex"])) : x("v-if", !0)
           ],
           64
           /* STABLE_FRAGMENT */
-        )) : C("v-if", !0)
+        )) : x("v-if", !0)
       ],
       6
       /* CLASS, STYLE */
     ));
   }
-}), Nt = /* @__PURE__ */ $e(At, [["__scopeId", "data-v-3195376e"]]), Wt = {
+}), Xt = /* @__PURE__ */ Ye(Ut, [["__scopeId", "data-v-2181a99e"]]), Gt = {
   开始日期: { "zh-CN": "开始日期", en: "Start Date", "zh-MO": "開始日期", _appCode: "framework" },
   结束日期: { "zh-CN": "结束日期", en: "End Date", "zh-MO": "結束日期", _appCode: "framework" },
   开始时间: { "zh-CN": "开始时间", en: "Start Time", "zh-MO": "開始時間", _appCode: "framework" },
@@ -1449,13 +1525,13 @@ const Ye = {
   请选择日期: { "zh-CN": "请选择日期", en: "Please select a date", "zh-MO": "請選擇日期", _appCode: "framework" },
   请选择时间: { "zh-CN": "请选择时间", en: "Please select the time", "zh-MO": "請選擇時間", _appCode: "framework" }
 };
-it(Wt);
-const ir = Ce(ht), sr = Ce(Tt), dr = Ce(Vt), cr = Ce(Et), vr = Ce(Nt), fr = { name: "datePicker 日期时间选择器" };
+Tt(Gt);
+const yr = Ae(xt), kr = Ae(It), br = Ae(Rt), gr = Ae(jt), Tr = Ae(Xt), wr = { name: "datePicker 日期时间选择器" };
 export {
-  ir as DasDatePicker,
-  sr as DasDateRangePicker,
-  dr as DasRangePicker,
-  cr as DasTimePicker,
-  vr as DasTimeRangePicker,
-  fr as default
+  yr as DasDatePicker,
+  kr as DasDateRangePicker,
+  br as DasRangePicker,
+  gr as DasTimePicker,
+  Tr as DasTimeRangePicker,
+  wr as default
 };