element-ps 2.0.23 → 2.0.26

package/es/components/avatar/src/avatar2.mjs

@@ -1,35 +1,67 @@
+import { defineComponent, ref, computed, openBlock, createElementBlock, normalizeClass, unref, normalizeStyle, createBlock, withCtx, resolveDynamicComponent, renderSlot } from 'vue';
+import { PsIcon } from '../../icon/index.mjs';
+import '../../../hooks/index.mjs';
 import '../../../utils/index.mjs';
-import '../../../constants/index.mjs';
-import { buildProps, definePropType } from '../../../utils/vue/props.mjs';
-import { componentSizes } from '../../../constants/size.mjs';
-import { iconPropType } from '../../../utils/vue/icon.mjs';
+import { avatarProps } from './avatar.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { isString } from '@vue/shared';
+import { isNumber } from '@vueuse/core';
+import { addUnit } from '../../../utils/dom/style.mjs';
 
-const avatarProps = buildProps({
-  size: {
-    type: [Number, String],
-    values: componentSizes,
-    default: "",
-    validator: (val) => typeof val === "number"
-  },
-  shape: {
-    type: String,
-    values: ["circle", "square"],
-    default: "circle"
-  },
-  icon: {
-    type: iconPropType
-  },
-  src: {
-    type: String,
-    default: ""
-  },
-  alt: String,
-  srcSet: String,
-  fit: {
-    type: definePropType(String),
-    default: "cover"
+const _hoisted_1 = ["src", "alt", "srcset"];
+const __default__ = {
+  name: "PsAvatar"
+};
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: avatarProps,
+  setup(__props) {
+    const props = __props;
+    const ns = useNamespace("avatar");
+    const hasLoadError = ref(false);
+    const avatarClass = computed(() => {
+      const { size, icon, shape } = props;
+      const classList = [ns.b()];
+      if (isString(size))
+        classList.push(ns.m(size));
+      if (icon)
+        classList.push(ns.m("icon"));
+      if (shape)
+        classList.push(ns.m(shape));
+      return classList;
+    });
+    const sizeStyle = computed(() => {
+      const { size } = props;
+      return isNumber(size) ? {
+        "--el-avatar-size": addUnit(size)
+      } : void 0;
+    });
+    const fitStyle = computed(() => ({
+      objectFit: props.fit
+    }));
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("span", {
+        class: normalizeClass(unref(avatarClass)),
+        style: normalizeStyle(unref(sizeStyle))
+      }, [
+        (_ctx.src || _ctx.srcSet) && !hasLoadError.value ? (openBlock(), createElementBlock("img", {
+          key: 0,
+          src: _ctx.src,
+          alt: _ctx.alt,
+          srcset: _ctx.srcSet,
+          style: normalizeStyle(unref(fitStyle))
+        }, null, 12, _hoisted_1)) : _ctx.icon ? (openBlock(), createBlock(unref(PsIcon), { key: 1 }, {
+          default: withCtx(() => [
+            (openBlock(), createBlock(resolveDynamicComponent(_ctx.icon)))
+          ]),
+          _: 1
+        })) : renderSlot(_ctx.$slots, "default", { key: 2 })
+      ], 6);
+    };
   }
 });
+var Avatar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/Users/meng/workspace/element-ps/packages/components/avatar/src/avatar.vue"]]);
 
-export { avatarProps };
+export { Avatar as default };
 //# sourceMappingURL=avatar2.mjs.map

package/es/components/avatar/src/avatar2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"avatar2.mjs","sources":["../../../../../../packages/components/avatar/src/avatar.ts"],"sourcesContent":["import { buildProps, definePropType, iconPropType } from '@element-ps/utils'\nimport { componentSizes } from '@element-ps/constants'\nimport type { ExtractPropTypes } from 'vue'\nimport type { ObjectFitProperty } from 'csstype'\nimport type Avatar from './avatar.vue'\n\nexport const avatarProps = buildProps({\n  size: {\n    type: [Number, String],\n    values: componentSizes,\n    default: '',\n    validator: (val: unknown): val is number => typeof val === 'number',\n  },\n  shape: {\n    type: String,\n    values: ['circle', 'square'],\n    default: 'circle',\n  },\n  icon: {\n    type: iconPropType,\n  },\n  src: {\n    type: String,\n    default: '',\n  },\n  alt: String,\n  srcSet: String,\n  fit: {\n    type: definePropType<ObjectFitProperty>(String),\n    default: 'cover',\n  },\n} as const)\nexport type AvatarProps = ExtractPropTypes<typeof avatarProps>\n\nexport type AvatarInstance = InstanceType<typeof Avatar>\n"],"names":[],"mappings":";;;;;;AAEY,MAAC,WAAW,GAAG,UAAU,CAAC;AACtC,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;AAC1B,IAAI,MAAM,EAAE,cAAc;AAC1B,IAAI,OAAO,EAAE,EAAE;AACf,IAAI,SAAS,EAAE,CAAC,GAAG,KAAK,OAAO,GAAG,KAAK,QAAQ;AAC/C,GAAG;AACH,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,MAAM,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;AAChC,IAAI,OAAO,EAAE,QAAQ;AACrB,GAAG;AACH,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,YAAY;AACtB,GAAG;AACH,EAAE,GAAG,EAAE;AACP,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,EAAE;AACf,GAAG;AACH,EAAE,GAAG,EAAE,MAAM;AACb,EAAE,MAAM,EAAE,MAAM;AAChB,EAAE,GAAG,EAAE;AACP,IAAI,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;AAChC,IAAI,OAAO,EAAE,OAAO;AACpB,GAAG;AACH,CAAC;;;;"}
+{"version":3,"file":"avatar2.mjs","sources":["../../../../../../packages/components/avatar/src/avatar.vue"],"sourcesContent":["<template>\n  <span :class=\"avatarClass\" :style=\"sizeStyle\">\n    <img\n      v-if=\"(src || srcSet) && !hasLoadError\"\n      :src=\"src\"\n      :alt=\"alt\"\n      :srcset=\"srcSet\"\n      :style=\"fitStyle\"\n    />\n    <ps-icon v-else-if=\"icon\">\n      <component :is=\"icon\" />\n    </ps-icon>\n    <slot v-else />\n  </span>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, ref, watch } from 'vue'\nimport { PsIcon } from '@element-ps/components/icon'\nimport { useNamespace } from '@element-ps/hooks'\nimport { addUnit, isNumber, isString } from '@element-ps/utils'\nimport { avatarProps } from './avatar'\n\nimport type { CSSProperties } from 'vue'\n\ndefineOptions({\n  name: 'PsAvatar',\n})\n\nconst props = defineProps(avatarProps)\n\nconst ns = useNamespace('avatar')\n\nconst hasLoadError = ref(false)\n\nconst avatarClass = computed(() => {\n  const { size, icon, shape } = props\n  const classList = [ns.b()]\n  if (isString(size)) classList.push(ns.m(size))\n  if (icon) classList.push(ns.m('icon'))\n  if (shape) classList.push(ns.m(shape))\n  return classList\n})\n\nconst sizeStyle = computed(() => {\n  const { size } = props\n  return isNumber(size)\n    ? ({\n        '--el-avatar-size': addUnit(size),\n      } as CSSProperties)\n    : undefined\n})\n\nconst fitStyle = computed<CSSProperties>(() => ({\n  objectFit: props.fit,\n}))\n\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AA+BA,IAAA,MAAA,EAAA,GAAA,aAAA,QAAA,CAAA,CAAA;AAEA,IAAA,MAAA,YAAA,GAAA,IAAA,KAAA,CAAA,CAAA;AAEA,IAAA,MAAA,WAAA,GAAA,SAAA,MAAA;AACA,MAAA,MAAA,EAAA,IAAA,EAAA,IAAA,EAAA,KAAA,EAAA,GAAA,KAAA,CAAA;AACA,MAAA,MAAA,SAAA,GAAA,CAAA,EAAA,CAAA,CAAA,EAAA,CAAA,CAAA;AACA,MAAA,IAAA,SAAA,IAAA,CAAA;AAAA,QAAA,SAAA,CAAA,IAAA,CAAA,EAAA,CAAA,CAAA,CAAA,IAAA,CAAA,CAAA,CAAA;AACA,MAAA,IAAA,IAAA;AAAA,QAAA,SAAA,CAAA,IAAA,CAAA,EAAA,CAAA,CAAA,CAAA,MAAA,CAAA,CAAA,CAAA;AACA,MAAA,IAAA,KAAA;AAAA,QAAA,SAAA,CAAA,IAAA,CAAA,EAAA,CAAA,CAAA,CAAA,KAAA,CAAA,CAAA,CAAA;AACA,MAAA,OAAA,SAAA,CAAA;AAAA,KACA,CAAA,CAAA;AAEA,IAAA,MAAA,SAAA,GAAA,SAAA,MAAA;AACA,MAAA,MAAA,EAAA,IAAA,EAAA,GAAA,KAAA,CAAA;AACA,MAAA,OAAA,QAAA,CAAA,IAAA,CACA,GAAA;AAAA,QACA,kBAAA,EAAA,QAAA,IAAA,CAAA;AAAA,OAEA,GAAA,KAAA,CAAA,CAAA;AAAA,KACA,CAAA,CAAA;AAEA,IAAA,MAAA,QAAA,GAAA,SAAA,OAAA;AAAA,MACA,WAAA,KAAA,CAAA,GAAA;AAAA,KACA,CAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/es/components/breadcrumb/index.mjs

@@ -1,7 +1,7 @@
 import '../../utils/index.mjs';
-import Breadcrumb from './src/breadcrumb2.mjs';
+import Breadcrumb from './src/breadcrumb.mjs';
 import BreadcrumbItem from './src/breadcrumb-item2.mjs';
-export { breadcrumbProps } from './src/breadcrumb.mjs';
+export { breadcrumbProps } from './src/breadcrumb2.mjs';
 export { breadcrumbItemProps } from './src/breadcrumb-item.mjs';
 import { withInstall, withNoopInstall } from '../../utils/vue/install.mjs';
 

package/es/components/breadcrumb/src/breadcrumb.mjs

@@ -1,17 +1,42 @@
-import '../../../utils/index.mjs';
-import { buildProps } from '../../../utils/vue/props.mjs';
-import { iconPropType } from '../../../utils/vue/icon.mjs';
+import { defineComponent, ref, provide, onMounted, openBlock, createElementBlock, normalizeClass, unref, renderSlot } from 'vue';
+import '../../../tokens/index.mjs';
+import '../../../hooks/index.mjs';
+import { breadcrumbProps } from './breadcrumb2.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { breadcrumbKey } from '../../../tokens/breadcrumb.mjs';
 
-const breadcrumbProps = buildProps({
-  separator: {
-    type: String,
-    default: "/"
-  },
-  separatorIcon: {
-    type: iconPropType,
-    default: ""
+const __default__ = {
+  name: "PsBreadcrumb"
+};
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: breadcrumbProps,
+  setup(__props) {
+    const props = __props;
+    const ns = useNamespace("breadcrumb");
+    const breadcrumb = ref();
+    provide(breadcrumbKey, props);
+    onMounted(() => {
+      const items = breadcrumb.value.querySelectorAll(`.${ns.e("item")}`);
+      if (items.length) {
+        items[items.length - 1].setAttribute("aria-current", "page");
+      }
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", {
+        ref_key: "breadcrumb",
+        ref: breadcrumb,
+        class: normalizeClass(unref(ns).b()),
+        "aria-label": "Breadcrumb",
+        role: "navigation"
+      }, [
+        renderSlot(_ctx.$slots, "default")
+      ], 2);
+    };
   }
 });
+var Breadcrumb = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/Users/meng/workspace/element-ps/packages/components/breadcrumb/src/breadcrumb.vue"]]);
 
-export { breadcrumbProps };
+export { Breadcrumb as default };
 //# sourceMappingURL=breadcrumb.mjs.map

package/es/components/breadcrumb/src/breadcrumb.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"breadcrumb.mjs","sources":["../../../../../../packages/components/breadcrumb/src/breadcrumb.ts"],"sourcesContent":["import { buildProps, iconPropType } from '@element-ps/utils'\nimport type { ExtractPropTypes } from 'vue'\nimport type Breadcrumb from './breadcrumb.vue'\n\nexport const breadcrumbProps = buildProps({\n  separator: {\n    type: String,\n    default: '/',\n  },\n  separatorIcon: {\n    type: iconPropType,\n    default: '',\n  },\n} as const)\nexport type BreadcrumbProps = ExtractPropTypes<typeof breadcrumbProps>\nexport type BreadcrumbInstance = InstanceType<typeof Breadcrumb>\n"],"names":[],"mappings":";;;;AACY,MAAC,eAAe,GAAG,UAAU,CAAC;AAC1C,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,GAAG;AAChB,GAAG;AACH,EAAE,aAAa,EAAE;AACjB,IAAI,IAAI,EAAE,YAAY;AACtB,IAAI,OAAO,EAAE,EAAE;AACf,GAAG;AACH,CAAC;;;;"}
+{"version":3,"file":"breadcrumb.mjs","sources":["../../../../../../packages/components/breadcrumb/src/breadcrumb.vue"],"sourcesContent":["<template>\n  <div\n    ref=\"breadcrumb\"\n    :class=\"ns.b()\"\n    aria-label=\"Breadcrumb\"\n    role=\"navigation\"\n  >\n    <slot />\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { onMounted, provide, ref } from 'vue'\nimport { breadcrumbKey } from '@element-ps/tokens'\n\nimport { useNamespace } from '@element-ps/hooks'\nimport { breadcrumbProps } from './breadcrumb'\n\ndefineOptions({\n  name: 'PsBreadcrumb',\n})\n\nconst props = defineProps(breadcrumbProps)\n\nconst ns = useNamespace('breadcrumb')\nconst breadcrumb = ref<HTMLDivElement>()\n\nprovide(breadcrumbKey, props)\n\nonMounted(() => {\n  const items = breadcrumb.value!.querySelectorAll(`.${ns.e('item')}`)\n  if (items.length) {\n    items[items.length - 1].setAttribute('aria-current', 'page')\n  }\n})\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAwBA,IAAA,MAAA,EAAA,GAAA,aAAA,YAAA,CAAA,CAAA;AACA,IAAA,MAAA,aAAA,GAAA,EAAA,CAAA;AAEA,IAAA,OAAA,CAAA,eAAA,KAAA,CAAA,CAAA;AAEA,IAAA,SAAA,CAAA,MAAA;AACA,MAAA,MAAA,KAAA,GAAA,WAAA,KAAA,CAAA,gBAAA,CAAA,IAAA,EAAA,CAAA,CAAA,CAAA,MAAA,CAAA,CAAA,CAAA,CAAA,CAAA;AACA,MAAA,IAAA,MAAA,MAAA,EAAA;AACA,QAAA,KAAA,CAAA,KAAA,CAAA,MAAA,GAAA,CAAA,CAAA,CAAA,YAAA,CAAA,gBAAA,MAAA,CAAA,CAAA;AAAA,OACA;AAAA,KACA,CAAA,CAAA;;;;;;;;;;;;;;;;;;"}

package/es/components/breadcrumb/src/breadcrumb2.mjs

@@ -1,42 +1,17 @@
-import { defineComponent, ref, provide, onMounted, openBlock, createElementBlock, normalizeClass, unref, renderSlot } from 'vue';
-import '../../../tokens/index.mjs';
-import '../../../hooks/index.mjs';
-import { breadcrumbProps } from './breadcrumb.mjs';
-import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
-import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
-import { breadcrumbKey } from '../../../tokens/breadcrumb.mjs';
+import '../../../utils/index.mjs';
+import { buildProps } from '../../../utils/vue/props.mjs';
+import { iconPropType } from '../../../utils/vue/icon.mjs';
 
-const __default__ = {
-  name: "PsBreadcrumb"
-};
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...__default__,
-  props: breadcrumbProps,
-  setup(__props) {
-    const props = __props;
-    const ns = useNamespace("breadcrumb");
-    const breadcrumb = ref();
-    provide(breadcrumbKey, props);
-    onMounted(() => {
-      const items = breadcrumb.value.querySelectorAll(`.${ns.e("item")}`);
-      if (items.length) {
-        items[items.length - 1].setAttribute("aria-current", "page");
-      }
-    });
-    return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", {
-        ref_key: "breadcrumb",
-        ref: breadcrumb,
-        class: normalizeClass(unref(ns).b()),
-        "aria-label": "Breadcrumb",
-        role: "navigation"
-      }, [
-        renderSlot(_ctx.$slots, "default")
-      ], 2);
-    };
+const breadcrumbProps = buildProps({
+  separator: {
+    type: String,
+    default: "/"
+  },
+  separatorIcon: {
+    type: iconPropType,
+    default: ""
   }
 });
-var Breadcrumb = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/Users/meng/workspace/element-ps/packages/components/breadcrumb/src/breadcrumb.vue"]]);
 
-export { Breadcrumb as default };
+export { breadcrumbProps };
 //# sourceMappingURL=breadcrumb2.mjs.map

package/es/components/breadcrumb/src/breadcrumb2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"breadcrumb2.mjs","sources":["../../../../../../packages/components/breadcrumb/src/breadcrumb.vue"],"sourcesContent":["<template>\n  <div\n    ref=\"breadcrumb\"\n    :class=\"ns.b()\"\n    aria-label=\"Breadcrumb\"\n    role=\"navigation\"\n  >\n    <slot />\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { onMounted, provide, ref } from 'vue'\nimport { breadcrumbKey } from '@element-ps/tokens'\n\nimport { useNamespace } from '@element-ps/hooks'\nimport { breadcrumbProps } from './breadcrumb'\n\ndefineOptions({\n  name: 'PsBreadcrumb',\n})\n\nconst props = defineProps(breadcrumbProps)\n\nconst ns = useNamespace('breadcrumb')\nconst breadcrumb = ref<HTMLDivElement>()\n\nprovide(breadcrumbKey, props)\n\nonMounted(() => {\n  const items = breadcrumb.value!.querySelectorAll(`.${ns.e('item')}`)\n  if (items.length) {\n    items[items.length - 1].setAttribute('aria-current', 'page')\n  }\n})\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAwBA,IAAA,MAAA,EAAA,GAAA,aAAA,YAAA,CAAA,CAAA;AACA,IAAA,MAAA,aAAA,GAAA,EAAA,CAAA;AAEA,IAAA,OAAA,CAAA,eAAA,KAAA,CAAA,CAAA;AAEA,IAAA,SAAA,CAAA,MAAA;AACA,MAAA,MAAA,KAAA,GAAA,WAAA,KAAA,CAAA,gBAAA,CAAA,IAAA,EAAA,CAAA,CAAA,CAAA,MAAA,CAAA,CAAA,CAAA,CAAA,CAAA;AACA,MAAA,IAAA,MAAA,MAAA,EAAA;AACA,QAAA,KAAA,CAAA,KAAA,CAAA,MAAA,GAAA,CAAA,CAAA,CAAA,YAAA,CAAA,gBAAA,MAAA,CAAA,CAAA;AAAA,OACA;AAAA,KACA,CAAA,CAAA;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"breadcrumb2.mjs","sources":["../../../../../../packages/components/breadcrumb/src/breadcrumb.ts"],"sourcesContent":["import { buildProps, iconPropType } from '@element-ps/utils'\nimport type { ExtractPropTypes } from 'vue'\nimport type Breadcrumb from './breadcrumb.vue'\n\nexport const breadcrumbProps = buildProps({\n  separator: {\n    type: String,\n    default: '/',\n  },\n  separatorIcon: {\n    type: iconPropType,\n    default: '',\n  },\n} as const)\nexport type BreadcrumbProps = ExtractPropTypes<typeof breadcrumbProps>\nexport type BreadcrumbInstance = InstanceType<typeof Breadcrumb>\n"],"names":[],"mappings":";;;;AACY,MAAC,eAAe,GAAG,UAAU,CAAC;AAC1C,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,GAAG;AAChB,GAAG;AACH,EAAE,aAAa,EAAE;AACjB,IAAI,IAAI,EAAE,YAAY;AACtB,IAAI,OAAO,EAAE,EAAE;AACf,GAAG;AACH,CAAC;;;;"}

package/es/components/calendar/src/calendar2.mjs

@@ -3,7 +3,7 @@ import dayjs from 'dayjs';
 import { PsButtonGroup, PsButton } from '../../button/index.mjs';
 import '../../../hooks/index.mjs';
 import '../../../utils/index.mjs';
-import DateTable from './date-table2.mjs';
+import DateTable from './date-table.mjs';
 import { calendarProps } from './calendar.mjs';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
 import { useNamespace } from '../../../hooks/use-namespace/index.mjs';

package/es/components/calendar/src/date-table.mjs

@@ -1,35 +1,154 @@
-import '../../../utils/index.mjs';
+import { defineComponent, computed, openBlock, createElementBlock, normalizeClass, unref, Fragment, renderList, toDisplayString, createCommentVNode, createElementVNode, renderSlot } from 'vue';
+import dayjs from 'dayjs';
+import localeData from 'dayjs/plugin/localeData.js';
+import '../../../hooks/index.mjs';
 import '../../time-picker/index.mjs';
+import '../../../constants/index.mjs';
+import { dateTableProps, getPrevMonthLastDays, getMonthDays, toNestedArr } from './date-table2.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useLocale } from '../../../hooks/use-locale/index.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
 import { rangeArr } from '../../time-picker/src/common/date-utils.mjs';
-import { buildProps, definePropType } from '../../../utils/vue/props.mjs';
+import { WEEK_DAYS } from '../../../constants/date.mjs';
 
-const getPrevMonthLastDays = (date, count) => {
-  const lastDay = date.subtract(1, "month").endOf("month").date();
-  return rangeArr(count).map((_, index) => lastDay - (count - index - 1));
+const _hoisted_1 = { key: 0 };
+const __default__ = {
+  name: "DateTable"
 };
-const getMonthDays = (date) => {
-  const days = date.daysInMonth();
-  return rangeArr(days).map((_, index) => index + 1);
-};
-const toNestedArr = (days) => rangeArr(days.length / 7).map((index) => {
-  const start = index * 7;
-  return days.slice(start, start + 7);
-});
-const dateTableProps = buildProps({
-  selectedDay: {
-    type: definePropType(Object)
-  },
-  range: {
-    type: definePropType(Array)
-  },
-  date: {
-    type: definePropType(Object),
-    required: true
-  },
-  hideHeader: {
-    type: Boolean
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: dateTableProps,
+  setup(__props, { expose }) {
+    const props = __props;
+    dayjs.extend(localeData);
+    const { t, lang } = useLocale();
+    const nsTable = useNamespace("calendar-table");
+    const nsDay = useNamespace("calendar-day");
+    const now = dayjs().locale(lang.value);
+    const firstDayOfWeek = now.$locale().weekStart || 0;
+    const isInRange = computed(() => !!props.range && !!props.range.length);
+    const rows = computed(() => {
+      let days = [];
+      if (isInRange.value) {
+        const [start, end] = props.range;
+        const currentMonthRange = rangeArr(end.date() - start.date() + 1).map((index) => ({
+          text: start.date() + index,
+          type: "current"
+        }));
+        let remaining = currentMonthRange.length % 7;
+        remaining = remaining === 0 ? 0 : 7 - remaining;
+        const nextMonthRange = rangeArr(remaining).map((_, index) => ({
+          text: index + 1,
+          type: "next"
+        }));
+        days = currentMonthRange.concat(nextMonthRange);
+      } else {
+        const firstDay = props.date.startOf("month").day();
+        const prevMonthDays = getPrevMonthLastDays(props.date, firstDay - firstDayOfWeek).map((day) => ({
+          text: day,
+          type: "prev"
+        }));
+        const currentMonthDays = getMonthDays(props.date).map((day) => ({
+          text: day,
+          type: "current"
+        }));
+        days = [...prevMonthDays, ...currentMonthDays];
+        const remaining = 7 - (days.length % 7 || 7);
+        const nextMonthDays = rangeArr(remaining).map((_, index) => ({
+          text: index + 1,
+          type: "next"
+        }));
+        days = days.concat(nextMonthDays);
+      }
+      return toNestedArr(days);
+    });
+    const weekDays = computed(() => {
+      const start = firstDayOfWeek;
+      if (start === 0) {
+        return WEEK_DAYS.map((_) => t(`el.datepicker.weeks.${_}`));
+      } else {
+        return WEEK_DAYS.slice(start).concat(WEEK_DAYS.slice(0, start)).map((_) => t(`el.datepicker.weeks.${_}`));
+      }
+    });
+    const getFormattedDate = (day, type) => {
+      switch (type) {
+        case "prev":
+          return props.date.startOf("month").subtract(1, "month").date(day);
+        case "next":
+          return props.date.startOf("month").add(1, "month").date(day);
+        case "current":
+          return props.date.date(day);
+      }
+    };
+    const getCellClass = ({ text, type }) => {
+      const classes = [type];
+      if (type === "current") {
+        const date = getFormattedDate(text, type);
+        if (date.isSame(props.selectedDay, "day")) {
+          classes.push(nsDay.is("selected"));
+        }
+        if (date.isSame(now, "day")) {
+          classes.push(nsDay.is("today"));
+        }
+      }
+      return classes;
+    };
+    const getSlotData = ({ text, type }) => {
+      const day = getFormattedDate(text, type);
+      return {
+        isSelected: day.isSame(props.selectedDay),
+        type: `${type}-month`,
+        day: day.format("YYYY-MM-DD"),
+        date: day.toDate()
+      };
+    };
+    expose({
+      getFormattedDate
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("table", {
+        class: normalizeClass([unref(nsTable).b(), unref(nsTable).is("range", unref(isInRange))]),
+        cellspacing: "0",
+        cellpadding: "0"
+      }, [
+        !_ctx.hideHeader ? (openBlock(), createElementBlock("thead", _hoisted_1, [
+          (openBlock(true), createElementBlock(Fragment, null, renderList(unref(weekDays), (day) => {
+            return openBlock(), createElementBlock("th", { key: day }, toDisplayString(day), 1);
+          }), 128))
+        ])) : createCommentVNode("v-if", true),
+        createElementVNode("tbody", null, [
+          (openBlock(true), createElementBlock(Fragment, null, renderList(unref(rows), (row, index) => {
+            return openBlock(), createElementBlock("tr", {
+              key: index,
+              class: normalizeClass({
+                [unref(nsTable).e("row")]: true,
+                [unref(nsTable).em("row", "hide-border")]: index === 0 && _ctx.hideHeader
+              })
+            }, [
+              (openBlock(true), createElementBlock(Fragment, null, renderList(row, (cell, key) => {
+                return openBlock(), createElementBlock("td", {
+                  key,
+                  class: normalizeClass(getCellClass(cell))
+                }, [
+                  createElementVNode("div", {
+                    class: normalizeClass(unref(nsDay).b())
+                  }, [
+                    renderSlot(_ctx.$slots, "dateCell", {
+                      data: getSlotData(cell)
+                    }, () => [
+                      createElementVNode("span", null, toDisplayString(cell.text), 1)
+                    ])
+                  ], 2)
+                ], 2);
+              }), 128))
+            ], 2);
+          }), 128))
+        ])
+      ], 2);
+    };
   }
 });
+var DateTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/Users/meng/workspace/element-ps/packages/components/calendar/src/date-table.vue"]]);
 
-export { dateTableProps, getMonthDays, getPrevMonthLastDays, toNestedArr };
+export { DateTable as default };
 //# sourceMappingURL=date-table.mjs.map

package/es/components/calendar/src/date-table.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"date-table.mjs","sources":["../../../../../../packages/components/calendar/src/date-table.ts"],"sourcesContent":["import { buildProps, definePropType, isObject } from '@element-ps/utils'\nimport { rangeArr } from '@element-ps/components/time-picker'\nimport type { ExtractPropTypes } from 'vue'\nimport type { Dayjs } from 'dayjs'\nimport type DateTable from './date-table.vue'\n\nexport type CalendarDateCellType = 'next' | 'prev' | 'current'\nexport type CalendarDateCell = {\n  text: number\n  type: CalendarDateCellType\n}\n\nexport const getPrevMonthLastDays = (date: Dayjs, count: number) => {\n  const lastDay = date.subtract(1, 'month').endOf('month').date()\n  return rangeArr(count).map((_, index) => lastDay - (count - index - 1))\n}\n\nexport const getMonthDays = (date: Dayjs) => {\n  const days = date.daysInMonth()\n  return rangeArr(days).map((_, index) => index + 1)\n}\n\nexport const toNestedArr = (days: CalendarDateCell[]) =>\n  rangeArr(days.length / 7).map((index) => {\n    const start = index * 7\n    return days.slice(start, start + 7)\n  })\n\nexport const dateTableProps = buildProps({\n  selectedDay: {\n    type: definePropType<Dayjs>(Object),\n  },\n  range: {\n    type: definePropType<[Dayjs, Dayjs]>(Array),\n  },\n  date: {\n    type: definePropType<Dayjs>(Object),\n    required: true,\n  },\n  hideHeader: {\n    type: Boolean,\n  },\n} as const)\nexport type DateTableProps = ExtractPropTypes<typeof dateTableProps>\n\nexport type DateTableInstance = InstanceType<typeof DateTable>\n"],"names":[],"mappings":";;;;;AAEY,MAAC,oBAAoB,GAAG,CAAC,IAAI,EAAE,KAAK,KAAK;AACrD,EAAE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;AAClE,EAAE,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,OAAO,IAAI,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;AAC1E,EAAE;AACU,MAAC,YAAY,GAAG,CAAC,IAAI,KAAK;AACtC,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;AAClC,EAAE,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC;AACrD,EAAE;AACU,MAAC,WAAW,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,KAAK;AAC9E,EAAE,MAAM,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC;AAC1B,EAAE,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;AACtC,CAAC,EAAE;AACS,MAAC,cAAc,GAAG,UAAU,CAAC;AACzC,EAAE,WAAW,EAAE;AACf,IAAI,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;AAChC,GAAG;AACH,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC;AAC/B,GAAG;AACH,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;AAChC,IAAI,QAAQ,EAAE,IAAI;AAClB,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,OAAO;AACjB,GAAG;AACH,CAAC;;;;"}
+{"version":3,"file":"date-table.mjs","sources":["../../../../../../packages/components/calendar/src/date-table.vue"],"sourcesContent":["<template>\n  <table\n    :class=\"[nsTable.b(), nsTable.is('range', isInRange)]\"\n    cellspacing=\"0\"\n    cellpadding=\"0\"\n  >\n    <thead v-if=\"!hideHeader\">\n      <th v-for=\"day in weekDays\" :key=\"day\">{{ day }}</th>\n    </thead>\n\n    <tbody>\n      <tr\n        v-for=\"(row, index) in rows\"\n        :key=\"index\"\n        :class=\"{\n          [nsTable.e('row')]: true,\n          [nsTable.em('row', 'hide-border')]: index === 0 && hideHeader,\n        }\"\n      >\n        <td\n          v-for=\"(cell, key) in row\"\n          :key=\"key\"\n          :class=\"getCellClass(cell)\"\n        >\n          <div :class=\"nsDay.b()\">\n            <slot name=\"dateCell\" :data=\"getSlotData(cell)\">\n              <span>{{ cell.text }}</span>\n            </slot>\n          </div>\n        </td>\n      </tr>\n    </tbody>\n  </table>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed } from 'vue'\nimport dayjs from 'dayjs'\nimport localeData from 'dayjs/plugin/localeData.js'\nimport { useLocale, useNamespace } from '@element-ps/hooks'\nimport { rangeArr } from '@element-ps/components/time-picker'\nimport { WEEK_DAYS } from '@element-ps/constants'\nimport {\n  dateTableProps,\n  getMonthDays,\n  getPrevMonthLastDays,\n  toNestedArr,\n} from './date-table'\nimport type { CalendarDateCell, CalendarDateCellType } from './date-table'\nimport type { Dayjs } from 'dayjs'\n\ndayjs.extend(localeData)\n\ndefineOptions({\n  name: 'DateTable',\n})\n\nconst props = defineProps(dateTableProps)\n\nconst { t, lang } = useLocale()\nconst nsTable = useNamespace('calendar-table')\nconst nsDay = useNamespace('calendar-day')\n\nconst now = dayjs().locale(lang.value)\n// todo better way to get Day.js locale object\nconst firstDayOfWeek: number = (now as any).$locale().weekStart || 0\n\nconst isInRange = computed(() => !!props.range && !!props.range.length)\n\nconst rows = computed(() => {\n  let days: CalendarDateCell[] = []\n  if (isInRange.value) {\n    const [start, end] = props.range!\n    const currentMonthRange: CalendarDateCell[] = rangeArr(\n      end.date() - start.date() + 1\n    ).map((index) => ({\n      text: start.date() + index,\n      type: 'current',\n    }))\n\n    let remaining = currentMonthRange.length % 7\n    remaining = remaining === 0 ? 0 : 7 - remaining\n    const nextMonthRange: CalendarDateCell[] = rangeArr(remaining).map(\n      (_, index) => ({\n        text: index + 1,\n        type: 'next',\n      })\n    )\n    days = currentMonthRange.concat(nextMonthRange)\n  } else {\n    const firstDay = props.date.startOf('month').day()\n    const prevMonthDays: CalendarDateCell[] = getPrevMonthLastDays(\n      props.date,\n      firstDay - firstDayOfWeek\n    ).map((day) => ({\n      text: day,\n      type: 'prev',\n    }))\n    const currentMonthDays: CalendarDateCell[] = getMonthDays(props.date).map(\n      (day) => ({\n        text: day,\n        type: 'current',\n      })\n    )\n    days = [...prevMonthDays, ...currentMonthDays]\n    const remaining = 7 - (days.length % 7 || 7)\n    const nextMonthDays: CalendarDateCell[] = rangeArr(remaining).map(\n      (_, index) => ({\n        text: index + 1,\n        type: 'next',\n      })\n    )\n    days = days.concat(nextMonthDays)\n  }\n  return toNestedArr(days)\n})\n\nconst weekDays = computed(() => {\n  const start = firstDayOfWeek\n  if (start === 0) {\n    return WEEK_DAYS.map((_) => t(`el.datepicker.weeks.${_}`))\n  } else {\n    return WEEK_DAYS.slice(start)\n      .concat(WEEK_DAYS.slice(0, start))\n      .map((_) => t(`el.datepicker.weeks.${_}`))\n  }\n})\n\nconst getFormattedDate = (day: number, type: CalendarDateCellType): Dayjs => {\n  switch (type) {\n    case 'prev':\n      return props.date.startOf('month').subtract(1, 'month').date(day)\n    case 'next':\n      return props.date.startOf('month').add(1, 'month').date(day)\n    case 'current':\n      return props.date.date(day)\n  }\n}\n\nconst getCellClass = ({ text, type }: CalendarDateCell) => {\n  const classes: string[] = [type]\n  if (type === 'current') {\n    const date = getFormattedDate(text, type)\n    if (date.isSame(props.selectedDay, 'day')) {\n      classes.push(nsDay.is('selected'))\n    }\n    if (date.isSame(now, 'day')) {\n      classes.push(nsDay.is('today'))\n    }\n  }\n  return classes\n}\n\nconst getSlotData = ({ text, type }: CalendarDateCell) => {\n  const day = getFormattedDate(text, type)\n  return {\n    isSelected: day.isSame(props.selectedDay),\n    type: `${type}-month`,\n    day: day.format('YYYY-MM-DD'),\n    date: day.toDate(),\n  }\n}\n\ndefineExpose({\n  /** @description toggle date panel */\n  getFormattedDate,\n})\n</script>\n"],"names":[],"mappings":"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"}