vxe-table 3.12.10-beta.0 → 3.12.10-beta.2

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.10-beta.0";
+const version = "3.12.10-beta.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2824,7 +2824,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.10-beta.0"}`;
+const log_version = `table v${"3.12.10-beta.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8413,16 +8413,21 @@ const Methods = {
    * 只对 tree-config 有效，获取行的父级
    */
   getTreeParentRow(rowOrRowid) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
     const {
-      treeConfig,
       fullDataRowIdData
-    } = this;
+    } = internalData;
     if (rowOrRowid && treeConfig) {
       let rowid;
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(rowOrRowid)) {
         rowid = rowOrRowid;
       } else {
-        rowid = getRowid(this, rowOrRowid);
+        rowid = getRowid($xeTable, rowOrRowid);
       }
       if (rowid) {
         const rest = fullDataRowIdData[rowid];
@@ -8449,10 +8454,14 @@ const Methods = {
    * 根据行获取行的唯一主键
    * @param {Row} row 行对象
    */
-  getRowid(row) {
+  getRowid(cellValue) {
     const $xeTable = this;
-    const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, getRowkey($xeTable));
-    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(rowid) ? '' : encodeURIComponent(rowid);
+    const internalData = $xeTable;
+    const {
+      fullDataRowIdData
+    } = internalData;
+    const rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(cellValue) ? '' : encodeURIComponent(cellValue || '');
+    return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
   },
   /**
    * 获取处理后的表格数据
@@ -8493,14 +8502,19 @@ const Methods = {
       const treeOpts = $xeTable.computeTreeOpts;
       const {
         transform,
-        mapChildrenField
+        mapChildrenField,
+        rowField,
+        parentField
       } = treeOpts;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       if (transform) {
         return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray(tableFullTreeData, {
           children: mapChildrenField
         }), {
-          children: childrenField
+          key: rowField,
+          parentKey: parentField,
+          children: childrenField,
+          mapChildren: mapChildrenField
         });
       }
       return tableFullTreeData.slice(0);