jb-mobile-ui 1.5.0 → 1.5.2

package/dist/index.es.js

@@ -5391,6 +5391,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
     const timeKey = computed(() => timeKeyMap[props.timePickerType]);
     const defaultValueFirst = computed(() => Array.isArray(props.defaultValue) ? props.defaultValue[0] : props.defaultValue);
     const defaultValueSecond = computed(() => Array.isArray(props.defaultValue) ? props.defaultValue[1] : props.defaultValue);
+    const calendarKey = ref(0);
     const defaultDate = computed(() => {
       return props.timePickerType === "dateRange" ? [
         dayjs(defaultValueFirst.value).startOf(timeKey.value).toDate(),
@@ -5590,7 +5591,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
       var _a, _b;
       if (["dateRange", "week"].includes(props.timePickerType)) {
         (_a = calendarRef.value) == null ? void 0 : _a.scrollToDate(
-          Array.isArray(defaultDate.value) ? defaultDate.value[0] : defaultDate.value
+          props.timePickerType === "week" ? weekStartDate : Array.isArray(defaultDate.value) ? defaultDate.value[0] : defaultDate.value
         );
       } else {
         const selectedItem = (_b = timePickerContentRef.value) == null ? void 0 : _b.querySelector(".selected");
@@ -5682,20 +5683,36 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
       return dayjs(startTime).isSame(dayjs(minDate.value), timeKey.value);
     };
     const toPrevDate = () => {
-      handleFinishSelectDate(
-        dayjs(endTime).subtract(1, timeKey.value).toDate()
-      );
+      const date = dayjs(endTime).subtract(1, timeKey.value).toDate();
+      if (props.timePickerType === "week") {
+        setWeekStartAndEndDate(date);
+      }
+      handleFinishSelectDate(date);
       selectedTimeValue.value = dayjs(props.timePickerType === "examine" ? endTime : startTime).format("YYYY-MM-DD");
-      handleConfirm();
+      if (!props.withSelectTab) {
+        handleConfirm();
+      } else {
+        calendarKey.value++;
+        nextTick(() => {
+          setSelectedScrollIntoView();
+        });
+      }
     };
     const toNextDate = () => {
-      nextTick(() => {
-        handleFinishSelectDate(
-          dayjs(endTime).add(1, timeKey.value).toDate()
-        );
-        selectedTimeValue.value = dayjs(props.timePickerType === "examine" ? endTime : startTime).format("YYYY-MM-DD");
+      const date = dayjs(endTime).add(1, timeKey.value).toDate();
+      if (props.timePickerType === "week") {
+        setWeekStartAndEndDate(date);
+      }
+      handleFinishSelectDate(date);
+      selectedTimeValue.value = dayjs(props.timePickerType === "examine" ? endTime : startTime).format("YYYY-MM-DD");
+      if (!props.withSelectTab) {
         handleConfirm();
-      });
+      } else {
+        calendarKey.value++;
+        nextTick(() => {
+          setSelectedScrollIntoView();
+        });
+      }
     };
     const confirmSelectDate = () => {
       setDateValueFormat([startTime, endTime], timePickerTypeObj.value.format);
@@ -5843,11 +5860,12 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
                 ])) : createCommentVNode("", true)
               ])
             ])) : createCommentVNode("", true),
-            withDirectives(createVNode(_component_van_calendar, {
+            withDirectives((openBlock(), createBlock(_component_van_calendar, {
               ref_key: "calendarRef",
               ref: calendarRef,
               class: "jb-mobile-time-picker__calendar",
               "allow-same-day": "",
+              key: calendarKey.value,
               type: timePickerTypeObj.value.calendarType,
               poppable: false,
               "show-mark": false,
@@ -5867,7 +5885,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
                 createElementVNode("div", _hoisted_6$5, toDisplayString(text), 1)
               ]),
               _: 1
-            }, 8, ["type", "min-date", "max-date", "default-date", "first-day-of-week"]), [
+            }, 8, ["type", "min-date", "max-date", "default-date", "first-day-of-week"])), [
               [vShow, isShowCalendar.value]
             ]),
             withDirectives(createElementVNode("div", _hoisted_7$4, [
@@ -5902,7 +5920,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const JbMobileTimePicker = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-4804ddd8"]]);
+const JbMobileTimePicker = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-2322ec22"]]);
 const _hoisted_1$9 = { class: "jb-mobile-date-picker" };
 const _hoisted_2$7 = { class: "jb-mobile-date-picker__value" };
 const _hoisted_3$6 = ["src"];
@@ -7493,14 +7511,15 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       const { selectedOptions } = data;
       selectedOptionsList.value = selectedOptions;
     };
-    watch(() => modelValue.value, (newValue) => {
+    watch(() => [isShowPopup.value, modelValue.value], (newValue) => {
+      if (!newValue[0]) return;
       if (!props.multiple) {
-        defaultValue.value = newValue;
+        defaultValue.value = newValue[1];
         return;
       }
       nextTick(() => {
         handleReset();
-        setDefaultSelectedValue(options.value, newValue);
+        setDefaultSelectedValue(options.value, newValue[1]);
         updateAllParentCheckedStatus(options.value);
         selectedValueList.value = getCheckedBottomLevelItems(options.value);
       });
@@ -7678,7 +7697,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const JbMobileCascader = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-f074f9e0"]]);
+const JbMobileCascader = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-fca7f37c"]]);
 const _hoisted_1$1 = { class: "jb-mobile-steps__item" };
 const _hoisted_2 = { class: "jb-mobile-steps__item__left flex-column-center" };
 const _hoisted_3 = {

package/package.json

@@ -2,7 +2,7 @@
   "name": "jb-mobile-ui",
   "description": "JinBiWuYe Mobile UI Components base on Vant",
   "private": false,
-  "version": "1.5.0",
+  "version": "1.5.2",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",
   "type": "module",