vxe-table 3.5.6 → 3.5.7

package/packages/form/src/form.js

@@ -5,8 +5,8 @@ import VXETable from '../../v-x-e-table'
 import { isEnableConf, eqEmptyValue, getFuncText } from '../../tools/utils'
 import DomTools, { browse } from '../../tools/dom'
 import { createItem, handleFieldOrItem } from './util'
-import { renderTitle } from './render'
 import { errLog } from '../../tools/log'
+import VxeFormConfigItem from './form-config-item'
 
 class Rule {
   constructor (rule) {
@@ -62,114 +62,6 @@ function getResetValue (value, resetValue) {
   return resetValue
 }
 
-function renderItems (h, _vm, itemList) {
-  const { _e, rules, data, collapseAll, validOpts, titleOverflow: allTitleOverflow } = _vm
-  return itemList.map((item) => {
-    const { slots, title, folding, visible, visibleMethod, field, collapseNode, itemRender, showError, errRule, className, titleOverflow, children } = item
-    const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
-    const span = item.span || _vm.span
-    const align = item.align || _vm.align
-    const titleAlign = item.titleAlign || _vm.titleAlign
-    const titleWidth = item.titleWidth || _vm.titleWidth
-    let itemVisibleMethod = visibleMethod
-    const itemOverflow = (XEUtils.isUndefined(titleOverflow) || XEUtils.isNull(titleOverflow)) ? allTitleOverflow : titleOverflow
-    const showEllipsis = itemOverflow === 'ellipsis'
-    const showTitle = itemOverflow === 'title'
-    const showTooltip = itemOverflow === true || itemOverflow === 'tooltip'
-    const hasEllipsis = showTitle || showTooltip || showEllipsis
-    const params = { data, field, property: field, item, $form: _vm }
-    let isRequired
-    if (visible === false) {
-      return _e()
-    }
-    // 如果为项集合
-    const isGather = children && children.length > 0
-    if (isGather) {
-      const childVNs = renderItems(h, _vm, item.children)
-      return childVNs.length ? h('div', {
-        class: ['vxe-form--gather vxe-row', item.id, span ? `vxe-col--${span} is--span` : '', className ? (XEUtils.isFunction(className) ? className(params) : className) : '']
-      }, childVNs) : _e()
-    }
-    if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-      itemVisibleMethod = compConf.itemVisibleMethod
-    }
-    if (rules) {
-      const itemRules = rules[field]
-      if (itemRules) {
-        isRequired = itemRules.some(rule => rule.required)
-      }
-    }
-    let contentVNs = []
-    if (slots && slots.default) {
-      contentVNs = _vm.callSlot(slots.default, params, h)
-    } else if (compConf && compConf.renderItemContent) {
-      contentVNs = compConf.renderItemContent.call(_vm, h, itemRender, params)
-    } else if (compConf && compConf.renderItem) {
-      contentVNs = compConf.renderItem.call(_vm, h, itemRender, params)
-    } else if (field) {
-      contentVNs = [`${XEUtils.get(data, field)}`]
-    }
-    const ons = showTooltip ? {
-      mouseenter (evnt) {
-        _vm.triggerTitleTipEvent(evnt, params)
-      },
-      mouseleave: _vm.handleTitleTipLeaveEvent
-    } : {}
-    return h('div', {
-      class: ['vxe-form--item', item.id, span ? `vxe-col--${span} is--span` : null, className ? (XEUtils.isFunction(className) ? className(params) : className) : '', {
-        'is--title': title,
-        'is--required': isRequired,
-        'is--hidden': folding && collapseAll,
-        'is--active': !itemVisibleMethod || itemVisibleMethod(params),
-        'is--error': showError
-      }],
-      key: item.id
-    }, [
-      h('div', {
-        class: 'vxe-form--item-inner'
-      }, [
-        title || (slots && slots.title) ? h('div', {
-          class: ['vxe-form--item-title', titleAlign ? `align--${titleAlign}` : null, {
-            'is--ellipsis': hasEllipsis
-          }],
-          style: titleWidth ? {
-            width: isNaN(titleWidth) ? titleWidth : `${titleWidth}px`
-          } : null,
-          attrs: {
-            title: showTitle ? getFuncText(title) : null
-          },
-          on: ons
-        }, renderTitle(h, _vm, item)) : null,
-        h('div', {
-          class: ['vxe-form--item-content', align ? `align--${align}` : null]
-        }, contentVNs.concat(
-          [
-            collapseNode ? h('div', {
-              class: 'vxe-form--item-trigger-node',
-              on: {
-                click: _vm.toggleCollapseEvent
-              }
-            }, [
-              h('span', {
-                class: 'vxe-form--item-trigger-text'
-              }, collapseAll ? GlobalConfig.i18n('vxe.form.unfolding') : GlobalConfig.i18n('vxe.form.folding')),
-              h('i', {
-                class: ['vxe-form--item-trigger-icon', collapseAll ? GlobalConfig.icon.FORM_FOLDING : GlobalConfig.icon.FORM_UNFOLDING]
-              })
-            ]) : null,
-            errRule && validOpts.showMessage ? h('div', {
-              class: 'vxe-form--item-valid',
-              style: errRule.maxWidth ? {
-                width: `${errRule.maxWidth}px`
-              } : null
-            }, errRule.content) : null
-          ])
-        )
-      ])
-    ])
-  })
-}
-
 export default {
   name: 'VxeForm',
   mixins: [vSize],
@@ -208,7 +100,10 @@ export default {
   },
   provide () {
     return {
-      $xeform: this
+      $xeform: this,
+      $xeformgather: null,
+      $xeformitem: null,
+      $xeformiteminfo: null
     }
   },
   computed: {
@@ -246,11 +141,10 @@ export default {
   render (h) {
     const { _e, loading, className, data, vSize, tooltipOpts, formItems, customLayout } = this
     const hasUseTooltip = VXETable._tooltip
+    const defaultSlot = this.$scopedSlots.default
     return h('form', {
       class: ['vxe-form', className ? (XEUtils.isFunction(className) ? className({ items: formItems, data, $form: this }) : className) : '', {
         [`size--${vSize}`]: vSize,
-        'is--colon': this.titleColon,
-        'is--asterisk': this.titleAsterisk,
         'is--loading': loading
       }],
       on: {
@@ -260,11 +154,18 @@ export default {
     }, [
       h('div', {
         class: 'vxe-form--wrapper vxe-row'
-      }, customLayout ? this.$slots.default : renderItems(h, this, formItems)),
+      }, customLayout ? (defaultSlot ? defaultSlot.call(this, h, {}) : []) : formItems.map((item, index) => {
+        return h(VxeFormConfigItem, {
+          key: index,
+          props: {
+            itemConfig: item
+          }
+        })
+      })),
       h('div', {
         class: 'vxe-form-slots',
         ref: 'hideItem'
-      }, customLayout ? [] : this.$slots.default),
+      }, customLayout ? [] : (defaultSlot ? defaultSlot.call(this, h, {}) : [])),
       h('div', {
         class: ['vxe-loading', {
           'is--visible': loading
@@ -553,7 +454,7 @@ export default {
                 }
               } else {
                 const isArrType = type === 'array'
-                const hasEmpty = isArrType ? (!XEUtils.isArray(itemValue) || !itemValue.length) : eqEmptyValue(itemValue)
+                const hasEmpty = isArrType || XEUtils.isArray(itemValue) ? (!XEUtils.isArray(itemValue) || !itemValue.length) : eqEmptyValue(itemValue)
                 if (required ? (hasEmpty || validErrorRuleValue(rule, itemValue)) : (!hasEmpty && validErrorRuleValue(rule, itemValue))) {
                   errorRules.push(new Rule(rule))
                 }
@@ -602,26 +503,30 @@ export default {
         }
       })
     },
-    /**
-     * 更新项状态
-     * 如果组件值 v-model 发生 change 时，调用改函数用于更新某一项编辑状态
-     * 如果单元格配置了校验规则，则会进行校验
-     */
-    updateStatus (scope, itemValue) {
-      const { property } = scope
-      if (property) {
-        this.validItemRules('change', property, itemValue)
+    triggerItemEvent (evnt, field, itemValue) {
+      if (field) {
+        return this.validItemRules(evnt ? evnt.type : 'all', field, itemValue)
           .then(() => {
-            this.clearValidate(property)
+            this.clearValidate(field)
           })
           .catch(({ rule }) => {
-            const item = this.getItemByField(property)
+            const item = this.getItemByField(field)
             if (item) {
               item.showError = true
               item.errRule = rule
             }
           })
       }
+      return this.$nextTick()
+    },
+    /**
+     * 更新项状态
+     * 如果组件值 v-model 发生 change 时，调用改函数用于更新某一项编辑状态
+     * 如果单元格配置了校验规则，则会进行校验
+     */
+    updateStatus (scope, itemValue) {
+      const { field } = scope
+      return this.triggerItemEvent(new Event('change'), field, itemValue)
     }
   }
 }

package/packages/form/src/util.js

@@ -69,14 +69,14 @@ export function destroyItem (_vm) {
 }
 
 export function assemItem (_vm) {
-  const { $el, $xeform, xeformgather, itemConfig } = _vm
-  const itemGather = xeformgather ? xeformgather.itemConfig : null
+  const { $el, $xeform, $xeformgather, itemConfig } = _vm
+  const itemGather = $xeformgather ? $xeformgather.itemConfig : null
   itemConfig.slots = _vm.$scopedSlots
   if (itemGather) {
     if (!itemGather.children) {
       itemGather.children = []
     }
-    itemGather.children.splice([].indexOf.call(xeformgather.$el.children, $el), 0, itemConfig)
+    itemGather.children.splice([].indexOf.call($xeformgather.$el.children, $el), 0, itemConfig)
   } else {
     $xeform.staticItems.splice([].indexOf.call($xeform.$refs.hideItem.children, $el), 0, itemConfig)
   }

package/packages/input/src/input.js

@@ -463,7 +463,9 @@ function renderNumberIcon (h, _vm) {
     class: 'vxe-input--number-suffix'
   }, [
     h('span', {
-      class: 'vxe-input--number-prev is--prev',
+      class: ['vxe-input--number-prev is--prev', {
+        'is--disabled': _vm.isDisabledAddNumber
+      }],
       on: {
         mousedown: _vm.numberMousedownEvent,
         mouseup: _vm.numberStopDown,
@@ -475,7 +477,9 @@ function renderNumberIcon (h, _vm) {
       })
     ]),
     h('span', {
-      class: 'vxe-input--number-next is--next',
+      class: ['vxe-input--number-next is--next', {
+        'is--disabled': _vm.isDisabledSubtractNumber
+      }],
       on: {
         mousedown: _vm.numberMousedownEvent,
         mouseup: _vm.numberStopDown,
@@ -662,6 +666,14 @@ export default {
     placement: String,
     transfer: { type: Boolean, default: () => GlobalConfig.input.transfer }
   },
+  inject: {
+    $xeform: {
+      default: null
+    },
+    $xeformiteminfo: {
+      default: null
+    }
+  },
   data () {
     return {
       panelIndex: 0,
@@ -1027,6 +1039,29 @@ export default {
     inpReadonly () {
       const { type, readonly, editable, multiple } = this
       return readonly || multiple || !editable || (type === 'week' || type === 'quarter')
+    },
+    numValue () {
+      const { type, isNumType, inputValue } = this
+      if (isNumType) {
+        return type === 'integer' ? XEUtils.toInteger(handleNumber(inputValue)) : XEUtils.toNumber(handleNumber(inputValue))
+      }
+      return 0
+    },
+    isDisabledSubtractNumber () {
+      const { min, isNumType, inputValue, numValue } = this
+      // 当有值时再进行判断
+      if ((inputValue || inputValue === 0) && isNumType && min !== null) {
+        return numValue <= XEUtils.toNumber(min)
+      }
+      return false
+    },
+    isDisabledAddNumber () {
+      const { max, isNumType, inputValue, numValue } = this
+      // 当有值时再进行判断
+      if ((inputValue || inputValue === 0) && isNumType && max !== null) {
+        return numValue >= XEUtils.toNumber(max)
+      }
+      return false
     }
   },
   watch: {
@@ -1168,6 +1203,10 @@ export default {
       this.$emit('input', { value, $event: evnt })
       if (XEUtils.toValueString(this.value) !== value) {
         this.$emit('change', { value, $event: evnt })
+        // 自动更新校验状态
+        if (this.$xeform && this.$xeformiteminfo) {
+          this.$xeform.triggerItemEvent(evnt, this.$xeformiteminfo.itemConfig.field, value)
+        }
       }
     },
     emitInputEvent (value, evnt) {
@@ -1433,17 +1472,17 @@ export default {
       }
     },
     numberPrevEvent (evnt) {
-      const { disabled, readonly } = this
+      const { disabled, readonly, isDisabledAddNumber } = this
       clearTimeout(this.downbumTimeout)
-      if (!disabled && !readonly) {
+      if (!disabled && !readonly && !isDisabledAddNumber) {
         this.numberChange(true, evnt)
       }
       this.$emit('prev-number', { $event: evnt })
     },
     numberNextEvent (evnt) {
-      const { disabled, readonly } = this
+      const { disabled, readonly, isDisabledSubtractNumber } = this
       clearTimeout(this.downbumTimeout)
-      if (!disabled && !readonly) {
+      if (!disabled && !readonly && !isDisabledSubtractNumber) {
         this.numberChange(false, evnt)
       }
       this.$emit('next-number', { $event: evnt })

package/packages/radio/src/button.js

@@ -15,6 +15,12 @@ export default {
   inject: {
     $xeradiogroup: {
       default: null
+    },
+    $xeform: {
+      default: null
+    },
+    $xeformiteminfo: {
+      default: null
     }
   },
   computed: {
@@ -68,10 +74,14 @@ export default {
       const { $xeradiogroup } = this
       const params = { label, $event: evnt }
       if ($xeradiogroup) {
-        $xeradiogroup.handleChecked(params)
+        $xeradiogroup.handleChecked(params, evnt)
       } else {
         this.$emit('input', label)
         this.$emit('change', params)
+        // 自动更新校验状态
+        if (this.$xeform && this.$xeformiteminfo) {
+          this.$xeform.triggerItemEvent(evnt, this.$xeformiteminfo.itemConfig.field, label)
+        }
       }
     },
     changeEvent (evnt) {

package/packages/radio/src/group.js

@@ -9,6 +9,14 @@ export default {
     strict: { type: Boolean, default: () => GlobalConfig.radioGroup.strict },
     size: { type: String, default: () => GlobalConfig.radioGroup.size || GlobalConfig.size }
   },
+  inject: {
+    $xeform: {
+      default: null
+    },
+    $xeformiteminfo: {
+      default: null
+    }
+  },
   provide () {
     return {
       $xeradiogroup: this
@@ -31,9 +39,13 @@ export default {
     }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [])
   },
   methods: {
-    handleChecked (params) {
+    handleChecked (params, evnt) {
       this.$emit('input', params.label)
       this.$emit('change', params)
+      // 自动更新校验状态
+      if (this.$xeform && this.$xeformiteminfo) {
+        this.$xeform.triggerItemEvent(evnt, this.$xeformiteminfo.itemConfig.field, params.label)
+      }
     }
   }
 }

package/packages/radio/src/radio.js

@@ -18,6 +18,12 @@ export default {
   inject: {
     $xeradiogroup: {
       default: null
+    },
+    $xeform: {
+      default: null
+    },
+    $xeformiteminfo: {
+      default: null
     }
   },
   computed: {
@@ -71,10 +77,14 @@ export default {
       const { $xeradiogroup } = this
       const params = { label, $event: evnt }
       if ($xeradiogroup) {
-        $xeradiogroup.handleChecked(params)
+        $xeradiogroup.handleChecked(params, evnt)
       } else {
         this.$emit('input', label)
         this.$emit('change', params)
+        // 自动更新校验状态
+        if (this.$xeform && this.$xeformiteminfo) {
+          this.$xeform.triggerItemEvent(evnt, this.$xeformiteminfo.itemConfig.field, label)
+        }
       }
     },
     changeEvent (evnt) {

package/packages/select/src/select.js

@@ -229,6 +229,14 @@ export default {
   components: {
     VxeInput
   },
+  inject: {
+    $xeform: {
+      default: null
+    },
+    $xeformiteminfo: {
+      default: null
+    }
+  },
   provide () {
     return {
       $xeselect: this
@@ -483,6 +491,10 @@ export default {
       if (selectValue !== this.value) {
         this.$emit('input', selectValue)
         this.$emit('change', { value: selectValue, $event: evnt })
+        // 自动更新校验状态
+        if (this.$xeform && this.$xeformiteminfo) {
+          this.$xeform.triggerItemEvent(evnt, this.$xeformiteminfo.itemConfig.field, selectValue)
+        }
       }
     },
     mousedownOptionEvent (evnt) {

package/packages/switch/src/switch.js

@@ -18,6 +18,14 @@ export default {
     openIcon: String,
     closeIcon: String
   },
+  inject: {
+    $xeform: {
+      default: null
+    },
+    $xeformiteminfo: {
+      default: null
+    }
+  },
   data () {
     return {
       isActivated: false,
@@ -107,6 +115,10 @@ export default {
         }
         this.$emit('input', value)
         this.$emit('change', { value, $event: evnt })
+        // 自动更新校验状态
+        if (this.$xeform && this.$xeformiteminfo) {
+          this.$xeform.triggerItemEvent(evnt, this.$xeformiteminfo.itemConfig.field, value)
+        }
         this.activeTimeout = setTimeout(() => {
           this.hasAnimat = false
         }, 400)

package/packages/table/src/body.js

@@ -327,15 +327,27 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
     const rowLevel = rest ? rest.level : 0
     const seq = rest ? rest.seq : -1
     const params = { $table: $xetable, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex }
+    // 行是否被展开
+    const isExpandRow = expandColumn && rowExpandeds.length && rowExpandeds.indexOf(row) > -1
+    // 树节点是否被展开
+    let isExpandTree = false
+    let rowChildren = []
+    // 是否新增行
     let isNewRow = false
     if (editConfig) {
       isNewRow = editStore.insertList.indexOf(row) > -1
     }
+    if (treeConfig && !scrollYLoad && !treeOpts.transform && treeExpandeds.length) {
+      rowChildren = row[treeOpts.children]
+      isExpandTree = rowChildren && rowChildren.length && treeExpandeds.indexOf(row) > -1
+    }
     rows.push(
       h('tr', {
-        class: ['vxe-body--row', {
+        class: ['vxe-body--row', treeConfig ? `row--level-${rowLevel}` : '', {
           'row--stripe': stripe && ($xetable.getVTRowIndex(row) + 1) % 2 === 0,
           'is--new': isNewRow,
+          'is--expand-row': isExpandRow,
+          'is--expand-tree': isExpandTree,
           'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
           'row--radio': radioOpts.highlight && $xetable.selectRow === row,
           'row--checked': checkboxOpts.highlight && $xetable.isCheckedByCheckboxRow(row)
@@ -351,7 +363,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
       }))
     )
     // 如果行被展开了
-    if (expandColumn && rowExpandeds.length && rowExpandeds.indexOf(row) > -1) {
+    if (isExpandRow) {
       let cellStyle
       if (treeConfig) {
         cellStyle = {
@@ -388,11 +400,8 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
       )
     }
     // 如果是树形表格
-    if (treeConfig && !scrollYLoad && !treeOpts.transform && treeExpandeds.length) {
-      const rowChildren = row[treeOpts.children]
-      if (rowChildren && rowChildren.length && treeExpandeds.indexOf(row) > -1) {
-        rows.push(...renderRows(h, _vm, $xetable, fixedType, rowChildren, tableColumn))
-      }
+    if (isExpandTree) {
+      rows.push(...renderRows(h, _vm, $xetable, fixedType, rowChildren, tableColumn))
     }
   })
   return rows

package/packages/table/src/methods.js

@@ -4644,7 +4644,7 @@ const Methods = {
 }
 
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearActived,getActiveRecord,isActiveByRow,setActiveRow,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',')
+const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',')
 
 funcs.forEach(name => {
   Methods[name] = function (...args) {

package/packages/table/src/table.js

@@ -2,6 +2,7 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
 import VxeTableBody from './body'
+import VxeTableHeader from '../../header'
 import vSize from '../../mixins/size'
 import { isEnableConf, getFuncText } from '../../tools/utils'
 import { createResizeEvent } from '../../tools/resize'
@@ -24,7 +25,7 @@ function renderFixed (h, $xetable, fixedType) {
     class: `vxe-table--fixed-${fixedType}-wrapper`,
     ref: `${fixedType}Container`
   }, [
-    showHeader ? h('vxe-table-header', {
+    showHeader ? h(VxeTableHeader, {
       props: {
         fixedType,
         tableData,
@@ -1007,7 +1008,7 @@ export default {
           /**
            * 表头
            */
-          showHeader ? h('vxe-table-header', {
+          showHeader ? h(VxeTableHeader, {
             ref: 'tableHeader',
             props: {
               tableData,

package/packages/textarea/src/textarea.js

@@ -30,6 +30,14 @@ export default {
     className: String,
     size: { type: String, default: () => GlobalConfig.textarea.size || GlobalConfig.size }
   },
+  inject: {
+    $xeform: {
+      default: null
+    },
+    $xeformiteminfo: {
+      default: null
+    }
+  },
   data () {
     return {
       inputValue: this.value
@@ -132,6 +140,10 @@ export default {
       this.$emit('modelValue', value)
       if (this.value !== value) {
         this.$emit('change', { value, $event: evnt })
+        // 自动更新校验状态
+        if (this.$xeform && this.$xeformiteminfo) {
+          this.$xeform.triggerItemEvent(evnt, this.$xeformiteminfo.itemConfig.field, value)
+        }
       }
     },
     inputEvent (evnt) {

package/packages/validator/src/mixin.js

@@ -278,7 +278,7 @@ export default {
                 }
               } else {
                 const isArrType = type === 'array'
-                const hasEmpty = isArrType ? (!XEUtils.isArray(cellValue) || !cellValue.length) : eqEmptyValue(cellValue)
+                const hasEmpty = isArrType || XEUtils.isArray(cellValue) ? (!XEUtils.isArray(cellValue) || !cellValue.length) : eqEmptyValue(cellValue)
                 if (required ? (hasEmpty || validErrorRuleValue(rule, cellValue)) : (!hasEmpty && validErrorRuleValue(rule, cellValue))) {
                   this.validRuleErr = true
                   errorRules.push(new Rule(rule))

package/styles/button.scss

@@ -272,11 +272,6 @@ $btnThemeList: (
   }
 }
 .vxe-button--loading-icon,
-.vxe-button--icon,
-.vxe-button--content {
-  vertical-align: middle;
-}
-.vxe-button--loading-icon,
 .vxe-button--icon {
   min-width: $vxe-font-size;
   &+.vxe-button--content {

package/styles/form.scss

@@ -106,22 +106,9 @@
       }
     }
   }
-  &.is--asterisk {
-    .vxe-form--item {
-      &.is--required {
-        .vxe-form--item-title-content {
-          &:before {
-            content: "*";
-            color: $vxe-form-validate-error-color;
-            font-family: Verdana,Arial,Tahoma;
-            margin-right: 0.2em;
-            font-weight: normal;
-            vertical-align: middle;
-          }
-        }
-      }
-    }
-  }
+}
+
+.vxe-form--item {
   &.is--colon {
     .vxe-form--item-title-postfix {
       &:after {
@@ -131,9 +118,20 @@
       }
     }
   }
-}
-
-.vxe-form--item {
+  &.is--asterisk {
+    &.is--required {
+      .vxe-form--item-title-content {
+        &:before {
+          content: "*";
+          color: $vxe-form-validate-error-color;
+          font-family: Verdana,Arial,Tahoma;
+          margin-right: 0.2em;
+          font-weight: normal;
+          vertical-align: middle;
+        }
+      }
+    }
+  }
   &.is--span {
     .vxe-default-input:not([type="submit"]):not([type="reset"]),
     .vxe-default-textarea,