@touchvue/ui 1.0.0-beta.56 → 1.0.0-beta.58

package/es/packages/components/calendar/src/calendar.vue2.mjs

@@ -406,6 +406,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
               }
               month.value = 1;
             } else {
+              year.value = end.value.year;
               if (start.value.month === end.value.month) {
                 if (Number(month.value) === 12) {
                   year.value = end.value.year + 1;
@@ -767,7 +768,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       const str = `${year.value || curYear}-${addZero(month.value)}-${addZero(day.value)}`;
       daysRangeData.value = toggleString(daysRangeData.value, str);
       setDaysData();
-      submitValue.value = iValue.value;
+      if (props.type !== "datetime") {
+        submitValue.value = iValue.value;
+      }
     };
     const selectTime = () => {
       if (day.value === null && !props.min && !props.max) {
@@ -777,7 +780,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }
     };
     const selectTimeAction = () => {
-      submitValue.value = iValue.value;
+      submitValue.value = getStringValue();
       emit("close");
     };
     const selectHour = (item) => {
@@ -1141,7 +1144,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             createCommentVNode(" \u5E74\u6708\u9009\u62E9 "),
             withDirectives(createElementVNode(
               "div",
-              { class: "to-calendar-picker" },
+              { class: "to-calendar-ym" },
               [
                 createVNode(
                   unref(ToScroll),
@@ -1187,190 +1190,163 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                 createCommentVNode(' <div class="to-calendar-year-list"> '),
                 createCommentVNode(" </div> "),
                 createCommentVNode(' <to-icon value="expand" link class="to-calendar-year-next" @click="nextYears"></to-icon> '),
-                createElementVNode("div", { class: "to-calendar-picker-divider" }),
                 createElementVNode("div", { class: "to-calendar-month" }, [
-                  createElementVNode("div", { class: "to-calendar-month-list" }, [
-                    createElementVNode("div", {
-                      class: normalizeClass(["to-calendar-month-item", setMonthClass(1)]),
-                      role: "button",
-                      onClick: withModifiers(($event) => selectMonth(1), ["stop"])
-                    }, [
-                      createElementVNode("div", { class: "to-calendar-month-item-content" }, [
-                        createElementVNode(
-                          "div",
-                          { class: "to-calendar-month-item-text" },
-                          toDisplayString(unref(t)("to.calendar.month.m1")),
-                          1
-                          /* TEXT */
-                        )
-                      ])
-                    ], 10, ["onClick"]),
-                    createElementVNode("div", {
-                      class: normalizeClass(["to-calendar-month-item", setMonthClass(2)]),
-                      role: "button",
-                      onClick: withModifiers(($event) => selectMonth(2), ["stop"])
-                    }, [
-                      createElementVNode("div", { class: "to-calendar-month-item-content" }, [
-                        createElementVNode(
-                          "div",
-                          { class: "to-calendar-month-item-text" },
-                          toDisplayString(unref(t)("to.calendar.month.m2")),
-                          1
-                          /* TEXT */
-                        )
-                      ])
-                    ], 10, ["onClick"]),
-                    createElementVNode("div", {
-                      class: normalizeClass(["to-calendar-month-item", setMonthClass(3)]),
-                      role: "button",
-                      onClick: withModifiers(($event) => selectMonth(3), ["stop"])
-                    }, [
-                      createElementVNode("div", { class: "to-calendar-month-item-content" }, [
-                        createElementVNode(
-                          "div",
-                          { class: "to-calendar-month-item-text" },
-                          toDisplayString(unref(t)("to.calendar.month.m3")),
-                          1
-                          /* TEXT */
-                        )
-                      ])
-                    ], 10, ["onClick"]),
-                    createElementVNode("div", {
-                      class: normalizeClass(["to-calendar-month-item", setMonthClass(4)]),
-                      role: "button",
-                      onClick: withModifiers(($event) => selectMonth(4), ["stop"])
-                    }, [
-                      createElementVNode("div", { class: "to-calendar-month-item-content" }, [
-                        createElementVNode(
-                          "div",
-                          { class: "to-calendar-month-item-text" },
-                          toDisplayString(unref(t)("to.calendar.month.m4")),
-                          1
-                          /* TEXT */
-                        )
-                      ])
-                    ], 10, ["onClick"]),
-                    createElementVNode("div", {
-                      class: normalizeClass(["to-calendar-month-item", setMonthClass(5)]),
-                      role: "button",
-                      onClick: withModifiers(($event) => selectMonth(5), ["stop"])
-                    }, [
-                      createElementVNode("div", { class: "to-calendar-month-item-content" }, [
-                        createElementVNode(
-                          "div",
-                          { class: "to-calendar-month-item-text" },
-                          toDisplayString(unref(t)("to.calendar.month.m5")),
-                          1
-                          /* TEXT */
-                        )
-                      ])
-                    ], 10, ["onClick"]),
-                    createElementVNode("div", {
-                      class: normalizeClass(["to-calendar-month-item", setMonthClass(6)]),
-                      role: "button",
-                      onClick: withModifiers(($event) => selectMonth(6), ["stop"])
-                    }, [
-                      createElementVNode("div", { class: "to-calendar-month-item-content" }, [
-                        createElementVNode(
-                          "div",
-                          { class: "to-calendar-month-item-text" },
-                          toDisplayString(unref(t)("to.calendar.month.m6")),
-                          1
-                          /* TEXT */
-                        )
-                      ])
-                    ], 10, ["onClick"]),
-                    createElementVNode("div", {
-                      class: normalizeClass(["to-calendar-month-item", setMonthClass(7)]),
-                      role: "button",
-                      onClick: withModifiers(($event) => selectMonth(7), ["stop"])
-                    }, [
-                      createElementVNode("div", { class: "to-calendar-month-item-content" }, [
-                        createElementVNode(
-                          "div",
-                          { class: "to-calendar-month-item-text" },
-                          toDisplayString(unref(t)("to.calendar.month.m7")),
-                          1
-                          /* TEXT */
-                        )
-                      ])
-                    ], 10, ["onClick"]),
-                    createElementVNode("div", {
-                      class: normalizeClass(["to-calendar-month-item", setMonthClass(8)]),
-                      role: "button",
-                      onClick: withModifiers(($event) => selectMonth(8), ["stop"])
-                    }, [
-                      createElementVNode("div", { class: "to-calendar-month-item-content" }, [
-                        createElementVNode(
-                          "div",
-                          { class: "to-calendar-month-item-text" },
-                          toDisplayString(unref(t)("to.calendar.month.m8")),
-                          1
-                          /* TEXT */
-                        )
-                      ])
-                    ], 10, ["onClick"]),
-                    createElementVNode("div", {
-                      class: normalizeClass(["to-calendar-month-item", setMonthClass(9)]),
-                      role: "button",
-                      onClick: withModifiers(($event) => selectMonth(9), ["stop"])
-                    }, [
-                      createElementVNode("div", { class: "to-calendar-month-item-content" }, [
-                        createElementVNode(
-                          "div",
-                          { class: "to-calendar-month-item-text" },
-                          toDisplayString(unref(t)("to.calendar.month.m9")),
-                          1
-                          /* TEXT */
-                        )
-                      ])
-                    ], 10, ["onClick"]),
-                    createElementVNode("div", {
-                      class: normalizeClass(["to-calendar-month-item", setMonthClass(10)]),
-                      role: "button",
-                      onClick: withModifiers(($event) => selectMonth(10), ["stop"])
-                    }, [
-                      createElementVNode("div", { class: "to-calendar-month-item-content" }, [
-                        createElementVNode(
-                          "div",
-                          { class: "to-calendar-month-item-text" },
-                          toDisplayString(unref(t)("to.calendar.month.m10")),
-                          1
-                          /* TEXT */
-                        )
-                      ])
-                    ], 10, ["onClick"]),
-                    createElementVNode("div", {
-                      class: normalizeClass(["to-calendar-month-item", setMonthClass(11)]),
-                      role: "button",
-                      onClick: withModifiers(($event) => selectMonth(11), ["stop"])
-                    }, [
-                      createElementVNode("div", { class: "to-calendar-month-item-content" }, [
-                        createElementVNode(
-                          "div",
-                          { class: "to-calendar-month-item-text" },
-                          toDisplayString(unref(t)("to.calendar.month.m11")),
-                          1
-                          /* TEXT */
-                        )
-                      ])
-                    ], 10, ["onClick"]),
-                    createElementVNode("div", {
-                      class: normalizeClass(["to-calendar-month-item", setMonthClass(12)]),
-                      role: "button",
-                      onClick: withModifiers(($event) => selectMonth(12), ["stop"])
-                    }, [
-                      createElementVNode("div", { class: "to-calendar-month-item-content" }, [
-                        createElementVNode(
-                          "div",
-                          { class: "to-calendar-month-item-text" },
-                          toDisplayString(unref(t)("to.calendar.month.m12")),
-                          1
-                          /* TEXT */
-                        )
-                      ])
-                    ], 10, ["onClick"])
-                  ])
+                  createElementVNode("div", {
+                    class: normalizeClass(["to-calendar-month-item", setMonthClass(1)]),
+                    role: "button",
+                    onClick: withModifiers(($event) => selectMonth(1), ["stop"])
+                  }, [
+                    createElementVNode(
+                      "div",
+                      { class: "to-calendar-month-item-text" },
+                      toDisplayString(unref(t)("to.calendar.month.m1")),
+                      1
+                      /* TEXT */
+                    )
+                  ], 10, ["onClick"]),
+                  createElementVNode("div", {
+                    class: normalizeClass(["to-calendar-month-item", setMonthClass(2)]),
+                    role: "button",
+                    onClick: withModifiers(($event) => selectMonth(2), ["stop"])
+                  }, [
+                    createElementVNode(
+                      "div",
+                      { class: "to-calendar-month-item-text" },
+                      toDisplayString(unref(t)("to.calendar.month.m2")),
+                      1
+                      /* TEXT */
+                    )
+                  ], 10, ["onClick"]),
+                  createElementVNode("div", {
+                    class: normalizeClass(["to-calendar-month-item", setMonthClass(3)]),
+                    role: "button",
+                    onClick: withModifiers(($event) => selectMonth(3), ["stop"])
+                  }, [
+                    createElementVNode(
+                      "div",
+                      { class: "to-calendar-month-item-text" },
+                      toDisplayString(unref(t)("to.calendar.month.m3")),
+                      1
+                      /* TEXT */
+                    )
+                  ], 10, ["onClick"]),
+                  createElementVNode("div", {
+                    class: normalizeClass(["to-calendar-month-item", setMonthClass(4)]),
+                    role: "button",
+                    onClick: withModifiers(($event) => selectMonth(4), ["stop"])
+                  }, [
+                    createElementVNode(
+                      "div",
+                      { class: "to-calendar-month-item-text" },
+                      toDisplayString(unref(t)("to.calendar.month.m4")),
+                      1
+                      /* TEXT */
+                    )
+                  ], 10, ["onClick"]),
+                  createElementVNode("div", {
+                    class: normalizeClass(["to-calendar-month-item", setMonthClass(5)]),
+                    role: "button",
+                    onClick: withModifiers(($event) => selectMonth(5), ["stop"])
+                  }, [
+                    createElementVNode(
+                      "div",
+                      { class: "to-calendar-month-item-text" },
+                      toDisplayString(unref(t)("to.calendar.month.m5")),
+                      1
+                      /* TEXT */
+                    )
+                  ], 10, ["onClick"]),
+                  createElementVNode("div", {
+                    class: normalizeClass(["to-calendar-month-item", setMonthClass(6)]),
+                    role: "button",
+                    onClick: withModifiers(($event) => selectMonth(6), ["stop"])
+                  }, [
+                    createElementVNode(
+                      "div",
+                      { class: "to-calendar-month-item-text" },
+                      toDisplayString(unref(t)("to.calendar.month.m6")),
+                      1
+                      /* TEXT */
+                    )
+                  ], 10, ["onClick"]),
+                  createElementVNode("div", {
+                    class: normalizeClass(["to-calendar-month-item", setMonthClass(7)]),
+                    role: "button",
+                    onClick: withModifiers(($event) => selectMonth(7), ["stop"])
+                  }, [
+                    createElementVNode(
+                      "div",
+                      { class: "to-calendar-month-item-text" },
+                      toDisplayString(unref(t)("to.calendar.month.m7")),
+                      1
+                      /* TEXT */
+                    )
+                  ], 10, ["onClick"]),
+                  createElementVNode("div", {
+                    class: normalizeClass(["to-calendar-month-item", setMonthClass(8)]),
+                    role: "button",
+                    onClick: withModifiers(($event) => selectMonth(8), ["stop"])
+                  }, [
+                    createElementVNode(
+                      "div",
+                      { class: "to-calendar-month-item-text" },
+                      toDisplayString(unref(t)("to.calendar.month.m8")),
+                      1
+                      /* TEXT */
+                    )
+                  ], 10, ["onClick"]),
+                  createElementVNode("div", {
+                    class: normalizeClass(["to-calendar-month-item", setMonthClass(9)]),
+                    role: "button",
+                    onClick: withModifiers(($event) => selectMonth(9), ["stop"])
+                  }, [
+                    createElementVNode(
+                      "div",
+                      { class: "to-calendar-month-item-text" },
+                      toDisplayString(unref(t)("to.calendar.month.m9")),
+                      1
+                      /* TEXT */
+                    )
+                  ], 10, ["onClick"]),
+                  createElementVNode("div", {
+                    class: normalizeClass(["to-calendar-month-item", setMonthClass(10)]),
+                    role: "button",
+                    onClick: withModifiers(($event) => selectMonth(10), ["stop"])
+                  }, [
+                    createElementVNode(
+                      "div",
+                      { class: "to-calendar-month-item-text" },
+                      toDisplayString(unref(t)("to.calendar.month.m10")),
+                      1
+                      /* TEXT */
+                    )
+                  ], 10, ["onClick"]),
+                  createElementVNode("div", {
+                    class: normalizeClass(["to-calendar-month-item", setMonthClass(11)]),
+                    role: "button",
+                    onClick: withModifiers(($event) => selectMonth(11), ["stop"])
+                  }, [
+                    createElementVNode(
+                      "div",
+                      { class: "to-calendar-month-item-text" },
+                      toDisplayString(unref(t)("to.calendar.month.m11")),
+                      1
+                      /* TEXT */
+                    )
+                  ], 10, ["onClick"]),
+                  createElementVNode("div", {
+                    class: normalizeClass(["to-calendar-month-item", setMonthClass(12)]),
+                    role: "button",
+                    onClick: withModifiers(($event) => selectMonth(12), ["stop"])
+                  }, [
+                    createElementVNode(
+                      "div",
+                      { class: "to-calendar-month-item-text" },
+                      toDisplayString(unref(t)("to.calendar.month.m12")),
+                      1
+                      /* TEXT */
+                    )
+                  ], 10, ["onClick"])
                 ])
               ],
               512
@@ -1459,52 +1435,50 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                       role: "button",
                       onClick: ($event) => selectDay(item)
                     }, [
-                      createElementVNode("div", { class: "to-calendar-day-item-content" }, [
-                        renderSlot(_ctx.$slots, "default", {
-                          item,
-                          index
-                        }, () => [
-                          item.value ? (openBlock(), createElementBlock(
-                            "div",
-                            {
-                              key: 0,
-                              class: "to-calendar-day-text"
-                            },
-                            toDisplayString(dayText.value(item.value)),
-                            1
-                            /* TEXT */
-                          )) : createCommentVNode("v-if", true),
-                          item.point && item.point.length > 0 ? (openBlock(), createElementBlock("div", {
-                            key: 1,
-                            class: "to-calendar-day-points"
-                          }, [
-                            (openBlock(true), createElementBlock(
-                              Fragment,
-                              null,
-                              renderList(item.point, (ipoint, pointIndex) => {
-                                return withDirectives((openBlock(), createBlock(unref(ToTag), {
-                                  key: pointIndex,
-                                  type: _ctx.size === "large" ? "dot" : "",
-                                  color: pointColor.value(ipoint.type)
-                                }, {
-                                  default: withCtx(() => [
-                                    createTextVNode(
-                                      toDisplayString(ipoint.count),
-                                      1
-                                      /* TEXT */
-                                    )
-                                  ]),
-                                  _: 2
-                                  /* DYNAMIC */
-                                }, 1032, ["type", "color"])), [
-                                  [unref(tipDirective), ipoint.tooltip ? ipoint.tooltip : ""]
-                                ]);
-                              }),
-                              128
-                              /* KEYED_FRAGMENT */
-                            ))
-                          ])) : createCommentVNode("v-if", true)
-                        ])
+                      renderSlot(_ctx.$slots, "default", {
+                        item,
+                        index
+                      }, () => [
+                        item.value ? (openBlock(), createElementBlock(
+                          "div",
+                          {
+                            key: 0,
+                            class: "to-calendar-day-text"
+                          },
+                          toDisplayString(dayText.value(item.value)),
+                          1
+                          /* TEXT */
+                        )) : createCommentVNode("v-if", true),
+                        item.point && item.point.length > 0 ? (openBlock(), createElementBlock("div", {
+                          key: 1,
+                          class: "to-calendar-day-points"
+                        }, [
+                          (openBlock(true), createElementBlock(
+                            Fragment,
+                            null,
+                            renderList(item.point, (ipoint, pointIndex) => {
+                              return withDirectives((openBlock(), createBlock(unref(ToTag), {
+                                key: pointIndex,
+                                type: _ctx.size === "large" ? "dot" : "",
+                                color: pointColor.value(ipoint.type)
+                              }, {
+                                default: withCtx(() => [
+                                  createTextVNode(
+                                    toDisplayString(ipoint.count),
+                                    1
+                                    /* TEXT */
+                                  )
+                                ]),
+                                _: 2
+                                /* DYNAMIC */
+                              }, 1032, ["type", "color"])), [
+                                [unref(tipDirective), ipoint.tooltip ? ipoint.tooltip : ""]
+                              ]);
+                            }),
+                            128
+                            /* KEYED_FRAGMENT */
+                          ))
+                        ])) : createCommentVNode("v-if", true)
                       ])
                     ], 10, ["onClick"])), [
                       [unref(vDis), isDisableDay.value(item)]