diff --git a/.gitignore b/.gitignore index d337487a..671b4fac 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,6 @@ dist-ssr .env .cache server/dist -public/dist \ No newline at end of file +public/dist +es +lib \ No newline at end of file diff --git a/packages/gbeata/.fatherrc.ts b/packages/gbeata/.fatherrc.ts index ab2a6253..593241c8 100644 --- a/packages/gbeata/.fatherrc.ts +++ b/packages/gbeata/.fatherrc.ts @@ -2,15 +2,26 @@ import { defineConfig } from 'father'; export default defineConfig({ // more father config: https://github.com/umijs/father/blob/master/docs/config.md - esm: { output: 'dist' }, - extraBabelPlugins: [ - [ - 'babel-plugin-import', - { - libraryName: 'antd', - libraryDirectory: 'es', - style: true, - }, - ], - ], + cjs: { + output: 'lib', + // input: 'src/index.ts', + }, + esm: { + output: 'es', + // input: 'src/index.ts', + }, + umd: { + output: 'dist', + entry: 'src/index.ts', + }, + // extraBabelPlugins: [ + // [ + // 'babel-plugin-import', + // { + // libraryName: 'antd', + // libraryDirectory: 'es', + // style: true, + // }, + // ], + // ], }); diff --git a/packages/gbeata/docs/components/EditTable.md b/packages/gbeata/docs/components/EditTable.md index 18aab33a..47106ec0 100644 --- a/packages/gbeata/docs/components/EditTable.md +++ b/packages/gbeata/docs/components/EditTable.md @@ -12,7 +12,7 @@ order: 2 ```js // 需要设置先设置表格的编辑模式 - + ``` ## 可编辑行 @@ -21,7 +21,7 @@ order: 2 ```js // 需要设置先设置表格的编辑模式 - + ``` ## editable @@ -41,10 +41,10 @@ order: 2 扩展一个简易版的 number 类型编辑框。 ```js -import { registerTableRender, RenderProps } from 'multiway' +import { registerTableRender, RenderProps } from 'gbeata' import { InputNumber } from 'antd' -// 全局注册一次，放在全局 /multiway/index.tsx 里面 +// 全局注册一次，放在全局 /gbeata/index.tsx 里面 registerTableRender('editable-cell-number', ({ text, field }: RenderProps) => { return ({ editing, mode, save }: AnyKeyProps) => { return !editing ? text : diff --git a/packages/gbeata/docs/components/RegisterFieldDemo.tsx b/packages/gbeata/docs/components/RegisterFieldDemo.tsx index 81c657d7..f47d8f19 100644 --- a/packages/gbeata/docs/components/RegisterFieldDemo.tsx +++ b/packages/gbeata/docs/components/RegisterFieldDemo.tsx @@ -5,7 +5,7 @@ import CharaSelect from './CharaSelect'; // 注册自定义类型表单项 // 注册一个角色选择 -// 这段代码放在 /src/multiway/index 下面 +// 这段代码放在 /src/gbeata/index 下面 registerField('chara-select', { type: 'chara-select', defaultValue: '', diff --git a/packages/gbeata/docs/components/registerAction.md b/packages/gbeata/docs/components/registerAction.md index ad5a4e33..a2228604 100644 --- a/packages/gbeata/docs/components/registerAction.md +++ b/packages/gbeata/docs/components/registerAction.md @@ -4,7 +4,7 @@ group: 全局配置 # 注册 action 事件 -这个页面的代码是写在 `/src/multiway/index.tsx` 文件里的，如果你还没有，可点击 [这里](../) 查看如何创建。 +这个页面的代码是写在 `/src/gbeata/index.tsx` 文件里的，如果你还没有，可点击 [这里](../) 查看如何创建。 ## registerAction @@ -108,7 +108,7 @@ registerAction('actionName', (props, record, searchTable) => { ## 覆盖默认实现 -multiway 自带 action： +gbeata 自带 action： 1. view: 查看 2. update: 修改 @@ -118,7 +118,7 @@ multiway 自带 action： 你可以注册同名的 action 来覆盖原本的实现。 -自带的 action: https://github.com/viewweiwu/multiway/blob/master/src/gAction/index.tsx +自带的 action: https://github.com/viewweiwu/gbeata/blob/master/src/gAction/index.tsx ```js /** diff --git a/packages/gbeata/docs/components/registerField.md b/packages/gbeata/docs/components/registerField.md index 657bd63a..d0b97d69 100644 --- a/packages/gbeata/docs/components/registerField.md +++ b/packages/gbeata/docs/components/registerField.md @@ -27,7 +27,7 @@ group: 全局配置 * @desc render 函数参数 * @desc render 出来组件需要支持组件受控 * @param field 当前表单项 - * @param setFieldsValue 设置表单值，MwForm 的 setFieldsValue + * @param setFieldsValue 设置表单值，GForm 的 setFieldsValue * @param getFieldValue 获取某个表单项的值 * @param readonly 是否只读 * @param formInstans 可以调用表单方法 diff --git a/packages/gbeata/docs/components/setDefaultDataFilter.md b/packages/gbeata/docs/components/setDefaultDataFilter.md index 91bc7a04..4ea06a36 100644 --- a/packages/gbeata/docs/components/setDefaultDataFilter.md +++ b/packages/gbeata/docs/components/setDefaultDataFilter.md @@ -66,7 +66,7 @@ const listApi = () => axios.get('/some/list') ``` -如果接口放回的格式是上面的格式，请把下面的配置文件复制到 `/src/multiway/index.tsx` 下。 +如果接口放回的格式是上面的格式，请把下面的配置文件复制到 `/src/gbeata/index.tsx` 下。 ```js import { setDefaultDataFilter } from 'gbeata'; diff --git a/packages/gbeata/docs/components/setPermissionList.md b/packages/gbeata/docs/components/setPermissionList.md index 5d252b8d..5f5f78ce 100644 --- a/packages/gbeata/docs/components/setPermissionList.md +++ b/packages/gbeata/docs/components/setPermissionList.md @@ -4,11 +4,11 @@ group: 全局配置 # 按钮权限控制 -此参数用于控制 MwButton 或者 MwAction 的展示权限。 +此参数用于控制 GButton 或者 GAction 的展示权限。 ```tsx import React from 'react'; -import { MwButton, MwCtrl, MwAction, setPermissionList } from 'multiway'; +import { GButton, GCtrl, GAction, setPermissionList } from 'gbeata'; import { Space } from 'antd'; export default function Demo() { @@ -23,14 +23,14 @@ export default function Demo() { return ( <> - 设置权限 - 清空权限 + 设置权限 + 清空权限
- 删除 - - 删除 - + 删除 + + 删除 +
); @@ -38,7 +38,7 @@ export default function Demo() { ``` ```js -import { setPermissionList } from 'multiway'; +import { setPermissionList } from 'gbeata'; const addPermission = () => { setPermissionList(['delete']); diff --git a/packages/gbeata/package.json b/packages/gbeata/package.json index 5fb13dbf..6eba2c1c 100644 --- a/packages/gbeata/package.json +++ b/packages/gbeata/package.json @@ -38,7 +38,9 @@ "dependencies": { "@minko-fe/use-antd-resizable-header": "^2.9.0", "dumi-theme-antd-style": "^0.29.7", - "moment": "^2.29.4" + "moment": "^2.29.4", + "@ant-design/icons": "^5.2.6", + "antd": "^5.12.1" }, "devDependencies": { "@commitlint/cli": "^17.1.2", diff --git a/packages/gbeata/src/GAction/index.tsx b/packages/gbeata/src/GAction/index.tsx index 40ea5a2e..2f0dd27b 100644 --- a/packages/gbeata/src/GAction/index.tsx +++ b/packages/gbeata/src/GAction/index.tsx @@ -314,7 +314,7 @@ registerAction('editable-delete', (props, record, searchTable) => { onConfirm: () => { const key = getKey(record, searchTable?.rowKey); searchTable.tableRef.current.deleteRowByKey(key); - props.callback && props.callback(key); + props.callback?.(key); }, ...props, }; @@ -334,7 +334,7 @@ registerAction('editable-add', (props, _record, searchTable) => { }, onClick: () => { searchTable.tableRef.current.addRow({ - [getRowKey({}, searchTable?.rowKey)]: Date.now(), + [getRowKey({}, searchTable?.rowKey) as any]: Date.now(), // 正在编辑 editing: true, // 新增标识 diff --git a/packages/gbeata/src/GButton/index.d.ts b/packages/gbeata/src/GButton/index.d.ts index 7583ac59..bdd3cb95 100644 --- a/packages/gbeata/src/GButton/index.d.ts +++ b/packages/gbeata/src/GButton/index.d.ts @@ -1,7 +1,7 @@ import { GButtonProps } from './g-button'; -declare const MwButton: React.ForwardRefExoticComponent< +declare const GButton: React.ForwardRefExoticComponent< GButtonProps & React.RefAttributes >; -export default MwButton; +export default GButton; diff --git a/packages/gbeata/src/GCtrl/index.d.ts b/packages/gbeata/src/GCtrl/index.d.ts index cec188e4..5bd3f1d3 100644 --- a/packages/gbeata/src/GCtrl/index.d.ts +++ b/packages/gbeata/src/GCtrl/index.d.ts @@ -1,7 +1,7 @@ import { GCtrlProps } from './g-ctrl'; -declare const MwCtrl: React.ForwardRefExoticComponent< +declare const GCtrl: React.ForwardRefExoticComponent< GCtrlProps & React.RefAttributes >; -export default MwCtrl; +export default GCtrl; diff --git a/packages/gbeata/src/GCtrl/index.tsx b/packages/gbeata/src/GCtrl/index.tsx index 431b1236..ce574971 100644 --- a/packages/gbeata/src/GCtrl/index.tsx +++ b/packages/gbeata/src/GCtrl/index.tsx @@ -3,7 +3,7 @@ import { Divider, Dropdown, Menu, Space } from 'antd'; import classNames from 'classnames'; import React, { ReactNode, useEffect, useState } from 'react'; import GAction from '../GAction'; -import MwButton, { addRefresh, hasPermission } from '../GButton'; +import GButton, { addRefresh, hasPermission } from '../GButton'; import { CTRL_DEFAULT_MAX, CTRL_DEFAULT_MORE_TEXT } from '../constant'; import locale from '../locale'; import { AnyKeyProps } from '../types/AnyKeyProps'; @@ -27,7 +27,7 @@ const getCtrlItem = (node: any, key?: any, defaultProps?: AnyKeyProps) => { }; /** - * 将子节点转化成 MwAction 按钮 + * 将子节点转化成 GAction 按钮 * @param children 子节点 */ const getCtrlList = ( @@ -99,9 +99,9 @@ const getCtrlList = ( ctrlList.push( - + {more} - + , ); } diff --git a/packages/gbeata/src/GDialog/index.d.ts b/packages/gbeata/src/GDialog/index.d.ts index 471906c7..81df7a80 100644 --- a/packages/gbeata/src/GDialog/index.d.ts +++ b/packages/gbeata/src/GDialog/index.d.ts @@ -1,4 +1,4 @@ -export { default as MwDialog } from './g-dialog'; +export { default as GDialog } from './g-dialog'; import { GDialogProps } from './g-dialog'; diff --git a/packages/gbeata/src/GDialog/index.tsx b/packages/gbeata/src/GDialog/index.tsx index d40b0b5f..f099a3e1 100644 --- a/packages/gbeata/src/GDialog/index.tsx +++ b/packages/gbeata/src/GDialog/index.tsx @@ -69,7 +69,7 @@ export const setGlobalDialogField = (cb: () => ModalProps) => { defaultProps = { ...cb(), ...defaultProps }; }; -export default function MwDialog(props: GDialogProps) { +export default function GDialog(props: GDialogProps) { const { title, titleBefore, diff --git a/packages/gbeata/src/GDialogForm/index.d.ts b/packages/gbeata/src/GDialogForm/index.d.ts index 19d18b8f..568f9d39 100644 --- a/packages/gbeata/src/GDialogForm/index.d.ts +++ b/packages/gbeata/src/GDialogForm/index.d.ts @@ -1,7 +1,7 @@ import { GDialogFormProps } from './g-dialog-form'; -declare const MwDialogForm: React.ForwardRefExoticComponent< +declare const GDialogForm: React.ForwardRefExoticComponent< GDialogFormProps & React.RefAttributes >; -export default MwDialogForm; +export default GDialogForm; diff --git a/packages/gbeata/src/GDialogForm/index.md b/packages/gbeata/src/GDialogForm/index.md index 4db2e6ee..9712c0fc 100644 --- a/packages/gbeata/src/GDialogForm/index.md +++ b/packages/gbeata/src/GDialogForm/index.md @@ -501,7 +501,7 @@ export default function AyDialogFormDemo() { ## 另一种使用方式 -gbeata 提供了另一种使用方式，通过 add()、update()、view() 方法，可以减少声明 `state` 的声明，在 `MwSearchTable` 里，内嵌的 `GDialogForm` 也默认的是此使用方式。 +gbeata 提供了另一种使用方式，通过 add()、update()、view() 方法，可以减少声明 `state` 的声明，在 `GSearchTable` 里，内嵌的 `GDialogForm` 也默认的是此使用方式。 ```tsx import React, { useRef } from 'react'; @@ -584,13 +584,13 @@ export default function AyDialogFormDemo() { | name | 弹窗名字，一般不需要设置。 | string | - | - | | width | 弹窗宽度。 | number | - | - | | span | 每个 Field 所占的 span 值。 | number | 24 | - | -| fields | 表单项，跟 MwForm 一致。 | Array[MwFormField] | - | - | +| fields | 表单项，跟 GForm 一致。 | Array[GFormField] | - | - | | addApi | 进入编辑模式。 | Promise | - | - | | updateApi | 进出详情模式。 | Promise | - | - | | beforeSubmit | 表单的提交前校验，return false 则不会提交。 | (params?: AnyKeyProps, mode?: string) => boolean \| obejct | - | - | | dialogOnly | 是否只使用申明了 dialog 的 Field。 | boolean | false | - | -| dialogExtend | [MwDialog](../mw-dialog#参数) 的扩展值。 | object | - | - | -| formExtend | [MwForm](../form#props-参数) 的扩展值。 | object | - | - | +| dialogExtend | [GDialog](../mw-dialog#参数) 的扩展值。 | object | - | - | +| formExtend | [GForm](../form#props-参数) 的扩展值。 | object | - | - | | autoClose | 成功后是否自动关闭弹窗。 | boolean | true | - | | drawer | 是否用 Drawer 替换 Modal。 | boolean | false | - | | visible | 弹窗是否可见。 | boolean | false | 0.1.0 | @@ -610,7 +610,7 @@ export default function AyDialogFormDemo() { | update | 进入编辑模式，会自动设置 mode="update"。 | formRef.current.update(record: Record, [config](#config)) | | view | 进入详情模式，会自动设置 mode="view"。 | formRef.current.view(record: Record, [config](#config)) | | closeDialog | 关闭弹窗。 | formRef.current.view(record: Record) | -| getFormRef | 获取里面嵌套的 MwForm 的对象，可以调用 MwForm 的一些方法。 | formRef.current.getFormRef() | +| getFormRef | 获取里面嵌套的 GForm 的对象，可以调用 GForm 的一些方法。 | formRef.current.getFormRef() | | refreshFields | 刷新 form 的列。 | formRef.current.refreshFields() | | submit() | 主动提交表单。 | - | | resetFields() | 重置表单。 | - | diff --git a/packages/gbeata/src/GDialogForm/index.tsx b/packages/gbeata/src/GDialogForm/index.tsx index c26b75cf..34bb6929 100644 --- a/packages/gbeata/src/GDialogForm/index.tsx +++ b/packages/gbeata/src/GDialogForm/index.tsx @@ -10,10 +10,10 @@ import React, { useRef, useState, } from 'react'; +import GDialog from '../GDialog'; import { convertChildrenToField } from '../GFields/convertFields'; import GForm from '../GForm'; import { GFormField } from '../GForm/g-form'; -import MwDialog from '../MwDialog'; import locale from '../locale'; import { AnyKeyProps } from '../types/AnyKeyProps'; import { omitObj } from '../utils'; @@ -434,7 +434,7 @@ export default forwardRef(function GDialogForm( }; return ( - - + ); }); diff --git a/packages/gbeata/src/GForm/FieldsInit.tsx b/packages/gbeata/src/GForm/FieldsInit.tsx index 7e143dbe..5407b177 100644 --- a/packages/gbeata/src/GForm/FieldsInit.tsx +++ b/packages/gbeata/src/GForm/FieldsInit.tsx @@ -10,8 +10,8 @@ import { } from 'antd'; import React from 'react'; import GCardGroup from '../GCardGroup'; -import MwSelect from '../GSelect'; -import MwTagGroup from '../GTagGroup'; +import GSelect from '../GSelect'; +import GTagGroup from '../GTagGroup'; import { FORM_DEFAULT_ALLOW_CLEAR, FORM_DEFAULT_VALUE_CARD_GROUP, @@ -231,7 +231,7 @@ export const install = ( } return ( - ( - + ), }); diff --git a/packages/gbeata/src/GForm/g-form.d.ts b/packages/gbeata/src/GForm/g-form.d.ts index 19554fe7..10dcb5ab 100644 --- a/packages/gbeata/src/GForm/g-form.d.ts +++ b/packages/gbeata/src/GForm/g-form.d.ts @@ -74,7 +74,7 @@ export interface RegisterFieldProps { } /** - * 所有 field 的 最小单元，会被这些类型扩展: GForm AySearch MwTable MwSearchTable MwDialogForm + * 所有 field 的 最小单元，会被这些类型扩展: GForm AySearch GTable GSearchTable GDialogForm */ export interface Field { /** 标题 */ diff --git a/packages/gbeata/src/GForm/parseFields.tsx b/packages/gbeata/src/GForm/parseFields.tsx index ff2f212d..e8edf85c 100644 --- a/packages/gbeata/src/GForm/parseFields.tsx +++ b/packages/gbeata/src/GForm/parseFields.tsx @@ -40,7 +40,7 @@ export default function parseFields( for (const key in rest) { if (Array.isArray(rest[key]) && key === 'children') { // 携带子元素 - rest[key] = rest[key].map((field) => loop({ ...field })); + rest[key] = rest[key].map((field: GFormField) => loop({ ...field })); } else if ( isObj(rest[key]) && !(moment.isMoment(rest[key]) || isValidElement(rest[key])) diff --git a/packages/gbeata/src/GList/index.tsx b/packages/gbeata/src/GList/index.tsx index 030dc6a9..81fd51a7 100644 --- a/packages/gbeata/src/GList/index.tsx +++ b/packages/gbeata/src/GList/index.tsx @@ -19,7 +19,7 @@ import { clearEmpty, getKey } from '../utils'; import { GListContext } from './context'; import useStyles from './style'; -export default forwardRef(function MwList(props: GListProps, ref) { +export default forwardRef(function GList(props: GListProps, ref) { const { className, header, diff --git a/packages/gbeata/src/GSearch/index.d.ts b/packages/gbeata/src/GSearch/index.d.ts index 9c88e306..b7e22cfb 100644 --- a/packages/gbeata/src/GSearch/index.d.ts +++ b/packages/gbeata/src/GSearch/index.d.ts @@ -1,7 +1,7 @@ import { GSearchProps } from './g-search'; -declare const MwSearch: React.ForwardRefExoticComponent< +declare const GSearch: React.ForwardRefExoticComponent< GSearchProps & React.RefAttributes >; -export default MwSearch; +export default GSearch; diff --git a/packages/gbeata/src/GSearch/index.md b/packages/gbeata/src/GSearch/index.md index a8e26602..41695c51 100644 --- a/packages/gbeata/src/GSearch/index.md +++ b/packages/gbeata/src/GSearch/index.md @@ -882,8 +882,8 @@ GSearch 的 span 值是无效的，请使用 grid 来指定占格 ## GSearchField 参数 -| 参数名 | 说明 | 参数类型 | 默认值 | -| ------ | ------------------------------------------------------------------------------------------ | -------- | ------ | -| grid | 不同容器宽度状态下所占用的值 | object | - | -| span | 请不要使用此参数，设置了也无效，它被 grid 替代了 | - | - | -| ... | 其它参数都跟 MwForm 的一样，所以，[MwForm](../form#MwFormField-参数) 注册过的 field 都有效 | - | - | +| 参数名 | 说明 | 参数类型 | 默认值 | +| ------ | --------------------------------------------------------------------------------------- | -------- | ------ | +| grid | 不同容器宽度状态下所占用的值 | object | - | +| span | 请不要使用此参数，设置了也无效，它被 grid 替代了 | - | - | +| ... | 其它参数都跟 GForm 的一样，所以，[GForm](../form#GFormField-参数) 注册过的 field 都有效 | - | - | diff --git a/packages/gbeata/src/GSearch/index.tsx b/packages/gbeata/src/GSearch/index.tsx index 00a24daa..46f6dd7e 100644 --- a/packages/gbeata/src/GSearch/index.tsx +++ b/packages/gbeata/src/GSearch/index.tsx @@ -21,7 +21,7 @@ import { GFormField } from '../GForm/g-form'; import { FORM_TYPE_DATE, FORM_TYPE_DATE_RANGE } from '../constant'; import locale from '../locale'; import { AnyKeyProps } from '../types/AnyKeyProps'; -import { GSearchProps } from './g-search'; +import { GSearchField, GSearchProps } from './g-search'; import useStyles from './style'; type SearchSize = 'mini' | 'small' | 'middle' | 'large'; @@ -62,7 +62,7 @@ const getOrder = (field: any, i: number): number => { */ const getSearchFields = ( /** 配置项 */ - fields: Array, + fields: Array, /** 是否收起 */ mini: boolean, /** 当前尺寸 */ @@ -78,7 +78,7 @@ const getSearchFields = ( let spanSum: number = 0; // 每一行占用的 span，超过 24 清 0 let rowSpanSum: number = 0; - let newFields: Array = fields + let newFields: Array = fields // 过滤掉隐藏的 .filter((field) => field.hidden !== true) // 获取到排序值 @@ -176,7 +176,7 @@ const funcs = [ 'validateFields', ]; -export default forwardRef(function MwSearch(props: GSearchProps, ref) { +export default forwardRef(function GSearch(props: GSearchProps, ref) { const { fields, onConfirm, diff --git a/packages/gbeata/src/GSearchList/index.d.ts b/packages/gbeata/src/GSearchList/index.d.ts index 8a800d57..b4200700 100644 --- a/packages/gbeata/src/GSearchList/index.d.ts +++ b/packages/gbeata/src/GSearchList/index.d.ts @@ -2,11 +2,11 @@ import { GSearchListProps } from './g-search-list'; import Selection from './Selection'; import SelectionAll from './SelectionAll'; -declare const MwSearchList: React.ForwardRefExoticComponent< +declare const GSearchList: React.ForwardRefExoticComponent< GSearchListProps & React.RefAttributes > & { Selection?: typeof Selection; SelectionAll?: typeof SelectionAll; }; -export default MwSearchList; +export default GSearchList; diff --git a/packages/gbeata/src/GSearchTable/g-search-table.d.ts b/packages/gbeata/src/GSearchTable/g-search-table.d.ts index 5d62f1ba..8182c4c0 100644 --- a/packages/gbeata/src/GSearchTable/g-search-table.d.ts +++ b/packages/gbeata/src/GSearchTable/g-search-table.d.ts @@ -143,7 +143,7 @@ export interface TableRefProps { clearSorts(keys: Array): void; getApiParams(): any; deleteRowByKey(key: string): void; - addRow(record: Record, type: 'before' | 'after' = 'after'): void; + addRow(record: Record, type?: 'before' | 'after'): void; setPaginitionValue(paginition: LoadParams['pagination']): void; } diff --git a/packages/gbeata/src/GSearchTable/index.md b/packages/gbeata/src/GSearchTable/index.md index d40a7117..e150ca54 100644 --- a/packages/gbeata/src/GSearchTable/index.md +++ b/packages/gbeata/src/GSearchTable/index.md @@ -1119,7 +1119,7 @@ const fields: Array = [ ]; ``` -## MwTableField +## GTableField | 参数名 | 说明 | 参数类型 | 默认值 | --- | | -------------- | ------------------------------------------------------------------------- | --------------------------------------------------------------------- | -------- | --- | @@ -1136,7 +1136,7 @@ const fields: Array = [ | editable | 表格是否可以编辑，具体示例看[这里][可编辑表格]。 | boolean | - | | before | (仅 `editable` 可用), 渲染前置元素，[使用案例][可编辑表格] | ({ record: Record, field: Field, refreshRow: Function }) => ReactNode | - | | after | (仅 `editable` 可用), 渲染后置元素，[使用案例][可编辑表格] | ({ record: Record, field: Field, refreshRow: Function }) => ReactNode | - | -| children | 嵌套表格时使用。 | Array<[MwTableField][aytablefield]> | - | +| children | 嵌套表格时使用。 | Array<[GTableField][aytablefield]> | - | ## Option 参数 diff --git a/packages/gbeata/src/GSearchTable/use/useExtraBtn.tsx b/packages/gbeata/src/GSearchTable/use/useExtraBtn.tsx index 10d95dbd..980362de 100644 --- a/packages/gbeata/src/GSearchTable/use/useExtraBtn.tsx +++ b/packages/gbeata/src/GSearchTable/use/useExtraBtn.tsx @@ -11,7 +11,7 @@ import { Checkbox, Dropdown, Input, Menu, Space, Tooltip } from 'antd'; import { SizeType } from 'antd/lib/config-provider/SizeContext'; import React, { ChangeEvent, Dispatch, useEffect, useState } from 'react'; import GButton from '../../GButton'; -import MwDialog from '../../GDialog'; +import GDialog from '../../GDialog'; import { GTableField } from '../../GTable/g-table'; import locale from '../../locale'; import { GSearchTableProps, SearchTableInitConfig } from '../g-search-table'; @@ -177,7 +177,7 @@ const useFieldsEdit = ( return { fieldsEdit: ( <> - + setVisible(true)} /> diff --git a/packages/gbeata/src/GSelect/mw-select.d.ts b/packages/gbeata/src/GSelect/g-select.d.ts similarity index 70% rename from packages/gbeata/src/GSelect/mw-select.d.ts rename to packages/gbeata/src/GSelect/g-select.d.ts index d13e66bc..1345f6bf 100644 --- a/packages/gbeata/src/GSelect/mw-select.d.ts +++ b/packages/gbeata/src/GSelect/g-select.d.ts @@ -1,6 +1,6 @@ import { SelectProps } from 'antd/lib/select'; import { Option } from '../GForm/g-form'; -interface MwSelectProps extends SelectProps { +interface GSelectProps extends SelectProps { options?: Array