vxe-table 4.12.0-beta.9 → 4.12.0

package/packages/table/src/util.ts

@@ -112,25 +112,57 @@ export function getRowid ($xeTable: VxeTableConstructor, row: any) {
   return encodeRowid(rowid)
 }
 
+export function createHandleUpdateRowId ($xeTable: VxeTableConstructor) {
+  const rowKey = getRowkey($xeTable)
+  const isDeepKey = rowKey.indexOf('.') > -1
+  const updateRId = isDeepKey ? updateDeepRowKey : updateFastRowKey
+  return {
+    rowKey,
+    handleUpdateRowId (row: any) {
+      return row ? updateRId(row, rowKey) : null
+    }
+  }
+}
+
+export function createHandleGetRowId ($xeTable: VxeTableConstructor) {
+  const rowKey = getRowkey($xeTable)
+  const isDeepKey = rowKey.indexOf('.') > -1
+  const getRId = isDeepKey ? getDeepRowIdByKey : getFastRowIdByKey
+  return {
+    rowKey,
+    handleGetRowId (row: any) {
+      return row ? getRId(row, rowKey) : null
+    }
+  }
+}
+
 // 编码行主键
 export function encodeRowid (rowVal: string) {
   return XEUtils.eqNull(rowVal) ? '' : encodeURIComponent(rowVal)
 }
 
-export function updateDeepRowKey (row: any, rowkey: string) {
-  let rowid = XEUtils.get(row, rowkey)
+function getDeepRowIdByKey (row: any, rowKey: string) {
+  return XEUtils.get(row, rowKey)
+}
+
+export function updateDeepRowKey (row: any, rowKey: string) {
+  let rowid = getDeepRowIdByKey(row, rowKey)
   if (eqEmptyValue(rowid)) {
     rowid = getRowUniqueId()
-    XEUtils.set(row, rowkey, rowid)
+    XEUtils.set(row, rowKey, rowid)
   }
   return rowid
 }
 
-export function updateFastRowKey (row: any, rowkey: string) {
-  let rowid = row[rowkey]
+function getFastRowIdByKey (row: any, rowKey: string) {
+  return row[rowKey]
+}
+
+export function updateFastRowKey (row: any, rowKey: string) {
+  let rowid = getFastRowIdByKey(row, rowKey)
   if (eqEmptyValue(rowid)) {
     rowid = getRowUniqueId()
-    row[rowkey] = rowid
+    row[rowKey] = rowid
   }
   return rowid
 }
@@ -356,6 +388,7 @@ export function destroyColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMe
 
 export function getRootColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, column: ColumnInfo) {
   const { internalData } = $xeTable
+
   const { fullColumnIdData } = internalData
   if (!column) {
     return null

package/packages/ui/index.ts

@@ -129,6 +129,7 @@ VxeUI.setConfig({
       // remote: false,
       // filterMethod: null,
       // destroyOnClose: false,
+      // isEvery: false,
       showIcon: true
     },
     treeConfig: {