From 8a679079fbe069008be3f84a420b1addddcdf7c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Tue, 28 Jan 2020 21:34:16 +0800 Subject: [PATCH] feat: allow string type z-index --- src/dropdown-menu/README.md | 2 +- src/dropdown-menu/README.zh-CN.md | 2 +- src/dropdown-menu/index.js | 2 +- src/index-bar/README.md | 2 +- src/index-bar/README.zh-CN.md | 2 +- src/index-bar/index.js | 2 +- src/nav-bar/README.md | 2 +- src/nav-bar/README.zh-CN.md | 2 +- src/nav-bar/index.tsx | 2 +- src/number-keyboard/README.md | 2 +- src/number-keyboard/README.zh-CN.md | 2 +- src/number-keyboard/index.js | 2 +- src/sticky/README.md | 2 +- src/sticky/README.zh-CN.md | 2 +- src/sticky/index.js | 2 +- src/tabbar/README.md | 2 +- src/tabbar/README.zh-CN.md | 2 +- src/tabbar/index.js | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/dropdown-menu/README.md b/src/dropdown-menu/README.md index a7799f487..0b77cd51d 100644 --- a/src/dropdown-menu/README.md +++ b/src/dropdown-menu/README.md @@ -113,7 +113,7 @@ Use `active-color` prop to custom active color of the title and options | Attribute | Description | Type | Default | |------|------|------|------| | active-color | Active color of title and option | *string* | `#1989fa` | -| z-index | z-index of menu item | *number* | `10` | +| z-index | z-index of menu item | *string \| number* | `10` | | duration | Transition duration, unit second | *number* | `0.2` | | direction `v2.0.1` | Expand direction, can be set to `up` | *string* | `down` | | overlay | Whether to show overlay | *boolean* | `true` | diff --git a/src/dropdown-menu/README.zh-CN.md b/src/dropdown-menu/README.zh-CN.md index 566c3e3e2..335773cb4 100644 --- a/src/dropdown-menu/README.zh-CN.md +++ b/src/dropdown-menu/README.zh-CN.md @@ -117,7 +117,7 @@ export default { | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| | active-color | 菜单标题和选项的选中态颜色 | *string* | `#1989fa` | -| z-index | 菜单栏 z-index 层级 | *number* | `10` | +| z-index | 菜单栏 z-index 层级 | *string \| number* | `10` | | duration | 动画时长，单位秒 | *number* | `0.2` | | direction `v2.0.1` | 菜单展开方向，可选值为`up` | *string* | `down` | | overlay | 是否显示遮罩层 | *boolean* | `true` | diff --git a/src/dropdown-menu/index.js b/src/dropdown-menu/index.js index a0c5551d9..17bcc01cc 100644 --- a/src/dropdown-menu/index.js +++ b/src/dropdown-menu/index.js @@ -19,7 +19,7 @@ export default createComponent({ ], props: { - zIndex: Number, + zIndex: [Number, String], activeColor: String, overlay: { type: Boolean, diff --git a/src/index-bar/README.md b/src/index-bar/README.md index d3ae74533..1bde5083b 100644 --- a/src/index-bar/README.md +++ b/src/index-bar/README.md @@ -65,7 +65,7 @@ export default { | Attribute | Description | Type | Default | |------|------|------|------| | index-list | Index List | *string[] \| number[]* | `A-Z` | -| z-index | z-index | *number* | `1` | +| z-index | z-index | *string \| number* | `1` | | sticky | Whether to enable anchor sticky top | *boolean* | `true` | | sticky-offset-top `v2.0.7` | Anchor offset top when sticky | *number* | `0` | | highlight-color | Index character highlight color | *string* | `#07c160` | - | diff --git a/src/index-bar/README.zh-CN.md b/src/index-bar/README.zh-CN.md index 6a9d8eb73..263040f7a 100644 --- a/src/index-bar/README.zh-CN.md +++ b/src/index-bar/README.zh-CN.md @@ -69,7 +69,7 @@ export default { | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| | index-list | 索引字符列表 | *string[] \| number[]* | `A-Z` | -| z-index | z-index 层级 | *number* | `1` | +| z-index | z-index 层级 | *string \| number* | `1` | | sticky | 是否开启锚点自动吸顶 | *boolean* | `true` | | sticky-offset-top `v2.0.7` | 锚点自动吸顶时与顶部的距离 | *number* | `0` | | highlight-color | 索引字符高亮颜色 | *string* | `#07c160` | diff --git a/src/index-bar/index.js b/src/index-bar/index.js index c57723df4..ee11f6e52 100644 --- a/src/index-bar/index.js +++ b/src/index-bar/index.js @@ -42,7 +42,7 @@ export default createComponent({ ], props: { - zIndex: Number, + zIndex: [Number, String], highlightColor: String, sticky: { type: Boolean, diff --git a/src/nav-bar/README.md b/src/nav-bar/README.md index ab60e1a5d..8084b257f 100644 --- a/src/nav-bar/README.md +++ b/src/nav-bar/README.md @@ -59,7 +59,7 @@ export default { | left-arrow | Whether to show left arrow | *boolean* | `false` | | fixed | Whether to fixed top | *boolean* | `false` | | border | Whether to show bottom border | *boolean* | `true` | -| z-index | Z-index | *number* | `1` | +| z-index | Z-index | *string \| number* | `1` | ### Slots diff --git a/src/nav-bar/README.zh-CN.md b/src/nav-bar/README.zh-CN.md index 3df5fd1a9..17f777fd0 100644 --- a/src/nav-bar/README.zh-CN.md +++ b/src/nav-bar/README.zh-CN.md @@ -61,7 +61,7 @@ export default { | left-arrow | 是否显示左侧箭头 | *boolean* | `false` | | fixed | 是否固定在顶部 | *boolean* | `false` | | border | 是否显示下边框 | *boolean* | `true` | -| z-index | 元素 z-index | *number* | `1` | +| z-index | 元素 z-index | *string \| number* | `1` | ### Slots diff --git a/src/nav-bar/index.tsx b/src/nav-bar/index.tsx index 6a6cc2376..086e229d0 100644 --- a/src/nav-bar/index.tsx +++ b/src/nav-bar/index.tsx @@ -82,7 +82,7 @@ function NavBar( NavBar.props = { title: String, fixed: Boolean, - zIndex: Number, + zIndex: [Number, String], leftText: String, rightText: String, leftArrow: Boolean, diff --git a/src/number-keyboard/README.md b/src/number-keyboard/README.md index 00a97185b..7eb5bf3bd 100644 --- a/src/number-keyboard/README.md +++ b/src/number-keyboard/README.md @@ -141,7 +141,7 @@ Use `title` prop to set keyboard title | title | Keyboard title | *string* | - | | maxlength `v2.0.2` | Value maxlength | *string \| number* | - | | transition | Whether to show transition animation | *boolean* | `true` | -| z-index | Keyboard z-index | *number* | `100` | +| z-index | Keyboard z-index | *string \| number* | `100` | | extra-key | Content of bottom left key | *string* | `''` | | close-button-text | Close button text | *string* | `-` | | delete-button-text | Delete button text | *string* | `delete` | diff --git a/src/number-keyboard/README.zh-CN.md b/src/number-keyboard/README.zh-CN.md index 4ee5c286c..af4c54657 100644 --- a/src/number-keyboard/README.zh-CN.md +++ b/src/number-keyboard/README.zh-CN.md @@ -147,7 +147,7 @@ export default { | title | 键盘标题 | *string* | - | | maxlength `v2.0.2` | 输入值最大长度 | *string \| number* | - | | transition | 是否开启过场动画 | *boolean* | `true` | -| z-index | 键盘 z-index | *number* | `100` | +| z-index | 键盘 z-index | *string \| number* | `100` | | extra-key | 左下角按键内容 | *string* | `''` | | close-button-text | 关闭按钮文字，空则不展示 | *string* | `-` | | delete-button-text | 删除按钮文字 | *string* | `删除` | diff --git a/src/number-keyboard/index.js b/src/number-keyboard/index.js index 2b4253f7a..379af3a12 100644 --- a/src/number-keyboard/index.js +++ b/src/number-keyboard/index.js @@ -24,7 +24,7 @@ export default createComponent({ props: { show: Boolean, title: String, - zIndex: Number, + zIndex: [Number, String], closeButtonText: String, deleteButtonText: String, theme: { diff --git a/src/sticky/README.md b/src/sticky/README.md index 1288b96ba..348f2a883 100644 --- a/src/sticky/README.md +++ b/src/sticky/README.md @@ -57,7 +57,7 @@ export default { | Attribute | Description | Type | Default | |------|------|------|------| | offset-top | Offset top | *number* | `0` | -| z-index | z-index when sticky | *number* | `99` | +| z-index | z-index when sticky | *string \| number* | `99` | | container | Container DOM | *HTMLElement* | - | ### Events diff --git a/src/sticky/README.zh-CN.md b/src/sticky/README.zh-CN.md index cbd8dc211..cff4720dd 100644 --- a/src/sticky/README.zh-CN.md +++ b/src/sticky/README.zh-CN.md @@ -67,7 +67,7 @@ export default { | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| | offset-top | 吸顶时与顶部的距离，单位`px` | *number* | `0` | -| z-index | 吸顶时的 z-index | *number* | `99` | +| z-index | 吸顶时的 z-index | *string \| number* | `99` | | container | 容器对应的 HTML 节点 | *HTMLElement* | - | ### Events diff --git a/src/sticky/index.js b/src/sticky/index.js index 04e2e1aba..f702fc49f 100644 --- a/src/sticky/index.js +++ b/src/sticky/index.js @@ -17,7 +17,7 @@ export default createComponent({ ], props: { - zIndex: Number, + zIndex: [Number, String], container: null, offsetTop: { type: Number, diff --git a/src/tabbar/README.md b/src/tabbar/README.md index 7e30318d8..47a7b9ae3 100644 --- a/src/tabbar/README.md +++ b/src/tabbar/README.md @@ -161,7 +161,7 @@ export default { | v-model | Identifier of current tab | *string \| number* | `0` | | fixed | Whether to fixed bottom | *boolean* | `true` | | border | Whether to show border | *boolean* | `true` | -| z-index | Z-index | *number* | `1` | +| z-index | Z-index | *string \| number* | `1` | | active-color | Color of active tab item | *string* | `#1989fa` | | inactive-color | Color of inactive tab item | *string* | `#7d7e80` | | route | Whether to enable route mode | *boolean* | `false` | diff --git a/src/tabbar/README.zh-CN.md b/src/tabbar/README.zh-CN.md index d77f37d75..c1feb0f87 100644 --- a/src/tabbar/README.zh-CN.md +++ b/src/tabbar/README.zh-CN.md @@ -168,7 +168,7 @@ export default { | v-model | 当前选中标签的名称或索引值 | *string \| number* | `0` | | fixed | 是否固定在底部 | *boolean* | `true` | | border | 是否显示外边框 | *boolean* | `true` | -| z-index | 元素 z-index | *number* | `1` | +| z-index | 元素 z-index | *string \| number* | `1` | | active-color | 选中标签的颜色 | *string* | `#1989fa` | | inactive-color | 未选中标签的颜色 | *string* | `#7d7e80` | | route | 是否开启路由模式 | *boolean* | `false` | diff --git a/src/tabbar/index.js b/src/tabbar/index.js index 8d8ba4633..2cfb7baa2 100644 --- a/src/tabbar/index.js +++ b/src/tabbar/index.js @@ -9,7 +9,7 @@ export default createComponent({ props: { route: Boolean, - zIndex: Number, + zIndex: [Number, String], activeColor: String, inactiveColor: String, safeAreaInsetBottom: Boolean,