vxe-table 4.12.0-beta.1 → 4.12.0-beta.10

package/packages/table/src/util.ts

@@ -2,6 +2,7 @@ import { watch, reactive } from 'vue'
 import XEUtils from 'xe-utils'
 import { ColumnInfo } from './columnInfo'
 import { isPx, isScale } from '../../ui/src/dom'
+import { eqEmptyValue } from '../../ui/src/utils'
 
 import type { VxeTableConstructor, VxeTablePrivateMethods, VxeTableDefines } from '../../../types'
 
@@ -101,15 +102,37 @@ export function getRowUniqueId () {
 export function getRowkey ($xeTable: VxeTableConstructor) {
   const { props } = $xeTable
   const { computeRowOpts } = $xeTable.getComputeMaps()
-  const { rowId } = props
   const rowOpts = computeRowOpts.value
-  return rowId || rowOpts.keyField || '_X_ROW_KEY'
+  return `${props.rowId || rowOpts.keyField || '_X_ROW_KEY'}`
 }
 
 // 行主键 value
 export function getRowid ($xeTable: VxeTableConstructor, row: any) {
   const rowid = XEUtils.get(row, getRowkey($xeTable))
-  return XEUtils.eqNull(rowid) ? '' : encodeURIComponent(rowid)
+  return encodeRowid(rowid)
+}
+
+// 编码行主键
+export function encodeRowid (rowVal: string) {
+  return XEUtils.eqNull(rowVal) ? '' : encodeURIComponent(rowVal)
+}
+
+export function updateDeepRowKey (row: any, rowkey: string) {
+  let rowid = XEUtils.get(row, rowkey)
+  if (eqEmptyValue(rowid)) {
+    rowid = getRowUniqueId()
+    XEUtils.set(row, rowkey, rowid)
+  }
+  return rowid
+}
+
+export function updateFastRowKey (row: any, rowkey: string) {
+  let rowid = row[rowkey]
+  if (eqEmptyValue(rowid)) {
+    rowid = getRowUniqueId()
+    row[rowkey] = rowid
+  }
+  return rowid
 }
 
 export interface XEColumnInstance {
@@ -123,6 +146,14 @@ export const handleFieldOrColumn = ($xeTable: VxeTableConstructor, fieldOrColumn
   return null
 }
 
+export const handleRowidOrRow = ($xeTable: VxeTableConstructor, rowidOrRow: any) => {
+  if (rowidOrRow) {
+    const rowid = XEUtils.isString(rowidOrRow) || XEUtils.isNumber(rowidOrRow) ? rowidOrRow : getRowid($xeTable, rowidOrRow)
+    return $xeTable.getRowById(rowid)
+  }
+  return null
+}
+
 function getPaddingLeftRightSize (elem: HTMLElement | null) {
   if (elem) {
     const computedStyle = getComputedStyle(elem)

package/packages/toolbar/src/toolbar.ts

@@ -210,9 +210,7 @@ export default defineComponent({
             if (tCommandMethod) {
               tCommandMethod(params)
             } else {
-              if (process.env.VUE_APP_VXE_ENV === 'development') {
-                errLog('vxe.error.notCommands', [code])
-              }
+              errLog('vxe.error.notCommands', [code])
             }
           }
           $xeToolbar.dispatchEvent('button-click', params, evnt)
@@ -235,9 +233,7 @@ export default defineComponent({
             if (tCommandMethod) {
               tCommandMethod(params)
             } else {
-              if (process.env.VUE_APP_VXE_ENV === 'development') {
-                errLog('vxe.error.notCommands', [code])
-              }
+              errLog('vxe.error.notCommands', [code])
             }
           }
           $xeToolbar.dispatchEvent('tool-click', params, evnt)
@@ -598,25 +594,21 @@ export default defineComponent({
         warnLog('vxe.error.notFunc', ['queryMethod'])
       }
       const customOpts = computeCustomOpts.value
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (customOpts.isFooter) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter'])
-        }
-        if (customOpts.showFooter) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter'])
-        }
-        if (customOpts.immediate) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate'])
-        }
-        if (customOpts.trigger) {
-          warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger'])
-        }
+      if (customOpts.isFooter) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter'])
       }
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (props.refresh || props.import || props.export || props.print || props.zoom) {
-          if (!VxeUIButtonComponent) {
-            errLog('vxe.error.reqComp', ['vxe-button'])
-          }
+      if (customOpts.showFooter) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter'])
+      }
+      if (customOpts.immediate) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate'])
+      }
+      if (customOpts.trigger) {
+        warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger'])
+      }
+      if (props.refresh || props.import || props.export || props.print || props.zoom) {
+        if (!VxeUIButtonComponent) {
+          errLog('vxe.error.reqComp', ['vxe-button'])
         }
       }
     })