vxe-pc-ui 3.4.2 → 3.4.4

package/lib/index.umd.js

@@ -12854,14 +12854,14 @@ var defineVxeComponent = function defineVxeComponent(options) {
 };
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.4.2");
+var log_version = "ui v".concat("3.4.4");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-var ui_version = "3.4.2";
+var ui_version = "3.4.4";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -29260,13 +29260,13 @@ var validErrorRuleValue = function validErrorRuleValue(rule, val) {
     var props = $xeForm;
     var reactData = $xeForm.reactData;
     reactData.collapseAll = !!props.collapseStatus;
-    if (props.items) {
-      $xeForm.loadItem(props.items);
-    }
   },
   mounted: function mounted() {
     var $xeForm = this;
     var props = $xeForm;
+    if (props.items) {
+      $xeForm.loadItem(props.items);
+    }
     $xeForm.$nextTick(function () {
       if (true) {
         if (props.customLayout && props.items) {
@@ -37573,6 +37573,9 @@ function getOptUniqueId() {
         }, 100);
         $xeSelect.updateZIndex();
         $xeSelect.updatePlacement();
+        $xeSelect.dispatchEvent('visible-change', {
+          visible: true
+        }, null);
       }
     },
     hideOptionPanel: function hideOptionPanel() {
@@ -37585,6 +37588,9 @@ function getOptUniqueId() {
       internalData.hpTimeout = setTimeout(function () {
         reactData.isAniVisible = false;
       }, 350);
+      $xeSelect.dispatchEvent('visible-change', {
+        visible: false
+      }, null);
     },
     changeEvent: function changeEvent(evnt, selectValue) {
       var $xeSelect = this;
@@ -37697,37 +37703,61 @@ function getOptUniqueId() {
     },
     findOffsetOption: function findOffsetOption(option, isDwArrow) {
       var $xeSelect = this;
+      var props = $xeSelect;
       var reactData = $xeSelect.reactData;
       var internalData = $xeSelect.internalData;
-      var afterVisibleList = reactData.afterVisibleList;
-      var optFullValMaps = internalData.optFullValMaps;
+      var allowCreate = props.allowCreate;
+      var afterVisibleList = reactData.afterVisibleList,
+        optList = reactData.optList;
+      var optFullValMaps = internalData.optFullValMaps,
+        optAddMaps = internalData.optAddMaps;
       var valueField = $xeSelect.computeValueField;
+      var fullList = afterVisibleList;
+      var offsetAddIndex = 0;
+      if (allowCreate && optList.length) {
+        var firstItem = optList[0];
+        var optid = $xeSelect.getOptId(firstItem);
+        if (optAddMaps[optid]) {
+          offsetAddIndex = 1;
+          fullList = [optAddMaps[optid]].concat(fullList);
+        }
+      }
       if (!option) {
-        for (var i = 0; i < afterVisibleList.length - 1; i++) {
-          var item = afterVisibleList[i];
-          if ($xeSelect.validOffsetOption(item)) {
-            return item;
+        if (isDwArrow) {
+          for (var i = 0; i < fullList.length; i++) {
+            var item = fullList[i];
+            if ($xeSelect.validOffsetOption(item)) {
+              return item;
+            }
+          }
+        } else {
+          for (var len = fullList.length - 1; len >= 0; len--) {
+            var _item = fullList[len];
+            if ($xeSelect.validOffsetOption(_item)) {
+              return _item;
+            }
           }
         }
       }
-      var cacheItem = optFullValMaps[option[valueField]];
+      var avIndex = 0;
+      var cacheItem = option ? optFullValMaps[option[valueField]] : null;
       if (cacheItem) {
-        var avIndex = cacheItem._index;
-        if (avIndex > -1) {
-          if (isDwArrow) {
-            for (var _i = avIndex + 1; _i <= afterVisibleList.length - 1; _i++) {
-              var _item = afterVisibleList[_i];
-              if ($xeSelect.validOffsetOption(_item)) {
-                return _item;
-              }
+        avIndex = cacheItem._index + offsetAddIndex;
+      }
+      if (avIndex > -1) {
+        if (isDwArrow) {
+          for (var _i = avIndex + 1; _i <= fullList.length - 1; _i++) {
+            var _item2 = fullList[_i];
+            if ($xeSelect.validOffsetOption(_item2)) {
+              return _item2;
             }
-          } else {
-            if (avIndex > 0) {
-              for (var len = avIndex - 1; len >= 0; len--) {
-                var _item2 = afterVisibleList[len];
-                if ($xeSelect.validOffsetOption(_item2)) {
-                  return _item2;
-                }
+          }
+        } else {
+          if (avIndex > 0) {
+            for (var _len = avIndex - 1; _len >= 0; _len--) {
+              var _item3 = fullList[_len];
+              if ($xeSelect.validOffsetOption(_item3)) {
+                return _item3;
               }
             }
           }
@@ -37764,6 +37794,10 @@ function getOptUniqueId() {
           } else if (isUpArrow || isDwArrow) {
             evnt.preventDefault();
             var offsetOption = $xeSelect.findOffsetOption(currentOption, isDwArrow);
+            // 如果不匹配，默认最接近一个
+            if (!offsetOption) {
+              offsetOption = $xeSelect.findOffsetOption(null, isDwArrow);
+            }
             if (offsetOption) {
               $xeSelect.setCurrentOption(offsetOption);
               $xeSelect.handleScrollToOption(offsetOption, isDwArrow);
@@ -37815,8 +37849,12 @@ function getOptUniqueId() {
     },
     clickEvent: function clickEvent(evnt) {
       var $xeSelect = this;
+      var reactData = $xeSelect.reactData;
       $xeSelect.togglePanelEvent(evnt);
-      $xeSelect.dispatchEvent('click', {}, evnt);
+      $xeSelect.dispatchEvent('click', {
+        triggerButton: false,
+        visible: reactData.visiblePanel
+      }, evnt);
     },
     blurEvent: function blurEvent(evnt) {
       var $xeSelect = this;
@@ -37824,6 +37862,15 @@ function getOptUniqueId() {
       reactData.isActivated = false;
       $xeSelect.dispatchEvent('blur', {}, evnt);
     },
+    suffixClickEvent: function suffixClickEvent(evnt) {
+      var $xeSelect = this;
+      var reactData = $xeSelect.reactData;
+      $xeSelect.togglePanelEvent(evnt);
+      $xeSelect.dispatchEvent('click', {
+        triggerButton: true,
+        visible: reactData.visiblePanel
+      }, evnt);
+    },
     modelSearchEvent: function modelSearchEvent(value) {
       var $xeSelect = this;
       var reactData = $xeSelect.reactData;
@@ -37997,10 +38044,14 @@ function getOptUniqueId() {
               if (isDwArrow) {
                 if (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;
                 }
               } else {
                 if (optElem.offsetTop + offsetPadding < optWrapperElem.scrollTop || optElem.offsetTop + offsetPadding > optWrapperElem.scrollTop + optWrapperElem.clientHeight) {
                   optWrapperElem.scrollTop = optElem.offsetTop - offsetPadding;
+                } else if (optElem.offsetTop + optElem.offsetHeight - optWrapperElem.scrollTop > wrapperHeight) {
+                  optWrapperElem.scrollTop = optElem.offsetTop + optElem.offsetHeight - wrapperHeight;
                 }
               }
             } else if (scrollYLoad) {
@@ -38352,7 +38403,7 @@ function getOptUniqueId() {
           click: $xeSelect.clickEvent,
           focus: $xeSelect.focusEvent,
           blur: $xeSelect.blurEvent,
-          'suffix-click': $xeSelect.togglePanelEvent
+          'suffix-click': $xeSelect.suffixClickEvent
         },
         scopedSlots: prefixSlot ? {
           prefix: function prefix() {