@gm-pc/keyboard 1.28.0-beta.9 → 1.28.1-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/keyboard",
-  "version": "1.28.0-beta.9",
+  "version": "1.28.1-beta.0",
   "description": "",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gm-pc#readme",
@@ -27,10 +27,9 @@
   },
   "dependencies": {
     "@gm-common/tool": "^2.10.0",
-    "@gm-pc/react": "^1.28.0-beta.9",
-    "@gm-pc/table-x": "^1.28.0-beta.9",
+    "@gm-pc/react": "^1.28.1-beta.0",
     "classnames": "^2.2.5",
     "lodash": "^4.17.19"
   },
-  "gitHead": "7fc1c5f55a36184f94825f800a6759d925bcf1ab"
+  "gitHead": "21e6355e34d987a7243fbdb16d3d3c4981a59344"
 }

package/src/hoc/keyboard_table_x.tsx

@@ -1,8 +1,11 @@
 import React, { ComponentType, FC, useMemo } from 'react'
-import { TableXCellProps, TableXProps } from '@gm-pc/table-x'
+import {
+  TableXCellProps,
+  TableXProps,
+  KeyboardTableXColumn,
+  KeyboardTableXProps,
+} from '@gm-pc/table-x'
 import { devWarnForHook } from '@gm-common/tool'
-
-import { KeyboardTableXColumn, KeyboardTableXProps } from '../types'
 import { getColumnKey, CellKeyContext } from '../utils'
 import Wrap from '../core/wrap'
 /**
@@ -99,6 +102,7 @@ function keyboardTableXHOC<Props extends TableXProps = TableXProps>(
         }
       }
     })
+    console.log(id, { leftFixedWidth, rightFixedWidth })
 
     return (
       <Wrap

package/src/index.ts

@@ -14,9 +14,7 @@ export { default as KCTableSelect } from './cell/table_select'
 export { default as KCDatePicker } from './cell/date_picker'
 export { default as KCSelect } from './cell/select'
 
-export type {
-  KeyboardTableXProps,
-  KeyboardTableXColumn,
-  KeyboardCustomEvent,
-  KeyboardDirection,
-} from './types'
+// 从 @gm-pc/table-x 重新导出这些类型以保持向后兼容
+export type { KeyboardTableXProps, KeyboardTableXColumn } from '@gm-pc/table-x'
+
+export type { KeyboardCustomEvent, KeyboardDirection } from './types'

package/src/types.ts

@@ -1,23 +1,4 @@
-import { TableXColumn } from '@gm-pc/table-x'
-
-type KeyboardTableXColumn = {
-  isKeyboard?: boolean
-} & TableXColumn
-
-interface KeyboardTableXProps {
-  /* 通过 id 来确定本单元格内通信，避免多表格时混了。请确保 id 唯一 */
-  id: string
-  columns: KeyboardTableXColumn[]
-  /** 按下键是否允许增加一行数据 */
-  allowAddRowOnDownKey?: boolean
-  /* 增加一行数据 */
-  onAddRow(): void
-  onBeforeDispatch?(options: {
-    actionName: string
-    to: { rowKey: number; columnKey: string }
-    from: { rowKey: number; columnKey: string }
-  }): boolean
-}
+import { KeyboardTableXColumn, KeyboardTableXProps } from '@gm-pc/table-x'
 
 type KeyboardDirection = 'left' | 'right' | 'up' | 'down'
 interface KeyboardCustomEvent {

package/src/utils/scroll_into_view_fixed_width.ts

@@ -1,7 +1,6 @@
-import { TableXUtil } from '@gm-pc/table-x'
+import { TABLE_X } from '@gm-pc/table-x'
 
 import { KeyboardWrapData } from '../types'
-const { TABLE_X } = TableXUtil
 
 function scrollIntoViewFixedWidth(
   dom: HTMLElement,