vxe-table 3.8.19 → 3.8.20

package/lib/index.umd.js

@@ -11408,7 +11408,8 @@ var iconPrefix = 'vxe-icon-';
     tooltipConfig: {
       enterable: true
     },
-    titleAsterisk: true
+    titleAsterisk: true,
+    padding: true
   },
   input: {
     // size: null,
@@ -11520,7 +11521,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.19", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.20", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12510,7 +12511,7 @@ function oldFormItemRadioAndCheckboxRender(h, renderOpts, params) {
  */
 var renderMap = {
   input: {
-    autofocus: 'input',
+    autoFocus: 'input',
     renderEdit: nativeEditRender,
     renderDefault: nativeEditRender,
     renderFilter: nativeFilterRender,
@@ -12518,7 +12519,7 @@ var renderMap = {
     renderItemContent: nativeItemRender
   },
   textarea: {
-    autofocus: 'textarea',
+    autoFocus: 'textarea',
     renderEdit: nativeEditRender,
     renderItemContent: nativeItemRender
   },
@@ -12550,7 +12551,7 @@ var renderMap = {
     cellExportMethod: handleExportSelectMethod
   },
   VxeInput: {
-    autofocus: '.vxe-input--inner',
+    autoFocus: '.vxe-input--inner',
     renderEdit: defaultEditRender,
     renderCell: function renderCell(h, renderOpts, params) {
       var _renderOpts$props2 = renderOpts.props,
@@ -12581,7 +12582,7 @@ var renderMap = {
     renderItemContent: defaultItemRender
   },
   VxeTextarea: {
-    autofocus: '.vxe-textarea--inner',
+    autoFocus: '.vxe-textarea--inner',
     renderItemContent: defaultItemRender
   },
   VxeButton: {
@@ -12605,7 +12606,7 @@ var renderMap = {
     }
   },
   VxeSelect: {
-    autofocus: '.vxe-input--inner',
+    autoFocus: '.vxe-input--inner',
     renderEdit: defaultSelectEditRender,
     renderDefault: defaultSelectEditRender,
     renderCell: function renderCell(h, renderOpts, params) {
@@ -12656,30 +12657,30 @@ var renderMap = {
     cellExportMethod: handleExportSelectMethod
   },
   VxeRadio: {
-    autofocus: '.vxe-radio--input',
+    autoFocus: '.vxe-radio--input',
     renderItemContent: defaultFormItemRender
   },
   VxeRadioGroup: {
-    autofocus: '.vxe-radio--input',
+    autoFocus: '.vxe-radio--input',
     renderItemContent: formItemRadioAndCheckboxRender
   },
   VxeCheckbox: {
-    autofocus: '.vxe-checkbox--input',
+    autoFocus: '.vxe-checkbox--input',
     renderItemContent: defaultFormItemRender
   },
   VxeCheckboxGroup: {
-    autofocus: '.vxe-checkbox--input',
+    autoFocus: '.vxe-checkbox--input',
     renderItemContent: formItemRadioAndCheckboxRender
   },
   VxeSwitch: {
-    autofocus: '.vxe-switch--button',
+    autoFocus: '.vxe-switch--button',
     renderEdit: defaultEditRender,
     renderDefault: defaultEditRender,
     renderItemContent: defaultItemRender
   },
   // 以下已废弃
   $input: {
-    autofocus: '.vxe-input--inner',
+    autoFocus: '.vxe-input--inner',
     renderEdit: oldEditRender,
     renderCell: function renderCell(h, renderOpts, params) {
       var _renderOpts$props3 = renderOpts.props,
@@ -12709,7 +12710,7 @@ var renderMap = {
     renderItemContent: oldItemRender
   },
   $textarea: {
-    autofocus: '.vxe-textarea--inner',
+    autoFocus: '.vxe-textarea--inner',
     renderItemContent: oldItemRender
   },
   $button: {
@@ -12721,7 +12722,7 @@ var renderMap = {
     renderItemContent: oldButtonsItemRender
   },
   $select: {
-    autofocus: '.vxe-input--inner',
+    autoFocus: '.vxe-input--inner',
     renderEdit: oldSelectEditRender,
     renderDefault: oldSelectEditRender,
     renderCell: function renderCell(h, renderOpts, params) {
@@ -12772,15 +12773,15 @@ var renderMap = {
     cellExportMethod: handleExportSelectMethod
   },
   $radio: {
-    autofocus: '.vxe-radio--input',
+    autoFocus: '.vxe-radio--input',
     renderItemContent: oldFormItemRadioAndCheckboxRender
   },
   $checkbox: {
-    autofocus: '.vxe-checkbox--input',
+    autoFocus: '.vxe-checkbox--input',
     renderItemContent: oldFormItemRadioAndCheckboxRender
   },
   $switch: {
-    autofocus: '.vxe-switch--button',
+    autoFocus: '.vxe-switch--button',
     renderEdit: oldEditRender,
     renderDefault: oldEditRender,
     renderItemContent: oldItemRender
@@ -13224,7 +13225,7 @@ function component(comp) {
     components[comp.name] = comp;
   }
 }
-var version = "3.8.19";
+var version = "3.8.20";
 var tableVersion = version;
 var VxeUI = {
   v: v,
@@ -18026,6 +18027,11 @@ var Methods = {
     var fullColumnFieldData = this.fullColumnFieldData;
     return fullColumnFieldData[field] ? fullColumnFieldData[field].column : null;
   },
+  getParentColumn: function getParentColumn(fieldOrColumn) {
+    var fullColumnIdData = this.fullColumnIdData;
+    var column = handleFieldOrColumn(this, fieldOrColumn);
+    return column && column.parentId && fullColumnIdData[column.parentId] ? fullColumnIdData[column.parentId].column : null;
+  },
   /**
    * 获取当前表格的列
    * 收集到的全量列、全量表头列、处理条件之后的全量表头列、当前渲染中的表头列
@@ -18956,6 +18962,7 @@ var Methods = {
     var resizeList = [];
     var pxList = [];
     var pxMinList = [];
+    var autoMinList = [];
     var scaleList = [];
     var scaleMinList = [];
     var autoList = [];
@@ -18978,6 +18985,8 @@ var Methods = {
           scaleList.push(column);
         } else if (dom.isPx(column.minWidth)) {
           pxMinList.push(column);
+        } else if (column.minWidth === 'auto') {
+          autoMinList.push(column);
         } else if (dom.isScale(column.minWidth)) {
           scaleMinList.push(column);
         } else {
@@ -18989,6 +18998,7 @@ var Methods = {
       resizeList: resizeList,
       pxList: pxList,
       pxMinList: pxMinList,
+      autoMinList: autoMinList,
       scaleList: scaleList,
       scaleMinList: scaleMinList,
       autoList: autoList,
@@ -19074,11 +19084,11 @@ var Methods = {
             var cellStyle = getComputedStyle(firstCellEl);
             paddingSize = Math.floor(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingLeft) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingRight)) + 2;
           }
-          var colWidth = column.renderAutoWidth - paddingSize + 2;
+          var colWidth = column.renderAutoWidth - paddingSize;
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(cellElList, function (cellEl) {
             var labelEl = cellEl.firstChild;
             if (labelEl) {
-              colWidth = Math.max(colWidth, labelEl.offsetWidth);
+              colWidth = Math.max(colWidth, Math.ceil(labelEl.offsetWidth) + 4);
             }
           });
           column.renderAutoWidth = colWidth + paddingSize;
@@ -19109,6 +19119,7 @@ var Methods = {
     var resizeList = columnStore.resizeList,
       pxMinList = columnStore.pxMinList,
       pxList = columnStore.pxList,
+      autoMinList = columnStore.autoMinList,
       scaleList = columnStore.scaleList,
       scaleMinList = columnStore.scaleMinList,
       autoList = columnStore.autoList,
@@ -19119,6 +19130,12 @@ var Methods = {
       tableWidth += minWidth;
       column.renderWidth = minWidth;
     });
+    // 最小自适应
+    autoMinList.forEach(function (column) {
+      var scaleWidth = Math.max(60, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.renderAutoWidth));
+      tableWidth += scaleWidth;
+      column.renderWidth = scaleWidth;
+    });
     // 最小百分比
     scaleMinList.forEach(function (column) {
       var scaleWidth = Math.floor(parseInt(column.minWidth) * meanWidth);
@@ -19150,10 +19167,10 @@ var Methods = {
       column.renderWidth = width;
     });
     remainWidth -= tableWidth;
-    meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + remainList.length)) : 0;
+    meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + autoMinList.length + remainList.length)) : 0;
     if (fit) {
       if (remainWidth > 0) {
-        scaleMinList.concat(pxMinList).forEach(function (column) {
+        scaleMinList.concat(pxMinList).concat(autoMinList).forEach(function (column) {
           tableWidth += meanWidth;
           column.renderWidth += meanWidth;
         });
@@ -19172,7 +19189,7 @@ var Methods = {
        * 偏移量算法
        * 如果所有列足够放的情况下，从最后动态列开始分配
        */
-      var dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(remainList);
+      var dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(autoMinList).concat(remainList);
       var dynamicSize = dynamicList.length - 1;
       if (dynamicSize > 0) {
         var odiffer = bodyWidth - tableWidth;
@@ -23622,6 +23639,7 @@ function handleUupdateResize(_vm) {
         resizeList: [],
         pxList: [],
         pxMinList: [],
+        autoMinList: [],
         scaleList: [],
         scaleMinList: [],
         autoList: [],
@@ -23878,10 +23896,11 @@ function handleUupdateResize(_vm) {
       return Object.assign({}, conf.table.customConfig, this.customConfig);
     },
     autoWidthColumnList: function autoWidthColumnList() {
-      var visibleColumn = this.visibleColumn;
-      return visibleColumn.filter(function (column) {
-        return column.width === 'auto';
-      });
+      var tableColumn = this.tableColumn,
+        visibleColumn = this.visibleColumn;
+      return tableColumn.length || visibleColumn.length ? visibleColumn.filter(function (column) {
+        return column.width === 'auto' || column.minWidth === 'auto';
+      }) : [];
     },
     fixedColumnSize: function fixedColumnSize() {
       var collectColumn = this.collectColumn;
@@ -24240,6 +24259,9 @@ function handleUupdateResize(_vm) {
     var currLoading = this._isLoading || loading;
     return h('div', {
       class: ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), (_ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, "valid-msg--".concat(validOpts.msgMode), !!editRules), 'vxe-editable', !!editConfig), 'old-cell-valid', editRules && conf.cellVaildMode === 'obsolete'), 'cell--highlight', highlightCell), 'cell--selected', mouseConfig && mouseOpts.selected), 'cell--area', mouseConfig && mouseOpts.area), 'row--highlight', rowOpts.isHover || highlightHoverRow), 'column--highlight', columnOpts.isHover || highlightHoverColumn), 'checkbox--range', checkboxOpts.range), 'column--calc', isCalcColumn), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, 'is--header', showHeader), 'is--footer', showFooter), 'is--group', isGroup), 'is--tree-line', treeConfig && (treeOpts.showLine || treeOpts.line)), 'is--fixed-left', leftList.length), 'is--fixed-right', rightList.length), 'is--animat', !!this.animat), 'is--round', this.round), 'is--stripe', !treeConfig && stripe), 'is--loading', currLoading), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, 'is--empty', !currLoading && !tableData.length), 'is--scroll-y', overflowY), 'is--scroll-x', overflowX), 'is--virtual-x', scrollXLoad), 'is--virtual-y', scrollYLoad))],
+      attrs: {
+        spellcheck: false
+      },
       on: {
         keydown: this.keydownEvent
       }
@@ -26198,26 +26220,26 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       var editRender = column.editRender;
       if (isEnableConf(editRender)) {
         var compRender = v_x_e_table.renderer.get(editRender.name);
-        var autofocus = editRender.autofocus,
-          autoselect = editRender.autoselect;
+        var autoFocus = editRender.autofocus || editRender.autoFocus;
+        var autoSelect = editRender.autoSelect || editRender.autoselect;
         var inputElem;
-        if (!autofocus && compRender) {
-          autofocus = compRender.tableAutofocus || compRender.autofocus;
+        if (!autoFocus && compRender) {
+          autoFocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autofocus;
         }
-        if (!autoselect && compRender) {
-          autoselect = compRender.tableAutoSelect || compRender.autoselect;
+        if (!autoSelect && compRender) {
+          autoSelect = compRender.tableAutoSelect || compRender.autoselect;
         }
         // 如果指定了聚焦 class
-        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(autofocus)) {
-          inputElem = autofocus.call(this, params);
-        } else if (autofocus) {
-          inputElem = cell.querySelector(autofocus);
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(autoFocus)) {
+          inputElem = autoFocus.call(this, params);
+        } else if (autoFocus) {
+          inputElem = cell.querySelector(autoFocus);
           if (inputElem) {
             inputElem.focus();
           }
         }
         if (inputElem) {
-          if (autoselect) {
+          if (autoSelect) {
             inputElem.select();
           } else {
             // 保持一致行为，光标移到末端
@@ -28947,7 +28969,8 @@ function renderExtraSuffixIcon(h, _vm) {
         maxlength: inpMaxlength,
         readonly: inpReadonly,
         disabled: disabled,
-        autocomplete: autoComplete || autocomplete
+        autocomplete: autoComplete || autocomplete,
+        spellcheck: false
       },
       on: {
         keydown: this.keydownEvent,
@@ -32209,7 +32232,7 @@ function hasTreeChildren($xetable, row) {
   var childrenField = treeOpts.children || treeOpts.childrenField;
   return row[childrenField] && row[childrenField].length > 0;
 }
-function getSeq($xetable, row, $rowIndex, column, $columnIndex) {
+function getSeq($xetable, cellValue, row, $rowIndex, column, $columnIndex) {
   var seqOpts = $xetable.seqOpts;
   var seqMethod = seqOpts.seqMethod || column.seqMethod;
   if (seqMethod) {
@@ -32222,7 +32245,7 @@ function getSeq($xetable, row, $rowIndex, column, $columnIndex) {
       $columnIndex: $columnIndex
     });
   }
-  return $xetable.getRowSeq(row);
+  return cellValue;
 }
 function defaultFilterExportColumn(column) {
   return column.property || ['seq', 'checkbox', 'radio'].indexOf(column.type) > -1;
@@ -32289,10 +32312,13 @@ function getLabelData($xetable, opts, columns, datas) {
           } else {
             switch (column.type) {
               case 'seq':
-                cellValue = mode === 'all' ? path.map(function (num, i) {
-                  return i % 2 === 0 ? Number(num) + 1 : '.';
-                }).join('') : getSeq($xetable, row, $rowIndex, column, $columnIndex);
-                break;
+                {
+                  var seqValue = path.map(function (num, i) {
+                    return i % 2 === 0 ? Number(num) + 1 : '.';
+                  }).join('');
+                  cellValue = mode === 'all' ? seqValue : getSeq($xetable, seqValue, row, $rowIndex, column, $columnIndex);
+                  break;
+                }
               case 'checkbox':
                 cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row));
                 _item._checkboxLabel = checkboxOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkboxOpts.labelField) : '';
@@ -32358,8 +32384,11 @@ function getLabelData($xetable, opts, columns, datas) {
       } else {
         switch (column.type) {
           case 'seq':
-            cellValue = mode === 'all' ? $rowIndex + 1 : getSeq($xetable, row, $rowIndex, column, $columnIndex);
-            break;
+            {
+              var seqValue = $rowIndex + 1;
+              cellValue = mode === 'all' ? seqValue : getSeq($xetable, seqValue, row, $rowIndex, column, $columnIndex);
+              break;
+            }
           case 'checkbox':
             cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row));
             item._checkboxLabel = checkboxOpts.labelField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkboxOpts.labelField) : '';
@@ -35404,7 +35433,8 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
         }, conf.i18n('vxe.custom.setting.colSort')), h('vxe-tooltip', {
           props: {
             enterable: true,
-            content: conf.i18n('vxe.custom.setting.sortHelpTip')
+            content: conf.i18n('vxe.custom.setting.sortHelpTip'),
+            popupClassName: 'vxe-table--ignore-clear'
           },
           scopedSlots: {
             default: function _default() {
@@ -36524,13 +36554,11 @@ Object.keys(packages_table.methods).forEach(function (name) {
     }
   },
   created: function created() {
-    var data = this.data,
-      formOpts = this.formOpts,
-      proxyOpts = this.proxyOpts,
-      proxyConfig = this.proxyConfig;
-    if (proxyConfig && (data || proxyOpts.form && formOpts.data)) {
-      errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']);
-    }
+    // const { data, formOpts, proxyOpts, proxyConfig } = this
+    // if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
+    //   errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
+    // }
+
     if (false) {}
     this.initPages();
     GlobalEvent.on(this, 'keydown', this.handleGlobalKeydownEvent);
@@ -36622,7 +36650,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
         formOpts = this.formOpts;
       if (proxyConfig) {
         if (isEnableConf(formConfig) && proxyOpts.form && formOpts.items) {
-          var formData = {};
+          var fData = {};
           formOpts.items.forEach(function (item) {
             var field = item.field,
               itemRender = item.itemRender;
@@ -36638,10 +36666,10 @@ Object.keys(packages_table.methods).forEach(function (name) {
                   itemValue = defaultValue;
                 }
               }
-              formData[field] = itemValue;
+              fData[field] = itemValue;
             }
           });
-          this.formData = formData;
+          this.formData = fData;
         }
         if (!proxyInited && proxyOpts.autoLoad !== false) {
           this.proxyInited = true;
@@ -36677,7 +36705,6 @@ Object.keys(packages_table.methods).forEach(function (name) {
         tablePage = this.tablePage,
         pagerConfig = this.pagerConfig,
         editRules = this.editRules,
-        formData = this.formData,
         isRespMsg = this.isRespMsg,
         isActiveMsg = this.isActiveMsg,
         validConfig = this.validConfig,
@@ -36692,6 +36719,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
         ajax = _proxyOpts$ajax === void 0 ? {} : _proxyOpts$ajax;
       var resConfigs = proxyOpts.response || proxyOpts.props || {};
       var $xetable = $refs.xTable;
+      var formData = this.getFormData();
       var button;
       var code;
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(proxyTarget)) {
@@ -37120,6 +37148,13 @@ Object.keys(packages_table.methods).forEach(function (name) {
       }
       return Promise.resolve();
     },
+    getFormData: function getFormData() {
+      var proxyConfig = this.proxyConfig,
+        proxyOpts = this.proxyOpts,
+        formOpts = this.formOpts,
+        formData = this.formData;
+      return proxyConfig && isEnableConf(proxyOpts) && proxyOpts.form ? formData : formOpts.data;
+    },
     getFormItems: function getFormItems(itemIndex) {
       var formConfig = this.formConfig,
         formOpts = this.formOpts;
@@ -37337,7 +37372,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
         return {
           data: this.tableData,
           filter: this.filterData,
-          form: this.formData,
+          form: this.getFormData(),
           sort: sortData.length ? sortData[0] : {},
           sorts: sortData,
           pager: this.tablePage,
@@ -39001,7 +39036,10 @@ var autoTxtElem;
       attrs.placeholder = getFuncText(placeholder);
     }
     return h('div', {
-      class: ['vxe-textarea', className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--autosize', autosize), 'is--disabled', disabled), 'def--rows', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rows)), 'def--cols', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cols))]
+      class: ['vxe-textarea', className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--autosize', autosize), 'is--disabled', disabled), 'def--rows', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rows)), 'def--cols', !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cols))],
+      attrs: {
+        spellcheck: false
+      }
     }, [h('textarea', {
       ref: 'textarea',
       class: 'vxe-textarea--inner',
@@ -40258,6 +40296,8 @@ var ItemConfig = /*#__PURE__*/function () {
       titleAlign: item.titleAlign,
       titleWidth: item.titleWidth,
       titleColon: item.titleColon,
+      vertical: item.vertical,
+      padding: item.padding,
       titleAsterisk: item.titleAsterisk,
       titlePrefix: item.titlePrefix,
       titleSuffix: item.titleSuffix,
@@ -40478,12 +40518,14 @@ var VxeFormConfigItem = {
       readonly = $xeform.readonly,
       collapseAll = $xeform.collapseAll,
       validOpts = $xeform.validOpts,
+      allTitleBold = $xeform.titleBold,
       allTitleAlign = $xeform.titleAlign,
       allTitleWidth = $xeform.titleWidth,
       allTitleColon = $xeform.titleColon,
       allTitleAsterisk = $xeform.titleAsterisk,
       allTitleOverflow = $xeform.titleOverflow,
-      allVertical = $xeform.vertical;
+      allVertical = $xeform.vertical,
+      allPadding = $xeform.padding;
     var slots = item.slots,
       title = item.title,
       folding = item.folding,
@@ -40496,6 +40538,7 @@ var VxeFormConfigItem = {
       className = item.className,
       titleOverflow = item.titleOverflow,
       vertical = item.vertical,
+      padding = item.padding,
       children = item.children,
       showTitle = item.showTitle,
       contentClassName = item.contentClassName,
@@ -40511,12 +40554,14 @@ var VxeFormConfigItem = {
     var itemTitleStyle = compConf ? compConf.formItemTitleStyle || compConf.itemTitleStyle : null;
     var span = item.span || $xeform.span;
     var align = item.align || $xeform.align;
+    var itemPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(padding) ? allPadding : padding;
+    var itemVertical = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(vertical) ? allVertical : vertical;
+    var titleBold = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleBold) ? allTitleBold : item.titleBold;
     var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
-    var titleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
+    var titleWidth = itemVertical ? null : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
     var titleColon = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleColon) ? allTitleColon : item.titleColon;
     var titleAsterisk = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
-    var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(titleOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
-    var itemVertical = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(vertical) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(vertical) ? allVertical : vertical;
+    var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(titleOverflow) ? allTitleOverflow : titleOverflow;
     var ovEllipsis = itemOverflow === 'ellipsis';
     var ovTitle = itemOverflow === 'title';
     var ovTooltip = itemOverflow === true || itemOverflow === 'tooltip';
@@ -40531,7 +40576,8 @@ var VxeFormConfigItem = {
       $form: $xeform,
       $grid: $xeform.xegrid
     };
-    var isRequired;
+    var isRequired = false;
+    var isValid = false;
     if (visible === false) {
       return _e();
     }
@@ -40552,7 +40598,8 @@ var VxeFormConfigItem = {
     }
     if (!readonly && rules) {
       var itemRules = rules[field];
-      if (itemRules) {
+      if (itemRules && itemRules.length) {
+        isValid = true;
         isRequired = itemRules.some(function (rule) {
           return rule.required;
         });
@@ -40579,8 +40626,11 @@ var VxeFormConfigItem = {
       class: ['vxe-form--item', item.id, span ? "vxe-form--item-col_".concat(span, " is--span") : null, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
         'is--title': title,
         'is--colon': titleColon,
+        'is--bold': titleBold,
+        'is--padding': itemPadding,
         'is--vertical': itemVertical,
         'is--asterisk': titleAsterisk,
+        'is--valid': isValid,
         'is--required': isRequired,
         'is--hidden': folding && collapseAll,
         'is--active': isActivetem($xeform, item),
@@ -40740,6 +40790,12 @@ function getResetValue(value, resetValue) {
         return conf.form.align;
       }
     },
+    titleBold: {
+      type: String,
+      default: function _default() {
+        return conf.form.titleBold;
+      }
+    },
     titleAlign: {
       type: String,
       default: function _default() {
@@ -40772,6 +40828,12 @@ function getResetValue(value, resetValue) {
       type: Boolean,
       default: null
     },
+    padding: {
+      type: Boolean,
+      default: function _default() {
+        return conf.form.padding;
+      }
+    },
     className: [String, Function],
     disabled: Boolean,
     readonly: Boolean,
@@ -40863,6 +40925,9 @@ function getResetValue(value, resetValue) {
         data: data,
         $form: this
       }) : className : '', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--loading', loading)],
+      attrs: {
+        spellcheck: false
+      },
       on: {
         submit: this.submitEvent,
         reset: this.resetEvent
@@ -41116,10 +41181,12 @@ function getResetValue(value, resetValue) {
         return this.$nextTick();
       }
       var fields = [];
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrItem)) {
-        fields = fieldOrItem;
-      } else {
-        fields = [fieldOrItem];
+      if (fieldOrItem) {
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrItem)) {
+          fields = fieldOrItem;
+        } else {
+          fields = [fieldOrItem];
+        }
       }
       return this.beginValidate(fields.map(function (field) {
         return handleFieldOrItem(_this6, field);
@@ -41315,13 +41382,10 @@ function getResetValue(value, resetValue) {
           if (!i) {
             dom.scrollToView($el.querySelector(".".concat(item.id)));
           }
+          var autoFocus = itemRender.autoFocus || itemRender.autofocus || (compConf ? compConf.formItemAutoFocus : null);
           // 如果指定了聚焦 class
-          if (itemRender.autofocus) {
-            inputElem = $el.querySelector(".".concat(item.id, " ").concat(itemRender.autofocus));
-          }
-          // 渲染器的聚焦处理
-          if (!inputElem && compConf && compConf.autofocus) {
-            inputElem = $el.querySelector(".".concat(item.id, " ").concat(compConf.autofocus));
+          if (autoFocus) {
+            inputElem = $el.querySelector(".".concat(item.id, " ").concat(autoFocus));
           }
           if (inputElem) {
             inputElem.focus();
@@ -41397,6 +41461,10 @@ var form_item_props = {
   size: String,
   span: [String, Number],
   align: String,
+  titleBold: {
+    type: Boolean,
+    default: null
+  },
   titleAlign: {
     type: String,
     default: null
@@ -41421,6 +41489,10 @@ var form_item_props = {
     type: Boolean,
     default: null
   },
+  padding: {
+    type: Boolean,
+    default: null
+  },
   className: [String, Function],
   contentClassName: [String, Function],
   contentStyle: [Object, Function],
@@ -41459,12 +41531,14 @@ var renderItem = function renderItem(h, _vm, item, slots) {
     readonly = _vm.readonly,
     collapseAll = _vm.collapseAll,
     validOpts = _vm.validOpts,
+    allTitleBold = _vm.titleBold,
     allTitleAlign = _vm.titleAlign,
     allTitleWidth = _vm.titleWidth,
     allTitleColon = _vm.titleColon,
     allTitleAsterisk = _vm.titleAsterisk,
     allTitleOverflow = _vm.titleOverflow,
-    allVertical = _vm.vertical;
+    allVertical = _vm.vertical,
+    allPadding = _vm.padding;
   var title = item.title,
     folding = item.folding,
     visible = item.visible,
@@ -41476,6 +41550,7 @@ var renderItem = function renderItem(h, _vm, item, slots) {
     className = item.className,
     titleOverflow = item.titleOverflow,
     vertical = item.vertical,
+    padding = item.padding,
     showTitle = item.showTitle,
     contentClassName = item.contentClassName,
     contentStyle = item.contentStyle,
@@ -41490,12 +41565,14 @@ var renderItem = function renderItem(h, _vm, item, slots) {
   var itemTitleStyle = compConf ? compConf.formItemTitleStyle || compConf.itemTitleStyle : null;
   var span = item.span || _vm.span;
   var align = item.align || _vm.align;
+  var itemPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(padding) ? allPadding : padding;
+  var itemVertical = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(vertical) ? allVertical : vertical;
+  var titleBold = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleBold) ? allTitleBold : item.titleBold;
   var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
-  var titleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
+  var titleWidth = itemVertical ? null : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
   var titleColon = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleColon) ? allTitleColon : item.titleColon;
   var titleAsterisk = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
-  var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(titleOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
-  var itemVertical = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(vertical) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(vertical) ? allVertical : vertical;
+  var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(titleOverflow) ? allTitleOverflow : titleOverflow;
   var ovEllipsis = itemOverflow === 'ellipsis';
   var ovTitle = itemOverflow === 'title';
   var ovTooltip = itemOverflow === true || itemOverflow === 'tooltip';
@@ -41510,13 +41587,15 @@ var renderItem = function renderItem(h, _vm, item, slots) {
     $form: _vm,
     $grid: _vm.xegrid
   };
-  var isRequired;
+  var isRequired = false;
+  var isValid = false;
   if (visible === false) {
     return _e();
   }
   if (!readonly && rules) {
     var itemRules = rules[field];
-    if (itemRules) {
+    if (itemRules && itemRules.length) {
+      isValid = true;
       isRequired = itemRules.some(function (rule) {
         return rule.required;
       });
@@ -41543,8 +41622,11 @@ var renderItem = function renderItem(h, _vm, item, slots) {
     class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
       'is--title': title,
       'is--colon': titleColon,
+      'is--bold': titleBold,
+      'is--padding': itemPadding,
       'is--vertical': itemVertical,
       'is--asterisk': titleAsterisk,
+      'is--valid': isValid,
       'is--required': isRequired,
       'is--hidden': folding && collapseAll,
       'is--active': isActivetem(_vm, item),