Merge branch 'fix/bug' into 'dev'

packages/BasicTable/CHANGELOG.md

@@ -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

packages/BasicTable/package.json

 {
   "name": "@wisdom-components/basictable",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/BasicTools/CHANGELOG.md

@@ -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

packages/BasicTools/package.json

 {
   "name": "@wisdom-components/basictools",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/DeviceTree/CHANGELOG.md

@@ -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

packages/DeviceTree/package.json

 {
   "name": "@wisdom-components/devicetree",
-  "version": "1.3.12",
+  "version": "1.3.13",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/Empty/CHANGELOG.md

@@ -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

packages/Empty/package.json

 {
   "name": "@wisdom-components/empty",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "description": "@wisdom-components/empty",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/ExportExcel/CHANGELOG.md

@@ -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

packages/ExportExcel/package.json

 {
   "name": "@wisdom-components/exportexcel",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "> TODO: description",
   "author": "lijiwen <961370825@qq.com>",
   "homepage": "",

packages/HistoryInfo/CHANGELOG.md

@@ -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

packages/HistoryInfo/package.json

 {
   "name": "@wisdom-components/historyinfo",
-  "version": "1.4.11",
+  "version": "1.4.12",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/ImageSelect/CHANGELOG.md

@@ -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

packages/ImageSelect/package.json

 {
   "name": "@wisdom-components/imageselect",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/ImageSelect/src/index.js

@@ -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,39 +93,41 @@ const ImageSelect = ({ src, url, width, title, dataSource, onSearch, onSelect })
           </div>
         )}
       </div>
-      <Modal
-        width={width}
-        centered
-        title={
-          <div className={classNames(`${prefixCls}-modal-header`)}>
-            <div className={classNames(`${prefixCls}-modal-title`)}>{title}</div>
-            <Input
-              className={classNames(`${prefixCls}-modal-search`)}
-              placeholder="搜索图片关键词"
-              allowClear
-              bordered={false}
-              prefix={<SearchOutlined />}
-              onChange={onChange}
-              onPressEnter={onPressEnter}
-            />
-          </div>
-        }
-        footer={null}
-        visible={visible}
-        onCancel={handleCancel}
-        className={classNames(`${prefixCls}-modal`)}
-      >
-        {!!imgList.length &&
-          imgList.map((item, index) => {
-            return (
-              <div key={item.text + index} className={classNames(`${prefixCls}-modal-folder`)}>
-                <div className={classNames(`${prefixCls}-modal-path-title`)}>{item.text}</div>
-                <div>{renderImageList(item.list)}</div>
-              </div>
-            );
-          })}
-        {!imgList.length && <Empty />}
-      </Modal>
+      {visible && (
+        <Modal
+          width={width}
+          centered
+          title={
+            <div className={classNames(`${prefixCls}-modal-header`)}>
+              <div className={classNames(`${prefixCls}-modal-title`)}>{title}</div>
+              <Input
+                className={classNames(`${prefixCls}-modal-search`)}
+                placeholder="搜索图片关键词"
+                allowClear
+                bordered={false}
+                prefix={<SearchOutlined />}
+                onChange={onChange}
+                onPressEnter={onPressEnter}
+              />
+            </div>
+          }
+          footer={null}
+          visible={true}
+          onCancel={handleCancel}
+          className={classNames(`${prefixCls}-modal`)}
+        >
+          {!!imgList.length &&
+            imgList.map((item, index) => {
+              return (
+                <div key={item.text + index} className={classNames(`${prefixCls}-modal-folder`)}>
+                  <div className={classNames(`${prefixCls}-modal-path-title`)}>{item.text}</div>
+                  <div>{renderImageList(item.list)}</div>
+                </div>
+              );
+            })}
+          {!imgList.length && <Empty />}
+        </Modal>
+      )}
     </div>
   );
 };

packages/ImageSelect/src/index.less

@@ -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;

packages/QuotaSelect/CHANGELOG.md

@@ -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

packages/QuotaSelect/package.json

 {
   "name": "@wisdom-components/quotaselect",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "description": "> TODO: description",
   "author": "tuqian <webtuqian@163.com>",
   "homepage": "",

packages/QuotaSelect/src/index.js

@@ -221,97 +221,99 @@ const QuotaSelect = ({
   return (
     <div className={classNames(prefixCls)}>
       <Button {...buttonProps} onClick={showModal} />
-      <Modal
-        centered
-        width={width}
-        title={title}
-        cancelText={cancelText}
-        okText={okText}
-        visible={visible}
-        onCancel={handleCancel}
-        onOk={onOk}
-        className={classNames(`${prefixCls}-modal`)}
-      >
-        <div className={classNames(`${prefixCls}-modal-wrap`)}>
-          <div className={classNames(`${prefixCls}-modal-left`)}>
-            <div className={classNames(`${prefixCls}-modal-select-wrap`)}>
-              <Input
-                className={classNames(`${prefixCls}-modal-search`)}
-                placeholder={placeholder}
-                bordered={false}
-                prefix={searchPrefix}
-                onChange={onSearch}
-                onPressEnter={onSearch}
-              />
-              <div className={classNames(`${prefixCls}-modal-target`)}>
-                <div>指标：</div>
-                <Radio.Group onChange={onRadioChange} defaultValue={targetValue}>
-                  <Radio.Button value="emphasis">重点指标</Radio.Button>
-                  <Radio.Button value="all">全部</Radio.Button>
-                </Radio.Group>
+      {visible && (
+        <Modal
+          centered
+          width={width}
+          title={title}
+          cancelText={cancelText}
+          okText={okText}
+          visible={true}
+          onCancel={handleCancel}
+          onOk={onOk}
+          className={classNames(`${prefixCls}-modal`)}
+        >
+          <div className={classNames(`${prefixCls}-modal-wrap`)}>
+            <div className={classNames(`${prefixCls}-modal-left`)}>
+              <div className={classNames(`${prefixCls}-modal-select-wrap`)}>
+                <Input
+                  className={classNames(`${prefixCls}-modal-search`)}
+                  placeholder={placeholder}
+                  bordered={false}
+                  prefix={searchPrefix}
+                  onChange={onSearch}
+                  onPressEnter={onSearch}
+                />
+                <div className={classNames(`${prefixCls}-modal-target`)}>
+                  <div>指标：</div>
+                  <Radio.Group onChange={onRadioChange} defaultValue={targetValue}>
+                    <Radio.Button value="emphasis">重点指标</Radio.Button>
+                    <Radio.Button value="all">全部</Radio.Button>
+                  </Radio.Group>
+                </div>
+                <div
+                  className={classNames(`${prefixCls}-modal-select`, {
+                    warning: !(selectData.length < maximum),
+                  })}
+                >
+                  {selectData.length < maximum ? (
+                    <>
+                      <ExclamationCircleFilled />
+                      <div>已选择 {selectData.length} 个指标</div>
+                    </>
+                  ) : (
+                    <>
+                      <ExclamationCircleFilled />
+                      <div>已达上限，最多选择 {maximum} 个指标</div>
+                    </>
+                  )}
+                </div>
               </div>
-              <div
-                className={classNames(`${prefixCls}-modal-select`, {
-                  warning: !(selectData.length < maximum),
-                })}
-              >
-                {selectData.length < maximum ? (
-                  <>
-                    <ExclamationCircleFilled />
-                    <div>已选择 {selectData.length} 个指标</div>
-                  </>
-                ) : (
-                  <>
-                    <ExclamationCircleFilled />
-                    <div>已达上限，最多选择 {maximum} 个指标</div>
-                  </>
-                )}
+              <div className={classNames(`${prefixCls}-modal-option-wrap`)}>
+                {!quotaList.length && <Empty />}
+                <Row gutter={[0, 6]}>
+                  {!!quotaList.length &&
+                    quotaList.map((item) => (
+                      <Col span={8} key={item.key}>
+                        <Checkbox
+                          value={item.title}
+                          checked={item.checked}
+                          disabled={
+                            (selectData.length > maximum || selectData.length === maximum) &&
+                            !item.checked
+                          }
+                          onChange={handleCheckboxChange}
+                        >
+                          {item.title}
+                        </Checkbox>
+                      </Col>
+                    ))}
+                </Row>
               </div>
             </div>
-            <div className={classNames(`${prefixCls}-modal-option-wrap`)}>
-              {!quotaList.length && <Empty />}
-              <Row gutter={[0, 6]}>
-                {!!quotaList.length &&
-                  quotaList.map((item) => (
-                    <Col span={8} key={item.key}>
-                      <Checkbox
-                        value={item.title}
-                        checked={item.checked}
-                        disabled={
-                          (selectData.length > maximum || selectData.length === maximum) &&
-                          !item.checked
-                        }
-                        onChange={handleCheckboxChange}
-                      >
-                        {item.title}
-                      </Checkbox>
-                    </Col>
+            <div className={classNames(`${prefixCls}-modal-right`)}>
+              <div className={classNames(`${prefixCls}-modal-number`)}>
+                已选：{selectData.length}/{maximum}
+              </div>
+              <div className={classNames(`${prefixCls}-modal-tree`)}>
+                <Tree draggable={true} onDrop={handleDrop} {...treeProps}>
+                  {selectData.map((item) => (
+                    <TreeNode
+                      key={item.key}
+                      title={
+                        <div className={classNames(`${prefixCls}-modal-tree-title`)}>
+                          <div>{item.title}</div>
+                          <CloseOutlined onClick={() => handleCancelSelect(item)} />
+                        </div>
+                      }
+                    />
                   ))}
-              </Row>
-            </div>
-          </div>
-          <div className={classNames(`${prefixCls}-modal-right`)}>
-            <div className={classNames(`${prefixCls}-modal-number`)}>
-              已选：{selectData.length}/{maximum}
-            </div>
-            <div className={classNames(`${prefixCls}-modal-tree`)}>
-              <Tree draggable={true} onDrop={handleDrop} {...treeProps}>
-                {selectData.map((item) => (
-                  <TreeNode
-                    key={item.key}
-                    title={
-                      <div className={classNames(`${prefixCls}-modal-tree-title`)}>
-                        <div>{item.title}</div>
-                        <CloseOutlined onClick={() => handleCancelSelect(item)} />
-                      </div>
-                    }
-                  />
-                ))}
-              </Tree>
+                </Tree>
+              </div>
             </div>
           </div>
-        </div>
-      </Modal>
+        </Modal>
+      )}
     </div>
   );
 };