vxe-table 3.8.15 → 3.8.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.8.15",
+  "version": "3.8.17",
   "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -27,7 +27,7 @@
   "typings": "types/index.d.ts",
   "dependencies": {
     "dom-zindex": "^1.0.4",
-    "xe-utils": "^3.5.26"
+    "xe-utils": "^3.5.29"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

package/packages/edit/src/mixin.js

@@ -368,11 +368,18 @@ export default {
      * 获取表格数据集，包含新增、删除、修改
      */
     _getRecordset () {
+      const removeRecords = this.getRemoveRecords()
+      const pendingRecords = this.getPendingRecords()
+      const delRecords = removeRecords.concat(pendingRecords)
+      // 如果已经被删除，则无需放到更新数组
+      const updateRecords = this.getUpdateRecords().filter(row => {
+        return !delRecords.some(item => this.eqRow(item, row))
+      })
       return {
         insertRecords: this.getInsertRecords(),
-        removeRecords: this.getRemoveRecords(),
-        updateRecords: this.getUpdateRecords(),
-        pendingRecords: this.getPendingRecords()
+        removeRecords,
+        updateRecords,
+        pendingRecords
       }
     },
     /**

package/packages/export/src/mixin.js

@@ -828,6 +828,8 @@ function handleImport ($xetable, content, opts) {
       .then((data) => {
         let loadRest
         if (opts.mode === 'insert' || opts.mode === 'insertBottom') {
+          loadRest = $xetable.insertAt(data, -1)
+        } if (opts.mode === 'insertTop') {
           loadRest = $xetable.insert(data)
         } else {
           loadRest = $xetable.reloadData(data)
@@ -895,7 +897,7 @@ function handleFileImport ($xetable, file, opts) {
     $xetable._importResolve = _importResolve
     $xetable._importReject = _importReject
     if (window.FileReader) {
-      const options = Object.assign({ mode: 'insertBottom' }, opts, { type, filename })
+      const options = Object.assign({ mode: 'insertTop' }, opts, { type, filename })
       if (options.remote) {
         if (importMethod) {
           Promise.resolve(importMethod({ file, options, $table: $xetable })).then(() => {
@@ -1328,6 +1330,8 @@ export default {
           if ($xegrid && !opts.remote) {
             const { beforeQueryAll, afterQueryAll, ajax = {}, props = {} } = $xegrid.proxyOpts
             const ajaxMethods = ajax.queryAll
+            const queryAllSuccessMethods = ajax.queryAllSuccess
+            const queryAllErrorMethods = ajax.queryAllError
 
             if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
               if (!ajaxMethods) {
@@ -1346,14 +1350,21 @@ export default {
                 options: opts
               }
               return Promise.resolve((beforeQueryAll || ajaxMethods)(params))
-                .catch(e => e)
                 .then(rest => {
                   opts.data = (props.list ? XEUtils.get(rest, props.list) : rest) || []
                   if (afterQueryAll) {
                     afterQueryAll(params)
                   }
+                  if (queryAllSuccessMethods) {
+                    queryAllSuccessMethods({ ...params, response: rest })
+                  }
                   return handleExport(this, opts)
                 })
+                .catch((rest) => {
+                  if (queryAllErrorMethods) {
+                    queryAllErrorMethods({ ...params, response: rest })
+                  }
+                })
             }
           }
         } else if (mode === 'current') {
@@ -1442,10 +1453,10 @@ export default {
     _openImport (options) {
       const { importOpts } = this
       const defOpts = Object.assign({
-        mode: 'insertBottom',
+        mode: 'insertTop',
         message: true,
         types: XEUtils.keys(importOpts._typeMaps),
-        modes: ['insertBottom', 'covering']
+        modes: ['insertTop', 'covering']
       }, options, importOpts)
       const types = defOpts.types || []
       const modes = defOpts.modes || []

package/packages/filter/src/mixin.js

@@ -261,6 +261,11 @@ export default {
         })
       }
       return this.updateData()
+    },
+    _updateFilterOptionStatus (item, checked) {
+      item._checked = checked
+      item.checked = checked
+      return this.$nextTick()
     }
   }
 }

package/packages/grid/src/grid.js

@@ -368,11 +368,15 @@ export default {
     }
   },
   computed: {
-    isMsg () {
-      return this.proxyOpts.message !== false
+    isRespMsg () {
+      const { proxyOpts } = this
+      return XEUtils.isBoolean(proxyOpts.message) ? proxyOpts.message : proxyOpts.showResponseMsg
+    },
+    isActiveMsg () {
+      return this.proxyOpts.showActiveMsg
     },
     proxyOpts () {
-      return Object.assign({}, GlobalConfig.grid.proxyConfig, this.proxyConfig)
+      return XEUtils.merge({}, GlobalConfig.grid.proxyConfig, this.proxyConfig)
     },
     pagerOpts () {
       return Object.assign({}, GlobalConfig.grid.pagerConfig, this.pagerConfig)
@@ -571,7 +575,7 @@ export default {
      * @param {String/Object} code 字符串或对象
      */
     commitProxy (proxyTarget, ...args) {
-      const { $refs, toolbar, toolbarConfig, toolbarOpts, proxyOpts, tablePage, pagerConfig, editRules, formData, isMsg, validConfig, pagerOpts } = this
+      const { $refs, toolbar, toolbarConfig, toolbarOpts, proxyOpts, tablePage, pagerConfig, editRules, formData, isRespMsg, isActiveMsg, validConfig, pagerOpts } = this
       const { beforeQuery, afterQuery, beforeDelete, afterDelete, beforeSave, afterSave, ajax = {} } = proxyOpts
       const resConfigs = proxyOpts.response || proxyOpts.props || {}
       const $xetable = $refs.xTable
@@ -621,6 +625,8 @@ export default {
         case 'reload':
         case 'query': {
           const ajaxMethods = ajax.query
+          const querySuccessMethods = ajax.querySuccess
+          const queryErrorMethods = ajax.queryError
           if (ajaxMethods) {
             const isInited = code === '_init'
             const isReload = code === 'reload'
@@ -660,7 +666,7 @@ export default {
                 filterList = $xetable.getCheckedFilters()
               }
             }
-            const params = {
+            const commitParams = {
               code,
               button,
               isInited,
@@ -676,7 +682,7 @@ export default {
             this.sortData = sortList
             this.filterData = filterList
             this.tableLoading = true
-            const applyArgs = [params].concat(args)
+            const applyArgs = [commitParams].concat(args)
             return Promise.resolve((beforeQuery || ajaxMethods)(...applyArgs))
               .then(rest => {
                 this.tableLoading = false
@@ -702,9 +708,15 @@ export default {
                 if (afterQuery) {
                   afterQuery(...applyArgs)
                 }
+                if (querySuccessMethods) {
+                  querySuccessMethods({ ...commitParams, response: rest })
+                }
                 return { status: true }
-              }).catch(() => {
+              }).catch((rest) => {
                 this.tableLoading = false
+                if (queryErrorMethods) {
+                  queryErrorMethods({ ...commitParams, response: rest })
+                }
                 return { status: false }
               })
           } else {
@@ -716,11 +728,14 @@ export default {
         }
         case 'delete': {
           const ajaxMethods = ajax.delete
+          const deleteSuccessMethods = ajax.deleteSuccess
+          const deleteErrorMethods = ajax.deleteError
           if (ajaxMethods) {
             const selectRecords = $xetable.getCheckboxRecords()
             const removeRecords = selectRecords.filter(row => !$xetable.isInsertByRow(row))
             const body = { removeRecords }
-            const applyArgs = [{ $grid: this, code, button, body, form: formData, options: ajaxMethods }].concat(args)
+            const commitParams = { $grid: this, code, button, body, form: formData, options: ajaxMethods }
+            const applyArgs = [commitParams].concat(args)
             if (selectRecords.length) {
               return this.handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', () => {
                 if (!removeRecords.length) {
@@ -731,7 +746,7 @@ export default {
                   .then(rest => {
                     this.tableLoading = false
                     $xetable.setPendingRow(removeRecords, false)
-                    if (isMsg) {
+                    if (isRespMsg) {
                       // 检测弹窗模块
                       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                         if (!VXETable.modal) {
@@ -745,11 +760,14 @@ export default {
                     } else {
                       this.commitProxy('query')
                     }
+                    if (deleteSuccessMethods) {
+                      deleteSuccessMethods({ ...commitParams, response: rest })
+                    }
                     return { status: true }
                   })
                   .catch(rest => {
                     this.tableLoading = false
-                    if (isMsg) {
+                    if (isRespMsg) {
                       // 检测弹窗模块
                       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                         if (!VXETable.modal) {
@@ -758,11 +776,14 @@ export default {
                       }
                       VXETable.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                     }
+                    if (deleteErrorMethods) {
+                      deleteErrorMethods({ ...commitParams, response: rest })
+                    }
                     return { status: false }
                   })
               })
             } else {
-              if (isMsg) {
+              if (isActiveMsg) {
                 // 检测弹窗模块
                 if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                   if (!VXETable.modal) {
@@ -781,10 +802,13 @@ export default {
         }
         case 'save': {
           const ajaxMethods = ajax.save
+          const saveSuccessMethods = ajax.saveSuccess
+          const saveErrorMethods = ajax.saveError
           if (ajaxMethods) {
             const body = this.getRecordset()
             const { insertRecords, removeRecords, updateRecords, pendingRecords } = body
-            const applyArgs = [{ $grid: this, code, button, body, form: formData, options: ajaxMethods }].concat(args)
+            const commitParams = { $grid: this, code, button, body, form: formData, options: ajaxMethods }
+            const applyArgs = [commitParams].concat(args)
             // 排除掉新增且标记为删除的数据
             if (insertRecords.length) {
               body.pendingRecords = pendingRecords.filter(row => insertRecords.indexOf(row) === -1)
@@ -809,7 +833,7 @@ export default {
                   .then(rest => {
                     this.tableLoading = false
                     $xetable.clearPendingRow()
-                    if (isMsg) {
+                    if (isRespMsg) {
                       // 检测弹窗模块
                       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                         if (!VXETable.modal) {
@@ -823,11 +847,14 @@ export default {
                     } else {
                       this.commitProxy('query')
                     }
+                    if (saveSuccessMethods) {
+                      saveSuccessMethods({ ...commitParams, response: rest })
+                    }
                     return { status: true }
                   })
                   .catch(rest => {
                     this.tableLoading = false
-                    if (isMsg) {
+                    if (isRespMsg) {
                       // 检测弹窗模块
                       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                         if (!VXETable.modal) {
@@ -836,10 +863,13 @@ export default {
                       }
                       VXETable.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                     }
+                    if (saveErrorMethods) {
+                      saveErrorMethods({ ...commitParams, response: rest })
+                    }
                     return { status: false }
                   })
               } else {
-                if (isMsg) {
+                if (isActiveMsg) {
                   // 检测弹窗模块
                   if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                     if (!VXETable.modal) {
@@ -883,7 +913,7 @@ export default {
     },
     handleDeleteRow (code, alertKey, callback) {
       const selectRecords = this.getCheckboxRecords()
-      if (this.isMsg) {
+      if (this.isActiveMsg) {
         if (selectRecords.length) {
           return VXETable.modal.confirm({ id: `cfm_${code}`, content: GlobalConfig.i18n(alertKey), escClosable: true }).then(type => {
             if (type === 'confirm') {
@@ -931,13 +961,13 @@ export default {
       this.$emit('toolbar-tool-click', { code: tool.code, tool, $grid: this, $event: evnt })
     },
     triggerPendingEvent (code) {
-      const { isMsg } = this
+      const { isActiveMsg } = this
       const selectRecords = this.getCheckboxRecords()
       if (selectRecords.length) {
         this.togglePendingRow(selectRecords)
         this.clearCheckboxRow()
       } else {
-        if (isMsg) {
+        if (isActiveMsg) {
           // 检测弹窗模块
           if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
             if (!VXETable.modal) {

package/packages/input/src/input.js

@@ -628,8 +628,8 @@ export default {
       type: String,
       default: () => XEUtils.eqNull(GlobalConfig.input.placeholder) ? GlobalConfig.i18n('vxe.base.pleaseInput') : GlobalConfig.input.placeholder
     },
-    maxlength: [String, Number],
-    autocomplete: { type: String, default: 'off' },
+    maxLength: [String, Number],
+    autoComplete: { type: String, default: 'off' },
     align: String,
     form: String,
     className: String,
@@ -673,7 +673,12 @@ export default {
     prefixIcon: String,
     suffixIcon: String,
     placement: String,
-    transfer: { type: Boolean, default: () => GlobalConfig.input.transfer }
+    transfer: { type: Boolean, default: () => GlobalConfig.input.transfer },
+
+    // 已废弃
+    maxlength: [String, Number],
+    // 已废弃
+    autocomplete: String
   },
   inject: {
     $xeform: {
@@ -722,7 +727,8 @@ export default {
       return XEUtils.getSize(this.inputValue)
     },
     isCountError () {
-      return this.maxlength && this.inputCount > XEUtils.toNumber(this.maxlength)
+      const { maxLength, maxlength } = this
+      return (maxLength || maxlength) && this.inputCount > XEUtils.toNumber(maxLength || maxlength)
     },
     stepValue () {
       const { type, step } = this
@@ -1047,9 +1053,9 @@ export default {
       return type
     },
     inpMaxlength () {
-      const { isNumType, maxlength } = this
+      const { isNumType, maxLength, maxlength } = this
       // 数值最大长度限制 16 位，包含小数
-      return isNumType && !XEUtils.toNumber(maxlength) ? 16 : maxlength
+      return isNumType && !XEUtils.toNumber(maxLength || maxlength) ? 16 : (maxLength || maxlength)
     },
     inpReadonly () {
       const { type, readonly, editable, multiple } = this
@@ -1135,7 +1141,7 @@ export default {
     GlobalEvent.off(this, 'blur')
   },
   render (h) {
-    const { name, form, inputType, inpPlaceholder, inpMaxlength, inpReadonly, className, controls, showWordCount, countMethod, inputValue, isDatePickerType, visiblePanel, isActivated, vSize, type, align, readonly, disabled, autocomplete } = this
+    const { name, form, inputType, inpPlaceholder, inpMaxlength, inpReadonly, className, controls, showWordCount, countMethod, inputValue, isDatePickerType, visiblePanel, isActivated, vSize, type, align, readonly, disabled, autoComplete, autocomplete } = this
     const childs = []
     const prefix = rendePrefixIcon(h, this)
     const suffix = renderSuffixIcon(h, this)
@@ -1159,7 +1165,7 @@ export default {
           maxlength: inpMaxlength,
           readonly: inpReadonly,
           disabled,
-          autocomplete
+          autocomplete: autoComplete || autocomplete
         },
         on: {
           keydown: this.keydownEvent,

package/packages/table/src/column.js

@@ -129,7 +129,7 @@ export default {
     this.columnConfig = this.createColumn(this.$xetable, this)
   },
   mounted () {
-    UtilTools.assemColumn(this)
+    UtilTools.assembleColumn(this)
   },
   destroyed () {
     UtilTools.destroyColumn(this)

package/packages/table/src/columnInfo.js

@@ -151,7 +151,8 @@ export class ColumnInfo {
   }
 
   getKey () {
-    return this.field || (this.type ? `type=${this.type}` : null)
+    const { type } = this
+    return this.field || (type ? `type=${type}` : null)
   }
 
   update (name, value) {

package/packages/table/src/methods.js

@@ -392,11 +392,11 @@ const Methods = {
           if (childrenField === treeOpts.mapChildrenField) {
             errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField'])
           }
-          fullData.forEach(row => {
-            if (row[childrenField] && row[childrenField].length) {
-              warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
-            }
-          })
+          // fullData.forEach(row => {
+          //   if (row[childrenField] && row[childrenField].length) {
+          //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
+          //   }
+          // })
         }
         treeData = XEUtils.toArrayTree(fullData, {
           key: treeOpts.rowField,
@@ -725,7 +725,7 @@ const Methods = {
       }, { children: childrenField })
       row[childrenField] = rows
       if (transform) {
-        row[mapChildrenField] = rows
+        row[mapChildrenField] = XEUtils.clone(rows, false)
       }
       this.updateAfterDataIndex()
       return rows
@@ -2655,13 +2655,15 @@ const Methods = {
           this.clearSelected()
         }
         if (areaOpts.autoClear) {
-          const cellAreas = this.getCellAreas()
-          if (cellAreas.length && !getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
-            this.preventEvent(evnt, 'event.clearAreas', {}, () => {
-              this.clearCellAreas()
-              this.clearCopyCellArea()
-              this.emitEvent('clear-cell-area-selection', { cellAreas }, evnt)
-            })
+          if (this.getCellAreas) {
+            const cellAreas = this.getCellAreas()
+            if (cellAreas && cellAreas.length && !getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
+              this.preventEvent(evnt, 'event.clearAreas', {}, () => {
+                this.clearCellAreas()
+                this.clearCopyCellArea()
+                this.emitEvent('clear-cell-area-selection', { cellAreas }, evnt)
+              })
+            }
           }
         }
       }
@@ -5478,7 +5480,7 @@ const Methods = {
 }
 
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,getPrintHtml,exportData,openImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom'.split(',')
+const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,getPrintHtml,exportData,openImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom'.split(',')
 
 funcs.forEach(name => {
   Methods[name] = function (...args) {

package/packages/toolbar/src/toolbar.js

@@ -18,6 +18,7 @@ const renderDropdowns = (h, _vm, item, isBtn) => {
           disabled: child.disabled,
           loading: child.loading,
           type: child.type,
+          mode: child.mode,
           icon: child.icon,
           circle: child.circle,
           round: child.round,
@@ -63,6 +64,7 @@ function renderBtns (h, _vm) {
         disabled: item.disabled,
         loading: item.loading,
         type: item.type,
+        mode: item.mode,
         icon: item.icon,
         circle: item.circle,
         round: item.round,
@@ -112,6 +114,7 @@ function renderRightTools (h, _vm) {
         disabled: item.disabled,
         loading: item.loading,
         type: item.type,
+        mode: item.mode,
         icon: item.icon,
         circle: item.circle,
         round: item.round,

package/packages/tools/utils.js

@@ -48,7 +48,7 @@ export const UtilTools = {
     return XEUtils.set(row, column.field, value)
   },
   // 组装列配置
-  assemColumn (_vm) {
+  assembleColumn (_vm) {
     const { $el, $xetable, $xecolumn, columnConfig } = _vm
     const groupConfig = $xecolumn ? $xecolumn.columnConfig : null
     columnConfig.slots = _vm.$scopedSlots

package/packages/v-x-e-table/src/conf.js

@@ -263,7 +263,8 @@ export default {
     proxyConfig: {
       enabled: true,
       autoLoad: true,
-      message: true,
+      showResponseMsg: true,
+      showActiveMsg: true,
       props: {
         list: null,
         result: 'result',

package/packages/v-x-e-table/src/renderer.js

@@ -418,6 +418,13 @@ function handleFilterMethod ({ option, row, column }) {
   return cellValue == data
 }
 
+function handleInputFilterMethod ({ option, row, column }) {
+  const { data } = option
+  const cellValue = XEUtils.get(row, column.property)
+  /* eslint-disable eqeqeq */
+  return XEUtils.toValueString(cellValue).indexOf(data) > -1
+}
+
 function nativeSelectEditRender (h, renderOpts, params) {
   return [
     h('select', {
@@ -463,7 +470,7 @@ function getSelectCellValue (renderOpts, { row, column }) {
   let selectItem
   const labelProp = optionProps.label || 'label'
   const valueProp = optionProps.value || 'value'
-  if (!isEmptyValue(cellValue)) {
+  if (!(cellValue === null || cellValue === undefined)) {
     return XEUtils.map(props.multiple ? cellValue : [cellValue], optionGroups ? (value) => {
       const groupOptions = optionGroupProps.options || 'options'
       for (let index = 0; index < optionGroups.length; index++) {
@@ -662,7 +669,7 @@ const renderMap = {
     renderEdit: nativeEditRender,
     renderDefault: nativeEditRender,
     renderFilter: nativeFilterRender,
-    defaultFilterMethod: handleFilterMethod,
+    defaultFilterMethod: handleInputFilterMethod,
     renderItemContent: nativeItemRender
   },
   textarea: {
@@ -727,7 +734,7 @@ const renderMap = {
     },
     renderDefault: defaultEditRender,
     renderFilter: defaultFilterRender,
-    defaultFilterMethod: handleFilterMethod,
+    defaultFilterMethod: handleInputFilterMethod,
     renderItemContent: defaultItemRender
   },
   VxeTextarea: {
@@ -838,7 +845,7 @@ const renderMap = {
     },
     renderDefault: oldEditRender,
     renderFilter: oldFilterRender,
-    defaultFilterMethod: handleFilterMethod,
+    defaultFilterMethod: handleInputFilterMethod,
     renderItemContent: oldItemRender
   },
   $textarea: {

package/styles/form.scss

@@ -234,7 +234,7 @@
     padding: 0 0.8em;
   }
   .vxe-default-textarea {
-    height: calc($vxe-button-height-default * 2);
+    height: $vxe-button-height-default * 2;
     padding: 0.3em 0.6em;
   }
   .vxe-default-input[type="number"] {
@@ -324,7 +324,7 @@
       height: $vxe-button-height-medium;
     }
     .vxe-default-textarea {
-      height: calc($vxe-button-height-medium * 2);
+      height: $vxe-button-height-medium * 2;
     }
   }
   &.size--small {
@@ -341,7 +341,7 @@
       height: $vxe-button-height-small;
     }
     .vxe-default-textarea {
-      height: calc($vxe-button-height-small * 2);
+      height: $vxe-button-height-small * 2;
     }
   }
   &.size--mini {
@@ -358,7 +358,7 @@
       height: $vxe-button-height-mini;
     }
     .vxe-default-textarea {
-      height: calc($vxe-button-height-mini * 2);
+      height: $vxe-button-height-mini * 2;
     }
   }
 }