fix(timepicker): prevent scroll after closing panel

Tencent · Sep 30, 2022 · 8738ef4 · 8738ef4
1 parent f43ed54
commit 8738ef4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/_common b/src/_common
diff --git a/src/time-picker/panel/single-panel.tsx b/src/time-picker/panel/single-panel.tsx
@@ -34,6 +34,7 @@ export default defineComponent({
     triggerScroll: Boolean,
     onChange: Function,
     resetTriggerScroll: Function,
+    isShowPanel: Boolean,
   },
 
   setup(props) {
@@ -174,6 +175,8 @@ export default defineComponent({
     const handleScroll = (col: EPickerCols, idx: number) => {
       let val: number | string;
       let formattedVal: string;
+      if (!props.isShowPanel) return;
+
       const scrollTop = (colsRef[idx]?.scrollTop || 0) + panelOffset.top;
       const { offsetHeight, margin } = getItemHeight();
       const timeItemTotalHeight = offsetHeight + margin;
@@ -323,10 +326,6 @@ export default defineComponent({
             ref={(el) => (colsRef[idx] = el)}
             class={`${panelClassName.value}-body-scroll`}
             onScroll={debounce(() => handleScroll(col, idx), 50)}
-            style={{
-              '--timePickerPanelOffsetTop': panelOffset.top,
-              '--timePickerPanelOffsetBottom': panelOffset.bottom,
-            }}
           >
             {getColList(col).map((el) => (
               <li

diff --git a/src/time-picker/panel/time-picker-panel.tsx b/src/time-picker/panel/time-picker-panel.tsx
@@ -68,6 +68,7 @@ export default defineComponent({
             triggerScroll={triggerScroll.value}
             onChange={props.onChange}
             resetTriggerScroll={resetTriggerScroll}
+            isShowPanel={props.isShowPanel}
           />
         </div>
         {isFooterDisplay.value ? (
+4 −4		.github/workflows/pull-request.yml
+8 −4		js/upload/utils.ts
+1 −1		style/web/components/popup/_var.less
+7 −7		style/web/components/range-input/_index.less
+27 −0		test/unit/upload/returnFileSize.test.js