From 7d1462c45b05048362efd46842f5967b14c24433 Mon Sep 17 00:00:00 2001 From: Tyh2001 <1469442737@qq.com> Date: Sun, 4 Jun 2023 18:28:40 +0800 Subject: [PATCH] =?UTF-8?q?revert:=20=E5=8F=91=E5=B8=83=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=200.40.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.en-US.md | 12 ++++++ CHANGELOG.md | 6 +++ docs/components/count-down.md | 20 ++++----- docs/components/drawer.md | 6 +-- docs/components/popup.md | 4 +- docs/docs/changelog.md | 12 ++++++ packages/fighting-design/drawer/src/props.ts | 2 +- packages/fighting-design/package.json | 2 +- start/src/App.vue | 44 +------------------- 9 files changed, 48 insertions(+), 60 deletions(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 0a21c6c0fc..fda868cbe1 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -4,6 +4,18 @@ English | [Chinese](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.md) +## 0.40.4 (2023-06-04) + +**Repair** + +- Fix the issue of partial parameter responsive loss in the `f-button` component +- Fix the issue of `f-drawer` component content exceeding the display of scrollBars +- Fix the issue of `f-popup` component content exceeding the display of scrollBars + +**Other** + +- Change the default value of the `f-popup` component `z-index` configuration item to null + ## 0.40.3 (2023-05-22) - Fix unexpected margin display issue in the `f-avatar` component diff --git a/CHANGELOG.md b/CHANGELOG.md index 169e6477a6..bdf729917b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,16 @@ 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md) +## 0.40.4 (2023-06-04) + +**修复** + - 修复 `f-button` 组件部分参数响应式丢失问题 - 修复 `f-drawer` 组件内容部分超出不显示滚动条问题 - 修复 `f-popup` 组件内容部分超出不显示滚动条问题 +**其它** + - `f-popup` 组件 `z-index` 配置项默认值改为 null ## 0.40.3 (2023-05-22) diff --git a/docs/components/count-down.md b/docs/components/count-down.md index 154b00a5ba..6a0393f980 100644 --- a/docs/components/count-down.md +++ b/docs/components/count-down.md @@ -12,7 +12,7 @@ ::: demo ```vue @@ -27,7 +27,7 @@ ``` @@ -46,12 +46,12 @@ ::: demo ```vue ``` @@ -59,22 +59,20 @@ ## 毫秒级别渲染 -`millisecond` 属性可以开启毫秒级渲染。当为`false`时，渲染间隔为`1s` +`millisecond` 属性可以开启毫秒级渲染。当为 `false` 时，渲染间隔为 `1s` ::: demo ```vue ``` @@ -139,10 +137,10 @@ | 参数 | 说明 | 类型 | 可选值 | 默认值 | | ------------- | ------------------------------------------------------- | ---------------------------------------------- | ------ | -------- | | `time` | 倒计时时长，单位毫秒 | string / number | —— | —— | -| `inerval` | 倒计时渲染间隔，单位毫秒（开启`millisecond`则此项无效） | number | —— | `1000` | +| `interval` | 倒计时渲染间隔，单位毫秒（开启`millisecond`则此项无效） | number | —— | `1000` | | `format` | 时间格式 | string | —— | HH:mm:ss | -| `millisecond` | 是否开始毫秒级渲染 | boolean | —— | false | | `auto-start` | 是否自动开始倒计时 | boolean | —— | true | +| `millisecond` | 是否开始毫秒级渲染 | boolean | —— | false | | `on-finish` | 倒计时结束后触发的回调 | CountDownFinish | —— | —— | ## Methods diff --git a/docs/components/drawer.md b/docs/components/drawer.md index 79d0738249..290500520b 100644 --- a/docs/components/drawer.md +++ b/docs/components/drawer.md @@ -48,7 +48,7 @@ const visible1 = ref(false) const direction = ref('right') - const onShow = (dir: DrawerDirection) => { + const onShow = (dir: DrawerDirection): void => { direction.value = dir visible1.value = true } @@ -59,7 +59,7 @@ ## 多层嵌套 -`Drawer` 组件也拥有多层嵌套的方法 +`drawer` 组件也拥有多层嵌套的方法 ::: demo @@ -101,7 +101,7 @@ | `modal-blur` | 是否模糊遮罩层 | boolean | —— | false | | `close-icon` | 自定义关闭按钮 icon | FightingIcon | —— | —— | | `show-close-icon` | 是否展示关闭按钮 | boolean | —— | true | -| `z-index` | 层级，原生 [z-index](https://developer.mozilla.org/zh-CN/docs/Web/CSS/z-index) 属性 | number | —— | 1999 | +| `z-index` | 层级，原生 [z-index](https://developer.mozilla.org/zh-CN/docs/Web/CSS/z-index) 属性 | number | —— | —— | | `on-open` | 打开动画开始的回调 | PopupCallback | —— | —— | | `on-open-end` | 打开动画结束的回调 | PopupCallback | —— | —— | | `on-close` | 关闭动画开始的回调 | PopupCallback | —— | —— | diff --git a/docs/components/popup.md b/docs/components/popup.md index 5c319208f9..6f5f1fec9f 100644 --- a/docs/components/popup.md +++ b/docs/components/popup.md @@ -51,7 +51,7 @@ const visible2 = ref(false) const direction = ref('center') - const onShow = (dir: PopupDirection) => { + const onShow = (dir: PopupDirection): void => { direction.value = dir visible2.value = true } @@ -69,7 +69,7 @@ | `show-mask` | 是否展示遮罩层 | boolean | —— | true | | `mask-close` | 是否点击遮罩层关闭 | boolean | —— | true | | `mask-blur` | 是否模糊遮罩层 | boolean | —— | false | -| `z-index` | 层级 | number | —— | 1999 | +| `z-index` | 层级 | number | —— | —— | | `fullscreen` | 是否全屏展示 | boolean | —— | false | | `mask-background` | 自定义遮罩层背景色 | string | —— | rgba(35, 39, 46) | | `mask-opacity` | 遮罩层透明度 | number | —— | 0.5 | diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md index adf6d81a93..bdf729917b 100644 --- a/docs/docs/changelog.md +++ b/docs/docs/changelog.md @@ -2,6 +2,18 @@ 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md) +## 0.40.4 (2023-06-04) + +**修复** + +- 修复 `f-button` 组件部分参数响应式丢失问题 +- 修复 `f-drawer` 组件内容部分超出不显示滚动条问题 +- 修复 `f-popup` 组件内容部分超出不显示滚动条问题 + +**其它** + +- `f-popup` 组件 `z-index` 配置项默认值改为 null + ## 0.40.3 (2023-05-22) - 修复 `f-avatar` 组件意外的边距展示问题 diff --git a/packages/fighting-design/drawer/src/props.ts b/packages/fighting-design/drawer/src/props.ts index 896a28c71d..7038bac31d 100644 --- a/packages/fighting-design/drawer/src/props.ts +++ b/packages/fighting-design/drawer/src/props.ts @@ -39,7 +39,7 @@ export const Props = { * * @see z-index https://developer.mozilla.org/zh-CN/docs/Web/CSS/z-index */ - zIndex: setNumberProp(1999), + zIndex: setNumberProp(), /** 打开动画开始的回调 */ onOpen: setFunctionProp(), /** 打开动画结束的回调 */ diff --git a/packages/fighting-design/package.json b/packages/fighting-design/package.json index 88add81cbd..540366cc09 100644 --- a/packages/fighting-design/package.json +++ b/packages/fighting-design/package.json @@ -1,6 +1,6 @@ { "name": "fighting-design", - "version": "0.40.3", + "version": "0.40.4", "description": "Fighting design can quickly build interactive interfaces in vue3 applications, which looks good.", "keywords": [ "fighting", diff --git a/start/src/App.vue b/start/src/App.vue index 3b7880b039..1c772edac4 100644 --- a/start/src/App.vue +++ b/start/src/App.vue @@ -1,43 +1,3 @@ - - const visible2 = ref(false) - const direction = ref('center') - - const onShow = (dir: PopupDirection) => { - direction.value = dir - visible2.value = true - } - - - +