diff --git a/package.json b/package.json index 13c8122..268b08a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kne-components/components-core", - "version": "0.4.46", + "version": "0.4.47", "files": [ "build" ], @@ -22,7 +22,7 @@ "@kne/create-deferred": "^0.1.0", "@kne/ensure-slash": "^0.1.0", "@kne/flex-box": "^0.1.1", - "@kne/form-info": "^0.1.2", + "@kne/form-info": "^0.1.4", "@kne/global-context": "^1.3.2", "@kne/info-page": "^0.2.3", "@kne/is-empty": "^1.0.1", diff --git a/src/common/components/Scroller/index.js b/src/common/components/Scroller/index.js index 7030c49..0f0ee8f 100644 --- a/src/common/components/Scroller/index.js +++ b/src/common/components/Scroller/index.js @@ -31,13 +31,13 @@ const ScrollBar = ({onScroll, getContainer, ...scrollerProps}) => { }; }, []); return createPortal(scrollerProps.hasScroller ? (
{ const formModal = useFormModal(); return typeof apis?.onEditModalShow === 'function' ? apis.onEditModalShow : (item, apis) => { const modalApi = formModal({ - size: "small", - title: "修改文件名称", - formProps: { + size: "small", title: , formProps: { data: { name: dropRight(item.filename.split(".")).join("."), - }, - onSubmit: async (data) => { - const res = - apis?.onEdit && - (await apis?.onEdit({ - formData: Object.assign({}, data, { - name: `${data.name}.${last(item.filename.split("."))}`, - }), - item, - })); + }, onSubmit: async (data) => { + const res = apis?.onEdit && (await apis?.onEdit({ + formData: Object.assign({}, data, { + name: `${data.name}.${last(item.filename.split("."))}`, + }), item, + })); if (res !== false) { modalApi.close(); } }, - }, - children: ( - ]} - /> - ), + }, children: (} rule="REQ LEN-0-100"/>]} + />), }); }; }; const List = ({apis, ...p}) => { const handlerEdit = useEdit({apis}); - return ( - handlerEdit(item, apis)} - onDelete={apis?.onDelete} - renderModal={typeof p.renderModal === 'function' ? p.renderModal : ({onCancel, ...modalProps}) => { - return ; - }} - /> - ); + return ( handlerEdit(item, apis)} + onDelete={apis?.onDelete} + renderModal={typeof p.renderModal === 'function' ? p.renderModal : ({onCancel, ...modalProps}) => { + return ; + }} + />); }; const OptionButtons = (props) => { const handlerEdit = useEdit({apis: props.apis}); - return ( - handlerEdit(item, props.apis)} - onDelete={props.apis?.onDelete} - renderModal={typeof props.renderModal === 'function' ? props.renderModal : ({onCancel, ...modalProps}) => { - return ; - }} - /> - ); + return ( handlerEdit(item, props.apis)} + onDelete={props.apis?.onDelete} + renderModal={typeof props.renderModal === 'function' ? props.renderModal : ({onCancel, ...modalProps}) => { + return ; + }} + />); }; export default List; diff --git a/src/components/FileList/DragArea.js b/src/components/FileList/DragArea.js index ca76624..d3846ee 100644 --- a/src/components/FileList/DragArea.js +++ b/src/components/FileList/DragArea.js @@ -72,7 +72,7 @@ export const DragAreaOuter = ({ }, }} > - + {title}
- - - }> - - 上传 - - - - } - fileSize={fileSize} - maxLength={maxLength} - onFileSelected={onFileSelected} - accept={accept} - > - - - - ); + return ( + + + }> + + + + + + + + + } + fileSize={fileSize} + maxLength={maxLength} + onFileSelected={onFileSelected} + accept={accept} + > + + + ); }; export default FileUpload; diff --git a/src/components/FileList/Title.js b/src/components/FileList/Title.js index be92cdb..56ad661 100644 --- a/src/components/FileList/Title.js +++ b/src/components/FileList/Title.js @@ -22,9 +22,9 @@ const Title = ({ getPopupContainer, }) => { return (
- + - + :global(.ant-space-item) { display: flex; align-items: center; diff --git a/src/components/FormInfo/fields/index.js b/src/components/FormInfo/fields/index.js index 76a0e8b..a3c25e4 100644 --- a/src/components/FormInfo/fields/index.js +++ b/src/components/FormInfo/fields/index.js @@ -45,14 +45,16 @@ import withLocale from '../withLocale'; import style from "../style.module.scss"; const createWithFieldDecorator = (decoratorList) => (WrappedComponent) => { - const TargetComponent = compose(...decoratorList)(({forwardedRef, label, placeholder, ...props}) => { + const TargetComponent = compose(...decoratorList)(({forwardedRef, label, placeholder, labelRender, ...props}) => { return ( props.tips ? ( - {label} - + labelRender={(...args) => { + const targetLabel = typeof labelRender === 'function' ? labelRender(...args) : label; + return props.tips ? ( + {targetLabel} + (WrappedComponent) => { > - - ) : (label)} + + ) : (targetLabel); + }} ref={forwardedRef} />) }); diff --git a/src/components/FormInfo/index.js b/src/components/FormInfo/index.js index 414c545..9f0616c 100644 --- a/src/components/FormInfo/index.js +++ b/src/components/FormInfo/index.js @@ -1,11 +1,10 @@ import preset from "./preset"; import fields, {fieldDecorator} from "./fields"; -import {List, TableList, default as FormInfo} from "@kne/form-info"; +import {List, TableList, default as FormInfo, FormSteps} from "@kne/form-info"; import FormApiButton from "./FormApiButton"; import FormModal, {useFormModal, FormModalButton} from "./FormModal"; import FormStepModal, { - useFormStepModal, - FormStepModalButton, + useFormStepModal, FormStepModalButton, } from "./FormStepModal"; import FormDrawer, {useFormDrawer, FormDrawerButton} from "./FormDrawer"; import Form from "./Form"; @@ -13,13 +12,7 @@ import FormItem from "./FormItem"; import ErrorTip from "./ErrorTip"; import {MultiField} from "@kne/form-info"; import { - SubmitButton, - CancelButton, - useFormContext, - hooks, - widget, - utils, - formUtils, + SubmitButton, CancelButton, useFormContext, hooks, widget, utils, formUtils, } from "@kne/react-form-antd"; preset(); @@ -29,6 +22,7 @@ FormInfo.List = List; FormInfo.TableList = TableList; FormInfo.FormApiButton = FormApiButton; FormInfo.FormModal = FormModal; +FormInfo.FormSteps = FormSteps; FormInfo.useFormModal = useFormModal; FormInfo.FormModalButton = FormModalButton; FormInfo.FormStepModal = FormStepModal; @@ -67,6 +61,7 @@ export { useFormModal, FormModalButton, FormStepModal, + FormSteps, useFormStepModal, FormStepModalButton, FormDrawer, diff --git a/src/components/Global/style.module.scss b/src/components/Global/style.module.scss index aa5a706..3f5f49c 100644 --- a/src/components/Global/style.module.scss +++ b/src/components/Global/style.module.scss @@ -177,18 +177,6 @@ font-weight: normal; } - :global(.ant-segmented) { - background-color: var(--bg-color-grey-2); - } - - :global(.ant-segmented-item) { - color: var(--font-color-grey); - - &:global(.ant-segmented-item-selected) { - color: var(--font-color); - } - } - :global(.loading-container.is-loading) { opacity: 0.5; pointer-events: none; diff --git a/src/components/Table/TablePage.js b/src/components/Table/TablePage.js index 77c84b4..3b0f0fb 100644 --- a/src/components/Table/TablePage.js +++ b/src/components/Table/TablePage.js @@ -97,6 +97,7 @@ const TablePageInner = withFetch(({ getScrollEl().scrollTop = 0; }, size: pagination.size, + hideOnSinglePage: pagination.hideOnSinglePage, showSizeChanger: pagination.showSizeChanger, showQuickJumper: pagination.showQuickJumper, pageSizeOptions: pagination.pageSizeOptions, @@ -129,11 +130,12 @@ const TablePage = forwardRef(({pagination, ...props}, ref) => { pagination = Object.assign({}, { showSizeChanger: true, showQuickJumper: true, + hideOnSinglePage: false, open: true, paramsType: "data", requestType: "reload", currentName: "currentPage", - pageSizeName: "perPage", + pageSizeName: "perPage" }, pagination); const pageSizeKey = `${(props.name || "common").toUpperCase()}_TABLE_PAGE_SIZE`; const [pageSize, setPageSize] = useState(localStorage.getItem(pageSizeKey) || pagination.pageSize); diff --git a/src/components/Table/columns.module.scss b/src/components/Table/columns.module.scss index 772cb40..46a8d0c 100644 --- a/src/components/Table/columns.module.scss +++ b/src/components/Table/columns.module.scss @@ -27,6 +27,7 @@ .hover, .primary { cursor: pointer; + border-radius: var(--radius-default); &:hover { color: var(--primary-color);