vxe-table 4.3.0-beta.7 → 4.3.1

package/es/list/src/list.js

@@ -311,7 +311,7 @@ export default defineComponent({
                  */
                 h(VxeLoading, {
                     class: 'vxe-list--loading',
-                    loading: loading
+                    modelValue: loading
                 })
             ]);
         };

package/es/loading/src/loading.js

@@ -1,31 +1,41 @@
-import { defineComponent, h } from 'vue';
+import { defineComponent, h, computed } from 'vue';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 export default defineComponent({
     name: 'VxeLoading',
     props: {
-        loading: Boolean
+        modelValue: Boolean,
+        icon: String,
+        text: String
     },
-    render: function () {
-        var icon = GlobalConfig.icon.LOADING;
-        var loadingText = GlobalConfig.loadingText;
-        var text = loadingText === null ? loadingText : GlobalConfig.i18n('vxe.loading.text');
-        return h('div', {
-            class: ['vxe-loading', {
-                    'is--visible': this.loading
-                }]
-        }, [
-            h('div', {
-                class: 'vxe-loading--chunk'
+    setup: function (props) {
+        var computeLoadingIcon = computed(function () {
+            return props.icon || GlobalConfig.icon.LOADING;
+        });
+        var computeLoadingText = computed(function () {
+            var loadingText = GlobalConfig.loadingText;
+            return props.text || (loadingText === null ? loadingText : GlobalConfig.i18n('vxe.loading.text'));
+        });
+        return function () {
+            var loadingIcon = computeLoadingIcon.value;
+            var loadingText = computeLoadingText.value;
+            return h('div', {
+                class: ['vxe-loading', {
+                        'is--visible': props.modelValue
+                    }]
             }, [
-                icon ? h('i', {
-                    class: icon
-                }) : h('div', {
-                    class: 'vxe-loading--spinner'
-                }),
-                text ? h('div', {
-                    class: 'vxe-loading--text'
-                }, "".concat(text)) : null
-            ])
-        ]);
+                h('div', {
+                    class: 'vxe-loading--chunk'
+                }, [
+                    loadingIcon ? h('i', {
+                        class: loadingIcon
+                    }) : h('div', {
+                        class: 'vxe-loading--spinner'
+                    }),
+                    loadingText ? h('div', {
+                        class: 'vxe-loading--text'
+                    }, "".concat(loadingText)) : null
+                ])
+            ]);
+        };
     }
 });

package/es/locale/lang/en-US.js

@@ -1,7 +1,7 @@
 export default {
     vxe: {
         loading: {
-            text: 'Loading'
+            text: 'Loading...'
         },
         error: {
             groupFixed: 'If you use group headers, the fixed columns must be set by group.',

package/es/locale/lang/ja-JP.js

@@ -1,7 +1,7 @@
 export default {
     vxe: {
         loading: {
-            text: 'Loading'
+            text: 'Loading...'
         },
         error: {
             groupFixed: 'グループのヘッダを使用すると、固定列はグループで設定しなければなりません',

package/es/locale/lang/zh-CN.js

@@ -1,7 +1,7 @@
 export default {
     vxe: {
         loading: {
-            text: '加载中'
+            text: '加载中...'
         },
         error: {
             groupFixed: '如果使用分组表头，固定列必须按组设置',

package/es/locale/lang/zh-TC.js

@@ -1,7 +1,7 @@
 export default {
     vxe: {
         loading: {
-            text: '加載中'
+            text: '加載中...'
         },
         error: {
             groupFixed: '如果使用分組表頭，固定列必須按組設定',

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