fix(all): zhst/biz、zhst/meta、zhst/material: 修改 od、修改 boxSelectTree
This commit is contained in:
parent
0f0644495a
commit
59f0924c66
@ -1,5 +1,21 @@
|
|||||||
# @zhst/biz
|
# @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
|
## 0.21.3
|
||||||
|
|
||||||
### Patch Changes
|
### Patch Changes
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@zhst/biz",
|
"name": "@zhst/biz",
|
||||||
"version": "0.21.3",
|
"version": "0.21.5",
|
||||||
"description": "业务库",
|
"description": "业务库",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"business",
|
"business",
|
||||||
|
@ -223,11 +223,6 @@ const BigImageModal: React.FC<BigImageModalProps, BigModalRef> = forwardRef((pro
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// TODO: 页面初始化
|
|
||||||
useEffect(() => {
|
|
||||||
}, [dataSource]);
|
|
||||||
|
|
||||||
// 暴露 ref 实例
|
// 暴露 ref 实例
|
||||||
useImperativeHandle(ref, () => ({
|
useImperativeHandle(ref, () => ({
|
||||||
ref,
|
ref,
|
||||||
|
@ -1,15 +1,31 @@
|
|||||||
.zhst-biz-box-select-tree-panel {
|
.zhst-biz-box-select-tree-panel {
|
||||||
padding: 0 16px;
|
|
||||||
|
|
||||||
&-btns-common {
|
&-search {
|
||||||
padding: 4px 8px;
|
display: flex;
|
||||||
|
padding: 0 12px;
|
||||||
|
&-input {
|
||||||
|
margin-right: 4px;
|
||||||
|
}
|
||||||
|
&-btns {
|
||||||
|
flex: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&-btns-import {
|
&-btns {
|
||||||
|
padding: 6px 12px;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
&-common {
|
||||||
padding: 4px 8px;
|
padding: 4px 8px;
|
||||||
}
|
}
|
||||||
|
&-import {
|
||||||
&-btns-divider {
|
padding: 4px 8px;
|
||||||
|
}
|
||||||
|
&-divider {
|
||||||
margin: 8px 0;
|
margin: 8px 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
&-tree {
|
||||||
|
padding: 6px 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -128,20 +128,27 @@ const BoxPanel: FC<BoxPanelProps> = (props) => {
|
|||||||
onTreeCheck={onTreeCheck} // 树check选中事件
|
onTreeCheck={onTreeCheck} // 树check选中事件
|
||||||
onItemDelete={onItemDelete} // 右侧点击删除事件
|
onItemDelete={onItemDelete} // 右侧点击删除事件
|
||||||
/>
|
/>
|
||||||
<Space size={12} direction='vertical' style={{ width: '100%' }}>
|
<div className={classNames(componentName + '-search')}>
|
||||||
<Space size={4} style={{ width: '100%', justifyContent: 'space-between' }} >
|
<Input
|
||||||
<Input size='middle' onChange={(e) => onSearch?.(e)} placeholder='请输入盒子名称' {...searchInputProps} />
|
className={classNames(componentName + '-search-input')}
|
||||||
|
size='middle'
|
||||||
|
onChange={(e) => onSearch?.(e)}
|
||||||
|
placeholder='请输入盒子名称'
|
||||||
|
{...searchInputProps}
|
||||||
|
/>
|
||||||
{customImport || (
|
{customImport || (
|
||||||
<>
|
<div
|
||||||
|
className={classNames(componentName + '-search-btns')}
|
||||||
|
>
|
||||||
<Button type="text" onClick={() => onBatch?.() || handleCheckable()} icon={isTreeCheckable ? <SwitcherOutlined /> : <DiffOutlined />} />
|
<Button type="text" onClick={() => onBatch?.() || handleCheckable()} icon={isTreeCheckable ? <SwitcherOutlined /> : <DiffOutlined />} />
|
||||||
<Button type="text" onClick={() => onClockClick?.()} icon={<ClockCircleOutlined />} />
|
<Button type="text" onClick={() => onClockClick?.()} icon={<ClockCircleOutlined />} />
|
||||||
</>
|
</div>
|
||||||
)}
|
)}
|
||||||
</Space>
|
</div>
|
||||||
{/* 是否显示操作按钮 */}
|
{/* 是否显示操作按钮 */}
|
||||||
{showOptions && (
|
{showOptions && (
|
||||||
<>
|
<>
|
||||||
<Space align='center'>
|
<div className={classNames(componentName + '-btns')}>
|
||||||
<Button className={classNames(componentName + '-btns-common')} type='text' onClick={() => onImport?.()} icon={<ImportOutlined />} >导入盒子</Button>
|
<Button className={classNames(componentName + '-btns-common')} type='text' onClick={() => onImport?.()} icon={<ImportOutlined />} >导入盒子</Button>
|
||||||
<Divider className={classNames(componentName + '-btns-divider')} type="vertical" />
|
<Divider className={classNames(componentName + '-btns-divider')} type="vertical" />
|
||||||
{onCreate ?
|
{onCreate ?
|
||||||
@ -210,12 +217,13 @@ const BoxPanel: FC<BoxPanelProps> = (props) => {
|
|||||||
<Divider className={classNames(componentName + '-btns-divider')} type="vertical" />
|
<Divider className={classNames(componentName + '-btns-divider')} type="vertical" />
|
||||||
{/* @ts-ignore */}
|
{/* @ts-ignore */}
|
||||||
<Button className={classNames(componentName + '-btns-common')} danger type='text' icon={<CloseCircleOutlined />} disabled={treeProps?.checkedKeys?.length <= 0} onClick={onBoxBatchDelete} >删除</Button>
|
<Button className={classNames(componentName + '-btns-common')} danger type='text' icon={<CloseCircleOutlined />} disabled={treeProps?.checkedKeys?.length <= 0} onClick={onBoxBatchDelete} >删除</Button>
|
||||||
</Space>
|
</div>
|
||||||
<Divider style={{ margin: 0 }} />
|
<Divider style={{ margin: 0 }} />
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{extraBtns}
|
{extraBtns}
|
||||||
<BoxTree
|
<BoxTree
|
||||||
|
className={classNames(componentName + '-tree')}
|
||||||
treeCheckable={isTreeCheckable}
|
treeCheckable={isTreeCheckable}
|
||||||
data={data}
|
data={data}
|
||||||
onItemSelect={onItemSelect}
|
onItemSelect={onItemSelect}
|
||||||
@ -223,7 +231,6 @@ const BoxPanel: FC<BoxPanelProps> = (props) => {
|
|||||||
onItemDelete={onBoxDelete}
|
onItemDelete={onBoxDelete}
|
||||||
{...treeProps}
|
{...treeProps}
|
||||||
/>
|
/>
|
||||||
</Space>
|
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -56,6 +56,7 @@ const demo = () => {
|
|||||||
addonBefore: (
|
addonBefore: (
|
||||||
<Select
|
<Select
|
||||||
value={searchType}
|
value={searchType}
|
||||||
|
dropdownMatchSelectWidth={false}
|
||||||
onChange={_type => {
|
onChange={_type => {
|
||||||
setSearchType(_type)
|
setSearchType(_type)
|
||||||
setSearchVal('')
|
setSearchVal('')
|
||||||
|
@ -1,5 +1,23 @@
|
|||||||
# @zhst/material
|
# @zhst/material
|
||||||
|
|
||||||
|
## 0.17.4
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- fix: 修改 zhst/meta
|
||||||
|
- Updated dependencies
|
||||||
|
- @zhst/meta@0.20.3
|
||||||
|
- @zhst/biz@0.21.5
|
||||||
|
|
||||||
|
## 0.17.3
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- zhst/biz、zhst/meta、zhst/material: 修改 od、修改 boxSelectTree
|
||||||
|
- Updated dependencies
|
||||||
|
- @zhst/meta@0.20.2
|
||||||
|
- @zhst/biz@0.21.4
|
||||||
|
|
||||||
## 0.17.2
|
## 0.17.2
|
||||||
|
|
||||||
### Patch Changes
|
### Patch Changes
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@zhst/material",
|
"name": "@zhst/material",
|
||||||
"version": "0.17.2",
|
"version": "0.17.4",
|
||||||
"description": "物料库",
|
"description": "物料库",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"business",
|
"business",
|
||||||
|
@ -1,5 +1,21 @@
|
|||||||
# @zhst/utils
|
# @zhst/utils
|
||||||
|
|
||||||
|
## 0.20.3
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- fix: 修改 zhst/meta
|
||||||
|
- Updated dependencies
|
||||||
|
- @zhst/meta@0.20.3
|
||||||
|
|
||||||
|
## 0.20.2
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- zhst/biz、zhst/meta、zhst/material: 修改 od、修改 boxSelectTree
|
||||||
|
- Updated dependencies
|
||||||
|
- @zhst/meta@0.20.2
|
||||||
|
|
||||||
## 0.20.1
|
## 0.20.1
|
||||||
|
|
||||||
### Patch Changes
|
### Patch Changes
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@zhst/meta",
|
"name": "@zhst/meta",
|
||||||
"version": "0.20.1",
|
"version": "0.20.3",
|
||||||
"description": "原子组件",
|
"description": "原子组件",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"meta",
|
"meta",
|
||||||
|
@ -201,6 +201,7 @@ const CropperImage = forwardRef<CropperImageRefProps, CropperImageProps>((props,
|
|||||||
const { containerData = {}, targetTransform = {} } = viewer
|
const { containerData = {}, targetTransform = {} } = viewer
|
||||||
const imageSize = viewer.getImgSize()
|
const imageSize = viewer.getImgSize()
|
||||||
|
|
||||||
|
// @ts-ignore
|
||||||
currentFabricRef.current = new fabric.Canvas(
|
currentFabricRef.current = new fabric.Canvas(
|
||||||
canvasRef.current,
|
canvasRef.current,
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user