From e7f73b0499d27dc752a2b8febfbb9675c7a5e3b5 Mon Sep 17 00:00:00 2001 From: Wugaoliang Date: Tue, 2 Feb 2021 10:49:25 +0800 Subject: [PATCH 1/2] fix: #1573 --- CHANGELOG.md | 3 +++ components/index.d.ts | 1 + components/index.js | 2 ++ components/preview/index.js | 6 ++---- site/locales/zh-CN.js | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6c089e3c..ba2d722b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # 更新日志 +## 3.4.1 + +- 修复 `Preview` 图片预览组件,滚轮放大缩小错误 [#1573](https://github.com/XiaoMi/hiui/issues/1573) ## 3.4.0 - 优化组件弹出层自动计算合适的左右位置 [#1494](https://github.com/XiaoMi/hiui/issues/1494) diff --git a/components/index.d.ts b/components/index.d.ts index 403da9108..010463290 100644 --- a/components/index.d.ts +++ b/components/index.d.ts @@ -39,6 +39,7 @@ export { default as Filter } from './filter' export { default as Drawer } from './drawer' export { default as Search } from './search' export { default as Slider } from './slider' +export { default as Preview } from './preview' export { default as Popper } from './popper' export { default as Icon } from './icon' export { ThemeContext, LocaleContext } from './context' \ No newline at end of file diff --git a/components/index.js b/components/index.js index cd987b36b..8072782fe 100755 --- a/components/index.js +++ b/components/index.js @@ -52,5 +52,7 @@ export { default as Carousel } from './carousel' export { default as Watermark } from './watermark' export { default as Slider } from './slider' export { default as Search } from './search' +export { default as Preview } from './preview' + export { ThemeContext, LocaleContext } from './context' export { default as HiRequest } from './_util/hi-request' diff --git a/components/preview/index.js b/components/preview/index.js index 04d6440c8..9517d9cd1 100644 --- a/components/preview/index.js +++ b/components/preview/index.js @@ -5,7 +5,6 @@ import classNames from 'classnames' import Icon from '../icon' import Loading from '../loading' import './style/index.js' -// unstable_batchedUpdates const node = document.createElement('div') document.body.appendChild(node) const Preview = ({ @@ -129,9 +128,8 @@ const Preview = ({ ) const handleMouseWheel = useCallback( (e) => { - e.preventDefault() - const direct = e.deltaY - if (direct !== 0) { + const direct = e.deltaY > 0 ? 1 : -1 + if (direct !== 0 && e.deltaY !== 0) { const x = e.clientX const y = e.clientY handleZoom(x, y, direct) diff --git a/site/locales/zh-CN.js b/site/locales/zh-CN.js index a0f85a412..4c09d42dd 100755 --- a/site/locales/zh-CN.js +++ b/site/locales/zh-CN.js @@ -133,7 +133,7 @@ module.exports = { filter: 'Filter 筛选', charts: 'Charts 图表', 'rich-text-editor': 'RichTextEditor 富文本编辑', - preview: 'preview 预览' + preview: 'Preview 预览' }, designs: { summarize: '概述', From bb9b0549f8eb75ab054e3d4d4d6a1a1a626a72b2 Mon Sep 17 00:00:00 2001 From: Wugaoliang Date: Tue, 2 Feb 2021 10:56:36 +0800 Subject: [PATCH 2/2] fix: #1541 --- docs/demo/tree/section-async.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/demo/tree/section-async.jsx b/docs/demo/tree/section-async.jsx index 7ab0f6055..3b619850f 100644 --- a/docs/demo/tree/section-async.jsx +++ b/docs/demo/tree/section-async.jsx @@ -43,7 +43,7 @@ class Demo extends React.Component { method:'get', data:{}, params:{id:node.id}, - url:'http://my-json-server.typicode.com/hiui-group/db/conditiondata', + url:'https://my-json-server.typicode.com/hiui-group/db/conditiondata', transformResponse:(res)=>{ let data = JSON.parse(res) if(data[0]) {