diff --git a/packages/biz/CHANGELOG.md b/packages/biz/CHANGELOG.md index 0e925b9..dda3b31 100644 --- a/packages/biz/CHANGELOG.md +++ b/packages/biz/CHANGELOG.md @@ -1,5 +1,21 @@ # @zhst/biz +## 0.21.5 + +### Patch Changes + +- fix: 修改 zhst/meta +- Updated dependencies + - @zhst/meta@0.20.3 + +## 0.21.4 + +### Patch Changes + +- zhst/biz、zhst/meta、zhst/material: 修改 od、修改 boxSelectTree +- Updated dependencies + - @zhst/meta@0.20.2 + ## 0.21.3 ### Patch Changes diff --git a/packages/biz/package.json b/packages/biz/package.json index dea7efb..47f25ff 100644 --- a/packages/biz/package.json +++ b/packages/biz/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/biz", - "version": "0.21.3", + "version": "0.21.5", "description": "业务库", "keywords": [ "business", diff --git a/packages/biz/src/BigImageModal/BigImageModal.tsx b/packages/biz/src/BigImageModal/BigImageModal.tsx index 37688ab..ed7ce27 100644 --- a/packages/biz/src/BigImageModal/BigImageModal.tsx +++ b/packages/biz/src/BigImageModal/BigImageModal.tsx @@ -223,11 +223,6 @@ const BigImageModal: React.FC = forwardRef((pro ] } - - // TODO: 页面初始化 - useEffect(() => { - }, [dataSource]); - // 暴露 ref 实例 useImperativeHandle(ref, () => ({ ref, diff --git a/packages/biz/src/boxSelectTree/components/boxPanel/index.less b/packages/biz/src/boxSelectTree/components/boxPanel/index.less index b835d39..0101577 100644 --- a/packages/biz/src/boxSelectTree/components/boxPanel/index.less +++ b/packages/biz/src/boxSelectTree/components/boxPanel/index.less @@ -1,15 +1,31 @@ .zhst-biz-box-select-tree-panel { - padding: 0 16px; - &-btns-common { - padding: 4px 8px; + &-search { + display: flex; + padding: 0 12px; + &-input { + margin-right: 4px; + } + &-btns { + flex: none; + } } - &-btns-import { - padding: 4px 8px; + &-btns { + padding: 6px 12px; + display: flex; + justify-content: space-between; + &-common { + padding: 4px 8px; + } + &-import { + padding: 4px 8px; + } + &-divider { + margin: 8px 0; + } } - - &-btns-divider { - margin: 8px 0; + &-tree { + padding: 6px 0; } } diff --git a/packages/biz/src/boxSelectTree/components/boxPanel/index.tsx b/packages/biz/src/boxSelectTree/components/boxPanel/index.tsx index 1a9ede9..2168c40 100644 --- a/packages/biz/src/boxSelectTree/components/boxPanel/index.tsx +++ b/packages/biz/src/boxSelectTree/components/boxPanel/index.tsx @@ -128,102 +128,109 @@ const BoxPanel: FC = (props) => { onTreeCheck={onTreeCheck} // 树check选中事件 onItemDelete={onItemDelete} // 右侧点击删除事件 /> - - - onSearch?.(e)} placeholder='请输入盒子名称' {...searchInputProps} /> - {customImport || ( - <> - - - {onCreate ? - ( - - ) : ( - - className={classNames(componentName + '-create-modal')} - open={onCreate ? false : undefined} - formRef={createFormRef} - title="新建组" - modalProps={{ destroyOnClose: true }} - layout='horizontal' - labelCol={{ span: 6 }} - wrapperCol={{ span: 18 }} - trigger={} - submitter={{ - searchConfig: { - submitText: '确定', - resetText: '取消', - }, - }} - onFinish={onCreateSubmit} - > - - - { - createFormRef.current?.setFieldValue('boxList', null) - onBoxChoiceReset() - }} >恢复默认 - setBoxChoiceOpen(true)}>范围选择 - - ) - }} - /> - - ) - } - - {/* @ts-ignore */} - - - - - )} - {extraBtns} - + onSearch?.(e)} + placeholder='请输入盒子名称' + {...searchInputProps} /> - + {customImport || ( +
+
+ )} + + {/* 是否显示操作按钮 */} + {showOptions && ( + <> +
+ + + {onCreate ? + ( + + ) : ( + + className={classNames(componentName + '-create-modal')} + open={onCreate ? false : undefined} + formRef={createFormRef} + title="新建组" + modalProps={{ destroyOnClose: true }} + layout='horizontal' + labelCol={{ span: 6 }} + wrapperCol={{ span: 18 }} + trigger={} + submitter={{ + searchConfig: { + submitText: '确定', + resetText: '取消', + }, + }} + onFinish={onCreateSubmit} + > + + + { + createFormRef.current?.setFieldValue('boxList', null) + onBoxChoiceReset() + }} >恢复默认 + setBoxChoiceOpen(true)}>范围选择 + + ) + }} + /> + + ) + } + + {/* @ts-ignore */} + +
+ + + )} + {extraBtns} + ) } diff --git a/packages/biz/src/boxSelectTree/demo/basic.tsx b/packages/biz/src/boxSelectTree/demo/basic.tsx index 00365d6..6269b72 100644 --- a/packages/biz/src/boxSelectTree/demo/basic.tsx +++ b/packages/biz/src/boxSelectTree/demo/basic.tsx @@ -56,6 +56,7 @@ const demo = () => { addonBefore: (