@das-fed/ui 6.4.0-test.8.2 → 7.0.0

package/packages/components/calendar/index.d.ts

@@ -60,47 +60,45 @@ declare const DasCalendar: import("@das-fed/utils").SFCWithInstall<{
     isSwitchMonth: boolean;
 }, {}, string, {}, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, import("vue").ComponentProvideOptions> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & (new () => {
     $slots: {
-        custom?(_: {
+        custom?: (((props: {
             data: {
                 isSelected: boolean;
                 type: string;
                 day: string;
                 date: Date;
             };
-        }): any;
-        custom?(_: {
+        }) => any) & ((props: {
             data: {
                 isSelected: boolean;
                 type: string;
                 day: string;
                 date: Date;
             };
-        }): any;
-        "date-type"?(_: {
+        }) => any)) | undefined;
+        'date-type'?: ((props: {
             data: {
                 isSelected: boolean;
                 type: string;
                 day: string;
                 date: Date;
             };
-        }): any;
-        "date-cell"?(_: {
+        }) => any) | undefined;
+        'date-cell'?: (((props: {
             data: {
                 isSelected: boolean;
                 type: string;
                 day: string;
                 date: Date;
             };
-        }): any;
-        "date-cell"?(_: {
+        }) => any) & ((props: {
             data: {
                 isSelected: boolean;
                 type: string;
                 day: string;
                 date: Date;
             };
-        }): any;
-        "week-type"?(_: {
+        }) => any)) | undefined;
+        'week-type'?: (((props: {
             data: {
                 isSelected: boolean;
                 type: string;
@@ -112,8 +110,7 @@ declare const DasCalendar: import("@das-fed/utils").SFCWithInstall<{
                 day: null;
                 date: null;
             };
-        }): any;
-        "week-type"?(_: {
+        }) => any) & ((props: {
             data: {
                 isSelected: boolean;
                 type: string;
@@ -125,7 +122,7 @@ declare const DasCalendar: import("@das-fed/utils").SFCWithInstall<{
                 day: null;
                 date: null;
             };
-        }): any;
+        }) => any)) | undefined;
     };
 })>;
 export { DasCalendar };

package/packages/components/calendar/index.js

@@ -1,9 +1,8 @@
 import '@das-fed/ui/packages/components/calendar/style.css';
-import { withInstall as X } from "@das-fed/utils/with-install/index";
-import { defineComponent as G, ref as O, computed as w, watch as ee, nextTick as x, openBlock as u, createElementBlock as m, normalizeClass as B, Fragment as j, renderList as P, createElementVNode as b, toDisplayString as J, renderSlot as N, createCommentVNode as C, normalizeStyle as ae, onMounted as te, onBeforeUnmount as ne, createVNode as re, createSlots as K, withCtx as V, normalizeProps as F, mergeProps as Z, guardReactiveProps as E, createBlock as se } from "vue";
-import { t as A, setI18nRule as oe } from "@das-fed/web/packages/i18n/index";
-import z from "dayjs";
-import de from "dayjs/plugin/localeData";
+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 M from "dayjs";
 import { SizeWatcher as le } from "@das-fed/utils/size-watcher";
 import { setThemeRule as ce } from "@das-fed/web/packages/theme/index";
 const he = (o, i) => {
@@ -16,13 +15,13 @@ const he = (o, i) => {
   const d = o.endOf("month"), c = o.add(1, "month").startOf("month"), s = d.isSame(
     c,
     "week"
-  ) ? c.add(1, "week") : c, n = s.endOf("month"), f = i.startOf("month"), _ = n.isSame(f, "week") ? f.add(1, "week") : f;
+  ) ? c.add(1, "week") : c, n = s.endOf("month"), f = i.startOf("month"), z = n.isSame(f, "week") ? f.add(1, "week") : f;
   return [
     [o, d],
     [s.startOf("week"), n],
-    [_.startOf("week"), i]
+    [z.startOf("week"), i]
   ];
-}, U = (o, 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) : [];
 }, $ = (o) => Array.from(Array.from({ length: o }).keys()), ue = (o, i) => {
@@ -36,7 +35,7 @@ const he = (o, i) => {
   return o.slice(d, d + 7);
 }), fe = { key: 0 }, ye = { class: "das-calendar-header-box" }, ke = { class: "das-calendar-header-week-line" }, ge = ["onClick"], we = {
   name: "calendar-table"
-}, q = /* @__PURE__ */ G({
+}, G = /* @__PURE__ */ Q({
   ...we,
   props: {
     selectedDay: {},
@@ -53,12 +52,12 @@ const he = (o, i) => {
   },
   emits: ["pick"],
   setup(o, { expose: i, emit: d }) {
-    const c = d, s = z(), n = o, f = O("128px"), _ = O(), Y = 60, S = ["sun", "mon", "tue", "wed", "thu", "fri", "sat"], M = w(() => !!n.range && !!n.range.length), L = w(() => {
+    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(() => {
       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 = w(() => {
+    }), D = g(() => {
       let e = [];
-      if (M.value) {
+      if (_.value) {
         const [t, r] = n.range;
         let h = [];
         t.isSame(r, "month") ? h = $(r.date() - t.date() + 1).map((v) => ({
@@ -70,11 +69,11 @@ const he = (o, i) => {
         }));
         let k = h.length % 7;
         k = k === 0 ? 0 : 7 - k;
-        const g = $(k).map((v, T) => ({
+        const w = $(k).map((v, T) => ({
           text: T + 1,
           type: "next"
         }));
-        e = h.concat(g);
+        e = h.concat(w);
       } else {
         const t = n.date.startOf("month").day(), r = ue(
           n.date,
@@ -87,13 +86,13 @@ const he = (o, i) => {
           type: "current"
         }));
         e = [...r, ...h];
-        const k = 7 - (e.length % 7 || 7), g = $(k).map((v, T) => ({
+        const k = 7 - (e.length % 7 || 7), w = $(k).map((v, T) => ({
           text: T + 1,
           type: "next"
         }));
-        if (e = e.concat(g), n.calendartType == "simple" && e.length / 7 < 6) {
-          const v = g.length ? g[g.length - 1].text : 0, T = $(7).map((We, Q) => ({
-            text: v + Q + 1,
+        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,
             type: "next"
           }));
           e = e.concat(T);
@@ -106,7 +105,7 @@ const he = (o, i) => {
       let t = Number(e) - Y - 1;
       f.value = t / D.value.length - 1 + "px";
     };
-    ee(
+    ae(
       () => D.value,
       (e) => {
         if (n.cellHeight) {
@@ -157,12 +156,12 @@ const he = (o, i) => {
       if (t) {
         const r = t[e];
         if (r) {
-          const { text: h, type: k } = r, g = y(h, k);
+          const { text: h, type: k } = r, w = y(h, k);
           return {
-            isSelected: g.isSame(n.selectedDay),
+            isSelected: w.isSame(n.selectedDay),
             type: `${k}-month`,
-            day: g.format("YYYY-MM-DD"),
-            date: g.toDate()
+            day: w.format("YYYY-MM-DD"),
+            date: w.toDate()
           };
         }
       }
@@ -187,18 +186,18 @@ const he = (o, i) => {
       "table",
       {
         key: 0,
-        class: B(["das-calendar-table", { "is-range": M.value, "is-week": e.calendartType == "week", simple: e.calendartType == "simple" }]),
+        class: B(["das-calendar-table", { "is-range": _.value, "is-week": e.calendartType == "week", simple: e.calendartType == "simple" }]),
         cellspacing: "0",
         cellpadding: "0",
         ref_key: "tableRef",
-        ref: _
+        ref: z
       },
       [
         e.hideHeader ? C("v-if", !0) : (u(), m("thead", fe, [
           (u(!0), m(
             j,
             null,
-            P(L.value, (r, h) => (u(), m("th", {
+            P(J.value, (r, h) => (u(), m("th", {
               class: "das-calendar-table-header",
               key: r
             }, [
@@ -209,7 +208,7 @@ const he = (o, i) => {
                     {
                       class: B(["das-calendar-header-week", { highlight: e.highlightWeek }])
                     },
-                    J(r),
+                    L(r),
                     3
                     /* TEXT, CLASS */
                   ),
@@ -224,7 +223,7 @@ const he = (o, i) => {
                     key: 0,
                     class: B(["das-calendar-header-day", { highlight: e.highlightDay }])
                   },
-                  J(a(h)),
+                  L(a(h)),
                   3
                   /* TEXT, CLASS */
                 )) : C("v-if", !0)
@@ -251,8 +250,8 @@ const he = (o, i) => {
                 (u(!0), m(
                   j,
                   null,
-                  P(r, (k, g) => (u(), m("td", {
-                    key: g,
+                  P(r, (k, w) => (u(), m("td", {
+                    key: w,
                     class: B(R(k)),
                     onClick: (v) => I(k)
                   }, [
@@ -262,7 +261,7 @@ const he = (o, i) => {
                       "div",
                       {
                         class: "das-calendar-day",
-                        style: ae({ height: f.value })
+                        style: te({ height: f.value })
                       },
                       [
                         N(e.$slots, "date-cell", {
@@ -301,15 +300,15 @@ const he = (o, i) => {
 }, ze = {
   key: 1,
   class: "das-calendar-body 2"
-}, _e = {
+}, Ne = {
   key: 1,
   class: "das-calendar-cell-date"
-}, Ne = {
+}, _e = {
   key: 2,
   class: "das-calendar-cell-cont"
 }, Me = {
   name: "test"
-}, $e = /* @__PURE__ */ G({
+}, $e = /* @__PURE__ */ Q({
   ...Me,
   props: {
     modelValue: {},
@@ -325,38 +324,37 @@ const he = (o, i) => {
   },
   emits: ["update:model-value", "itemClick"],
   setup(o, { expose: i, emit: d }) {
-    z.extend(de);
-    const c = z.localeData().firstDayOfWeek(), s = o, n = d, f = O(), _ = O(), Y = O(), S = w(() => s.firstDayOfWeek || c), M = O(), L = z(), D = w({
+    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({
       get() {
-        return s.modelValue ? (M.value = y.value, y.value) : M.value;
+        return s.modelValue ? (_.value = y.value, y.value) : _.value;
       },
       set(a) {
         if (!a) return;
-        M.value = a;
+        _.value = a;
         const p = a.toDate();
         s.isSwitchMonth && n("update:model-value", p);
       }
-    }), H = w(() => {
+    }), H = g(() => {
       if (s.type == "week") {
         if (s.range) return s.range;
-        const p = (z(s.modelValue).day() - S.value + 7) % 7, l = 7 - (p + 1), e = [];
-        return e.push(z(s.modelValue).subtract(p, "day").toDate()), e.push(z(s.modelValue).add(l, "day").toDate()), e;
+        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;
       } else
         return s.range ? s.range : void 0;
-    }), W = w(() => {
+    }), W = g(() => {
       if (!H.value) return [];
-      const a = H.value.map((e) => z(e)), [p, l] = a;
-      return s.type == "week" ? [[p, l]] : p.isAfter(l) ? [] : p.isSame(l, "month") ? U(p, l) : p.add(1, "month").month() !== l.month() ? [] : U(p, l);
-    }), y = w(() => s.modelValue ? z(s.modelValue) : D.value || (W.value.length ? W.value[0][0] : L));
-    w(() => y.value.subtract(1, "month").date(1)), w(() => y.value.add(1, "month").date(1)), w(() => y.value.subtract(1, "year").date(1)), w(() => y.value.add(1, "year").date(1)), w(() => {
+      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));
+    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)}`;
-    }), te(() => {
+    }), ne(() => {
       Y.value = le(() => {
         var a, p;
-        Array.isArray(_.value) ? (a = _.value[0]) == null || a.getHeight() : (p = _.value) == null || p.getHeight();
+        Array.isArray(z.value) ? (a = z.value[0]) == null || a.getHeight() : (p = z.value) == null || p.getHeight();
       }, f.value);
-    }), ne(() => {
+    }), re(() => {
       Y.value.disconnect();
     });
     const R = (a) => {
@@ -365,7 +363,7 @@ const he = (o, i) => {
     return i({
       $calendar: f,
       setActive: (a) => {
-        D.value = z(a), n("itemClick", a);
+        D.value = M(a), n("itemClick", a);
       }
     }), (a, p) => (u(), m(
       "div",
@@ -386,9 +384,9 @@ const he = (o, i) => {
       </slot>\r
     </div> `),
         W.value.length === 0 ? (u(), m("div", Ce, [
-          re(q, {
+          se(G, {
             ref_key: "$calendarTable",
-            ref: _,
+            ref: z,
             date: y.value,
             firstDayOfWeek: S.value,
             parent: f.value,
@@ -397,7 +395,7 @@ const he = (o, i) => {
             highlightDay: a.highlightDay,
             showZhou: a.showZhou,
             cellHeight: a.cellHeight,
-            "selected-day": M.value,
+            "selected-day": _.value,
             onPick: R
           }, K({
             "date-cell": V((l) => [
@@ -406,7 +404,7 @@ const he = (o, i) => {
                 b(
                   "span",
                   null,
-                  J(Number(l.data.day.split("-").slice(2)).toString()),
+                  L(Number(l.data.day.split("-").slice(2)).toString()),
                   1
                   /* TEXT */
                 ),
@@ -431,10 +429,10 @@ const he = (o, i) => {
           (u(!0), m(
             j,
             null,
-            P(W.value, (l, e) => (u(), se(q, {
+            P(W.value, (l, e) => (u(), oe(G, {
               ref_for: !0,
               ref_key: "$calendarTable",
-              ref: _,
+              ref: z,
               key: e,
               firstDayOfWeek: S.value,
               date: l[0],
@@ -443,7 +441,7 @@ const he = (o, i) => {
               highlightDay: a.highlightDay,
               showZhou: a.showZhou,
               cellHeight: a.cellHeight,
-              "selected-day": M.value,
+              "selected-day": _.value,
               range: l,
               parent: f.value,
               "hide-header": e !== 0,
@@ -454,16 +452,16 @@ const he = (o, i) => {
                   key: 0,
                   ref_for: !0
                 }, t)) : C("v-if", !0),
-                a.type != "week" && !a.$slots.custom ? (u(), m("p", _e, [
+                a.type != "week" && !a.$slots.custom ? (u(), m("p", Ne, [
                   b(
                     "span",
                     null,
-                    J(Number(t.data.day.split("-").slice(2)).toString()),
+                    L(Number(t.data.day.split("-").slice(2)).toString()),
                     1
                     /* TEXT */
                   )
                 ])) : C("v-if", !0),
-                a.$slots.custom ? C("v-if", !0) : (u(), m("div", Ne, [
+                a.$slots.custom ? C("v-if", !0) : (u(), m("div", _e, [
                   N(a.$slots, "date-cell", Z({ ref_for: !0 }, t))
                 ]))
               ]),
@@ -554,10 +552,10 @@ const he = (o, i) => {
   "das-calendar-months-nov": { "zh-CN": "十一月", en: "Nov", _appCode: "framework" },
   "das-calendar-months-dec": { "zh-CN": "十二月", en: "Dec", _appCode: "framework" }
 };
-oe(be);
+de(be);
 ce(Se);
-const Ve = X($e), Fe = { name: `calendar ${A("日历")}` };
+const Re = ee($e), Ve = { name: `calendar ${A("日历")}` };
 export {
-  Ve as DasCalendar,
-  Fe as default
+  Re as DasCalendar,
+  Ve as default
 };

package/packages/components/calendar/src/Index.vue.d.ts

@@ -1,5 +1,5 @@
 import type { Props } from './type';
-declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<Props, {
+declare const _default: __VLS_WithSlots<import("vue").DefineComponent<Props, {
     $calendar: import("vue").Ref<any, any>;
     setActive: (val: Date) => void;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
@@ -17,47 +17,45 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<Pr
     isSwitchSelection: boolean;
     isSwitchMonth: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
-    custom?(_: {
+    custom?: (((props: {
         data: {
             isSelected: boolean;
             type: string;
             day: string;
             date: Date;
         };
-    }): any;
-    custom?(_: {
+    }) => any) & ((props: {
         data: {
             isSelected: boolean;
             type: string;
             day: string;
             date: Date;
         };
-    }): any;
-    "date-type"?(_: {
+    }) => any)) | undefined;
+    'date-type'?: ((props: {
         data: {
             isSelected: boolean;
             type: string;
             day: string;
             date: Date;
         };
-    }): any;
-    "date-cell"?(_: {
+    }) => any) | undefined;
+    'date-cell'?: (((props: {
         data: {
             isSelected: boolean;
             type: string;
             day: string;
             date: Date;
         };
-    }): any;
-    "date-cell"?(_: {
+    }) => any) & ((props: {
         data: {
             isSelected: boolean;
             type: string;
             day: string;
             date: Date;
         };
-    }): any;
-    "week-type"?(_: {
+    }) => any)) | undefined;
+    'week-type'?: (((props: {
         data: {
             isSelected: boolean;
             type: string;
@@ -69,8 +67,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<Pr
             day: null;
             date: null;
         };
-    }): any;
-    "week-type"?(_: {
+    }) => any) & ((props: {
         data: {
             isSelected: boolean;
             type: string;
@@ -82,10 +79,10 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<Pr
             day: null;
             date: null;
         };
-    }): any;
+    }) => any)) | undefined;
 }>;
 export default _default;
-type __VLS_WithTemplateSlots<T, S> = T & {
+type __VLS_WithSlots<T, S> = T & {
     new (): {
         $slots: S;
     };

package/packages/components/calendar/src/calendar-table.vue.d.ts

@@ -1,13 +1,13 @@
 import dayjs from 'dayjs';
 import type { calendarTableProps } from './type';
-declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<calendarTableProps, {
+declare const _default: __VLS_WithSlots<import("vue").DefineComponent<calendarTableProps, {
     getHeight: () => void;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     pick: (value: dayjs.Dayjs) => any;
 }, string, import("vue").PublicProps, Readonly<calendarTableProps> & Readonly<{
     onPick?: ((value: dayjs.Dayjs) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
-    "week-type"?(_: {
+    'week-type'?: ((props: {
         data: {
             isSelected: boolean;
             type: string;
@@ -19,18 +19,18 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<ca
             day: null;
             date: null;
         };
-    }): any;
-    "date-cell"?(_: {
+    }) => any) | undefined;
+    'date-cell'?: ((props: {
         data: {
             isSelected: boolean;
             type: string;
             day: string;
             date: Date;
         };
-    }): any;
+    }) => any) | undefined;
 }>;
 export default _default;
-type __VLS_WithTemplateSlots<T, S> = T & {
+type __VLS_WithSlots<T, S> = T & {
     new (): {
         $slots: S;
     };

package/packages/components/calendar/src/old-Index.vue.d.ts

@@ -1,7 +1,7 @@
 import 'element-plus/es/components/calendar/style/css';
 import 'dayjs/locale/zh-cn';
 import type { Props } from './type';
-declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<Props, {
+declare const _default: __VLS_WithSlots<import("vue").DefineComponent<Props, {
     $calendar: import("vue").Ref<any, any>;
     setActive: (val: any) => void;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
@@ -14,12 +14,12 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<Pr
     type: "normal" | "month" | "week" | "simple";
     isSwitchSelection: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
-    header?(_: {}): any;
-    custom?(_: any): any;
-    "date-cell"?(_: any): any;
+    header?: ((props: {}) => any) | undefined;
+    custom?: ((props: any) => any) | undefined;
+    'date-cell'?: ((props: any) => any) | undefined;
 }>;
 export default _default;
-type __VLS_WithTemplateSlots<T, S> = T & {
+type __VLS_WithSlots<T, S> = T & {
     new (): {
         $slots: S;
     };