vxe-pc-ui 4.14.14 → 4.14.16

package/es/modal/src/modal.js

@@ -276,12 +276,13 @@ export default defineVxeComponent({
         const recalculate = () => {
             const { width, height, minWidth, minHeight } = props;
             const isMsg = computeIsMsg.value;
+            const isMinimizeStatus = computeIsMinimizeStatus.value;
             const boxElem = getBox();
             if (boxElem) {
                 boxElem.style.width = width ? toCssUnit(width) : '';
                 boxElem.style.height = height ? toCssUnit(height) : '';
-                boxElem.style.minWidth = !isMsg && minWidth ? toCssUnit(minWidth) : '';
-                boxElem.style.minHeight = !isMsg && minHeight ? toCssUnit(minHeight) : '';
+                boxElem.style.minWidth = !isMsg && !isMinimizeStatus && minWidth ? toCssUnit(minWidth) : '';
+                boxElem.style.minHeight = !isMsg && !isMinimizeStatus && minHeight ? toCssUnit(minHeight) : '';
             }
             return nextTick();
         };
@@ -583,7 +584,9 @@ export default defineVxeComponent({
                     top: `${targetTop}px`,
                     left: `${targetLeft}px`,
                     width: '200px',
-                    height: `${headerEl.offsetHeight}px`
+                    height: `${headerEl.offsetHeight}px`,
+                    minHeight: '',
+                    minWidth: ''
                 });
                 savePosStorage();
                 return {
@@ -614,7 +617,9 @@ export default defineVxeComponent({
                         top: '0',
                         left: '0',
                         width: '100%',
-                        height: '100%'
+                        height: '100%',
+                        minHeight: '',
+                        minWidth: ''
                     });
                 }
                 savePosStorage();

package/es/select/src/select.js

@@ -529,6 +529,7 @@ export default defineVxeComponent({
                 if (selectVals.length && isAniVisible && visiblePanel) {
                     const cacheItem = reactData.reactFlag ? optFullValMaps[`${selectVals[0]}`] : null;
                     if (cacheItem) {
+                        reactData.currentOption = cacheItem.item;
                         handleScrollToOption(cacheItem.item);
                     }
                 }
@@ -539,6 +540,7 @@ export default defineVxeComponent({
             const { fullData, hpTimeout } = internalData;
             const isDisabled = computeIsDisabled.value;
             const remoteOpts = computeRemoteOpts.value;
+            const selectVals = computeSelectVals.value;
             if (!loading && !isDisabled) {
                 if (hpTimeout) {
                     clearTimeout(hpTimeout);
@@ -562,8 +564,12 @@ export default defineVxeComponent({
                     reactData.visiblePanel = true;
                     handleFocusSearch();
                     recalculate().then(() => {
-                        handleScrollSelect();
-                        refreshScroll();
+                        if (selectVals && selectVals.length) {
+                            handleScrollSelect();
+                        }
+                        else {
+                            refreshScroll();
+                        }
                     });
                     updatePlacement();
                 }, 10);
@@ -1031,7 +1037,6 @@ export default defineVxeComponent({
             });
         };
         const handleScrollToOption = (option, isDwArrow) => {
-            const { scrollYLoad } = reactData;
             const { optFullValMaps, scrollYStore } = internalData;
             const valueField = computeValueField.value;
             const cacheItem = optFullValMaps[option[valueField]];
@@ -1050,7 +1055,7 @@ export default defineVxeComponent({
                             const wrapperHeight = optWrapperElem.offsetHeight;
                             const offsetPadding = 1;
                             if (isDwArrow) {
-                                if (optElem.offsetTop + optElem.offsetHeight - optWrapperElem.scrollTop > wrapperHeight) {
+                                if (Math.ceil(optElem.offsetTop + optElem.offsetHeight - optWrapperElem.scrollTop) >= wrapperHeight) {
                                     optWrapperElem.scrollTop = optElem.offsetTop + optElem.offsetHeight - wrapperHeight;
                                 }
                                 else if (optElem.offsetTop + offsetPadding < optWrapperElem.scrollTop || optElem.offsetTop + offsetPadding > optWrapperElem.scrollTop + optWrapperElem.clientHeight) {
@@ -1066,7 +1071,7 @@ export default defineVxeComponent({
                                 }
                             }
                         }
-                        else if (scrollYLoad) {
+                        else {
                             if (isDwArrow) {
                                 optWrapperElem.scrollTop = avIndex * scrollYStore.rowHeight - optWrapperElem.clientHeight + scrollYStore.rowHeight;
                             }
@@ -1561,7 +1566,7 @@ export default defineVxeComponent({
                                             ref: refVirtualBody,
                                             class: 'vxe-select--body',
                                             style: {
-                                                transform: `translateY(${topSpaceHeight}px)`
+                                                marginTop: `${topSpaceHeight}px`
                                             }
                                         }, renderOpts())
                                     ])

package/es/ui/index.js

@@ -1,7 +1,7 @@
 import { VxeUI, setConfig, setIcon } from '@vxe-ui/core';
 import { dynamicApp } from '../dynamics';
 import { warnLog } from './src/log';
-export const version = "4.14.14";
+export const version = "4.14.16";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 export function config(options) {

package/es/ui/src/log.js

@@ -1,4 +1,4 @@
 import { log } from '@vxe-ui/core';
-const version = `ui v${"4.14.14"}`;
+const version = `ui v${"4.14.16"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -4646,7 +4646,7 @@ function checkDynamic() {
 }
 ;// ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.14.14"}`;
+const log_version = `ui v${"4.14.16"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// ./packages/ui/index.ts
@@ -4654,7 +4654,7 @@ const errLog = log.create('error', log_version);
 
 
 
-const ui_version = "4.14.14";
+const ui_version = "4.14.16";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -31897,12 +31897,13 @@ const lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
         minHeight
       } = props;
       const isMsg = computeIsMsg.value;
+      const isMinimizeStatus = computeIsMinimizeStatus.value;
       const boxElem = getBox();
       if (boxElem) {
         boxElem.style.width = width ? toCssUnit(width) : '';
         boxElem.style.height = height ? toCssUnit(height) : '';
-        boxElem.style.minWidth = !isMsg && minWidth ? toCssUnit(minWidth) : '';
-        boxElem.style.minHeight = !isMsg && minHeight ? toCssUnit(minHeight) : '';
+        boxElem.style.minWidth = !isMsg && !isMinimizeStatus && minWidth ? toCssUnit(minWidth) : '';
+        boxElem.style.minHeight = !isMsg && !isMinimizeStatus && minHeight ? toCssUnit(minHeight) : '';
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
     };
@@ -32245,7 +32246,9 @@ const lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
           top: `${targetTop}px`,
           left: `${targetLeft}px`,
           width: '200px',
-          height: `${headerEl.offsetHeight}px`
+          height: `${headerEl.offsetHeight}px`,
+          minHeight: '',
+          minWidth: ''
         });
         savePosStorage();
         return {
@@ -32276,7 +32279,9 @@ const lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
             top: '0',
             left: '0',
             width: '100%',
-            height: '100%'
+            height: '100%',
+            minHeight: '',
+            minWidth: ''
           });
         }
         savePosStorage();
@@ -34222,6 +34227,7 @@ function select_createInternalData() {
         if (selectVals.length && isAniVisible && visiblePanel) {
           const cacheItem = reactData.reactFlag ? optFullValMaps[`${selectVals[0]}`] : null;
           if (cacheItem) {
+            reactData.currentOption = cacheItem.item;
             handleScrollToOption(cacheItem.item);
           }
         }
@@ -34239,6 +34245,7 @@ function select_createInternalData() {
       } = internalData;
       const isDisabled = computeIsDisabled.value;
       const remoteOpts = computeRemoteOpts.value;
+      const selectVals = computeSelectVals.value;
       if (!loading && !isDisabled) {
         if (hpTimeout) {
           clearTimeout(hpTimeout);
@@ -34261,8 +34268,11 @@ function select_createInternalData() {
           reactData.visiblePanel = true;
           handleFocusSearch();
           recalculate().then(() => {
-            handleScrollSelect();
-            refreshScroll();
+            if (selectVals && selectVals.length) {
+              handleScrollSelect();
+            } else {
+              refreshScroll();
+            }
           });
           updatePlacement();
         }, 10);
@@ -34814,9 +34824,6 @@ function select_createInternalData() {
       });
     };
     const handleScrollToOption = (option, isDwArrow) => {
-      const {
-        scrollYLoad
-      } = reactData;
       const {
         optFullValMaps,
         scrollYStore
@@ -34838,7 +34845,7 @@ function select_createInternalData() {
               const wrapperHeight = optWrapperElem.offsetHeight;
               const offsetPadding = 1;
               if (isDwArrow) {
-                if (optElem.offsetTop + optElem.offsetHeight - optWrapperElem.scrollTop > wrapperHeight) {
+                if (Math.ceil(optElem.offsetTop + optElem.offsetHeight - optWrapperElem.scrollTop) >= wrapperHeight) {
                   optWrapperElem.scrollTop = optElem.offsetTop + optElem.offsetHeight - wrapperHeight;
                 } else if (optElem.offsetTop + offsetPadding < optWrapperElem.scrollTop || optElem.offsetTop + offsetPadding > optWrapperElem.scrollTop + optWrapperElem.clientHeight) {
                   optWrapperElem.scrollTop = optElem.offsetTop - offsetPadding;
@@ -34850,7 +34857,7 @@ function select_createInternalData() {
                   optWrapperElem.scrollTop = optElem.offsetTop + optElem.offsetHeight - wrapperHeight;
                 }
               }
-            } else if (scrollYLoad) {
+            } else {
               if (isDwArrow) {
                 optWrapperElem.scrollTop = avIndex * scrollYStore.rowHeight - optWrapperElem.clientHeight + scrollYStore.rowHeight;
               } else {
@@ -35348,7 +35355,7 @@ function select_createInternalData() {
         ref: refVirtualBody,
         class: 'vxe-select--body',
         style: {
-          transform: `translateY(${topSpaceHeight}px)`
+          marginTop: `${topSpaceHeight}px`
         }
       }, renderOpts())])]), footerSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-select--panel-footer'