vxe-table 4.3.0-beta.6 → 4.3.0

package/es/input/style.css

@@ -175,7 +175,7 @@
   .vxe-input .vxe-input--date-picker-icon[class*="vxe-icon-"],
   .vxe-input .vxe-input--search-icon[class*="vxe-icon-"],
   .vxe-input .vxe-input--password-icon[class*="vxe-icon-"] {
-    font-size: 1.5em; }
+    font-size: 1.2em; }
 
 .vxe-input .vxe-input--date-picker-suffix {
   display: flex;

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

@@ -664,25 +664,35 @@ export default defineComponent({
             var _a = props.slots, propSlots = _a === void 0 ? {} : _a, showClose = props.showClose, showZoom = props.showZoom, title = props.title;
             var zoomLocat = reactData.zoomLocat;
             var titleSlot = slots.title || propSlots.title;
-            var titVNs = titleSlot ? getSlotVNs(titleSlot({ $modal: $xemodal })) : [
-                h('span', {
-                    class: 'vxe-modal--title'
-                }, title ? getFuncText(title) : GlobalConfig.i18n('vxe.alert.title'))
+            var cornerSlot = slots.corner || propSlots.corner;
+            var titVNs = [
+                h('div', {
+                    class: 'vxe-modal--header-title'
+                }, titleSlot ? getSlotVNs(titleSlot({ $modal: $xemodal })) : (title ? getFuncText(title) : GlobalConfig.i18n('vxe.alert.title')))
             ];
+            var rightVNs = [];
+            if (cornerSlot) {
+                rightVNs.push(h('span', {
+                    class: 'vxe-modal--corner-warpper'
+                }, getSlotVNs(cornerSlot({ $modal: $xemodal }))));
+            }
             if (showZoom) {
-                titVNs.push(h('i', {
+                rightVNs.push(h('i', {
                     class: ['vxe-modal--zoom-btn', 'trigger--btn', zoomLocat ? GlobalConfig.icon.MODAL_ZOOM_OUT : GlobalConfig.icon.MODAL_ZOOM_IN],
                     title: GlobalConfig.i18n("vxe.modal.zoom".concat(zoomLocat ? 'Out' : 'In')),
                     onClick: toggleZoomEvent
                 }));
             }
             if (showClose) {
-                titVNs.push(h('i', {
+                rightVNs.push(h('i', {
                     class: ['vxe-modal--close-btn', 'trigger--btn', GlobalConfig.icon.MODAL_CLOSE],
                     title: GlobalConfig.i18n('vxe.modal.close'),
                     onClick: closeEvent
                 }));
             }
+            titVNs.push(h('div', {
+                class: 'vxe-modal--header-right'
+            }, rightVNs));
             return titVNs;
         };
         var renderHeaders = function () {
@@ -729,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 {
@@ -120,8 +120,6 @@
     overflow: auto; }
     .vxe-modal--wrapper.type--modal .vxe-modal--body .vxe-modal--content, .vxe-modal--wrapper.type--alert .vxe-modal--body .vxe-modal--content, .vxe-modal--wrapper.type--confirm .vxe-modal--body .vxe-modal--content {
       overflow: auto; }
-  .vxe-modal--wrapper.type--modal .vxe-modal--header {
-    padding: 0.6em 4.6em 0.6em 1em; }
   .vxe-modal--wrapper.type--alert .vxe-modal--status-wrapper, .vxe-modal--wrapper.type--confirm .vxe-modal--status-wrapper {
     font-size: 1.6em;
     padding-left: 10px; }
@@ -174,10 +172,11 @@
     display: flex;
     flex-grow: 1; }
   .vxe-modal--wrapper .vxe-modal--header {
+    display: flex;
+    flex-direction: row;
     flex-shrink: 0;
     font-size: 1.1em;
     font-weight: 700;
-    padding: 0.6em 2.8em 0.6em 1em;
     border-bottom: 1px solid #ebeef5;
     background-color: #F8F8F8;
     border-radius: 4px 4px 0 0;
@@ -185,23 +184,25 @@
        -moz-user-select: none;
         -ms-user-select: none;
             user-select: none; }
-    .vxe-modal--wrapper .vxe-modal--header.is--draggable {
+    .vxe-modal--wrapper .vxe-modal--header.is--draggable .vxe-modal--header-title {
       cursor: move; }
-    .vxe-modal--wrapper .vxe-modal--header.is--ellipsis {
+    .vxe-modal--wrapper .vxe-modal--header.is--ellipsis .vxe-modal--header-title {
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap; }
+  .vxe-modal--wrapper .vxe-modal--header-title {
+    flex-grow: 1;
+    padding: 0.6em 0 0.6em 1em; }
+  .vxe-modal--wrapper .vxe-modal--header-right {
+    flex-shrink: 0;
+    padding: 0.6em 1em 0.6em 0; }
   .vxe-modal--wrapper .vxe-modal--zoom-btn,
   .vxe-modal--wrapper .vxe-modal--close-btn {
-    position: absolute;
-    right: 14px;
-    z-index: 1;
-    cursor: pointer; }
+    cursor: pointer;
+    margin-left: 0.6em; }
     .vxe-modal--wrapper .vxe-modal--zoom-btn:hover,
     .vxe-modal--wrapper .vxe-modal--close-btn:hover {
       color: #409eff; }
-  .vxe-modal--wrapper .vxe-modal--zoom-btn {
-    right: 44px; }
   .vxe-modal--wrapper .vxe-modal--footer {
     flex-shrink: 0;
     text-align: right;

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/radio/style.css

@@ -180,7 +180,7 @@
 .vxe-radio {
   cursor: pointer; }
   .vxe-radio .vxe-radio--icon {
-    font-size: 1.34em; }
+    font-size: 1.4em; }
   .vxe-radio .vxe-radio--icon {
     color: #dcdfe6;
     vertical-align: middle;

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