@das-fed/ui 7.0.7-hot.21 → 7.0.7-hot.22

package/packages/components/calendar/index.js

@@ -1,38 +1,38 @@
 import '@das-fed/ui/packages/components/calendar/style.css';
 import { withInstall as ee } from "@das-fed/utils/with-install/index";
-import { defineComponent as Q, ref as O, computed as g, watch as ae, nextTick as x, createElementBlock as m, createCommentVNode as C, openBlock as u, normalizeClass as B, createElementVNode as b, Fragment as j, renderList as P, renderSlot as N, toDisplayString as L, normalizeStyle as te, onMounted as ne, onBeforeUnmount as re, createVNode as se, createSlots as K, withCtx as V, normalizeProps as F, mergeProps as Z, guardReactiveProps as E, createBlock as oe } from "vue";
-import { t as A, currentLang as U, setI18nRule as de } from "@das-fed/web/packages/i18n/index";
+import { defineComponent as Q, ref as H, computed as g, watch as ae, nextTick as I, createElementBlock as f, createCommentVNode as C, openBlock as u, normalizeClass as B, createElementVNode as b, Fragment as j, renderList as P, renderSlot as N, toDisplayString as L, normalizeStyle as te, onMounted as ne, onBeforeUnmount as re, createVNode as se, createSlots as K, withCtx as V, normalizeProps as F, mergeProps as Z, guardReactiveProps as x, createBlock as oe } from "vue";
+import { t as A, currentLang as U, setI18nRule as le } from "@das-fed/web/packages/i18n/index";
 import M from "dayjs";
-import { SizeWatcher as le } from "@das-fed/utils/size-watcher";
+import { SizeWatcher as de } from "@das-fed/utils/size-watcher";
 import { setThemeRule as ce } from "@das-fed/web/packages/theme/index";
 const he = (o, i) => {
-  const d = o.endOf("month"), c = i.startOf("month"), n = d.isSame(c, "week") ? c.add(1, "week") : c;
+  const l = o.endOf("month"), c = i.startOf("month"), n = l.isSame(c, "week") ? c.add(1, "week") : c;
   return [
-    [o, d],
+    [o, l],
     [n.startOf("week"), i]
   ];
 }, ie = (o, i) => {
-  const d = o.endOf("month"), c = o.add(1, "month").startOf("month"), s = d.isSame(
+  const l = o.endOf("month"), c = o.add(1, "month").startOf("month"), s = l.isSame(
     c,
     "week"
-  ) ? c.add(1, "week") : c, n = s.endOf("month"), f = i.startOf("month"), z = n.isSame(f, "week") ? f.add(1, "week") : f;
+  ) ? c.add(1, "week") : c, n = s.endOf("month"), p = i.startOf("month"), z = n.isSame(p, "week") ? p.add(1, "week") : p;
   return [
-    [o, d],
+    [o, l],
     [s.startOf("week"), n],
     [z.startOf("week"), i]
   ];
 }, q = (o, i) => {
-  const d = o.startOf("week"), c = i.endOf("week"), s = d.get("month"), n = c.get("month");
-  return s === n ? [[d, c]] : (s + 1) % 12 === n ? he(d, c) : s + 2 === n || (s + 1) % 11 === n ? ie(d, c) : [];
+  const l = o.startOf("week"), c = i.endOf("week"), s = l.get("month"), n = c.get("month");
+  return s === n ? [[l, c]] : (s + 1) % 12 === n ? he(l, c) : s + 2 === n || (s + 1) % 11 === n ? ie(l, c) : (console.warn("start time and end time interval must not exceed two months"), []);
 }, $ = (o) => Array.from(Array.from({ length: o }).keys()), ue = (o, i) => {
-  const d = o.subtract(1, "month").endOf("month").date();
-  return $(i).map((c, s) => d - (i - s - 1));
+  const l = o.subtract(1, "month").endOf("month").date();
+  return $(i).map((c, s) => l - (i - s - 1));
 }, pe = (o) => {
   const i = o.daysInMonth();
-  return $(i).map((d, c) => c + 1);
+  return $(i).map((l, c) => c + 1);
 }, me = (o) => $(o.length / 7).map((i) => {
-  const d = i * 7;
-  return o.slice(d, d + 7);
+  const l = i * 7;
+  return o.slice(l, l + 7);
 }), fe = { key: 0 }, ye = { class: "das-calendar-header-box" }, ke = { class: "das-calendar-header-week-line" }, ge = ["onClick"], we = {
   name: "calendar-table"
 }, G = /* @__PURE__ */ Q({
@@ -51,25 +51,25 @@ const he = (o, i) => {
     cellHeight: {}
   },
   emits: ["pick"],
-  setup(o, { expose: i, emit: d }) {
-    const c = d, s = M(), n = o, f = O("128px"), z = O(), Y = 60, S = ["sun", "mon", "tue", "wed", "thu", "fri", "sat"], _ = g(() => !!n.range && !!n.range.length), J = g(() => {
+  setup(o, { expose: i, emit: l }) {
+    const c = l, s = M(), n = o, p = H("128px"), z = H(), Y = 60, S = ["sun", "mon", "tue", "wed", "thu", "fri", "sat"], _ = g(() => !!n.range && !!n.range.length), J = g(() => {
       const e = n.firstDayOfWeek, t = n.showZhou ? "das-calendar-weeks-zhou-" : "das-calendar-weeks-";
       return e === 0 ? S.map((r) => A(`${t}${r}`)) : S.slice(e).concat(S.slice(0, e)).map((r) => A(`${t}${r}`));
-    }), D = g(() => {
+    }), v = g(() => {
       let e = [];
       if (_.value) {
         const [t, r] = n.range;
         let h = [];
-        t.isSame(r, "month") ? h = $(r.date() - t.date() + 1).map((v) => ({
-          text: t.date() + v,
+        t.isSame(r, "month") ? h = $(r.date() - t.date() + 1).map((D) => ({
+          text: t.date() + D,
           type: "current"
-        })) : h = $(t.endOf("month").date() - t.date() + 1).map((v) => ({
-          text: t.date() + v,
+        })) : h = $(t.endOf("month").date() - t.date() + 1).map((D) => ({
+          text: t.date() + D,
           type: "current"
         }));
         let k = h.length % 7;
         k = k === 0 ? 0 : 7 - k;
-        const w = $(k).map((v, T) => ({
+        const w = $(k).map((D, T) => ({
           text: T + 1,
           type: "next"
         }));
@@ -78,53 +78,53 @@ const he = (o, i) => {
         const t = n.date.startOf("month").day(), r = ue(
           n.date,
           (t - n.firstDayOfWeek + 7) % 7
-        ).map((v) => ({
-          text: v,
+        ).map((D) => ({
+          text: D,
           type: "prev"
-        })), h = pe(n.date).map((v) => ({
-          text: v,
+        })), h = pe(n.date).map((D) => ({
+          text: D,
           type: "current"
         }));
         e = [...r, ...h];
-        const k = 7 - (e.length % 7 || 7), w = $(k).map((v, T) => ({
+        const k = 7 - (e.length % 7 || 7), w = $(k).map((D, T) => ({
           text: T + 1,
           type: "next"
         }));
         if (e = e.concat(w), n.calendartType == "simple" && e.length / 7 < 6) {
-          const v = w.length ? w[w.length - 1].text : 0, T = $(7).map((We, X) => ({
-            text: v + X + 1,
+          const D = w.length ? w[w.length - 1].text : 0, T = $(7).map((We, X) => ({
+            text: D + X + 1,
             type: "next"
           }));
           e = e.concat(T);
         }
       }
       return me(e);
-    }), H = () => {
+    }), O = () => {
       var r;
       const e = (r = n.parent) == null ? void 0 : r.offsetHeight;
       let t = Number(e) - Y - 1;
-      f.value = t / D.value.length - 1 + "px";
+      p.value = t / v.value.length - 1 + "px", console.log("trHeight1", p.value, t, v.value.length);
     };
     ae(
-      () => D.value,
+      () => v.value,
       (e) => {
         if (n.cellHeight) {
-          f.value = `${n.cellHeight}px`;
+          p.value = `${n.cellHeight}px`;
           return;
         }
-        e && e.length ? x(() => {
-          H();
-        }) : f.value = "128px";
+        e && e.length ? I(() => {
+          O();
+        }) : p.value = "128px", console.log("trHeight2", p.value);
       },
       { immediate: !0 }
     );
     const W = () => {
-      if (n.cellHeight) {
-        f.value = `${n.cellHeight}px`;
+      if (console.log("getHeight", v.value, n.cellHeight), n.cellHeight) {
+        p.value = `${n.cellHeight}px`;
         return;
       }
-      x(() => {
-        H();
+      I(() => {
+        O();
       });
     }, y = (e, t) => {
       switch (t) {
@@ -138,11 +138,11 @@ const he = (o, i) => {
     }, R = ({ text: e, type: t }) => {
       const r = [t], h = y(e, t);
       return h.isSame(n.selectedDay, "day") && r.push("is-selected"), h.isSame(s, "day") && r.push("is-today"), r;
-    }, I = ({ text: e, type: t }) => {
+    }, E = ({ text: e, type: t }) => {
       const r = y(e, t);
       c("pick", r);
     }, a = (e) => {
-      const t = D.value[0];
+      const t = v.value[0];
       if (t) {
         const r = t[e];
         if (r) {
@@ -151,8 +151,8 @@ const he = (o, i) => {
         }
       }
       return "";
-    }, p = (e) => {
-      const t = D.value[0];
+    }, m = (e) => {
+      const t = v.value[0];
       if (t) {
         const r = t[e];
         if (r) {
@@ -171,7 +171,7 @@ const he = (o, i) => {
         day: null,
         date: null
       };
-    }, l = ({ text: e, type: t }) => {
+    }, d = ({ text: e, type: t }) => {
       const r = y(e, t);
       return {
         isSelected: r.isSame(n.selectedDay),
@@ -182,7 +182,7 @@ const he = (o, i) => {
     };
     return i({
       getHeight: W
-    }), (e, t) => D.value.length ? (u(), m(
+    }), (e, t) => v.value.length ? (u(), f(
       "table",
       {
         key: 0,
@@ -193,11 +193,11 @@ const he = (o, i) => {
         ref: z
       },
       [
-        e.hideHeader ? C("v-if", !0) : (u(), m("thead", fe, [
-          (u(!0), m(
+        e.hideHeader ? C("v-if", !0) : (u(), f("thead", fe, [
+          (u(!0), f(
             j,
             null,
-            P(J.value, (r, h) => (u(), m("th", {
+            P(J.value, (r, h) => (u(), f("th", {
               class: "das-calendar-table-header",
               key: r
             }, [
@@ -214,10 +214,10 @@ const he = (o, i) => {
                   ),
                   e.calendartType == "week" ? N(e.$slots, "week-type", {
                     key: 0,
-                    data: p(h)
+                    data: m(h)
                   }) : C("v-if", !0)
                 ]),
-                e.calendartType == "week" ? (u(), m(
+                e.calendartType == "week" ? (u(), f(
                   "div",
                   {
                     key: 0,
@@ -234,10 +234,10 @@ const he = (o, i) => {
           ))
         ])),
         b("tbody", null, [
-          (u(!0), m(
+          (u(!0), f(
             j,
             null,
-            P(D.value, (r, h) => (u(), m(
+            P(v.value, (r, h) => (u(), f(
               "tr",
               {
                 key: h,
@@ -247,13 +247,13 @@ const he = (o, i) => {
                 })
               },
               [
-                (u(!0), m(
+                (u(!0), f(
                   j,
                   null,
-                  P(r, (k, w) => (u(), m("td", {
+                  P(r, (k, w) => (u(), f("td", {
                     key: w,
                     class: B(R(k)),
-                    onClick: (v) => I(k)
+                    onClick: (D) => E(k)
                   }, [
                     C(" v-scrollbar "),
                     C(' :style="{ height: trHeight }" '),
@@ -261,11 +261,11 @@ const he = (o, i) => {
                       "div",
                       {
                         class: "das-calendar-day",
-                        style: te({ height: f.value })
+                        style: te({ height: p.value })
                       },
                       [
                         N(e.$slots, "date-cell", {
-                          data: l(k)
+                          data: d(k)
                         })
                       ],
                       4
@@ -323,53 +323,53 @@ const he = (o, i) => {
     cellHeight: { default: 0 }
   },
   emits: ["update:model-value", "itemClick"],
-  setup(o, { expose: i, emit: d }) {
-    const c = g(() => U.value == "zh-CN" ? 1 : (U.value == "en", 0)), s = o, n = d, f = O(), z = O(), Y = O(), S = g(() => s.firstDayOfWeek || c.value), _ = O(), J = M(), D = g({
+  setup(o, { expose: i, emit: l }) {
+    const c = g(() => U.value == "zh-CN" ? 1 : (U.value == "en", 0)), s = o, n = l, p = H(), z = H(), Y = H(), S = g(() => s.firstDayOfWeek || c.value), _ = H(), J = M(), v = g({
       get() {
         return s.modelValue ? (_.value = y.value, y.value) : _.value;
       },
       set(a) {
         if (!a) return;
         _.value = a;
-        const p = a.toDate();
-        s.isSwitchMonth && n("update:model-value", p);
+        const m = a.toDate();
+        s.isSwitchMonth && n("update:model-value", m);
       }
-    }), H = g(() => {
+    }), O = g(() => {
       if (s.type == "week") {
         if (s.range) return s.range;
-        const p = (M(s.modelValue).day() - S.value + 7) % 7, l = 7 - (p + 1), e = [];
-        return e.push(M(s.modelValue).subtract(p, "day").toDate()), e.push(M(s.modelValue).add(l, "day").toDate()), e;
+        const m = (M(s.modelValue).day() - S.value + 7) % 7, d = 7 - (m + 1), e = [];
+        return e.push(M(s.modelValue).subtract(m, "day").toDate()), e.push(M(s.modelValue).add(d, "day").toDate()), e;
       } else
         return s.range ? s.range : void 0;
     }), W = g(() => {
-      if (!H.value) return [];
-      const a = H.value.map((e) => M(e)), [p, l] = a;
-      return s.type == "week" ? [[p, l]] : p.isAfter(l) ? [] : p.isSame(l, "month") ? q(p, l) : p.add(1, "month").month() !== l.month() ? [] : q(p, l);
-    }), y = g(() => s.modelValue ? M(s.modelValue) : D.value || (W.value.length ? W.value[0][0] : J));
+      if (!O.value) return [];
+      const a = O.value.map((e) => M(e)), [m, d] = a;
+      return s.type == "week" ? [[m, d]] : m.isAfter(d) ? (console.warn("end time should be greater than start time"), []) : m.isSame(d, "month") ? q(m, d) : m.add(1, "month").month() !== d.month() ? (console.warn("start time and end time interval must not exceed two months"), []) : q(m, d);
+    }), y = g(() => s.modelValue ? M(s.modelValue) : v.value || (W.value.length ? W.value[0][0] : J));
     g(() => y.value.subtract(1, "month").date(1)), g(() => y.value.add(1, "month").date(1)), g(() => y.value.subtract(1, "year").date(1)), g(() => y.value.add(1, "year").date(1)), g(() => {
       const a = `das-calendar-month${y.value.format("M")}`;
       return `${y.value.year()} ${A("das-calendar-year")} ${A(a)}`;
     }), ne(() => {
-      Y.value = le(() => {
-        var a, p;
-        Array.isArray(z.value) ? (a = z.value[0]) == null || a.getHeight() : (p = z.value) == null || p.getHeight();
-      }, f.value);
+      Y.value = de(() => {
+        var a, m;
+        Array.isArray(z.value) ? (a = z.value[0]) == null || a.getHeight() : (m = z.value) == null || m.getHeight();
+      }, p.value);
     }), re(() => {
       Y.value.disconnect();
     });
     const R = (a) => {
-      s.isSwitchSelection && (D.value = a), n("itemClick", a.toDate());
+      s.isSwitchSelection && (v.value = a), n("itemClick", a.toDate());
     };
     return i({
-      $calendar: f,
+      $calendar: p,
       setActive: (a) => {
-        D.value = M(a), n("itemClick", a);
+        v.value = M(a), n("itemClick", a);
       }
-    }), (a, p) => (u(), m(
+    }), (a, m) => (u(), f(
       "div",
       {
         ref_key: "$calendar",
-        ref: f,
+        ref: p,
         class: "das-ui-calendar"
       },
       [
@@ -383,13 +383,13 @@ const he = (o, i) => {
         </div>\r
       </slot>\r
     </div> `),
-        W.value.length === 0 ? (u(), m("div", Ce, [
+        W.value.length === 0 ? (u(), f("div", Ce, [
           se(G, {
             ref_key: "$calendarTable",
             ref: z,
             date: y.value,
             firstDayOfWeek: S.value,
-            parent: f.value,
+            parent: p.value,
             calendartType: a.type,
             highlightWeek: a.highlightWeek,
             highlightDay: a.highlightDay,
@@ -398,20 +398,20 @@ const he = (o, i) => {
             "selected-day": _.value,
             onPick: R
           }, K({
-            "date-cell": V((l) => [
-              a.$slots.custom ? N(a.$slots, "custom", F(Z({ key: 0 }, l))) : C("v-if", !0),
-              a.type != "week" && !a.$slots.custom ? (u(), m("p", ve, [
+            "date-cell": V((d) => [
+              a.$slots.custom ? N(a.$slots, "custom", F(Z({ key: 0 }, d))) : C("v-if", !0),
+              a.type != "week" && !a.$slots.custom ? (u(), f("p", ve, [
                 b(
                   "span",
                   null,
-                  L(Number(l.data.day.split("-").slice(2)).toString()),
+                  L(Number(d.data.day.split("-").slice(2)).toString()),
                   1
                   /* TEXT */
                 ),
-                N(a.$slots, "date-type", F(E(l)))
+                N(a.$slots, "date-type", F(x(d)))
               ])) : C("v-if", !0),
-              a.$slots.custom ? C("v-if", !0) : (u(), m("div", De, [
-                N(a.$slots, "date-cell", F(E(l)))
+              a.$slots.custom ? C("v-if", !0) : (u(), f("div", De, [
+                N(a.$slots, "date-cell", F(x(d)))
               ]))
             ]),
             _: 2
@@ -419,31 +419,31 @@ const he = (o, i) => {
           }, [
             a.$slots["week-type"] && a.type == "week" ? {
               name: "week-type",
-              fn: V((l) => [
-                N(a.$slots, "week-type", F(E(l)))
+              fn: V((d) => [
+                N(a.$slots, "week-type", F(x(d)))
               ]),
               key: "0"
             } : void 0
           ]), 1032, ["date", "firstDayOfWeek", "parent", "calendartType", "highlightWeek", "highlightDay", "showZhou", "cellHeight", "selected-day"])
-        ])) : (u(), m("div", ze, [
-          (u(!0), m(
+        ])) : (u(), f("div", ze, [
+          (u(!0), f(
             j,
             null,
-            P(W.value, (l, e) => (u(), oe(G, {
+            P(W.value, (d, e) => (u(), oe(G, {
               ref_for: !0,
               ref_key: "$calendarTable",
               ref: z,
               key: e,
               firstDayOfWeek: S.value,
-              date: l[0],
+              date: d[0],
               calendartType: a.type,
               highlightWeek: a.highlightWeek,
               highlightDay: a.highlightDay,
               showZhou: a.showZhou,
               cellHeight: a.cellHeight,
               "selected-day": _.value,
-              range: l,
-              parent: f.value,
+              range: d,
+              parent: p.value,
               "hide-header": e !== 0,
               onPick: R
             }, K({
@@ -452,7 +452,7 @@ const he = (o, i) => {
                   key: 0,
                   ref_for: !0
                 }, t)) : C("v-if", !0),
-                a.type != "week" && !a.$slots.custom ? (u(), m("p", Ne, [
+                a.type != "week" && !a.$slots.custom ? (u(), f("p", Ne, [
                   b(
                     "span",
                     null,
@@ -461,7 +461,7 @@ const he = (o, i) => {
                     /* TEXT */
                   )
                 ])) : C("v-if", !0),
-                a.$slots.custom ? C("v-if", !0) : (u(), m("div", _e, [
+                a.$slots.custom ? C("v-if", !0) : (u(), f("div", _e, [
                   N(a.$slots, "date-cell", Z({ ref_for: !0 }, t))
                 ]))
               ]),
@@ -552,7 +552,7 @@ const he = (o, i) => {
   "das-calendar-months-nov": { "zh-CN": "十一月", en: "Nov", _appCode: "framework" },
   "das-calendar-months-dec": { "zh-CN": "十二月", en: "Dec", _appCode: "framework" }
 };
-de(be);
+le(be);
 ce(Se);
 const Re = ee($e), Ve = { name: `calendar ${A("日历")}` };
 export {

package/packages/components/cascader/index.js

@@ -81,9 +81,9 @@ const Ce = { style: { maxheight: "200px" } }, ke = {
       },
       (e) => {
         e && (e.addEventListener("mouseenter", function() {
-          u.value = !0, n.value && clearTimeout(n.value);
+          console.log("进入tooltip"), u.value = !0, n.value && clearTimeout(n.value);
         }), e.addEventListener("mouseleave", function() {
-          n.value = setTimeout(() => {
+          console.log("离开toolTip"), n.value = setTimeout(() => {
             u.value = !1;
           }, 200);
         }));