vxe-table 4.3.0-beta.9 → 4.3.2

package/es/modal/src/modal.js

@@ -739,7 +739,7 @@ export default defineComponent({
                  */
                 contVNs.push(h(VxeLoading, {
                     class: 'vxe-modal--loading',
-                    loading: props.loading
+                    modelValue: props.loading
                 }));
             }
             return [

package/es/modal/style.css

@@ -47,7 +47,7 @@
   .vxe-modal--wrapper.is--loading .vxe-modal--header,
   .vxe-modal--wrapper.is--loading .vxe-modal--footer {
     position: relative;
-    border-bottom-color: rgba(0, 0, 0, 0.2); }
+    border-bottom-color: rgba(255, 255, 255, 0.5); }
     .vxe-modal--wrapper.is--loading .vxe-modal--header:before,
     .vxe-modal--wrapper.is--loading .vxe-modal--footer:before {
       content: "";
@@ -61,7 +61,7 @@
          -moz-user-select: none;
           -ms-user-select: none;
               user-select: none;
-      background-color: rgba(0, 0, 0, 0.2); }
+      background-color: rgba(255, 255, 255, 0.5); }
   .vxe-modal--wrapper:not(.lock--view) {
     pointer-events: none; }
   .vxe-modal--wrapper:not(.type--message).lock--scroll {

package/es/pager/style.css

@@ -50,7 +50,7 @@
        -moz-user-select: none;
         -ms-user-select: none;
             user-select: none;
-    background-color: rgba(0, 0, 0, 0.2); }
+    background-color: rgba(255, 255, 255, 0.5); }
   .vxe-pager .vxe-pager--prev-btn,
   .vxe-pager .vxe-pager--next-btn,
   .vxe-pager .vxe-pager--num-btn,

package/es/select/src/select.js

@@ -31,6 +31,7 @@ export default defineComponent({
         optionGroupProps: Object,
         optionConfig: Object,
         className: [String, Function],
+        max: { type: [String, Number], default: null },
         size: { type: String, default: function () { return GlobalConfig.select.size || GlobalConfig.size; } },
         filterable: Boolean,
         filterMethod: Function,
@@ -111,6 +112,13 @@ export default defineComponent({
             var groupPropsOpts = computeGroupPropsOpts.value;
             return groupPropsOpts.options || 'options';
         });
+        var computeIsMaximize = computed(function () {
+            var modelValue = props.modelValue, multiple = props.multiple, max = props.max;
+            if (multiple && max) {
+                return (modelValue ? modelValue.length : 0) >= XEUtils.toNumber(max);
+            }
+            return false;
+        });
         var computeOptionOpts = computed(function () {
             return Object.assign({}, GlobalConfig.select.optionConfig, props.optionConfig);
         });
@@ -646,6 +654,19 @@ export default defineComponent({
                 showOptionPanel();
             }
         };
+        var checkOptionDisabled = function (isSelected, option, group) {
+            if (option.disabled) {
+                return true;
+            }
+            if (group && group.disabled) {
+                return true;
+            }
+            var isMaximize = computeIsMaximize.value;
+            if (isMaximize && !isSelected) {
+                return true;
+            }
+            return false;
+        };
         var renderOption = function (list, group) {
             var optionKey = props.optionKey, modelValue = props.modelValue, multiple = props.multiple;
             var currentValue = reactData.currentValue;
@@ -656,16 +677,17 @@ export default defineComponent({
             var useKey = optionOpts.useKey;
             return list.map(function (option, cIndex) {
                 var slots = option.slots, className = option.className;
-                var isVisible = !isGroup || isOptionVisible(option);
-                var isDisabled = (group && group.disabled) || option.disabled;
                 var optionValue = option[valueField];
+                var isSelected = multiple ? (modelValue && modelValue.indexOf(optionValue) > -1) : modelValue === optionValue;
+                var isVisible = !isGroup || isOptionVisible(option);
+                var isDisabled = checkOptionDisabled(isSelected, option, group);
                 var optid = getOptid(option);
                 var defaultSlot = slots ? slots.default : null;
                 return isVisible ? h('div', {
                     key: useKey || optionKey ? optid : cIndex,
                     class: ['vxe-select-option', className ? (XEUtils.isFunction(className) ? className({ option: option, $select: $xeselect }) : className) : '', {
                             'is--disabled': isDisabled,
-                            'is--selected': multiple ? (modelValue && modelValue.indexOf(optionValue) > -1) : modelValue === optionValue,
+                            'is--selected': isSelected,
                             'is--hover': currentValue === optionValue
                         }],
                     // attrs