vxe-table 3.7.9-beta.0 → 3.7.9-beta.1

package/packages/edit/src/mixin.js

@@ -29,7 +29,7 @@ function insertTreeRow (_vm, newRecords, isAppend) {
       }
       parentChilds[funcName](item)
       mapChilds[funcName](item)
-      const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds, parent, level: parentLevel + 1 }
+      const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds, parent: parentRow, level: parentLevel + 1 }
       fullDataRowIdData[rowid] = rest
       fullAllDataRowIdData[rowid] = rest
     } else {
@@ -55,7 +55,7 @@ function handleInsertRowAt (_vm, records, row, isInsertNextRow) {
     records = [records]
   }
   const newRecords = _vm.defineField(records.map(record => Object.assign(treeConfig && transform ? { [mapChildrenField]: [], [childrenField]: [] } : {}, record)))
-  if (!row) {
+  if (XEUtils.eqNull(row)) {
   // 如果为虚拟树
     if (treeConfig && transform) {
       insertTreeRow(_vm, newRecords, false)

package/packages/table/src/body.js

@@ -87,7 +87,7 @@ function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, r
     columnOpts,
     validErrorMaps
   } = $xetable
-  const { type, cellRender, editRender, align, showOverflow, className, treeNode } = column
+  const { type, cellRender, editRender, align, showOverflow, className, treeNode, slots } = column
   const { actived } = editStore
   const { rHeight: scrollYRHeight } = sYOpts
   const { height: rowHeight } = rowOpts
@@ -245,13 +245,16 @@ function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, r
       }, column.renderCell(h, params))
     )
     if (showValidTip && errorValidItem) {
+      const errRule = errorValidItem.rule
+      const validSlot = slots ? slots.valid : null
+      const validParams = { ...params, ...errorValidItem }
       tdVNs.push(
         h('div', {
-          class: 'vxe-cell--valid-error-hint',
-          style: errorValidItem.rule && errorValidItem.rule.maxWidth ? {
-            width: `${errorValidItem.rule.maxWidth}px`
+          class: ['vxe-cell--valid-error-hint', UtilTools.getClass(validOpts.className, errorValidItem)],
+          style: errRule && errRule.maxWidth ? {
+            width: `${errRule.maxWidth}px`
           } : null
-        }, [
+        }, validSlot ? $xetable.callSlot(validSlot, validParams, h) : [
           h('span', {
             class: 'vxe-cell--valid-error-msg'
           }, errorValidItem.content)

package/packages/table/src/methods.js

@@ -680,7 +680,8 @@ const Methods = {
       }
       XEUtils.eachTree(rows, (childRow, index, items, path, parent, nodes) => {
         const rowid = getRowid(this, childRow)
-        const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, items, parent, level: parentLevel + nodes.length }
+        const parentRow = parent || row
+        const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, items, parent: parentRow, level: parentLevel + nodes.length }
         fullDataRowIdData[rowid] = rest
         fullDataRowMap.set(childRow, rest)
         fullAllDataRowIdData[rowid] = rest
@@ -1382,7 +1383,8 @@ const Methods = {
         rowid = getRowid(this, rowOrRowid)
       }
       if (rowid) {
-        return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].parent : null
+        const rest = fullDataRowIdData[rowid]
+        return rest ? rest.parent : null
       }
     }
     return null

package/packages/tools/dom.js

@@ -132,9 +132,11 @@ export const DomTools = {
     return getNodeOffset(elem, container, { left: 0, top: 0 })
   },
   getAbsolutePos (elem) {
+    // 当主页面嵌套在iframe时，elem.getBoundingClientRect()仅计算在当前body内的边界距离，忽略了body所在的边界距离
+    const bodyBounding = document.body.getBoundingClientRect()
     const bounding = elem.getBoundingClientRect()
-    const boundingTop = bounding.top
-    const boundingLeft = bounding.left
+    const boundingTop = bounding.top - bodyBounding.top
+    const boundingLeft = bounding.left - bodyBounding.left
     const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode()
     return { boundingTop, top: scrollTop + boundingTop, boundingLeft, left: scrollLeft + boundingLeft, visibleHeight, visibleWidth }
   },