vxe-table 4.3.0-beta.9 → 4.3.2

package/lib/vxe-toolbar/style/style.min.css

@@ -1 +1 @@
-.vxe-custom--option .vxe-checkbox--icon{font-size:1.4em}.vxe-custom--option .vxe-checkbox--icon{color:#dcdfe6;vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.is--checked.vxe-custom--option,.is--indeterminate.vxe-custom--option{color:#409eff}.is--checked.vxe-custom--option .vxe-checkbox--icon,.is--indeterminate.vxe-custom--option .vxe-checkbox--icon{color:#409eff}.vxe-custom--option:not(.is--disabled){cursor:pointer}.vxe-custom--option:not(.is--disabled):hover .vxe-checkbox--icon{color:#409eff}.is--disabled.vxe-custom--option{color:#bfbfbf;cursor:not-allowed}.is--disabled.vxe-custom--option .vxe-checkbox--icon{color:#dcdfe6}.vxe-custom--option .vxe-checkbox--label{padding-left:.5em;vertical-align:middle}.vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.6em 0;color:#606266;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;background-color:#fff}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid #e8eaec;border-bottom-width:0;background-color:#f8f8f9}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:rgba(0,0,0,.2)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--wrapper{flex-wrap:wrap}.vxe-toolbar .vxe-tools--operate{flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative;margin-left:.8em}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:#d9dadb;border-radius:50%}.vxe-toolbar .vxe-custom--wrapper.is--active .vxe-custom--option-wrapper{display:block}.vxe-toolbar .vxe-custom--option-wrapper{display:none;position:absolute;right:2px;text-align:left;background-color:#fff;z-index:19;border:1px solid #e8eaec;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2)}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header{padding:.28em 0;font-weight:700;border-bottom:1px solid #dadce0}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body{padding:.2em 0;max-height:17.6em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body .vxe-custom--option:hover{background-color:#f5f7fa}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li{max-width:16em;min-width:12.5em;padding:.2em 1em .2em 1em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--2,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--2{padding-left:3.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--2 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--2 .vxe-checkbox--icon{left:1.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--3,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--3{padding-left:4.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--3 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--3 .vxe-checkbox--icon{left:2.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--4,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--4{padding-left:5.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--4 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--4 .vxe-checkbox--icon{left:3.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--5,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--5{padding-left:6.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--5 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--5 .vxe-checkbox--icon{left:4.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--6,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--6{padding-left:7.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--6 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--6 .vxe-checkbox--icon{left:5.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--7,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--7{padding-left:8.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--7 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--7 .vxe-checkbox--icon{left:6.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--8,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--8{padding-left:9.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--8 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--8 .vxe-checkbox--icon{left:7.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer{border-top:1px solid #dadce0;text-align:right}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer button{background-color:transparent;width:50%;height:2.5em;border:0;color:#606266;text-align:center;cursor:pointer}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer button:focus{outline:0}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer button:hover{color:#409eff}.vxe-custom--option-wrapper .vxe-custom--body,.vxe-custom--option-wrapper .vxe-custom--header{list-style-type:none;overflow-x:hidden;overflow-y:auto;margin:0;padding:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-custom--option-wrapper .vxe-custom--body>li,.vxe-custom--option-wrapper .vxe-custom--header>li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-toolbar{font-size:14px}.vxe-toolbar.size--medium{font-size:14px}.vxe-toolbar.size--small{font-size:13px}.vxe-toolbar.size--mini{font-size:12px}
+.vxe-custom--option .vxe-checkbox--icon{font-size:1.34em}.vxe-custom--option .vxe-checkbox--icon{color:#dcdfe6;vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.is--checked.vxe-custom--option,.is--indeterminate.vxe-custom--option{color:#409eff}.is--checked.vxe-custom--option .vxe-checkbox--icon,.is--indeterminate.vxe-custom--option .vxe-checkbox--icon{color:#409eff}.vxe-custom--option:not(.is--disabled){cursor:pointer}.vxe-custom--option:not(.is--disabled):hover .vxe-checkbox--icon{color:#409eff}.is--disabled.vxe-custom--option{color:#bfbfbf;cursor:not-allowed}.is--disabled.vxe-custom--option .vxe-checkbox--icon{color:#dcdfe6}.vxe-custom--option .vxe-checkbox--label{padding-left:.5em;vertical-align:middle}.vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.6em 0;color:#606266;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;background-color:#fff}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid #e8eaec;border-bottom-width:0;background-color:#f8f8f9}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:rgba(255,255,255,.5)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--wrapper{flex-wrap:wrap}.vxe-toolbar .vxe-tools--operate{flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative;margin-left:.8em}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:#d9dadb;border-radius:50%}.vxe-toolbar .vxe-custom--wrapper.is--active .vxe-custom--option-wrapper{display:block}.vxe-toolbar .vxe-custom--option-wrapper{display:none;position:absolute;right:2px;text-align:left;background-color:#fff;z-index:19;border:1px solid #e8eaec;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2)}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header{padding:.28em 0;font-weight:700;border-bottom:1px solid #dadce0}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body{padding:.2em 0;max-height:17.6em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body .vxe-custom--option:hover{background-color:#f5f7fa}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li{max-width:16em;min-width:12.5em;padding:.2em 1em .2em 1em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--2,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--2{padding-left:3.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--2 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--2 .vxe-checkbox--icon{left:1.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--3,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--3{padding-left:4.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--3 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--3 .vxe-checkbox--icon{left:2.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--4,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--4{padding-left:5.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--4 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--4 .vxe-checkbox--icon{left:3.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--5,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--5{padding-left:6.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--5 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--5 .vxe-checkbox--icon{left:4.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--6,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--6{padding-left:7.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--6 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--6 .vxe-checkbox--icon{left:5.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--7,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--7{padding-left:8.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--7 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--7 .vxe-checkbox--icon{left:6.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--8,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--8{padding-left:9.5em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--body>li.level--8 .vxe-checkbox--icon,.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--header>li.level--8 .vxe-checkbox--icon{left:7.8em}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer{border-top:1px solid #dadce0;text-align:right}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer button{background-color:transparent;width:50%;height:2.5em;border:0;color:#606266;text-align:center;cursor:pointer}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer button:focus{outline:0}.vxe-toolbar .vxe-custom--option-wrapper .vxe-custom--footer button:hover{color:#409eff}.vxe-custom--option-wrapper .vxe-custom--body,.vxe-custom--option-wrapper .vxe-custom--header{list-style-type:none;overflow-x:hidden;overflow-y:auto;margin:0;padding:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-custom--option-wrapper .vxe-custom--body>li,.vxe-custom--option-wrapper .vxe-custom--header>li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-toolbar{font-size:14px}.vxe-toolbar.size--medium{font-size:14px}.vxe-toolbar.size--small{font-size:13px}.vxe-toolbar.size--mini{font-size:12px}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vxe-table",
-  "version": "4.3.0-beta.9",
-  "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
+  "version": "4.3.2",
+  "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项等...",
   "scripts": {
     "serve": "vue-cli-service serve",
     "lint": "vue-cli-service lint",

package/packages/checkbox/src/checkbox.ts

@@ -42,17 +42,30 @@ export default defineComponent({
 
     const $xecheckboxgroup = inject('$xecheckboxgroup', null as (VxeCheckboxGroupConstructor & VxeCheckboxGroupPrivateMethods) | null)
 
-    const computeDisabled = computed(() => {
-      return props.disabled || ($xecheckboxgroup && $xecheckboxgroup.props.disabled)
+    const computeIsChecked = computed(() => {
+      if ($xecheckboxgroup) {
+        return XEUtils.includes($xecheckboxgroup.props.modelValue, props.label)
+      }
+      return props.modelValue === props.checkedValue
     })
 
-    const computeChecked = computed(() => {
-      return $xecheckboxgroup ? XEUtils.includes($xecheckboxgroup.props.modelValue, props.label) : props.modelValue === props.checkedValue
+    const computeIsDisabled = computed(() => {
+      if (props.disabled) {
+        return true
+      }
+      if ($xecheckboxgroup) {
+        const { props: groupProps } = $xecheckboxgroup
+        const { computeIsMaximize } = $xecheckboxgroup.getComputeMaps()
+        const isMaximize = computeIsMaximize.value
+        const isChecked = computeIsChecked.value
+        return groupProps.disabled || (isMaximize && !isChecked)
+      }
+      return false
     })
 
     const changeEvent = (evnt: Event & { target: { checked: boolean } }) => {
       const { checkedValue, uncheckedValue } = props
-      const isDisabled = computeDisabled.value
+      const isDisabled = computeIsDisabled.value
       if (!isDisabled) {
         const checked = evnt.target.checked
         const value = checked ? checkedValue : uncheckedValue
@@ -80,8 +93,8 @@ export default defineComponent({
 
     const renderVN = () => {
       const vSize = computeSize.value
-      const isDisabled = computeDisabled.value
-      const isChecked = computeChecked.value
+      const isDisabled = computeIsDisabled.value
+      const isChecked = computeIsChecked.value
       const indeterminate = props.indeterminate
       return h('label', {
         class: ['vxe-checkbox', {

package/packages/checkbox/src/group.ts

@@ -1,15 +1,16 @@
-import { defineComponent, h, provide, PropType, inject } from 'vue'
+import { defineComponent, h, provide, PropType, computed, inject } from 'vue'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import XEUtils from 'xe-utils'
 import { useSize } from '../../hooks/size'
 
-import { VxeCheckboxGroupConstructor, VxeCheckboxGroupEmits, VxeCheckboxGroupPrivateMethods, CheckboxGroupPrivateMethods, CheckboxGroupMethods, VxeCheckboxGroupPropTypes, VxeFormConstructor, VxeFormPrivateMethods, VxeFormDefines } from '../../../types/all'
+import { VxeCheckboxGroupConstructor, VxeCheckboxGroupEmits, VxeCheckboxGroupPrivateMethods, CheckboxGroupPrivateMethods, CheckboxPrivateComputed, CheckboxGroupMethods, VxeCheckboxGroupPropTypes, VxeFormConstructor, VxeFormPrivateMethods, VxeFormDefines } from '../../../types/all'
 
 export default defineComponent({
   name: 'VxeCheckboxGroup',
   props: {
     modelValue: Array as PropType<VxeCheckboxGroupPropTypes.ModelValue>,
     disabled: Boolean as PropType<VxeCheckboxGroupPropTypes.Disabled>,
+    max: { type: [String, Number] as PropType<VxeCheckboxGroupPropTypes.Max>, default: null },
     size: { type: String as PropType<VxeCheckboxGroupPropTypes.Size>, default: () => GlobalConfig.checkbox.size || GlobalConfig.size }
   },
   emits: [
@@ -23,10 +24,24 @@ export default defineComponent({
 
     const xID = XEUtils.uniqueId()
 
+    const computeIsMaximize = computed(() => {
+      const { modelValue, max } = props
+      if (max) {
+        return (modelValue ? modelValue.length : 0) >= XEUtils.toNumber(max)
+      }
+      return false
+    })
+
+    const computeMaps: CheckboxPrivateComputed = {
+      computeIsMaximize
+    }
+
     const $xecheckboxgroup = {
       xID,
       props,
-      context
+      context,
+
+      getComputeMaps: () => computeMaps
     } as unknown as VxeCheckboxGroupConstructor & VxeCheckboxGroupPrivateMethods
 
     useSize(props)

package/packages/form/src/form.ts

@@ -603,7 +603,7 @@ export default defineComponent({
          */
         h(VxeLoading, {
           class: 'vxe-form--loading',
-          loading
+          modelValue: loading
         }),
         /**
          * 工具提示

package/packages/icon/src/icon.ts

@@ -5,7 +5,8 @@ import { VxeIconPropTypes, VxeIconEmits } from '../../../types/all'
 export default defineComponent({
   name: 'VxeIcon',
   props: {
-    name: String as PropType<VxeIconPropTypes.Name>
+    name: String as PropType<VxeIconPropTypes.Name>,
+    roll: Boolean as PropType<VxeIconPropTypes.Roll>
   },
   emits: [
     'click'
@@ -16,7 +17,7 @@ export default defineComponent({
     }
     return () => {
       return h('i', {
-        class: `vxe-icon-${props.name}`,
+        class: [`vxe-icon-${props.name}`, props.roll ? 'roll' : ''],
         onClick: clickEvent
       })
     }

package/packages/list/src/list.ts

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

package/packages/loading/index.d.ts

@@ -0,0 +1,4 @@
+import { VxeLoading } from '../../types/loading'
+
+export * from '../../types/loading'
+export default VxeLoading

package/packages/loading/src/loading.ts

@@ -1,32 +1,44 @@
-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 () {
-    const icon = GlobalConfig.icon.LOADING
-    const loadingText = GlobalConfig.loadingText
-    const 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 (props) {
+    const computeLoadingIcon = computed(() => {
+      return props.icon || GlobalConfig.icon.LOADING
+    })
+
+    const computeLoadingText = computed(() => {
+      const loadingText = GlobalConfig.loadingText
+      return props.text || (loadingText === null ? loadingText : GlobalConfig.i18n('vxe.loading.text'))
+    })
+
+    return () => {
+      const loadingIcon = computeLoadingIcon.value
+      const 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'
-        }, `${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'
+          }, `${loadingText}`) : null
+        ])
       ])
-    ])
+    }
   }
 })

package/packages/locale/lang/en-US.ts

@@ -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/packages/locale/lang/ja-JP.ts

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

package/packages/locale/lang/zh-CN.ts

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

package/packages/locale/lang/zh-TC.ts

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

package/packages/modal/src/modal.ts

@@ -786,7 +786,7 @@ export default defineComponent({
         contVNs.push(
           h(VxeLoading, {
             class: 'vxe-modal--loading',
-            loading: props.loading
+            modelValue: props.loading
           })
         )
       }

package/packages/select/src/select.ts

@@ -36,6 +36,7 @@ export default defineComponent({
     optionGroupProps: Object as PropType<VxeSelectPropTypes.OptionGroupProps>,
     optionConfig: Object as PropType<VxeSelectPropTypes.OptionConfig>,
     className: [String, Function] as PropType<VxeSelectPropTypes.ClassName>,
+    max: { type: [String, Number] as PropType<VxeSelectPropTypes.Max>, default: null },
     size: { type: String as PropType<VxeSelectPropTypes.Size>, default: () => GlobalConfig.select.size || GlobalConfig.size },
     filterable: Boolean as PropType<VxeSelectPropTypes.Filterable>,
     filterMethod: Function as PropType<VxeSelectPropTypes.FilterMethod>,
@@ -130,6 +131,14 @@ export default defineComponent({
       return groupPropsOpts.options || 'options'
     })
 
+    const computeIsMaximize = computed(() => {
+      const { modelValue, multiple, max } = props
+      if (multiple && max) {
+        return (modelValue ? modelValue.length : 0) >= XEUtils.toNumber(max)
+      }
+      return false
+    })
+
     const computeOptionOpts = computed(() => {
       return Object.assign({}, GlobalConfig.select.optionConfig, props.optionConfig)
     })
@@ -677,6 +686,20 @@ export default defineComponent({
       }
     }
 
+    const checkOptionDisabled = (isSelected: any, option: VxeOptionProps, group?: VxeOptgroupProps) => {
+      if (option.disabled) {
+        return true
+      }
+      if (group && group.disabled) {
+        return true
+      }
+      const isMaximize = computeIsMaximize.value
+      if (isMaximize && !isSelected) {
+        return true
+      }
+      return false
+    }
+
     const renderOption = (list: VxeOptionProps[], group?: VxeOptgroupProps) => {
       const { optionKey, modelValue, multiple } = props
       const { currentValue } = reactData
@@ -687,16 +710,17 @@ export default defineComponent({
       const { useKey } = optionOpts
       return list.map((option, cIndex) => {
         const { slots, className } = option
-        const isVisible = !isGroup || isOptionVisible(option)
-        const isDisabled = (group && group.disabled) || option.disabled
         const optionValue = option[valueField as 'value']
+        const isSelected = multiple ? (modelValue && modelValue.indexOf(optionValue) > -1) : modelValue === optionValue
+        const isVisible = !isGroup || isOptionVisible(option)
+        const isDisabled = checkOptionDisabled(isSelected, option, group)
         const optid = getOptid(option)
         const defaultSlot = slots ? slots.default : null
         return isVisible ? h('div', {
           key: useKey || optionKey ? optid : cIndex,
           class: ['vxe-select-option', className ? (XEUtils.isFunction(className) ? className({ 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

package/packages/table/src/body.ts

@@ -31,7 +31,7 @@ export default defineComponent({
 
     const { xID, props: tableProps, context: tableContext, reactData: tableReactData, internalData: tableInternalData } = $xetable
     const { refTableHeader, refTableBody, refTableFooter, refTableLeftBody, refTableRightBody, refValidTooltip } = $xetable.getRefMaps()
-    const { computeEditOpts, computeMouseOpts, computeSYOpts, computeEmptyOpts, computeKeyboardOpts, computeTooltipOpts, computeRadioOpts, computeTreeOpts, computeCheckboxOpts, computeValidOpts, computeRowOpts, computeColumnOpts } = $xetable.getComputeMaps()
+    const { computeEditOpts, computeMouseOpts, computeSYOpts, computeEmptyOpts, computeKeyboardOpts, computeTooltipOpts, computeRadioOpts, computeExpandOpts, computeTreeOpts, computeCheckboxOpts, computeValidOpts, computeRowOpts, computeColumnOpts } = $xetable.getComputeMaps()
 
     const refElem = ref() as Ref<XEBodyScrollElement>
     const refBodyTable = ref() as Ref<HTMLTableElement>
@@ -397,11 +397,14 @@ export default defineComponent({
         )
         // 如果行被展开了
         if (isExpandRow) {
-          let cellStyle
+          const expandOpts = computeExpandOpts.value
+          const { height: expandHeight } = expandOpts
+          const cellStyle: any = {}
+          if (expandHeight) {
+            cellStyle.height = `${expandHeight}px`
+          }
           if (treeConfig) {
-            cellStyle = {
-              paddingLeft: `${(rowLevel * treeOpts.indent) + 30}px`
-            }
+            cellStyle.paddingLeft = `${(rowLevel * treeOpts.indent) + 30}px`
           }
           const { showOverflow } = expandColumn
           const hasEllipsis = (XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow)) ? allColumnOverflow : showOverflow
@@ -414,14 +417,18 @@ export default defineComponent({
               ...trOn
             }, [
               h('td', {
-                class: ['vxe-body--expanded-column', {
+                class: {
+                  'vxe-body--expanded-column': 1,
                   'fixed--hidden': fixedType && !hasFixedColumn,
                   'col--ellipsis': hasEllipsis
-                }],
+                },
                 colspan: tableColumn.length
               }, [
                 h('div', {
-                  class: 'vxe-body--expanded-cell',
+                  class: {
+                    'vxe-body--expanded-cell': 1,
+                    'is--ellipsis': expandHeight
+                  },
                   style: cellStyle
                 }, [
                   expandColumn.renderData(expandParams)

package/packages/table/src/props.ts

@@ -147,6 +147,8 @@ export default {
   validConfig: Object as PropType<VxeTablePropTypes.ValidConfig>,
   // 校验规则配置项
   editRules: Object as PropType<VxeTablePropTypes.EditRules>,
+  // 加载中配置项
+  loadingConfig: Object as PropType<VxeTablePropTypes.LoadingConfig>,
   // 空内容渲染配置项
   emptyRender: Object as PropType<VxeTablePropTypes.EmptyRender>,
   // 自定义列配置项

package/packages/table/src/table.ts

@@ -486,6 +486,10 @@ export default defineComponent({
       return Object.assign({}, GlobalConfig.table.emptyRender, props.emptyRender) as VxeTablePropTypes.EmptyOpts
     })
 
+    const computeLoadingOpts = computed(() => {
+      return Object.assign({}, GlobalConfig.table.loadingConfig, props.loadingConfig) as VxeTablePropTypes.LoadingOpts
+    })
+
     const computeCellOffsetWidth = computed(() => {
       return props.border ? Math.max(2, Math.ceil(reactData.scrollbarWidth / reactData.tableColumn.length)) : 1
     })
@@ -578,6 +582,7 @@ export default defineComponent({
       computeExpandOpts,
       computeTreeOpts,
       computeEmptyOpts,
+      computeLoadingOpts,
       computeCustomOpts,
       computeIsAllCheckboxDisabled
     }
@@ -5938,6 +5943,7 @@ export default defineComponent({
       const mouseOpts = computeMouseOpts.value
       const validOpts = computeValidOpts.value
       const validTipOpts = computeValidTipOpts.value
+      const loadingOpts = computeLoadingOpts.value
       const isMenu = computeIsMenu.value
       return h('div', {
         ref: refElem,
@@ -6050,7 +6056,9 @@ export default defineComponent({
          */
         h(VxeLoading, {
           class: 'vxe-table--loading',
-          loading
+          modelValue: loading,
+          icon: loadingOpts.icon,
+          text: loadingOpts.text
         }),
         /**
          * 筛选

package/packages/toolbar/src/toolbar.ts

@@ -268,11 +268,11 @@ export default defineComponent({
       const { isRefresh } = reactData
       const refreshOpts = computeRefreshOpts.value
       if (!isRefresh) {
-        const { query } = refreshOpts
-        if (query) {
+        const queryMethod = refreshOpts.queryMethod || refreshOpts.query
+        if (queryMethod) {
           reactData.isRefresh = true
           try {
-            Promise.resolve(query({})).catch((e) => e).then(() => {
+            Promise.resolve(queryMethod({})).catch((e) => e).then(() => {
               reactData.isRefresh = false
             })
           } catch (e) {
@@ -280,7 +280,7 @@ export default defineComponent({
           }
         } else if ($xegrid) {
           reactData.isRefresh = true
-          $xegrid.commitProxy('reload').catch((e) => e).then(() => {
+          $xegrid.commitProxy(refreshOpts.code || 'reload').catch((e) => e).then(() => {
             reactData.isRefresh = false
           })
         }
@@ -608,8 +608,9 @@ export default defineComponent({
     nextTick(() => {
       const { refresh } = props
       const refreshOpts = computeRefreshOpts.value
-      if (refresh && !$xegrid && !refreshOpts.query) {
-        warnLog('vxe.error.notFunc', ['query'])
+      const queryMethod = refreshOpts.queryMethod || refreshOpts.query
+      if (refresh && !$xegrid && !queryMethod) {
+        warnLog('vxe.error.notFunc', ['queryMethod'])
       }
     })
 

package/styles/base/checked.scss

@@ -1,6 +1,6 @@
 %XECheckboxIcon {
   .vxe-checkbox--icon {
-    font-size: 1.4em;
+    font-size: 1.34em;
   }
   .vxe-checkbox--icon {
     color: $vxe-input-border-color;

package/styles/footer.scss

@@ -1,23 +1 @@
 /**Variable**/
-
-.vxe-table--footer-wrapper {
-  color: $vxe-table-footer-font-color;
-  margin-top: -1px;
-  &.body--wrapper{
-    overflow-x: auto;
-  }
-}
-
-.vxe-footer--column {
-  &.col--ellipsis {
-    & > .vxe-cell {
-      display: flex;
-      align-items: center;
-      .vxe-cell--item {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-}

package/styles/form.scss

@@ -71,6 +71,7 @@
   user-select: none;
   cursor: pointer;
   .vxe-form--item-trigger-icon {
+    display: inline-block;
     margin: 0 0.25em;
     transition: all 0.1s;
   }