jb-mobile-ui 1.4.2 → 1.4.3

package/dist/index.es.js

@@ -1,4 +1,4 @@
-import { ref, onMounted, reactive, getCurrentInstance, nextTick, onActivated, onUnmounted, onDeactivated, isRef, watch, inject, computed, provide, unref, isVNode, defineComponent, createVNode, onBeforeUnmount, watchEffect, mergeProps, Transition, Teleport, withDirectives, vShow, Fragment, onBeforeUpdate, Comment, createApp, useAttrs, useSlots, createBlock, openBlock, createSlots, renderList, withCtx, renderSlot, normalizeProps, guardReactiveProps, createElementVNode, createElementBlock, createCommentVNode, toDisplayString, normalizeStyle as normalizeStyle$1, normalizeClass as normalizeClass$1, createTextVNode, vModelDynamic, customRef } from "vue";
+import { ref, onMounted, reactive, getCurrentInstance, nextTick, onActivated, onUnmounted, onDeactivated, isRef, watch, inject, computed, provide, unref, isVNode, defineComponent, createVNode, onBeforeUnmount, watchEffect, mergeProps, Transition, Teleport, withDirectives, vShow, Fragment, onBeforeUpdate, Comment, createApp, useAttrs, createBlock, openBlock, withCtx, renderSlot, createElementVNode, createElementBlock, createCommentVNode, toDisplayString, normalizeStyle as normalizeStyle$1, normalizeClass as normalizeClass$1, createTextVNode, renderList, vModelDynamic, useSlots, customRef } from "vue";
 import { showToast as showToast$1 } from "vant";
 import dayjs from "dayjs";
 import weekOfYear from "dayjs/plugin/weekOfYear";
@@ -4707,19 +4707,16 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
   __name: "JbMobileButton",
   setup(__props) {
     const attrs = useAttrs();
-    const slots = useSlots();
     return (_ctx, _cache) => {
       const _component_van_button = Button;
-      return openBlock(), createBlock(_component_van_button, mergeProps({ class: "jb-mobile-button" }, unref(attrs)), createSlots({ _: 2 }, [
-        renderList(unref(slots), (_, key) => {
-          return {
-            name: key,
-            fn: withCtx((scope) => [
-              renderSlot(_ctx.$slots, key, normalizeProps(guardReactiveProps(scope || {})), void 0, true)
-            ])
-          };
-        })
-      ]), 1040);
+      return openBlock(), createBlock(_component_van_button, mergeProps({ class: "jb-mobile-button" }, unref(attrs)), {
+        default: withCtx(() => [
+          renderSlot(_ctx.$slots, "default", {}, void 0, true),
+          renderSlot(_ctx.$slots, "icon", {}, void 0, true),
+          renderSlot(_ctx.$slots, "loading", {}, void 0, true)
+        ]),
+        _: 3
+      }, 16);
     };
   }
 });
@@ -4730,7 +4727,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const JbMobileButton = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__scopeId", "data-v-5a0db3b9"]]);
+const JbMobileButton = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__scopeId", "data-v-3768c8dc"]]);
 const _imports_0$5 = "data:image/svg+xml,%3c?xml%20version='1.0'%20encoding='UTF-8'?%3e%3csvg%20width='24px'%20height='24px'%20viewBox='0%200%2024%2024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20xmlns:xlink='http://www.w3.org/1999/xlink'%3e%3ctitle%3e编组%2017%3c/title%3e%3cg%20id='页面-1'%20stroke='none'%20stroke-width='1'%20fill='none'%20fill-rule='evenodd'%3e%3cg%20id='按地区'%20transform='translate(-26,%20-254)'%3e%3cg%20id='编组-17'%20transform='translate(26,%20254)'%3e%3ccircle%20id='椭圆形'%20fill='%23F4F4F4'%20cx='12'%20cy='12'%20r='12'%3e%3c/circle%3e%3cpolyline%20id='路径'%20stroke='%23000000'%20stroke-width='1.33333333'%20stroke-linecap='round'%20stroke-linejoin='round'%20points='14%2016%2010%2012%2014%208'%3e%3c/polyline%3e%3c/g%3e%3c/g%3e%3c/g%3e%3c/svg%3e";
 const forwardDisabledSvg = "data:image/svg+xml,%3c?xml%20version='1.0'%20encoding='UTF-8'?%3e%3csvg%20width='24px'%20height='24px'%20viewBox='0%200%2024%2024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20xmlns:xlink='http://www.w3.org/1999/xlink'%3e%3ctitle%3e编组%2017备份%3c/title%3e%3cg%20id='页面-1'%20stroke='none'%20stroke-width='1'%20fill='none'%20fill-rule='evenodd'%3e%3cg%20id='总部'%20transform='translate(-325,%20-254)'%3e%3cg%20id='编组-11'%20transform='translate(26,%20254)'%3e%3cg%20id='编组-17备份'%20transform='translate(299,%200)'%3e%3ccircle%20id='椭圆形'%20fill='%23F4F4F4'%20cx='12'%20cy='12'%20r='12'%3e%3c/circle%3e%3cpolyline%20id='路径'%20stroke='%23C9C9C9'%20stroke-width='1.33333333'%20stroke-linecap='round'%20stroke-linejoin='round'%20transform='translate(12,%2012)%20scale(-1,%201)%20translate(-12,%20-12)'%20points='14%2016%2010%2012%2014%208'%3e%3c/polyline%3e%3c/g%3e%3c/g%3e%3c/g%3e%3c/g%3e%3c/svg%3e";
 const forwardSvg = "data:image/svg+xml,%3c?xml%20version='1.0'%20encoding='UTF-8'?%3e%3csvg%20width='24px'%20height='24px'%20viewBox='0%200%2024%2024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20xmlns:xlink='http://www.w3.org/1999/xlink'%3e%3ctitle%3e编组%2017备份%3c/title%3e%3cg%20id='页面-1'%20stroke='none'%20stroke-width='1'%20fill='none'%20fill-rule='evenodd'%3e%3cg%20id='按地区'%20transform='translate(-325,%20-254)'%3e%3cg%20id='编组-11'%20transform='translate(26,%20254)'%3e%3cg%20id='编组-17备份'%20transform='translate(299,%200)'%3e%3ccircle%20id='椭圆形'%20fill='%23F4F4F4'%20cx='12'%20cy='12'%20r='12'%3e%3c/circle%3e%3cpolyline%20id='路径'%20stroke='%23000000'%20stroke-width='1.33333333'%20stroke-linecap='round'%20stroke-linejoin='round'%20transform='translate(12,%2012)%20scale(-1,%201)%20translate(-12,%20-12)'%20points='14%2016%2010%2012%2014%208'%3e%3c/polyline%3e%3c/g%3e%3c/g%3e%3c/g%3e%3c/g%3e%3c/svg%3e";
@@ -4890,7 +4887,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const JbMobilePopup = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-95314bb6"]]);
+const JbMobilePopup = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-2c28244d"]]);
 const _hoisted_1$6 = {
   key: 0,
   class: "jb-mobile-date-picker"
@@ -5505,6 +5502,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
               "max-date": maxDate.value,
               "default-date": defaultDate.value,
               formatter,
+              "lazy-render": false,
               onSelect: handleSelectDate,
               onConfirm: handleFinishSelectDate
             }, {
@@ -5545,7 +5543,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const JbMobileTimePicker = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-6720e0d8"]]);
+const JbMobileTimePicker = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-87a0b52f"]]);
 const _hoisted_1$5 = { class: "jb-mobile-date-picker" };
 const _hoisted_2$4 = { class: "jb-mobile-date-picker__value" };
 const _hoisted_3$3 = ["src"];
@@ -6011,7 +6009,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           title: __props.popupTitle,
           "grey-bg": true,
           "foot-button": false,
-          "content-height": 434
+          height: 434
         }), {
           default: withCtx(() => [
             __props.options.length ? (openBlock(), createElementBlock("div", _hoisted_2$2, [
@@ -6032,7 +6030,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const JbMobileSelect = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-2a27651c"]]);
+const JbMobileSelect = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-a148a345"]]);
 const _imports_0 = "data:image/svg+xml,%3c?xml%20version='1.0'%20encoding='UTF-8'?%3e%3csvg%20width='24px'%20height='24px'%20viewBox='0%200%2024%2024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20xmlns:xlink='http://www.w3.org/1999/xlink'%3e%3ctitle%3e图标（24）/巡检%3c/title%3e%3cg%20id='页面-1'%20stroke='none'%20stroke-width='1'%20fill='none'%20fill-rule='evenodd'%3e%3cg%20id='我的服务备份-14'%20transform='translate(-339,%20-371)'%20fill='%237B52FE'%20fill-rule='nonzero'%3e%3cg%20id='编组-28'%20transform='translate(0,%20134)'%3e%3cg%20id='编组-28备份'%20transform='translate(0,%2051)'%3e%3cg%20id='编组-32备份-4'%20transform='translate(0,%20176)'%3e%3cg%20id='编组-27'%20transform='translate(132,%200)'%3e%3cg%20id='编组'%20transform='translate(211.3571,%2016)'%3e%3cpath%20d='M0.127476811,5.43301045%20L5.51144105,11.8129903%20C5.70234462,12.0384575%206.03582177,12.0632342%206.25572336,11.8699765%20C6.27022237,11.8575882%206.28472138,11.8427223%206.29680387,11.8278563%20L16.146462,0.901366518%20C16.3325325,0.695720566%2016.3325325,0.37610216%2016.1440455,0.170456209%20C15.9555584,-0.0351897433%2015.6438297,-0.0574886986%2015.4287612,0.118425301%20L6.19289432,7.77687878%20C6.01407325,7.92553851%205.76275714,7.93792683%205.57185357,7.80908838%20L0.813763084,4.63520326%20C0.593861494,4.4890212%200.303881373,4.52866379%200.12989331,4.72935442%20C-0.0416782539,4.93004505%20-0.0440947695,5.22984216%200.127476811,5.43301045%20Z'%20id='路径'%3e%3c/path%3e%3c/g%3e%3c/g%3e%3c/g%3e%3c/g%3e%3c/g%3e%3c/g%3e%3c/g%3e%3c/svg%3e";
 const _hoisted_1$1 = { class: "jb-mobile-tree-select-popup__search" };
 const _hoisted_2$1 = { class: "jb-mobile-tree-select-popup__list" };
@@ -6740,7 +6738,6 @@ function useInfiniteScroll(options = {}) {
     bottomThreshold = 100,
     topThreshold = 100,
     throttleDelay = 300,
-    scrollDirectionThreshold = 5,
     disabled = ref(false),
     onLoadMore,
     onLoadPrevious,
@@ -6751,14 +6748,12 @@ function useInfiniteScroll(options = {}) {
   const isLoadingPrevious = ref(false);
   const hasMoreData = ref(true);
   const hasPreviousData = ref(true);
-  const isProcessingScroll = ref(false);
   let lastScrollTop = 0;
   const executeLoadMore = async () => {
     if (isLoadingMore.value || !hasMoreData.value || !onLoadMore) {
       return;
     }
     isLoadingMore.value = true;
-    isProcessingScroll.value = true;
     try {
       await onLoadMore();
       if (debug) console.log("✅ 向下加载更多完成");
@@ -6766,7 +6761,6 @@ function useInfiniteScroll(options = {}) {
       console.error("❌ 向下加载更多失败:", error);
     } finally {
       isLoadingMore.value = false;
-      isProcessingScroll.value = false;
     }
   };
   const executeLoadPrevious = async () => {
@@ -6774,7 +6768,6 @@ function useInfiniteScroll(options = {}) {
       return;
     }
     isLoadingPrevious.value = true;
-    isProcessingScroll.value = true;
     try {
       await onLoadPrevious();
       if (debug) console.log("✅ 向上加载完成");
@@ -6782,11 +6775,10 @@ function useInfiniteScroll(options = {}) {
       console.error("❌ 向上加载失败:", error);
     } finally {
       isLoadingPrevious.value = false;
-      isProcessingScroll.value = false;
     }
   };
   const handleScroll = throttle(async (event) => {
-    if (disabled.value || isProcessingScroll.value) return;
+    if (disabled.value) return;
     const target = event.target;
     if (!target) return;
     const { scrollTop, scrollHeight, clientHeight } = target;
@@ -6795,18 +6787,12 @@ function useInfiniteScroll(options = {}) {
     const isNearBottom = distanceToBottom < bottomThreshold;
     const isNearTop = distanceToTop < topThreshold;
     let scrollDirection = "none";
-    const scrollDelta = scrollTop - lastScrollTop;
-    if (Math.abs(scrollDelta) > scrollDirectionThreshold) {
-      if (scrollDelta > 0) {
-        scrollDirection = "down";
-      } else {
-        scrollDirection = "up";
-      }
-      lastScrollTop = scrollTop;
-      if (debug) {
-        console.log(`🔄 滚动方向变化: ${scrollDirection}, 滚动距离: ${scrollDelta}px`);
-      }
+    if (scrollTop > lastScrollTop) {
+      scrollDirection = "down";
+    } else if (scrollTop < lastScrollTop) {
+      scrollDirection = "up";
     }
+    lastScrollTop = scrollTop;
     const scrollInfo = {
       scrollTop,
       scrollHeight,
@@ -6819,15 +6805,14 @@ function useInfiniteScroll(options = {}) {
     };
     if (debug) {
       console.log("📊 滚动信息:", scrollInfo);
-      console.log(`🔄 加载状态: 向下加载=${isLoadingMore.value}, 向上加载=${isLoadingPrevious.value}, 处理中=${isProcessingScroll.value}`);
     }
     if (isNearBottom && scrollDirection === "down") {
       if (debug) console.log("🔽 触发向下加载");
-      executeLoadMore();
+      await executeLoadMore();
     }
     if (isNearTop && scrollDirection === "up") {
       if (debug) console.log("🔼 触发向上加载");
-      executeLoadPrevious();
+      await executeLoadPrevious();
     }
     scrollInfoRef.value = scrollInfo;
   }, throttleDelay);
@@ -6836,7 +6821,6 @@ function useInfiniteScroll(options = {}) {
     isLoadingPrevious.value = false;
     hasMoreData.value = true;
     hasPreviousData.value = true;
-    isProcessingScroll.value = false;
     lastScrollTop = 0;
   };
   const triggerLoadMore = async () => {

package/package.json

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