vxe-table 4.18.0-beta.2 → 4.18.0-beta.20

package/es/table/src/util.js

@@ -76,6 +76,7 @@ export function createInternalData() {
         fullDataRowIdData: {},
         // 数据集（仅可视）
         visibleDataRowIdData: {},
+        keepUpdateFieldMaps: {},
         footerFullDataRowData: {},
         // 渲染中缓存数据
         sourceDataRowIdData: {},
@@ -131,6 +132,7 @@ export function createInternalData() {
 }
 export function createReactData() {
     return {
+        updateColFlag: 0,
         // 低性能的静态列
         staticColumns: [],
         // 渲染的列分组
@@ -200,7 +202,8 @@ export function createReactData() {
             activeBtn: false,
             activeWrapper: false,
             visible: false,
-            maxHeight: 0,
+            maxHeight: null,
+            popupTop: 0,
             oldSortMaps: {},
             oldFixedMaps: {},
             oldVisibleMaps: {}
@@ -508,11 +511,18 @@ export function restoreScrollLocation($xeTable, scrollLeft, scrollTop) {
     }
     return $xeTable.clearScroll();
 }
+export function getRowUniqueId() {
+    return XEUtils.uniqueId('row_');
+}
 /**
  * 生成行的唯一主键
  */
-export function getRowUniqueId() {
-    return XEUtils.uniqueId('row_');
+export function createRowId(rowOpts, row, keyField) {
+    const { createKeyMethod } = rowOpts;
+    if (createKeyMethod) {
+        return createKeyMethod({ row, keyField });
+    }
+    return getRowUniqueId();
 }
 export function hasDeepKey(rowKey) {
     return rowKey.indexOf('.') > -1;
@@ -531,11 +541,13 @@ export function getRowid($xeTable, row) {
 export function createHandleUpdateRowId($xeTable) {
     const internalData = $xeTable.internalData;
     const { isCurrDeepKey, currKeyField } = internalData;
+    const { computeRowOpts } = $xeTable.getComputeMaps();
+    const rowOpts = computeRowOpts.value;
     const updateRId = isCurrDeepKey ? updateDeepRowKey : updateFastRowKey;
     return {
         rowKey: currKeyField,
         handleUpdateRowId(row) {
-            return row ? updateRId(row, currKeyField) : '';
+            return row ? updateRId(rowOpts, row, currKeyField) : '';
         }
     };
 }
@@ -557,10 +569,11 @@ export function encodeRowid(rowVal) {
 function getDeepRowIdByKey(row, rowKey) {
     return XEUtils.get(row, rowKey);
 }
-export function updateDeepRowKey(row, rowKey) {
+function updateDeepRowKey(rowOpts, row, rowKey) {
     let rowid = encodeRowid(getDeepRowIdByKey(row, rowKey));
     if (eqEmptyValue(rowid)) {
-        rowid = getRowUniqueId();
+        const newRowid = createRowId(rowOpts, row, rowKey);
+        rowid = '' + newRowid;
         XEUtils.set(row, rowKey, rowid);
     }
     return rowid;
@@ -568,11 +581,12 @@ export function updateDeepRowKey(row, rowKey) {
 function getFastRowIdByKey(row, rowKey) {
     return row[rowKey];
 }
-export function updateFastRowKey(row, rowKey) {
+function updateFastRowKey(rowOpts, row, rowKey) {
     let rowid = encodeRowid(getFastRowIdByKey(row, rowKey));
     if (eqEmptyValue(rowid)) {
-        rowid = getRowUniqueId();
-        row[rowKey] = rowid;
+        const newRowid = createRowId(rowOpts, row, rowKey);
+        rowid = '' + newRowid;
+        row[rowKey] = newRowid;
     }
     return rowid;
 }