vxe-pc-ui 3.14.15 → 3.14.16

package/es/modal/src/modal.js

@@ -416,12 +416,13 @@ export default {
             const props = $xeModal;
             const { width, height, minWidth, minHeight } = props;
             const isMsg = $xeModal.computeIsMsg;
+            const isMinimizeStatus = $xeModal.computeIsMinimizeStatus;
             const boxElem = $xeModal.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 $xeModal.$nextTick();
         },
@@ -753,7 +754,9 @@ export default {
                     top: `${targetTop}px`,
                     left: `${targetLeft}px`,
                     width: '200px',
-                    height: `${headerEl.offsetHeight}px`
+                    height: `${headerEl.offsetHeight}px`,
+                    minHeight: '',
+                    minWidth: ''
                 });
                 $xeModal.savePosStorage();
                 return {
@@ -787,7 +790,9 @@ export default {
                         top: '0',
                         left: '0',
                         width: '100%',
-                        height: '100%'
+                        height: '100%',
+                        minHeight: '',
+                        minWidth: ''
                     });
                 }
                 $xeModal.savePosStorage();

package/es/select/src/select.js

@@ -725,6 +725,7 @@ export default {
                 if (selectVals.length && isAniVisible && visiblePanel) {
                     const cacheItem = reactData.reactFlag ? optFullValMaps[`${selectVals[0]}`] : null;
                     if (cacheItem) {
+                        reactData.currentOption = cacheItem.item;
                         $xeSelect.handleScrollToOption(cacheItem.item);
                     }
                 }
@@ -739,6 +740,7 @@ export default {
             const { fullData, hpTimeout } = internalData;
             const isDisabled = $xeSelect.computeIsDisabled;
             const remoteOpts = $xeSelect.computeRemoteOpts;
+            const selectVals = $xeSelect.computeSelectVals;
             if (!loading && !isDisabled) {
                 if (hpTimeout) {
                     clearTimeout(hpTimeout);
@@ -769,8 +771,12 @@ export default {
                     reactData.visiblePanel = true;
                     $xeSelect.handleFocusSearch();
                     $xeSelect.recalculate().then(() => {
-                        $xeSelect.handleScrollSelect();
-                        $xeSelect.refreshScroll();
+                        if (selectVals && selectVals.length) {
+                            $xeSelect.handleScrollSelect();
+                        }
+                        else {
+                            $xeSelect.refreshScroll();
+                        }
                     });
                     $xeSelect.updatePlacement();
                 }, 10);
@@ -1302,9 +1308,7 @@ export default {
         },
         handleScrollToOption(option, isDwArrow) {
             const $xeSelect = this;
-            const reactData = $xeSelect.reactData;
             const internalData = $xeSelect.internalData;
-            const { scrollYLoad } = reactData;
             const { optFullValMaps, scrollYStore } = internalData;
             const valueField = $xeSelect.computeValueField;
             const cacheItem = optFullValMaps[option[valueField]];
@@ -1320,7 +1324,7 @@ export default {
                             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) {
@@ -1336,7 +1340,7 @@ export default {
                                 }
                             }
                         }
-                        else if (scrollYLoad) {
+                        else {
                             if (isDwArrow) {
                                 optWrapperElem.scrollTop = avIndex * scrollYStore.rowHeight - optWrapperElem.clientHeight + scrollYStore.rowHeight;
                             }

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 = "3.14.15";
+export const version = "3.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${"3.14.15"}`;
+const version = `ui v${"3.14.16"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -13214,7 +13214,7 @@ function checkDynamic() {
 }
 ;// ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.14.15");
+var log_version = "ui v".concat("3.14.16");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// ./packages/ui/index.ts
@@ -13222,7 +13222,7 @@ var errLog = log.create('error', log_version);
 
 
 
-var ui_version = "3.14.15";
+var ui_version = "3.14.16";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -43066,12 +43066,13 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
         minWidth = props.minWidth,
         minHeight = props.minHeight;
       var isMsg = $xeModal.computeIsMsg;
+      var isMinimizeStatus = $xeModal.computeIsMinimizeStatus;
       var boxElem = $xeModal.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 $xeModal.$nextTick();
     },
@@ -43429,7 +43430,9 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
           top: "".concat(targetTop, "px"),
           left: "".concat(targetLeft, "px"),
           width: '200px',
-          height: "".concat(headerEl.offsetHeight, "px")
+          height: "".concat(headerEl.offsetHeight, "px"),
+          minHeight: '',
+          minWidth: ''
         });
         $xeModal.savePosStorage();
         return {
@@ -43463,7 +43466,9 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
             top: '0',
             left: '0',
             width: '100%',
-            height: '100%'
+            height: '100%',
+            minHeight: '',
+            minWidth: ''
           });
         }
         $xeModal.savePosStorage();
@@ -45707,6 +45712,7 @@ function select_createInternalData() {
         if (selectVals.length && isAniVisible && visiblePanel) {
           var cacheItem = reactData.reactFlag ? optFullValMaps["".concat(selectVals[0])] : null;
           if (cacheItem) {
+            reactData.currentOption = cacheItem.item;
             $xeSelect.handleScrollToOption(cacheItem.item);
           }
         }
@@ -45724,6 +45730,7 @@ function select_createInternalData() {
         hpTimeout = internalData.hpTimeout;
       var isDisabled = $xeSelect.computeIsDisabled;
       var remoteOpts = $xeSelect.computeRemoteOpts;
+      var selectVals = $xeSelect.computeSelectVals;
       if (!loading && !isDisabled) {
         if (hpTimeout) {
           clearTimeout(hpTimeout);
@@ -45753,8 +45760,11 @@ function select_createInternalData() {
           reactData.visiblePanel = true;
           $xeSelect.handleFocusSearch();
           $xeSelect.recalculate().then(function () {
-            $xeSelect.handleScrollSelect();
-            $xeSelect.refreshScroll();
+            if (selectVals && selectVals.length) {
+              $xeSelect.handleScrollSelect();
+            } else {
+              $xeSelect.refreshScroll();
+            }
           });
           $xeSelect.updatePlacement();
         }, 10);
@@ -46316,9 +46326,7 @@ function select_createInternalData() {
     },
     handleScrollToOption: function handleScrollToOption(option, isDwArrow) {
       var $xeSelect = this;
-      var reactData = $xeSelect.reactData;
       var internalData = $xeSelect.internalData;
-      var scrollYLoad = reactData.scrollYLoad;
       var optFullValMaps = internalData.optFullValMaps,
         scrollYStore = internalData.scrollYStore;
       var valueField = $xeSelect.computeValueField;
@@ -46335,7 +46343,7 @@ function select_createInternalData() {
               var wrapperHeight = optWrapperElem.offsetHeight;
               var 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;
@@ -46347,7 +46355,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 {