vxe-table 4.3.0-beta.6 → 4.3.0

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/styles/base/checked.scss

@@ -1,6 +1,6 @@
 %XECheckboxIcon {
   .vxe-checkbox--icon {
-    font-size: 1.16em;
+    font-size: 1.34em;
   }
   .vxe-checkbox--icon {
     color: $vxe-input-border-color;
@@ -39,7 +39,7 @@
 %XERadioIcon {
   cursor: pointer;
   .vxe-radio--icon {
-    font-size: 1.34em;
+    font-size: 1.4em;
   }
   .vxe-radio--icon {
     color: $vxe-input-border-color;

package/styles/export.scss

@@ -123,32 +123,3 @@
 .vxe-export--panel-column-option {
   @extend %XECheckboxIcon;
 }
-
-.vxe-modal--wrapper {
-  .vxe-export--panel-column-option {
-    & > .vxe-checkbox--icon {
-      font-size: $vxe-checkbox-font-size-default;
-    }
-  }
-  &.size--medium {
-    .vxe-export--panel-column-option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-medium;
-      }
-    }
-  }
-  &.size--small {
-    .vxe-export--panel-column-option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-small;
-      }
-    }
-  }
-  &.size--mini {
-    .vxe-export--panel-column-option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-mini;
-      }
-    }
-  }
-}

package/styles/filter.scss

@@ -111,32 +111,3 @@
 .vxe-table--filter-option {
   @extend %XECheckboxIcon;
 }
-
-.vxe-table {
-  .vxe-table--filter-option {
-    & > .vxe-checkbox--icon {
-      font-size: $vxe-checkbox-font-size-default;
-    }
-  }
-  &.size--medium {
-    .vxe-table--filter-option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-medium;
-      }
-    }
-  }
-  &.size--small {
-    .vxe-table--filter-option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-small;
-      }
-    }
-  }
-  &.size--mini {
-    .vxe-table--filter-option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-mini;
-      }
-    }
-  }
-}

package/styles/icon.scss

@@ -1,9 +1,7 @@
-@import './old-icon.scss';
-
 @font-face {
-  font-family: "vxeiconfont";
+  font-family: "vxeiconfont"; /* Project id 3480594 */
   src: 
-       url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
+       url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAADRgAAsAAAAAdGwAADQNAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACWYAqBszyBkgwBNgIkA4Q4C4IeAAQgBYULB45+G9phdUPIBeeBg192pddGImxRWpWPItg4QMhDe9n/f0LSMYawdAMTtfodgYhCYeGSkMPSwsUdQbpJSU4phVOlzRWpPaeFHb/sGfC9XmqXkOx2fR/laSIgiWhsQDYaUEQfO1p04fYYqOw54LVENMLq5+zfBP/r1cO6ffV7SFI0efhauvd3945aVS+WiUeDkN0xHokwwQWPs01YXDTVpQwPc+sfazbWxGDAIiWXwMaAsaJqDBCUIWNUKZED9ASsIgwUVELRvhMLu/FOzOAwvvnP8f/837POu/tnWcuLShpgGhgAnHnfaSXtstRmDwyFXS7QArNkpc1QYJoe4Az7x/6171gQmGGncZJBKAxCwbHfHfzz3PzG8bzjaRjg0lQ6gY0vPjZQYH/Qfa8B/k1U05QvzaWvGha97YxZ6153PHmUGIMgA4LfXqp5WFgytvhHhS+1Llu2bFlzsU26pUbIjSbuM312t2QG//2v7Z7ZWWE+4iHSsnunUV8pGEGw9r/5ooqYSUq0RAm79wCCdviXBRSEaYYJh/kcg/NCHnEQDRAQ0zQA9tN9Jnl2ApLHsz9UIVXUAnfhP/YCO8xuRglL76VCOi7aa+pL2tyo3n23MxPYEUAAXI5/c1vkRB5T/DELLCwt8szD7ZnFFmviWDESyfybs2z5y7EXQuQcU9Fo5RTL2Lk7F81PIP78GdDMLEjDCJ0QSgOrNTNsALTyKa2MkPSODUnrkMOMUBpp7QdaB+EQUhViLF25qPx6nyu77Vz0jc3Z0EsU8Zdc01NLdRvMf8Y0fZ+soYcENyEER5Ra29xeQ3jmkmJdqQ98gQ8Ofu8IwDA4EQyi0UXrAa4oa24JcAED/nkA6WkU5edmAdR0A4phEmCwrW2vwkAsDw6kjl0OeJKfj3eJAgUkUEGB/8q5WWsC4y+R93Wx5V+B/CBxJgAuJ0AFyIADx7Zlv3mXR4PGxYGshnW/EgZtDWhlCQHm27CX95cPKFDh44k3EvyRE0IYSczCTAnVtLGI5axjM1s5yBjHOH8sj+1xcjwB8eojH8kUKp0ilK1WLVCvBrVXx3QKPAihghbmcLPN67fDrXeu893kv3x6nIwXW5e9ud68Fq9lbCWvkVvfXve3qg1cWjniEvlNtCQGpkUVDfkNUZOhmTpalfwZlbOrQT4qOCcnd+jb+PsArTYGqy0NRNsmw+0Idi/2Np4/H13Mrmd3o5fJl+jr9Htx22f9+KA3kbH+f3kBj6YxTmGPoEOaNBtJ61Y6Q+X+A1OV3yoTVv06S21W7hc3alHWXOVN0u6bPHfsPL751a6HHVJ3z1d0f7qcLuZxGOMhda/fvI3G4vBkAQnDIn78BZCRC9QqZOpcrlCqdLlbolCEtzic3rZ9lpqVggTLX0O5bsv6DSNqNx4ao30xmy8BoazzLy+eOHlhz/UbfYjYMpVVw3EjqP7DDr8IwPFI2GAaEBCcFVBMAQKGTiDs0AoEGd8IR9QhnLBPUNCMcMFkIKg4Jvil6rUncEd4l9RaAjwQftgv/HFAyDEViBDcE1rcEjqUIcJQj0jEEZGEfiBm4TthwkciB58IMz4TJZgJRBWuiGp8IRpwUDRiFIgm/CCa8YGwYACIFgwC0Yqrog2TgFiEr8Ry3Bbr0ITYgLtiI3aITdgp+nBcbMZmsbXkdn0Q2CXG8FAcQwcQ53FU3MBucRvzgbiDm+I+7os3mA4kBpekHbqAxOKyxGEcSF6pSu0D7JUyDAEZiudSjddSgzdSi7ekDu/ICEwAMhs/yVY8lgvwRK7CAiBXYyGQa3BYrsUiINdhMZBdWAJkN5YC2VPqT90LLAdyECuA3Ftyqf4TKEf+hQrkITQix1CJPIwq5BFUI4+iBnkMtchTaAfyLIaBvIBf5A30AHkTvUDewVb5AC3Izzglv+C0AmCbwgbbFVzMAopwPFVEYSVQRGMVUMRgNVDE4poiDmuAIh5rFQlYp0jEFkVStvWgRxsgF41APnoGTWgj/IUOwWk0BvfRJniPXsAHNBum0Bz4F82FaTQPPqJz8AmdBysgXirZ4KISBCeUYDipRMcFJS/sUTqE60pjuOEfedAn60igDfjf9whqJnq8TeHiDPyGskGvyt8aWmDi/YsqX+aWcZXiUUSuCwULjEwuMR4opAxir2FEGBw02IpjIBUmwwU1U4CUsGZMNFdI+PyDQgJGJbPETeNBJVLoeCBWE3euS8ZZ6ho2S6BiIZVNBAkHvGmV2tN+0Vacim80tDpj5XykBSCBcNE21d1ndOino+HaJKv3+lnoq3NSnQBnNMBGVqNm+wyHINe/1rRpWFqU7bBGcZyM8C4IpZPrnatTwjDKVrDnnQiJduPeiONu23NA3mkj5K5lk7VrJQfgc3JvJpguPN4j4VUWISQNBpsJ5gnCuspBxj2sJT7oGLqs6Y3bTu3xatVZ+XqyOdRQARzkJdydf5j/6Rh/t0/nsrWVao2mURiI5Lb3txSfHArA6XZD7GAyNrI3MKmFDxTioMx/SqcsPaWTjnz6E9KsGnr2mh+UwyifIXQDEhUCbljHqkOli9nbIN2nuH0bA9MoiqGzqJ509DQaHZO0XrTOriqPrGfFcXdQWn4DqH2anwhu0RaplK5S2Gj7P7ZnElkDtiVRqSEocgNHa0EvBOF45QMUZJ4yrErKuU4JdwRmMxndWZUyLKbcnW3/ya6tM2HVrPbI6elAK3WXH4vGgr6wi5d1gW2w9fzgzcHacWy9qmI0yRkSaooJR5M7TB/8h4NXtCp1Qbww5EBdF3qmIo7X+x9JTyNc4GC5/+hLz0K54bfcphfmE+1NDclSBbbRFcRVwmTALro67kOK4Y5sy+4SSrkvQGS5+RpFo3VSI5bMg1E7q+PiiLf0rWbMLQ13LWIggISElIBw1MrqG0jAzWS6kG0MjFyNhlL3fUPVyOzRQLguZ0VPG3G8hDAVoJx+yZ2ihIXQ5CdLcERJKKck/IhX+lgiUiuu7TIj8mhsLIqxJaVxnIucJKZDuw08R9FWb+HFFh1s2de6hDpdcBbby5QOvjn1zTcN9OiFZj2pPVoi0eJU39s1tdfroy1mKmkYUvM07VRf0CPZTpYsM3f27CgRTJbLwtrFCQ0mQ697bN9QiP440MuUlFz7QPbCgwn+fX8XchQLZX4stAmvif8HdsKkyh3vIYh9q1FSgOlQDzFlVAwZaCVE6/jbpITDSbP+vSqgzgmUyzW/XnUr015QsielpxV4CVqs1siPZt3MqAohFhzqWy8zkBIaTeRFRlaBfv0CHSfvss6008owOwVQSaI007fdUQnBWhOfTdb5BOyCZvXwF50XAoZLcUynmI6dkuRn5TY9bSaKiBm1eFHSbr+rW14IV5qmS95PEugkjr0oApZAyFMHA32Ce4n+YOJXAQGgHPFaQGiTZD4EmCfcozf964d/zIeueTeOwPYQzASv9i2BVVNGR6OyBWnz1dHCXLvXw9YAKEReQrkdx3iCzOOA1mBQPwSbjVmnDUhPdX3wUeUMIh+bSmeA59mlIXSqiz5Kmkwp67zz0Mvcnz0tcPpF2YTOSiJo9roDEvkQy7tqOwuo0iXoZBlHWwTjKe4ZuXuIaLGRSrmWzUtpd5AXcG9Pbq5Yp1LoqIaEXdIgIVIuUz5sq6lASb6v5B9STewGk9phkzLjcOSVp6WXejyN3BvP1AREHLnAlK/TzH2d4/dWyRadBW/JXaaO8JUrPU7pCdPVG8t84XBPuirbNX/vzzoz3pw7/xeOKpVmVqhVICyC23M9ByCd/u6OfnPrb3qsNNa1j4Fn+muYs9AQIOKv+2CPXOMtQc4L+RS97u292HsUoiQJqb9a0Yv7PxxOp1khPbdKodtlg8dpEu4apnDRDKszvT4nihAqtVBqvJscobSCcPcs5iK6Ps11Cwi5KVoct/YOhKPTJwlSCZ0oGLEVZIoSYOSP7B47pdcOAc+Hr+NoN49CL0duTFmMFqn9S78BihyiQW3C2dIaB4kEZhsyKl3ciVGN1WvjPO136HK3hYNmOQzRsP/C2GquFbaixUehGtevFrr+VxBDdAsUolF6uTgYI5/FTDYVOZMpYyYbjR3YI1hhJCClvEryWFBaGMgcESUJleeepBKiLGNOM3ldp4LQ9WRtnsOFLyLkF1Y0i6PN2+J/ZPdkE4UOYkQidzuNGmUPtCwyitjyM+TQNTSjTej/7eA57PKMEoq0WRsg3Ha2haf6QEo5WoQn4qXYTS7efX1vEudha396gXZ1mf7p/ftzVYkOaAXWUkHbtAQWmaMXaDV5pe53G8PvlvXGqBr9+GP7eLv9mBMtRK91XIqX9iT5nIym0k5wjR5gvE1Enf7iCqkULr7F31NTp79MXeFOc/NGdV0RaVkB0aqGJX1tgZcbvllc2xGG3VmU0zdwav4OGBmJGaiBIhUa+iITzCgHycXDA3e1zxJeFEeWSoaGu9zj1BxRqdbk5rVZbO3dM3fl0lCBf1tsv8YLpNiBjFycJbczAJoiJAzbr3fscBi4q7SKTGyiqiKzWDlDo7puUgaZs5qf4W4qcCfcqEMv03HlU/s85f2nY8hnDzqdD5xJF+ALTeOeYUjIXVRt1SrKeZUQL8lSJEojXibEpl8oI6BXMFuam1M+tuUok4k23boo1tPTQkGUNNHzRUptDXdMrW3UhkvdbNrfpXFGMHx60RwgkU8Fg2JHY3K64+gzDBC5bYsFOQU1FEcZ91R6uoUIj3/SdUm5zp1Mp7mXpq4wkxN6lhfBKYejkpAxYu1XgLDTVog0qWGR5zNKk1kZ7Vcjfx0KjkaoAIg3/Fm4Zl6dfuAFwiV0onQqnLxGboho27/gScEaBaUc6HkcpWczwDXSCfIuyMg8ityvMAEwrxgyDlaK5RChoFKBZcZE46cBrkhaUi66vbYWRE2Gsr6AOPpsQ27YKT0WbgOetzeO42gnWzuhlx3NE+sAYVsWYXKg8t3gA79s76cBSk0RqZTKzCCddutVchFcS2MrO6XxCSk9C6ZorO0Px+llrV7NMQrUJPsA1epjVXOC1fPa7gWk+5xZbGfX8FTBI9MEZt8ZwNefd3YdmrmGdGDgZaHXsC0/gfgxpLHLZn/WCUDISAteaEPvMVykdZ9MlcnGnvFkxsktnpGDKJPwNllSKmVSraCUNS0r9GYxggGz5uGZnK9TC0ExAmEkhO2wMgUUK3aquX+rS5FnUKVz0Mk8ZpSPLx6+a9/e3n0eSDZr66UoJlU+JZOeBGEghERaMpLJhpIko2dfP/nq5eHTT20f2/fGqb5j74QawLju39F0mn/+6NNxvAIDtWwVrxeROW+GYVPQ85ltnkUGBSB+izjwTLO2LfP3aeb5bauJKklS3UtlqgNDyhyRkzK9ITASPGSUGJA+X2kYFiYBXumx/po+zCh5TDjao5RYQ0FfH0H12mljhFjscemaT1iMjtYHBxlDGnaRYMiSSAONlLbrFLwB0gnf1o2jmAumav20PFSw9rL6KBVYU1+lusOwlGswtbPHktPc76SmB6xKM+3fPu+cu+XdueBevPuxNwTy+Ahq67ElxHdNRLoEpbd6ZMAypnNL8r7AK5PQBC4OdnWDMtACKk9G2+U8pedZtAjUVdrdT5HzpOqmOY/t9Cy2QVbf2wM9Q5rqECpZj7nXXZMrLYFoD3uo2iunZ34aeS8iC/0IOq4V74m75g3v2hAJDzmHh2c/TdehWjFOjMy575sakYaOfz6R8w6Z8WL3fZ0XRapr8bp/c5S1jrpHRpo3BqTG5v32WuDjE+IVL3rGkI1q2kso+oJPV6rm2QRt61L7S1HWOB+HM3rmwI7eo+8n7FKc2un85vK2faf2ZPy0hqmM2Ip/kajPG3h6SOzyjnUfeT5Tv0/v54EuYxRQEpkGF6NFa1GaB4ehC+Rq8h2jxW/tXwjCFI79F7MkaMibaGZSQh9xI8yZifCM2alY1N7cqubS2u+RLufCDC9mAbFV+IPz6AWImkTc0qOKSEUoswnHK+dWqFQ50QRYVVwcf7mrsCi8otAxDp5CfkaOaeM28hpGJgBOs/UQxj+Bygcau8AqV2F+LQBvcRQGITSGfTZaWIux+VypjHKvjfuT/SeNZBXuVL5Iqks6W1UbL5qSSF6vCmpcY9iby85mMmxS4zYHo+y+of8pXita0r8tHMpFmnNqIKgoGEjCLMJkyi2uA/FMXBCKrOugo1Oh7BRjKSDSWox1GAhu9Y6iLCFCAtIFYPk2DhAad8lXGNfUgEsxBGxhU5xEXkU5yuE6o0wOECvgpW+AUMYoZTmmyNJjMDppg9YzK/q22WiaR4hR8akGXDg3uK+sn5RzmWgNcK6n2Jhp0uwOjNSNrf2Y9vFsGXGMUpv5eBoBLIoWPVQKD7oSTiOfS41O+5oU0b3BK2v4KClpXFMpWaHninqVqQbZyVFuEP80qLTYOqgob6IU6TGNzDxJJtnVnWLGDGvVgsfAKRm+QoLE91jSaaFIBebze9lOA7P1KrmUtOSWFHs1oJeDZ0t/k9P7ged9p7bO85C5lmzUvQq0qcmSw/I46kdB14Vvmsr8napMXwZnJ+OZUGsJMgVQKM9X34ctswWlNsYI4hPk/ccfKr2TCR+fBxCt6YMybGC9DttXrkT3lDsCj8NlL1LH6Nh0YfjT8chiihsdmt6bbiJLbdqMModIZxbi+XkaKgunzc6kTn+vuUSB3OqqqnmEZKvkwREWFQU9ryVJqULE7vHSFIORXDVmszGRkEJ5yLi3UbgtD9ARCwUynE1AZMnAwFhKGyZXp6dSiXGWWJiU85Uzh3gJ0g9eLtC+vuCcm7ekdNuR9K8Uk5T6iF82SthvEGR4Oz54uE8WgQ4IJ7SSi4gC0RqtET0u+4f/P09zR//fPzPVNVrMM3OiKFMwqUzmqnXxJ8x4RGEptuT9KZ9iuzxUuCf3cdSXrtCd+ucg7pkN8YdFtoPM5kX6GmlzpeeS9HUtM4Mnh4y76MWpNvkqd5KZIgsiim3V61rKRjnHAWXZ9Z92di0j+fNG/Wssg+YZsu2QPJhiN5v23lkGK80pOSZDtcGUk2KuNBlyc/T1GIAGPKJtVL+RnH54OQ6CnwPQiL2N+gHpIB6oTJVmfU6ugfzdL472Uwt7jy86OiO/e/OO8wWdxC4P7tzj/289Q8HabanVieh7XbGDPqMAolkEZs+IhoEGLb8w89oWp9x1B4bW25ty1mwYtHNd3j1Y2RLfP7hhpmlT1/7WZe+Nlky0ZShFlBrK5WAH02zhevUHHXjVg6MPpcV+Wn1BD7LkUPK6LHuuMHClxVwj4AARcUQtVt8zPEFtVOOvoyw6oTM6uFy7V3su7pr6lHifoeVuopemuR0d+D4w7gjvJF+5MzMlSJ+sMOiDUwwhKQADaCQOIlnmA2bIDujlVn/nRfLt5/q7Lw33Xs0yrK0W6nFczydn40F7XjoSnSeJHdVu3Z2RyIxnNjaoB2ZimS4kbIx8SVHREnmPb0LBkb3ePcxVU1i4D4lBvVpKXPoKZSnX14da4l/M1L2hcUANpBWZ9+61Y4ewTKySA8v/H+VjI6hHjhz9IJj2mSC2EyccDgXlcJBcWLYzObE1ab6NrRnORHKCTUEmKYILnUthJ7Xo55NQZjgLKQWkUADGXXlCb/cyT4pyBruVqsp7iG0VowZWJcAJPtm93Ky2yMsE50oZ1yyKREkaC1D3G4utUrpHEIRoU/crSx974N2IA7BBonE81bIvC3K8rXPvE+C3xsxpI6FI2U2sAHgZPIC1cCcT1RPCJ5qZwaFNLSy/t0NQWGDgolhwM5zAATVvt2oNF0VBcSXtVrDWkYXiJh4D2/uhGqg9A4y/yo0hXuIkiZfPLJoXms0tDnC+7GTtTF3IGDrMBBWc9T4LNcHYUGEYLIIcZ9FheqjkdMahepgJfjJIlxg71rzOCq26AO+bMlya+ix9ymBlXLGSrsR7F2IhzSGmg5yinBibxNEOruCh9r9xc22xddy6yzqF1c9w/Pg4sIDH1l/NIRalJfx7AnSoND2RFcusbqAlqFxc1Nl5oa5qt5iUaF4kR6heFv77d3hZkG4k5nOA/s5jeBFckWr5bppEroFvrG4HROPBaXwVl6viO/Q5VFx+7uWSI3hmXhrPBRyxnAk0wVeAFHni68UemAmmTQ8TmGZF+mTmBthHkcJ7iBEYFSr0UeHxsb3PjCpGNiVVK1VCiBP1vN8JwYTIHe7l1JwdsEa2uS92ilqzIlsuz1aYPxHqhWfLzYpPykdaNPufyu+8U23miM/QgIqJ3DMIgHgULnZdMT8s4gvMr+J17gEE3tbP8ZL3Jc9/vP+p0y6sIT/IHBhoDsr/7tBbzYFz+e9ze+SphMJ0aapYnCpNv+vQW1PFXv4u+/SprNOczZ6uwntbu8//1rsWnVRJ2ZtCr/YS4FnyU3OC624y2QLs2QyXorMuZ4pcMs6AwM2/tooWOC6oD9sfJo/N0zNcMWiMq6xv2sNkxuUxbveUxi6c3SLfd3tp7lq3mdkd51vq7tqXevO7hfJ9O21Lb/fkMSgZbnpEQOxnSQSdoc8XnNwz3IB/+ebhkWG8GG/Gif/Sh124h8MPN+3yttzkfOIIcdPf52lGNBsaWsuqkjCJQKh6gAXY6Uu5S2XdYHlgUbF8yQZCQauxGyyVm9spNs7tUzWCVlArSs8QVi8waNBaW8HbaeqIEdj1nIl2w3bcHksA1uOSFLE4RQIkdXSKOC+1rzyOI7oScVrNvHmaTkJxbb5aIlfHUbelxCLVfR63iA30qWORbSkcNVcHrJ98Yry9on3+8/GKifHKcOg4bTw6xjt0K+1msCL4Ke0/92dBiqBb7u1lGIBJGnXlXE37XDSgScYAp2lMchxHw1JZkmPglXo74Ajs/seM6sakyhiERc9ScTRxyZhpEGSRdRLMhCo+jL+HYCbKJ3jZln03bIJHNBP28G847zRjkhE4IU/EjqXTNXx8gcSyzeGm8/8PYLEH/u98k7QcHr6emudGccujTsDPsTwS2L0b3Df0ehvI9+ATSxcB0+E/mpD2n6fV21rnGHLP7JBJhw++Qt8PHqIAKEAfv5o/ztUTPJnN+1HyZC5pbhkLsUzsOOXTHo3bvvavf10Pt9dALqrsnt/MgDLxGvwWAJ2H7qJweKu7u7BlMZDbnC6qKGEKnFvKgP6OWDzVM4b+GbAgygGBZYrijxytKhdE/laWDNtb12AyW3OAHPL4Risg3STV0/zO/jV7Xtu/IJgeoe4p7J/aLRtiIplt67dOX3X4mt/Zz592f0Gw7X+hDfwuP7UzD32EGp3e7ssWhwe3QqbYWXmMmq2ew6oc74RuM5dRtVKNVC9Npu4nQjfeK325D11gIhjZVRsOE42MFwQiAvgZL3v8GuWOxYbPP/t17dczYQtix+iGs6+frCo9tMpigDkPePA0Wn6Shs/XeGx3urmWe76pfj9XzzvETXZaV4fJfzau/P9m77FgvzxjUBXfUv55wWPSb4yVskYf3BeXjpOz741teSCz1VJROUTTu/eEpsHohb17svtQTe0fyqKQkCILoWpQ/sbr3ZPxv/VhHlo+X+sRNgiIj6CWHzYDKD4u7O0d6XbtPvinGlXl5p3xNMPHrTpge0nN3zWvWjIGPpPaScM86/NARm5nR+Kj4X904R6w0NVHhhfjMP9W/+uKE+NllcxIIGWp+mlXJlgDt4Jo/e43AsTvdPuh69fi4iwWO7u4WIB0KrrDZQe+1vAy0xcT2LkPy3RhYgHWQ/gh7Xv8uNuFSe067a59/DqoTJdu7EdP17NB7XA/3dBwl24w495eLIM6vg63woWBk5907R/esUiwD0dyIeFwOZWE3YsXd46bvRdHpDL8uHlUIg50zN0lWHQS8QmygZUIVoF/0iHdyeqUUbJiJV77f5lH764Nx35A9aAs+xiby+mW3B188LF6c/wbsDiZ/zUYrGanlRxvZQiQbYbiNNiDcAN8AsmDWA0VScYUYwIIduXvB7e/wEpcJdhXl7mdJqL2PHv6r6n16dNhKmscHIUzMr/SD2BtXGywO1WqKvKdabX9jK+l9NCvWIDlPOwrgWm79omJdmeic/vJk+fPXV97Ns41k5PtQEHf7fhqlybJJsMGQL6ABKU7hKqOoqo+TgsLxDkJkfkeCmW5b6JeUKp029ZV5rJl2pNXuHkBaTeuygEkUfROjymHsSAbV4pT2goY5NwnKAc45vnDusKrTioREBEvfokReyfiOVRNbNQ1/tXNfL/QbHidf3526EmmZkFCLFDNlcXnHN1TPnZ4sSlfu2YtSPrAstGlB+hJQyxZpLOJLGIRdIRUH0piIVdHcOhkErUs+owVxXiwoi1QLEtNHaabaWOpaQHtNAMeIittDG+gDz8RAfoAgLXyOlN+NIegtgZaf15UINVXUbCiUFG4IlBB9RntgSeCW3vB+Ms7WxHUFFgYuO0YSA10g/rILkUB/E4swolxyfCURngyGSd2VboYU/QRnMcYoSN8+N+RGH9QQvXtBNs/GKuSQ0IkL19WFxeLlSrt3kBZN11D75YF6ogg7Rcz6cePJGZkMVh3okZ+z17YrWbU+ANIWvXL8ec6wxtyHavDGjrPAenua6dYvWL4/WZwaWVD2GBDEmroBeFVjmD33w1hpuCefCBNUgy7vjvmWjcee+caf3g6i4lkQBSqEnGJKiHxj85ujHh3d3HZ9589rmIMiLqottXNmZt3p7NVI+Sszq1ziyMR6iBLnlGvu88I8C7oLcXbWBF8nyCjyRed2OEIKXlj9UC+GUZJfvBw9tzkKKpTao3TRdV8uB/p7cCavV2+GearnC4K0TGXTtm7Tz3dI7YT15vBdBdlQt39vjCK2Sd9C0wD87sFXgdV/TZSdOfO1QTfE0qoLN1ZTkFYedTQyBvjICi92+eTAD/SaHeoF53a6dlgRVRozcKt90c5o/9GsSMy/tEY3fMtvnSULEVEsDq3r+aSi8M8o4+Ssx+rL8aLVnHvSUuR13jhz/JrEUuOB2O6x0u2X5EQurTNxosWc7sOWcEE5/FCD+KltgvHi3YQ6Cu4NaHG7xUmrAVOL4/SNjbtbGocaWiKCtVG7Nlej9LdSuujWd13uOFpwcymBk7TCQUMSCPS7XY+lojLM+NELkKcOQ/3OLkQl1dgJ3IW2RXkbIBULR0kBw8/I/enfzYcTF41CDIfnzx1kmVcMH/BcofB7YMCS1Z+QT4I3dhf3r/4tF9XO+UJ8l4xzu8UZycGT8FjnqDONbKV2Dvspp2mtdcH4/3OEya4qikyZ3Ui/h5PkHnMN3OmISLHtlO1IK3AsLG/rH9JLVd1PH6CsuywwyOm7eo8Gy9t1TJxHe8e4Zy/fYR5IBE34edrPCYwRi4Xmm07Pjwiyy7afneX5zIt09lD6IHQbtqkwWr6NlVXYrL2IduRRmQXcl995tprXGgXz9Z0sWi5YbyKckeyp0u9Te8SR6k6LDc8wj8ocTaOIn8v13+24fi1v+8xZgSHA1HrHtqBer3y+8wrnd8key+r5JGe1pk5GJG1nnapncv4leUOm50vyAsP/8cvEBI4CBV8CWxJ0uPtsxx9XI8cVQdFd2W5+cx7z/kT9yen6r2rz9MYR2/10aO+roiYc0fXQDmDVD2r5391bR8Y+Mnfk55zKfOiTvzg9w+0u/54Wj+rT2zMDmT/FTDPY0ZY2Aw9oQo8fu7KpBApkRyeDZEo9vMi4mJuvVj94lZMXMQ8ewoJBD717MCpccz7soEOWVx8BavKzGKHSUeJ46QDxJGyHfPMpsWLzuLTBOjQiKwYr3B+4vKkFR6smB9e59ZVkr/klyevC52F+id4s3Jy47aCXnBq/aMUT7UZV7+2/OW9bVEf2EN1UEs8JGoH+qRykrsjFpYMk/IAWwcYac5yWX9Bemi9ZP0h6YX1+52zp0suYEGAdVxiTgCr56HTpb3H9hoDLFNGWRaVcSkbDuSJpvFxM9PpYRXm9TjjL1PivF54Pb4PT4avheOIuCIPxSz5cRhSwDDnP4rcGKpT3XLsGBEJoq2Yn6oP9ff3lHlGNc0OZyJcEUzZRTaVe+7x5n0gzOvhRA0b2xKyw/4+0y4jfPlMZgUGtyE9edly868oGYSAJFJsPb9yVuiXFm3AoVvTmLM7senkN/a2AHthGrP1/OWWnOPQ7GmTaqz7+SGslTN0M1bqBPd9ph3Jm5D4fwQIbLkFsYGm/XaAs8VsXMU64ZKCQDocjX/QPeXZSG30nDLTMf+rDFLcXGvTRuAwOTCnqQhkRWAZIm3KEcJhsXFz1n6aXSCnw9CESx2i107YvIt0Ar9YoXi6zcZG7mULYbM4cMcPkXBL8PEd3C9x0XFfop9nRmc+B4K9geG66hrdsmqdupbpaqrRWqNDrd4zb5Vwa8p4tyOpMp0dNY6ilS6UUjTX5+RXgA7IWPiFP3U/F37/0b5Jt6k9Jw2Owfo928PpBkab3xDMs3HTYWIm8ft3olGlMhIGh16KeB+GBmt26XbZ/ND9aP/xo2Y0bFe1JuJkvPLWTRuLy9esrXZW1qypzxX01yISQqkx88KVIYWFIZbnU7UWKnVRc98NpKyZN/A//xSpwDch3jcrwVdfTQI/eZp9/x+RvNdP+sEXQFkwz6ttbJdcGcee49Vs0wbJ8ollSzUVpdnhrXOn5hhhBxbZRRA31AcxjVEB2ZFBsLzwWH+P9GIq+Qs4cCJw+mJnvnqOKn77af/7+ilZGcimI3xmF9QpcgNNpsBcxRdCHwg0KXK/QJObcpSPWN3DkG9RvksSGSOIE4JVD0ZEQUFE5P3rfD+6ZOztDTFNaAKyR1rM1ekPIgKmhz36e7MbRKqt4TK090ePdVtJ+GMKQeBJdSlUA1XwraUwWXZWoTmfFT79rJ/C2QUe48iFwzg4j7sQo7EruOb2hm/NPnyLx5NtO7IoCQ7nlmZr/S4XHh6RyITyjkG5MyMik7bAteP0ayMz8oDMIexCtiPpN+IUeuk1+jMvopIYW6g85ZKISrtNa33xxvGrbWgcHxcqA8jjSV7+6Pk/WufbosdobrZvWhvaE1IQq5XIXlu+bS8yQs7z1Rf9G+PTN4UheldifmMMsSn0Vk3BAEK0BU/FCNtySQh7RIHRGegk1kdTMLWj2qZi0GIbTs1PwdAIWHp3oKcwvs4yjERcNaARRuelFEhEXTiVAiiXBDdg3rh0OfvrEeMQkexdk48uGyyc7xGD13uBwAv/c+fO48ijZ38dTuhQHtALyaZcZDdqxKohc1HtqBFU110zKn85yozq0LqJZw6eidzBuqTWRdwyRkbYorlIoOMxJJTERLQcaaWi2glXk1DNYCKEgWS0407LHOXIKqgOzd4wNoN1ncVkhbGoIQaYbBtZSEyEZm2Kfb0CDtPC4MexJJway8TqeEaNI2GPa37JK17HbsqCJhJHFhIQJ49PDxJObMQMZjc/Vj6ms4+oklbMpLMKLI8tBSw68yfLlxVpjFi7e1mz1ag0bsqMtL2I+om6aOsx2zjbI62x2CL8VpNbOjq+d9wIZL92fNl/NOrGf6lFHd2P7H8yAxWJCRWAHd55kzaCeF/feCOhIkaSfRivy6SCbwUFiwMeZZi39P3wApHwpapVJjNmy+bOkcmNsla9G2bcPdpt3M5N52Y37hbtPo652MLjhao58YRag9fKv30QbyboCGZ8NGGcS4hwxUmwFU974xVYSX3qaKv1rxxfECN5F7No6K9oB2VZrE7e+GxsyQxzFAgTQudRTEJUUE9WeyLaEZ3ovTB442ty9bfBfnaI88OX+JlOGgSBJyEH3ZXY2uFzDfbwLIeHR67D8GMtbSYSydTWcpmAu/QhIQseeu7c8DqsnLhkDdZ+qqamtvZwHNj+Le+R9VeLB4l2dPi83B8a6+EZA63sPz/8z0cSuhS7ZglRjl13bvhcaBY84cMlHOFyWwvJZCK1tI3hYdePPHSAZ9k3DJ+rxSrdDzYqx5p7llNAGv8UvMsrW4zL0mFeB5CfrBy+PvwcZgvrua7H9rBpz9BPOAc3Rx1K/E0fxgI6VFmbd+/QmveJ+P5i7jzFJyVTY7U/zA9yNbrDOx1JfjeRDn6syudiMLQYhntIlXLhV/E1WZ4e4REeBlo9IrzopaeY9ZfW3QGNc5dEFTUq9XU31uVPLLIHssRO20nyA1txHwS9Okzatu6mJCHqba/MTSYzF15VZsi+Yrt52vaKvYZsQV+2v4y236yizBXkB+gOMAkeZGc8Ql9B70PvtQl9hK7tbvvcatw8fIC1QlUSGloyn1CR+XESWHX1b92crlB4vnoUHkX5r4o9cl9W6eyADKk0I2D2Q0LBAefyD+c23ZFmknlzn4F0xV1WrJj+bCZNksxAvOXvrWeSM51MMvUjOxBByC7EEmkKRPTwl0aOWU2BUAGiqw+CbEc6b0ExhryiaCy5FDBFVxZppWKrKkC2Ik+CmXKcwoiPFAjoV0VQgFP5SifgVEDBOxU64Skry50AJdwJHG++VFhQuHVjyaYDT5W+8oj/nz2yX5JjECUJBEkiw0VCvfAkgUF0UXFB+2XPD1l9b4EbCqqBCvjiKEZTfBPD6VXHrxqOw3pZJxzq9h5JmKfbgj863/z9V+pEp+mU4DKtOKVDIpwYyUk5TUX3K3tCMdr25pLgV3PZy9opRdAthRhgQJd4Kqmnu6bL/ENHdwnifXzijYCKGGN7sKo/nqfihIZy1byNBi3ExW6qTVw1V6nUwlHy1Fejt2z5KGrRZgv0gsQE3wqdNagB30Sh/gwEX2XDwuyAQsb1rduG3DXuQN4P6yJ6eZ12rqtAEkZ6e8cI/EfjxBAXOxcgf9IDwKsV0bolSx5zBL7xcT4CDra2NmVGEb2je1K1qd0kJGlu5bobZFDT7UymbCaC2c2Lz51nIMg7IXyB2zUI+HRw2yM/VWwQigzitJviVLUaRHP7zTQxWoUGwOO0NGFICHPeUKKGp+b2xqQZ4Gm5KmniDWh5Kt6FrB3ItKtV3L3GVCvRvcsHj5dYHevInwcvM4fDHmSzPWg34ZnJwP6usDmBvQA0N5eU6HQHfIhOcHGKWUtKAPR7ScqC/e7AdpWopKjOq51lUhgTMJ+5+CEX+9d3HpunX0l9UhoqyVszP3POoc7ETr+k60l0tp0ACm1uRckXo48ZMDrj/0n032PpD6v8/88YDSi32j7vx91jhet9rOVhAY07N8KiIR9iGbiHoN04hqL0PPll8o7wjwDZk+3V1QQz3UxgNQEZwRM/tKH6Mu3yhqoxGx3hUNPMfCUPEao3E7o1r9xh92rArSDMBFrF09o824aJa3UhbXFSYNUxDdn9E/uTO4f2kf2Rpo7XkKIy7CznmOeR9BFkOAlVgpO9y6Bq/XccW9R1P2R3tRArqF3VQCEonl35dlZQyRuv6V3IywTaEUbI65DPV3BiKsPVEytZzW6MC+Qh7nDwkRgCzGxlJCyMqaKbmzuORLmEO2vxaCVXNSMSG4sNt41Gh75X++nPKQ9YhlzvpBNusiT+vZqLuBXy29i6qkoeB1XGBiwXz8luRSlhD5UESVEcp5Ws9LFRH5Y1VKhaWkjY7V2bLndvgnK5KyTximDVyuKDEdaDBQetEQeLw5ftaM6KFpD5XAPoOeokDAKBVejkhtCSfhQ6njmmw/Rc2khLyzBjGGv37+/ld/Qc/JCrMMnlJkXup6dYp5nk5T8p8ZpZnveIIQMD940ktgdWcl623BgQYJRnvzUoOOBc/u3cHpnEz00RJQuFyaKUq4SCA87lr87nAs1W/y/5ToC+6iQ1AH2DEaqUXos/tpZUNx3P+7VtI/c7jlBkBOeF23gv+V09AjM5UZpswqvUNX6u6N4FqlaPrdiHAHl8J2Ti/L7mpQvwPtZP7EkbR3XRIIpLz897LgK30pykkk713TdO4Q894O+fOYJQ/eMMGUA+uUte4up2VMVN+K/28GSeDe3zI6xAfgXkHIhePlK6vRdjD9EtGpncIcKh5weGTo/tJ122a6gSqjPwlvq0xzV1Ai+zZ4SGMKdjXIF+RAWN9DLZYqEiXfzAedrGmZsTHAq/4bRQadKErjlLTJZAFe/szOeQe2e15Sd0QZf9jXFe7NmU19bblzD8WUUfH1f6jlPXJPUycaru3aw7lrkUZGwLr9vRpwUj4PpO5L/WRKMuW9+7ZQcGQPoMWTfkGVoUNB6J/Wf9ZVRSV50mVOaQD+/cZVUvgRKve8IB12VYLhnot0Yuk+kIHuqHM3b55ZDH1n5ZJXnsAls2OZQG9CVn6YaOjzWhNw7JzN8MqKv6TS7XpfP307JFW4A1yLok6jYAhAxWRvn8wunvRu/Cf5CZKP5RGAbgU5jpZapPX6DfiUGQfheJ+/XSNzIDhgUo0x6al+7fFP9vxrZ9/7K5uWHVbzGuThbVJQDNw0IEkADDQQW/1XrjtIeXNWnG2iDASI5ObpPAAFi6TQYjYBMU3wmofA1Q+85uMwz2JeDGFm8AUBAwW8CWZbhNgHkHbpPAOHhlWee7zwp8/3qqswMOah/1NsPgilasNtxAdLWCDL7bnbrosgT22f6Ixcv/iaExqTIS1/2F1vj03ev2RbP9BwRan0vdD5/MQhc0p+775F0Dc+6K5n9wth3Nyufn56Cre+tyeveFAmLA6+ycxL1GTibCK2/2jrD60fkJBg0jap4AzH+BqlOMV0/n1daLHfjBxXZMB1ldG4NPLNCCDkynLMXS92oGMF7rnaKv9g84ZmusYBSfPQflgi3fti+lG0Lu3BzXX/13dAIMIJRgwUEF9EWCFHjgH9lwFQARJpS9h/H1LpU21vkgjOIkzfKirOqm7fphnOZl3fbjvO7n/X4AERTDCZKiGZbjBVGSFVXTDfPXZL75LdtxPT8IozhJs7woq7ppu34Yp3lZt/04r/t5v79YKleqtXqj2Wp3ur2+XEVRfHRkWVchMnocHXiRdBQf1DuJiQZcDEukbz4fxHhhsWXPIatfdJxjiU7WjjZXBEUdb90I97bLx77JdDX4dZSQNZHFLNfjgt5FdYy+WiWvC6E1hpNar+RJ2Yl3pP1xpiggW+1zdBX4dFG4DpwP/U6plXd+7nJKEFtA9uBcMAuZPXS9Y72yiMxLdNYUG0nqsUx2YF6GNDtPE58nY05YgqiR6/4EJpHHQv1RPAyaopBhFRpzdQrIYryemOIZ06JRbNYKZ/KLvyWOdtw4zs33GvEyE9QXzmuJItDpvrorLlyrllPvMrckE/ho83MuDImycqSwKuIi6WhlHQ1qHEYzFTCC3dX/bRrsVp00KLxx4zyktQWnFNziRJtvR6QZ3KLGxVo1+gq36kli+JZztHJZbOl1IaQKU26yGu0ilSJG6XV5yHaapyoRv8hlnqMzGRFYel1aYk65ddCfYI1wkO+CPn/2q5rVeuIyUu9R3aU9RdVdm1ZpCRrdbssbHHvbshopluEPte45EoclZ/dGDm1Njida/G+oFrOscXRMBPS9rMAcS421H7dvbz+ptMe8wizKsHmRFHqXraK4NEd5m1iFSaXEJYH1lIjVBwWZMakHKovqIpu12sTlciKsdCE5rbyDsMVfDAunqdGOsU7Q4c9qYK7TQtXw0TWb1EKcNWUkNQ+eViEeUZBPv+Ksa/kUQcL3NR7FJF7BDVSzuoyZB6OIxXy2y9qcQ61B4tqXZk1wKrVIdKTFclfZpi8PpNJK9MjvrGMUmljglNs7qCB14yw0EfClF8VR8TJA6glzpzWp5gMR0h9siIvtYq0sHDHEkwZgUghfV2Np00gyMD6S9zdhibZjehztIsYrOUmQ9pCUkvioLuOLij2T3OyutSiab1fyMdOoeGVr4eDKuwAAAA==') format('woff2');
 }
 
 @keyframes rollCircle {
@@ -43,12 +41,132 @@
   }
 }
 
-.vxe-icon-checkbox-checked:before {
-  content: "\e67d";
+.vxe-icon-indicator:before {
+  content: "\e646";
+}
+
+.vxe-icon-file-excel:before {
+  content: "\e7b7";
+}
+
+.vxe-icon-file-pdf:before {
+  content: "\e7b8";
+}
+
+.vxe-icon-file-image:before {
+  content: "\e7ba";
+}
+
+.vxe-icon-file-markdown:before {
+  content: "\e7bb";
+}
+
+.vxe-icon-file-ppt:before {
+  content: "\e7bc";
+}
+
+.vxe-icon-file-word:before {
+  content: "\e7bd";
+}
+
+.vxe-icon-file-zip:before {
+  content: "\e7be";
+}
+
+.vxe-icon-file-txt:before {
+  content: "\e616";
+}
+
+.vxe-icon-refresh:before {
+  content: "\e647";
 }
 
 .vxe-icon-checkbox-unchecked:before {
-  content: "\e638";
+  content: "\e727";
+}
+
+.vxe-icon-information:before {
+  content: "\e7b9";
+}
+
+.vxe-icon-info-circle-fill:before {
+  content: "\e697";
+}
+
+.vxe-icon-info-circle:before {
+  content: "\e618";
+}
+
+.vxe-icon-chart-radar:before {
+  content: "\e7dc";
+}
+
+.vxe-icon-chart-bar-x:before {
+  content: "\e60c";
+}
+
+.vxe-icon-repeat:before {
+  content: "\ea4a";
+}
+
+.vxe-icon-voice-fill:before {
+  content: "\e7c3";
+}
+
+.vxe-icon-voice:before {
+  content: "\e6be";
+}
+
+.vxe-icon-flow-branch:before {
+  content: "\e604";
+}
+
+.vxe-icon-comment:before {
+  content: "\e70c";
+}
+
+.vxe-icon-envelope:before {
+  content: "\e628";
+}
+
+.vxe-icon-folder:before {
+  content: "\e7d1";
+}
+
+.vxe-icon-folder-open:before {
+  content: "\e7d2";
+}
+
+.vxe-icon-picture:before {
+  content: "\ea13";
+}
+
+.vxe-icon-picture-fill:before {
+  content: "\e653";
+}
+
+.vxe-icon-bell:before {
+  content: "\e680";
+}
+
+.vxe-icon-bell-fill:before {
+  content: "\e681";
+}
+
+.vxe-icon-undo:before {
+  content: "\e739";
+}
+
+.vxe-icon-home:before {
+  content: "\e7c6";
+}
+
+.vxe-icon-home-fill:before {
+  content: "\e867";
+}
+
+.vxe-icon-checkbox-checked:before {
+  content: "\e67d";
 }
 
 .vxe-icon-checkbox-indeterminate:before {
@@ -99,10 +217,6 @@
   content: "\e66e";
 }
 
-.vxe-icon-refresh:before {
-  content: "\e619";
-}
-
 .vxe-icon-zoom-in:before {
   content: "\e826";
 }
@@ -251,10 +365,6 @@
   content: "\e617";
 }
 
-.vxe-icon-information:before {
-  content: "\e7f7";
-}
-
 .vxe-icon-ellipsis-h:before {
   content: "\e636";
 }
@@ -347,7 +457,7 @@
   content: "\e682";
 }
 
-.vxe-icon-chart-bar:before {
+.vxe-icon-chart-bar-y:before {
   content: "\e84e";
 }
 
@@ -371,10 +481,6 @@
   content: "\e690";
 }
 
-.vxe-icon-info-circle-fill:before {
-  content: "\e6e4";
-}
-
 .vxe-icon-error-circle-fill:before {
   content: "\e62b";
 }
@@ -403,10 +509,6 @@
   content: "\e600";
 }
 
-.vxe-icon-info-circle:before {
-  content: "\e77e";
-}
-
 .vxe-icon-question-circle:before {
   content: "\e782";
 }
@@ -479,10 +581,6 @@
   content: "\e677";
 }
 
-.vxe-icon-repeat:before {
-  content: "\e67b";
-}
-
 .vxe-icon-warning-triangle-fill:before {
   content: "\e68b";
 }
@@ -506,4 +604,3 @@
 .vxe-icon-radio-unchecked:before {
   content: "\e7c9";
 }
-

package/styles/input.scss

@@ -238,7 +238,7 @@ $iconWidth: 1.6em;
     top: 50%;
     transform: translate(-50%, -50%);
     &[class*="vxe-icon-"] {
-      font-size: 1.5em;
+      font-size: 1.2em;
     }
   }
 

package/styles/loading.scss

@@ -19,7 +19,7 @@
     left: 0;
     transform: translateY(-50%);
     text-align: center;
-    color: $vxe-primary-color;
+    color: $vxe-loading-color;
   }
   .vxe-loading--default-icon {
     font-size: 1.4em;

package/styles/modal.scss

@@ -150,11 +150,6 @@
     }
   }
 
-  &.type--modal {
-    .vxe-modal--header {
-      padding: 0.6em 4.6em 0.6em 1em;
-    }
-  }
   &.type--alert,
   &.type--confirm {
     .vxe-modal--status-wrapper {
@@ -238,36 +233,44 @@
     flex-grow: 1;
   }
   .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 $vxe-modal-border-color;
     background-color: $vxe-modal-header-background-color;
     border-radius: $vxe-border-radius $vxe-border-radius 0 0;
     user-select: none;
     &.is--draggable {
-      cursor: move;
+      .vxe-modal--header-title {
+        cursor: move;
+      }
     }
     &.is--ellipsis {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
+      .vxe-modal--header-title {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
     }
   }
+  .vxe-modal--header-title {
+    flex-grow: 1;
+    padding: 0.6em 0 0.6em 1em;
+  }
+  .vxe-modal--header-right {
+    flex-shrink: 0;
+    padding: 0.6em 1em 0.6em 0;
+  }
   .vxe-modal--zoom-btn,
   .vxe-modal--close-btn {
-    position: absolute;
-    right: 14px;
-    z-index: 1;
     cursor: pointer;
+    margin-left: 0.6em;
     &:hover {
       color: $vxe-primary-color;
     }
   }
-  .vxe-modal--zoom-btn {
-    right: 44px;
-  }
   .vxe-modal--footer {
     flex-shrink: 0;
     text-align: right;

package/styles/table.scss

@@ -1030,6 +1030,9 @@
   .vxe-body--expanded-cell {
     position: relative;
     z-index: 1;
+    &.is--ellipsis {
+      overflow: auto;
+    }
   }
 
   /*设置列高度*/

package/styles/toolbar.scss

@@ -175,33 +175,13 @@
 
 .vxe-toolbar {
   font-size: $vxe-font-size;
-  .vxe-custom--option {
-    & > .vxe-checkbox--icon {
-      font-size: $vxe-checkbox-font-size-default;
-    }
-  }
   &.size--medium {
     font-size: $vxe-font-size-medium;
-    .vxe-custom--option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-medium;
-      }
-    }
   }
   &.size--small {
     font-size: $vxe-font-size-small;
-    .vxe-custom--option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-small;
-      }
-    }
   }
   &.size--mini {
     font-size: $vxe-font-size-mini;
-    .vxe-custom--option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-mini;
-      }
-    }
   }
 }

package/styles/variable.scss

@@ -108,7 +108,8 @@ $vxe-table-menu-item-width: 178px !default;
 $vxe-table-menu-background-color: #fff !default;
 
 /*loading*/
-$vxe-loading-background-color: rgba(0, 0, 0, 0.2) !default;
+$vxe-loading-color: $vxe-primary-color !default;
+$vxe-loading-background-color: rgba(255, 255, 255, 0.5) !default;
 $vxe-loading-z-index: 999 !default;
 
 /*validate*/