vxe-table 3.4.8 → 3.4.10

package/packages/grid/src/grid.js

@@ -462,7 +462,7 @@ export default {
      * @param {String/Object} code 字符串或对象
      */
     commitProxy (proxyTarget, ...args) {
-      const { $refs, toolbar, toolbarConfig, toolbarOpts, proxyOpts, tablePage, pagerConfig, formData, isMsg } = this
+      const { $refs, toolbar, toolbarConfig, toolbarOpts, proxyOpts, tablePage, pagerConfig, editRules, formData, isMsg } = this
       const { beforeQuery, afterQuery, beforeDelete, afterDelete, beforeSave, afterSave, ajax = {}, props: proxyProps = {} } = proxyOpts
       const $xetable = $refs.xTable
       let button
@@ -669,8 +669,12 @@ export default {
             if (pendingRecords.length) {
               body.insertRecords = insertRecords.filter(row => pendingRecords.indexOf(row) === -1)
             }
-            // 只校验新增和修改的数据
-            return this.validate(body.insertRecords.concat(updateRecords)).then((errMap) => {
+            let restPromise = Promise.resolve()
+            if (editRules) {
+              // 只校验新增和修改的数据
+              restPromise = this.validate(body.insertRecords.concat(updateRecords))
+            }
+            return restPromise.then((errMap) => {
               if (errMap) {
                 // 如果校验不通过
                 return

package/packages/input/src/input.js

@@ -1031,6 +1031,19 @@ export default {
       this.inputValue = val
       this.changeValue()
     },
+    type () {
+      // 切换类型是重置内置变量
+      Object.assign(this, {
+        inputValue: this.value,
+        datetimePanelValue: null,
+        datePanelValue: null,
+        datePanelLabel: '',
+        datePanelType: 'day',
+        selectMonth: null,
+        currentDate: null
+      })
+      this.initValue()
+    },
     dateLabelFormat () {
       this.dateParseValue(this.datePanelValue)
       this.inputValue = this.datePanelLabel

package/packages/table/src/body.js

@@ -12,10 +12,20 @@ function isOperateMouse ($xetable) {
   return $xetable._isResize || ($xetable.lastScrollTime && Date.now() < $xetable.lastScrollTime + $xetable.delayHover)
 }
 
-function renderLine (h, _vm, $xetable, rowLevel, items, params) {
-  const column = params.column
-  const { treeOpts, treeConfig } = $xetable
+function renderLine (h, _vm, $xetable, params) {
+  const { row, column } = params
+  const { treeOpts, treeConfig, fullAllDataRowIdData } = $xetable
   const { slots, treeNode } = column
+  const rowid = UtilTools.getRowid($xetable, row)
+  const rest = fullAllDataRowIdData[rowid]
+  let rLevel = 0
+  let rIndex = 0
+  let items = []
+  if (rest) {
+    rLevel = rest.level
+    rIndex = rest._index
+    items = rest.items
+  }
   if (slots && slots.line) {
     return $xetable.callSlot(slots.line, params, h)
   }
@@ -27,8 +37,8 @@ function renderLine (h, _vm, $xetable, rowLevel, items, params) {
         h('div', {
           class: 'vxe-tree--line',
           style: {
-            height: `${calcTreeLine(params, items)}px`,
-            left: `${(rowLevel * treeOpts.indent) + (rowLevel ? 2 - getOffsetSize($xetable) : 0) + 16}px`
+            height: `${calcTreeLine(params, items, rIndex)}px`,
+            left: `${(rLevel * treeOpts.indent) + (rLevel ? 2 - getOffsetSize($xetable) : 0) + 16}px`
           }
         })
       ])
@@ -213,7 +223,7 @@ function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, r
   } else {
     // 渲染单元格
     tdVNs.push(
-      ...renderLine(h, _vm, $xetable, rowLevel, items, params),
+      ...renderLine(h, _vm, $xetable, params),
       h('div', {
         class: ['vxe-cell', {
           'c--title': showTitle,
@@ -286,7 +296,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
     checkboxOpts,
     expandColumn,
     hasFixedColumn,
-    fullDataRowIdData,
+    fullAllDataRowIdData,
     rowOpts
   } = $xetable
   const rows = []
@@ -312,7 +322,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
       }
     }
     const rowid = UtilTools.getRowid($xetable, row)
-    const rest = fullDataRowIdData[rowid]
+    const rest = fullAllDataRowIdData[rowid]
     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 }

package/packages/table/src/methods.js

@@ -1241,36 +1241,28 @@ const Methods = {
       XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
         const rowid = getRowid(this, row)
         const allrest = fullAllDataRowIdData[rowid]
-        const fullrest = fullDataRowIdData[rowid]
         const seq = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('')
         if (allrest) {
           allrest.seq = seq
           allrest._index = index
-        }
-        if (fullrest) {
-          fullrest.seq = seq
-          fullrest._index = index
         } else {
-          fullAllDataRowIdData[rowid] = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 }
-          fullDataRowIdData[rowid] = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 }
+          const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 }
+          fullAllDataRowIdData[rowid] = rest
+          fullDataRowIdData[rowid] = rest
         }
       }, { children: treeOpts.mapChildren })
     } else {
       afterFullData.forEach((row, index) => {
         const rowid = getRowid(this, row)
         const allrest = fullAllDataRowIdData[rowid]
-        const fullrest = fullDataRowIdData[rowid]
         const seq = index + 1
         if (allrest) {
           allrest.seq = seq
           allrest._index = index
-        }
-        if (fullrest) {
-          fullrest.seq = seq
-          fullrest._index = index
         } else {
-          fullAllDataRowIdData[rowid] = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 }
-          fullDataRowIdData[rowid] = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 }
+          const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, items: [], parent: null, level: 0 }
+          fullAllDataRowIdData[rowid] = rest
+          fullDataRowIdData[rowid] = rest
         }
       })
     }
@@ -3843,6 +3835,7 @@ const Methods = {
         return this.handleAsyncTreeExpandChilds(row)
       }).then(() => {
         if (transform) {
+          this.handleVirtualTreeToList()
           return this.handleTableData()
         }
       }).then(() => {
@@ -4057,7 +4050,9 @@ const Methods = {
     return this.handleTableData().then(() => {
       if (transform) {
         this.handleVirtualTreeToList()
+        return this.handleTableData()
       }
+    }).then(() => {
       if (isExists) {
         this.recalculate()
       }
@@ -4559,10 +4554,14 @@ const Methods = {
       }
     }
     return cellLabel
-  }
+  },
   /*************************
    * Publish methods
    *************************/
+
+  getSetupOptions () {
+    return GlobalConfig
+  }
 }
 
 // Module methods

package/packages/table/src/util.js

@@ -115,9 +115,12 @@ export function getColMinWidth (params) {
 }
 
 function countTreeExpand (prevRow, params) {
+  let count = 1
+  if (!prevRow) {
+    return count
+  }
   const { $table } = params
   const rowChildren = prevRow[$table.treeOpts.children]
-  let count = 1
   if ($table.isTreeExpandByRow(prevRow)) {
     for (let index = 0; index < rowChildren.length; index++) {
       count += countTreeExpand(rowChildren[index], params)
@@ -130,13 +133,13 @@ export function getOffsetSize ($xetable) {
   return lineOffsetSizes[$xetable.vSize] || 0
 }
 
-export function calcTreeLine (params, items) {
-  const { $table, $rowIndex } = params
+export function calcTreeLine (params, items, rIndex) {
+  const { $table } = params
   let expandSize = 1
-  if ($rowIndex) {
-    expandSize = countTreeExpand(items[$rowIndex - 1], params)
+  if (rIndex) {
+    expandSize = countTreeExpand(items[rIndex - 1], params)
   }
-  return $table.rowHeight * expandSize - ($rowIndex ? 1 : (12 - getOffsetSize($table)))
+  return $table.rowHeight * expandSize - (rIndex ? 1 : (12 - getOffsetSize($table)))
 }
 
 export function mergeBodyMethod (mergeList, _rowIndex, _columnIndex) {

package/packages/validator/src/mixin.js

@@ -1,4 +1,5 @@
 import XEUtils from 'xe-utils'
+import GlobalConfig from '../../v-x-e-table/src/conf'
 import { UtilTools, DomTools } from '../../tools'
 import { eqEmptyValue } from '../../tools/src/utils'
 
@@ -158,14 +159,19 @@ export default {
             }
           })
         }).catch(firstErrParams => {
-          return new Promise((resolve) => {
+          return new Promise((resolve, reject) => {
             const finish = () => {
               this.$nextTick(() => {
                 if (cb) {
                   cb(validRest)
                   resolve()
                 } else {
-                  resolve(validRest)
+                  if (GlobalConfig.validToReject === 'obsolete') {
+                    // 已废弃，校验失败将不会执行catch
+                    reject(validRest)
+                  } else {
+                    resolve(validRest)
+                  }
                 }
               })
             }