Commit b18a298d authored by 涂茜's avatar 涂茜

Merge branch 'fix/bug' into 'dev'

Fix/bug See merge request !32
parents d5841ce2 a0b7b2e4
Pipeline #26469 failed with stages
in 15 seconds
......@@ -2,6 +2,13 @@
All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.4.4](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/basictable@1.4.2...@wisdom-components/basictable@1.4.4) (2021-04-22)
### Bug Fixes
- update package ([403ae9d](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/403ae9d9e5cec67084343cdbfc06370ee07b1681))
- update package ([f0b3401](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/f0b34012654a1a9af9d20f72589b78671cb231a0))
## [1.4.3](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/basictable@1.4.2...@wisdom-components/basictable@1.4.3) (2021-04-22)
### Bug Fixes
......
{
"name": "@wisdom-components/basictable",
"version": "1.4.3",
"version": "1.4.4",
"description": "> TODO: description",
"author": "tuqian <webtuqian@163.com>",
"homepage": "",
......
......@@ -2,6 +2,13 @@
All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.2.9](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/basictools@1.2.7...@wisdom-components/basictools@1.2.9) (2021-04-22)
### Bug Fixes
- update package ([403ae9d](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/403ae9d9e5cec67084343cdbfc06370ee07b1681))
- update package ([f0b3401](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/f0b34012654a1a9af9d20f72589b78671cb231a0))
## [1.2.8](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/basictools@1.2.7...@wisdom-components/basictools@1.2.8) (2021-04-22)
### Bug Fixes
......
{
"name": "@wisdom-components/basictools",
"version": "1.2.8",
"version": "1.2.9",
"description": "> TODO: description",
"author": "tuqian <webtuqian@163.com>",
"homepage": "",
......
......@@ -2,6 +2,12 @@
All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.3.13](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/devicetree@1.3.12...@wisdom-components/devicetree@1.3.13) (2021-04-22)
### Bug Fixes
- update package ([403ae9d](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/403ae9d9e5cec67084343cdbfc06370ee07b1681))
## [1.3.12](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/devicetree@1.3.8...@wisdom-components/devicetree@1.3.12) (2021-04-22)
### Bug Fixes
......
{
"name": "@wisdom-components/devicetree",
"version": "1.3.12",
"version": "1.3.13",
"description": "> TODO: description",
"author": "tuqian <webtuqian@163.com>",
"homepage": "",
......
......@@ -2,6 +2,12 @@
All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.3.11](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/empty@1.3.10...@wisdom-components/empty@1.3.11) (2021-04-22)
### Bug Fixes
- update package ([403ae9d](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/403ae9d9e5cec67084343cdbfc06370ee07b1681))
## [1.3.10](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/empty@1.3.9...@wisdom-components/empty@1.3.10) (2021-04-22)
### Bug Fixes
......
{
"name": "@wisdom-components/empty",
"version": "1.3.10",
"version": "1.3.11",
"description": "@wisdom-components/empty",
"author": "tuqian <webtuqian@163.com>",
"homepage": "",
......
......@@ -2,6 +2,12 @@
All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.0.9](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/exportexcel@1.0.7...@wisdom-components/exportexcel@1.0.9) (2021-04-22)
### Bug Fixes
- update package ([403ae9d](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/403ae9d9e5cec67084343cdbfc06370ee07b1681))
## [1.0.8](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/exportexcel@1.0.7...@wisdom-components/exportexcel@1.0.8) (2021-04-22)
### Bug Fixes
......
{
"name": "@wisdom-components/exportexcel",
"version": "1.0.8",
"version": "1.0.9",
"description": "> TODO: description",
"author": "lijiwen <961370825@qq.com>",
"homepage": "",
......
......@@ -2,6 +2,12 @@
All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.4.12](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/historyinfo@1.4.11...@wisdom-components/historyinfo@1.4.12) (2021-04-22)
### Bug Fixes
- update package ([403ae9d](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/403ae9d9e5cec67084343cdbfc06370ee07b1681))
## [1.4.11](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/historyinfo@1.4.8...@wisdom-components/historyinfo@1.4.11) (2021-04-22)
### Bug Fixes
......
{
"name": "@wisdom-components/historyinfo",
"version": "1.4.11",
"version": "1.4.12",
"description": "> TODO: description",
"author": "tuqian <webtuqian@163.com>",
"homepage": "",
......
......@@ -2,6 +2,13 @@
All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.3.11](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/imageselect@1.3.10...@wisdom-components/imageselect@1.3.11) (2021-04-22)
### Bug Fixes
- update package ([403ae9d](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/403ae9d9e5cec67084343cdbfc06370ee07b1681))
- update quotaselect ([2bdb602](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/2bdb602dc2349b12aad76d3561dd90adfb71e9f6))
## [1.3.10](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/imageselect@1.3.8...@wisdom-components/imageselect@1.3.10) (2021-04-22)
### Bug Fixes
......
{
"name": "@wisdom-components/imageselect",
"version": "1.3.10",
"version": "1.3.11",
"description": "> TODO: description",
"author": "tuqian <webtuqian@163.com>",
"homepage": "",
......
......@@ -50,7 +50,7 @@ const ImageSelect = ({ src, url, width, title, dataSource, onSearch, onSelect })
const renderImageList = (data = []) => {
return (
<Row gutter={[0, 24]}>
<Row gutter={[0, 12]}>
{!!data &&
data.map((item, index) => (
<Col
......@@ -93,6 +93,7 @@ const ImageSelect = ({ src, url, width, title, dataSource, onSearch, onSelect })
</div>
)}
</div>
{visible && (
<Modal
width={width}
centered
......@@ -111,7 +112,7 @@ const ImageSelect = ({ src, url, width, title, dataSource, onSearch, onSelect })
</div>
}
footer={null}
visible={visible}
visible={true}
onCancel={handleCancel}
className={classNames(`${prefixCls}-modal`)}
>
......@@ -126,6 +127,7 @@ const ImageSelect = ({ src, url, width, title, dataSource, onSearch, onSelect })
})}
{!imgList.length && <Empty />}
</Modal>
)}
</div>
);
};
......
......@@ -80,8 +80,15 @@
}
&-item-wrap {
padding: 10px 0;
text-align: center;
border: 1px solid transparent;
&.selected {
background: linear-gradient(0deg, #f1f4fb 0%, #ffffff 100%);
border: 1px solid #b8d6fb;
border-radius: 2px;
}
}
&-item-wrap:hover {
......@@ -96,12 +103,6 @@
height: 40px;
}
&.selected {
background: linear-gradient(0deg, #f1f4fb 0%, #ffffff 100%);
border: 1px solid #b8d6fb;
border-radius: 2px;
}
&-item-text {
font-size: 12px;
white-space: nowrap;
......
......@@ -2,6 +2,13 @@
All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.7.7](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/quotaselect@1.7.6...@wisdom-components/quotaselect@1.7.7) (2021-04-22)
### Bug Fixes
- update package ([403ae9d](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/403ae9d9e5cec67084343cdbfc06370ee07b1681))
- update quotaselect ([2bdb602](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/commits/2bdb602dc2349b12aad76d3561dd90adfb71e9f6))
## [1.7.6](https://g.civnet.cn:8443/ReactWeb5/wisdom-components/compare/@wisdom-components/quotaselect@1.7.2...@wisdom-components/quotaselect@1.7.6) (2021-04-22)
### Bug Fixes
......
{
"name": "@wisdom-components/quotaselect",
"version": "1.7.6",
"version": "1.7.7",
"description": "> TODO: description",
"author": "tuqian <webtuqian@163.com>",
"homepage": "",
......
......@@ -221,13 +221,14 @@ const QuotaSelect = ({
return (
<div className={classNames(prefixCls)}>
<Button {...buttonProps} onClick={showModal} />
{visible && (
<Modal
centered
width={width}
title={title}
cancelText={cancelText}
okText={okText}
visible={visible}
visible={true}
onCancel={handleCancel}
onOk={onOk}
className={classNames(`${prefixCls}-modal`)}
......@@ -312,6 +313,7 @@ const QuotaSelect = ({
</div>
</div>
</Modal>
)}
</div>
);
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment