diff --git a/packages/nutui-taro-demo/src/app.scss b/packages/nutui-taro-demo/src/app.scss index 1453e68174..d6346f9a34 100644 --- a/packages/nutui-taro-demo/src/app.scss +++ b/packages/nutui-taro-demo/src/app.scss @@ -4,6 +4,7 @@ page { page, #app { + font-size: 14px; min-width: 100vw; .demo { box-sizing: border-box; diff --git a/packages/nutui-taro-demo/src/exhibition/pages/avatar/badge.vue b/packages/nutui-taro-demo/src/exhibition/pages/avatar/badge.vue new file mode 100644 index 0000000000..ed3f9a6f9e --- /dev/null +++ b/packages/nutui-taro-demo/src/exhibition/pages/avatar/badge.vue @@ -0,0 +1,12 @@ + + diff --git a/packages/nutui-taro-demo/src/exhibition/pages/avatar/basic.vue b/packages/nutui-taro-demo/src/exhibition/pages/avatar/basic.vue new file mode 100644 index 0000000000..14db3db015 --- /dev/null +++ b/packages/nutui-taro-demo/src/exhibition/pages/avatar/basic.vue @@ -0,0 +1,9 @@ + + diff --git a/packages/nutui-taro-demo/src/exhibition/pages/avatar/click.vue b/packages/nutui-taro-demo/src/exhibition/pages/avatar/click.vue new file mode 100644 index 0000000000..83786d1499 --- /dev/null +++ b/packages/nutui-taro-demo/src/exhibition/pages/avatar/click.vue @@ -0,0 +1,9 @@ + + diff --git a/packages/nutui-taro-demo/src/exhibition/pages/avatar/color.vue b/packages/nutui-taro-demo/src/exhibition/pages/avatar/color.vue new file mode 100644 index 0000000000..d264d1f652 --- /dev/null +++ b/packages/nutui-taro-demo/src/exhibition/pages/avatar/color.vue @@ -0,0 +1,9 @@ + + diff --git a/packages/nutui-taro-demo/src/exhibition/pages/avatar/count.vue b/packages/nutui-taro-demo/src/exhibition/pages/avatar/count.vue new file mode 100644 index 0000000000..637f0d83c6 --- /dev/null +++ b/packages/nutui-taro-demo/src/exhibition/pages/avatar/count.vue @@ -0,0 +1,16 @@ + + diff --git a/packages/nutui-taro-demo/src/exhibition/pages/avatar/group.vue b/packages/nutui-taro-demo/src/exhibition/pages/avatar/group.vue new file mode 100644 index 0000000000..ad31116356 --- /dev/null +++ b/packages/nutui-taro-demo/src/exhibition/pages/avatar/group.vue @@ -0,0 +1,17 @@ + + diff --git a/packages/nutui-taro-demo/src/exhibition/pages/avatar/index.vue b/packages/nutui-taro-demo/src/exhibition/pages/avatar/index.vue index 56a5ace6d3..bd6a22ca9c 100644 --- a/packages/nutui-taro-demo/src/exhibition/pages/avatar/index.vue +++ b/packages/nutui-taro-demo/src/exhibition/pages/avatar/index.vue @@ -1,139 +1,67 @@ - +}); + diff --git a/packages/nutui-taro-demo/src/exhibition/pages/avatar/shape.vue b/packages/nutui-taro-demo/src/exhibition/pages/avatar/shape.vue new file mode 100644 index 0000000000..dc830da4b4 --- /dev/null +++ b/packages/nutui-taro-demo/src/exhibition/pages/avatar/shape.vue @@ -0,0 +1,7 @@ + + diff --git a/packages/nutui-taro-demo/src/exhibition/pages/avatar/size.vue b/packages/nutui-taro-demo/src/exhibition/pages/avatar/size.vue new file mode 100644 index 0000000000..fabb7f4753 --- /dev/null +++ b/packages/nutui-taro-demo/src/exhibition/pages/avatar/size.vue @@ -0,0 +1,14 @@ + + diff --git a/packages/nutui-taro-demo/src/exhibition/pages/avatar/zindex.vue b/packages/nutui-taro-demo/src/exhibition/pages/avatar/zindex.vue new file mode 100644 index 0000000000..71d6eb80ad --- /dev/null +++ b/packages/nutui-taro-demo/src/exhibition/pages/avatar/zindex.vue @@ -0,0 +1,12 @@ + + diff --git a/src/packages/__VUE/avatar/demo.vue b/src/packages/__VUE/avatar/demo.vue deleted file mode 100644 index bee447782e..0000000000 --- a/src/packages/__VUE/avatar/demo.vue +++ /dev/null @@ -1,191 +0,0 @@ - - - diff --git a/src/packages/__VUE/avatar/demo/badge.vue b/src/packages/__VUE/avatar/demo/badge.vue new file mode 100644 index 0000000000..5453baddbb --- /dev/null +++ b/src/packages/__VUE/avatar/demo/badge.vue @@ -0,0 +1,12 @@ + + diff --git a/src/packages/__VUE/avatar/demo/basic.vue b/src/packages/__VUE/avatar/demo/basic.vue new file mode 100644 index 0000000000..39c5445529 --- /dev/null +++ b/src/packages/__VUE/avatar/demo/basic.vue @@ -0,0 +1,9 @@ + + diff --git a/src/packages/__VUE/avatar/demo/click.vue b/src/packages/__VUE/avatar/demo/click.vue new file mode 100644 index 0000000000..96f6bf3425 --- /dev/null +++ b/src/packages/__VUE/avatar/demo/click.vue @@ -0,0 +1,9 @@ + + diff --git a/src/packages/__VUE/avatar/demo/color.vue b/src/packages/__VUE/avatar/demo/color.vue new file mode 100644 index 0000000000..e025f9d018 --- /dev/null +++ b/src/packages/__VUE/avatar/demo/color.vue @@ -0,0 +1,9 @@ + + diff --git a/src/packages/__VUE/avatar/demo/count.vue b/src/packages/__VUE/avatar/demo/count.vue new file mode 100644 index 0000000000..cd65f0a467 --- /dev/null +++ b/src/packages/__VUE/avatar/demo/count.vue @@ -0,0 +1,16 @@ + + diff --git a/src/packages/__VUE/avatar/demo/group.vue b/src/packages/__VUE/avatar/demo/group.vue new file mode 100644 index 0000000000..584b2d1ac6 --- /dev/null +++ b/src/packages/__VUE/avatar/demo/group.vue @@ -0,0 +1,17 @@ + + diff --git a/src/packages/__VUE/avatar/demo/index.vue b/src/packages/__VUE/avatar/demo/index.vue new file mode 100644 index 0000000000..c53f37dcb1 --- /dev/null +++ b/src/packages/__VUE/avatar/demo/index.vue @@ -0,0 +1,67 @@ + + diff --git a/src/packages/__VUE/avatar/demo/shape.vue b/src/packages/__VUE/avatar/demo/shape.vue new file mode 100644 index 0000000000..0913389e01 --- /dev/null +++ b/src/packages/__VUE/avatar/demo/shape.vue @@ -0,0 +1,7 @@ + + diff --git a/src/packages/__VUE/avatar/demo/size.vue b/src/packages/__VUE/avatar/demo/size.vue new file mode 100644 index 0000000000..fabb7f4753 --- /dev/null +++ b/src/packages/__VUE/avatar/demo/size.vue @@ -0,0 +1,14 @@ + + diff --git a/src/packages/__VUE/avatar/demo/zindex.vue b/src/packages/__VUE/avatar/demo/zindex.vue new file mode 100644 index 0000000000..3a111e8ce2 --- /dev/null +++ b/src/packages/__VUE/avatar/demo/zindex.vue @@ -0,0 +1,12 @@ + + diff --git a/src/packages/__VUE/avatar/doc.en-US.md b/src/packages/__VUE/avatar/doc.en-US.md index 58493934b3..8e2daa62a9 100644 --- a/src/packages/__VUE/avatar/doc.en-US.md +++ b/src/packages/__VUE/avatar/doc.en-US.md @@ -14,218 +14,74 @@ const app = createApp(); app.use(Avatar); ``` -### Size - -Support three sizes:small、normal、large - -:::demo - -```vue - -``` - -::: - -### Shape - -Support two shapes:square、round - -:::demo - -```vue - - -``` - -::: +### Basic Usage -### Type +> demo: avatar basic -Support three types:picture、icon、letter - -:::demo +### Size -```vue - - -``` +size: `small`, `normal`, `large` -::: +> demo: avatar size -### Custom colors and background colors +### Shape -Icon and letter types can have custom colors and background colors +shape: `square`, `round` -:::demo +> demo: avatar shape -```vue - - -``` +### Color -::: +> demo: avatar color ### Avatar with badge -:::demo - -```vue - - -``` +> demo: avatar badge -::: - -### Avatar group display - -:::demo - -```vue - - -``` +### AvatarGroup -::: - -### Avatar group to control hierarchy direction - -:::demo - -```vue - - -``` +> demo: avatar group -::: +### AvatarGroup Direction -### Click on the avatar to trigger the event +> demo: avatar zindex -:::demo +### Click Event -```vue - - -``` +> demo: avatar click + +### Dynamically change count -::: +> demo: avatar count ## API ### Avatar Props -| Attribute | Description | Type | Default | -| --------- | ------------------------------------------------------------------ | ---------------- | -------- | -| size | The size of the avatar,eg `large`、`normal`、`small`,and numbers | string \| number | `normal` | -| shape | shape of avatar,eg `square`、`round ` | string | `round` | -| color | color of text | string | `#666` | -| bg-color | background color | string | `#eee` | +| Attribute | Description | Type | Default | +| --- | --- | --- | --- | +| size | The size of the avatar,eg `large`、`normal`、`small`,and numbers | string \| number | `normal` | +| shape | shape of avatar,eg `square`、`round ` | string | `round` | +| color | color of text | string | `#666` | +| bg-color | background color | string | `#eee` | ### AvatarGroup Props -| Attribute | Description | Type | Default | -| ------------ | -------------------------------------------------------------------------------------------------------------------------------------- | ---------------- | -------- | -| max-count | Max avatars to show | string \| number | - | -| max-content | When the number of avatars exceeds, a avatar folding element will appear,
The content of this element can be `...`、`more`、`+N` | string | `+N` | -| size | The size of the avatar,eg `large`、`normal`、`small`,支持直接输入数字 | string \| number | `normal` | -| shape | The shape of avatar,eg `square`、`round` | string | `round` | -| max-color | color of text | string | `#666` | -| max-bg-color | background color | string | `#eee` | -| span | Distance between avatars | string | `-8` | -| zIndex | Hierarchy direction between avatar group,eg `left`、`right` | string | `left` | +| Attribute | Description | Type | Default | +| --- | --- | --- | --- | +| max-count | Max avatars to show | string \| number | - | +| max-content | When the number of avatars exceeds, a avatar folding element will appear,
The content of this element can be `...`、`more`、`+N` | string | `+N` | +| size | The size of the avatar,eg `large`、`normal`、`small`,支持直接输入数字 | string \| number | `normal` | +| shape | The shape of avatar,eg `square`、`round` | string | `round` | +| max-color | color of text | string | `#666` | +| max-bg-color | background color | string | `#eee` | +| span | Distance between avatars | string | `-8` | +| zIndex | Hierarchy direction between avatar group,eg `left`、`right` | string | `left` | ### Avatar Slots -| Name | Description | -| ------- | ---------------------------------- | +| Name | Description | +| --- | --- | | default | default slot for img, icon or text | ## Theming @@ -234,13 +90,13 @@ const handleClick = () => { The component provides the following CSS variables, which can be used to customize styles. Please refer to [ConfigProvider component](#/en-US/component/configprovider). -| Name | Default Value | -| ----------------------------- | ------------- | -| --nut-actionsheet-light-color | _#f6f6f6_ | -| --nut-avatar-square | _5px_ | -| --nut-avatar-large-width | _60px_ | -| --nut-avatar-large-height | _60px_ | -| --nut-avatar-small-width | _32px_ | -| --nut-avatar-small-height | _32px_ | -| --nut-avatar-normal-width | _40px_ | -| --nut-avatar-normal-height | _40px_ | +| Name | Default Value | +| --- | --- | +| --nut-actionsheet-light-color | _#f6f6f6_ | +| --nut-avatar-square | _5px_ | +| --nut-avatar-large-width | _60px_ | +| --nut-avatar-large-height | _60px_ | +| --nut-avatar-small-width | _32px_ | +| --nut-avatar-small-height | _32px_ | +| --nut-avatar-normal-width | _40px_ | +| --nut-avatar-normal-height | _40px_ | diff --git a/src/packages/__VUE/avatar/doc.md b/src/packages/__VUE/avatar/doc.md index 2a37a75d21..1f68600728 100644 --- a/src/packages/__VUE/avatar/doc.md +++ b/src/packages/__VUE/avatar/doc.md @@ -16,216 +16,72 @@ app.use(Avatar); ### 基础用法 -支持三种尺寸:small、normal、large - -:::demo - -```vue - -``` - -::: - -### 头像形状 - -支持两种形状:square、round - -:::demo - -```vue - - -``` - -::: - -### 头像类型 +> demo: avatar basic -支持三种类型:图片、Icon 以及字符 +### 尺寸 -:::demo - -```vue - - -``` +支持三种尺寸:small、normal、large -::: +> demo: avatar size -### 自定义颜色及背景色 +### 形状 -Icon 和字符型可以自定义颜色及背景色 +支持两种形状:`square`、`round` -:::demo +> demo: avatar shape -```vue - - -``` +### 自定义颜色 -::: +> demo: avatar color ### 带徽标的头像 -:::demo - -```vue - - -``` - -::: +> demo: avatar badge ### 头像组合展现 -:::demo - -```vue - - -``` - -::: +> demo: avatar group ### 组合头像可控制层级方向 -:::demo - -```vue - - -``` +> demo: avatar zindex -::: +### 点击事件 -### 点击头像触发事件 +> demo: avatar click -:::demo - -```vue - - -``` +### 动态修改数量 -::: +> demo: avatar count ## API ### Avatar Props -| 参数 | 说明 | 类型 | 默认值 | -| -------- | -------------------------------------------------------------- | ---------------- | -------- | -| size | 头像的大小,可选值为:`large`、`normal`、`small`,支持输入数字 | string \| number | `normal` | -| shape | 头像的形状,可选值为:`square`、`round ` | string | `round` | -| color | 字体颜色 | string | `#666` | -| bg-color | 背景色 | string | `#eee` | +| 参数 | 说明 | 类型 | 默认值 | +| --- | --- | --- | --- | +| size | 头像的大小,可选值为:`large`、`normal`、`small`,支持输入数字 | string \| number | `normal` | +| shape | 头像的形状,可选值为:`square`、`round ` | string | `round` | +| color | 字体颜色 | string | `#666` | +| bg-color | 背景色 | string | `#eee` | ### AvatarGroup Props -| 参数 | 说明 | 类型 | 默认值 | -| ------------ | ------------------------------------------------------------------------- | ---------------- | -------- | -| max-count | 显示的最大头像个数 | string \| number | - | -| max-content | 头像数量超出时,会出现一个头像折叠元素,该元素内容可为`...`、`more`、`+N` | string | `+N` | -| size | 头像的大小,可选值为:`large`、`normal`、`small`,支持直接输入数字 | string \| number | `normal` | -| shape | 头像的形状,可选值为:`square`、`round` | string | `round` | -| max-color | 头像折叠元素的字体颜色 | string | `#666` | -| max-bg-color | 头像折叠元素的背景色 | string | `#eee` | -| span | 头像之间的间距 | string | `-8` | -| zIndex | 组合头像之间的层级方向,可选值为:`left`、`right` | string | `left` | +| 参数 | 说明 | 类型 | 默认值 | +| --- | --- | --- | --- | +| max-count | 显示的最大头像个数 | string \| number | - | +| max-content | 头像数量超出时,会出现一个头像折叠元素,该元素内容可为`...`、`more`、`+N` | string | `+N` | +| size | 头像的大小,可选值为:`large`、`normal`、`small`,支持直接输入数字 | string \| number | `normal` | +| shape | 头像的形状,可选值为:`square`、`round` | string | `round` | +| max-color | 头像折叠元素的字体颜色 | string | `#666` | +| max-bg-color | 头像折叠元素的背景色 | string | `#eee` | +| span | 头像之间的间距 | string | `-8` | +| zIndex | 组合头像之间的层级方向,可选值为:`left`、`right` | string | `left` | ### Avatar Slots -| 名称 | 描述 | -| ------- | -------------------------------------- | +| 名称 | 描述 | +| --- | --- | | default | 默认插槽,可放置图片、图标、文本等元素 | ## 主题定制 @@ -234,13 +90,13 @@ const handleClick = () => { 组件提供了下列 CSS 变量,可用于自定义样式,使用方法请参考 [ConfigProvider 组件]()。 -| 名称 | 默认值 | -| ----------------------------- | --------- | +| 名称 | 默认值 | +| --- | --- | | --nut-actionsheet-light-color | _#f6f6f6_ | -| --nut-avatar-square | _5px_ | -| --nut-avatar-large-width | _60px_ | -| --nut-avatar-large-height | _60px_ | -| --nut-avatar-small-width | _32px_ | -| --nut-avatar-small-height | _32px_ | -| --nut-avatar-normal-width | _40px_ | -| --nut-avatar-normal-height | _40px_ | +| --nut-avatar-square | _5px_ | +| --nut-avatar-large-width | _60px_ | +| --nut-avatar-large-height | _60px_ | +| --nut-avatar-small-width | _32px_ | +| --nut-avatar-small-height | _32px_ | +| --nut-avatar-normal-width | _40px_ | +| --nut-avatar-normal-height | _40px_ | diff --git a/src/packages/__VUE/avatar/doc.taro.md b/src/packages/__VUE/avatar/doc.taro.md index d20f008194..575ef6180d 100644 --- a/src/packages/__VUE/avatar/doc.taro.md +++ b/src/packages/__VUE/avatar/doc.taro.md @@ -16,216 +16,72 @@ app.use(Avatar); ### 基础用法 -支持三种尺寸:small、normal、large - -:::demo - -```vue - -``` - -::: - -### 头像形状 - -支持两种形状:square、round - -:::demo - -```vue - - -``` - -::: - -### 头像类型 +> demo: avatar basic exhibition -支持三种类型:图片、Icon 以及字符 +### 尺寸 -:::demo - -```vue - - -``` +支持三种尺寸:small、normal、large -::: +> demo: avatar size exhibition -### 自定义颜色及背景色 +### 形状 -Icon 和字符型可以自定义颜色及背景色 +支持两种形状:`square`、`round` -:::demo +> demo: avatar shape exhibition -```vue - - -``` +### 自定义颜色 -::: +> demo: avatar color exhibition ### 带徽标的头像 -:::demo - -```vue - - -``` - -::: +> demo: avatar badge exhibition ### 头像组合展现 -:::demo - -```vue - - -``` - -::: +> demo: avatar group exhibition ### 组合头像可控制层级方向 -:::demo - -```vue - - -``` +> demo: avatar zindex exhibition -::: +### 点击事件 -### 点击头像触发事件 +> demo: avatar click exhibition -:::demo - -```vue - - -``` +### 动态修改数量 -::: +> demo: avatar count exhibition ## API ### Avatar Props -| 参数 | 说明 | 类型 | 默认值 | -| -------- | -------------------------------------------------------------- | ---------------- | -------- | -| size | 头像的大小,可选值为:`large`、`normal`、`small`,支持输入数字 | string \| number | `normal` | -| shape | 头像的形状,可选值为:`square`、`round ` | string | `round` | -| color | 字体颜色 | string | `#666` | -| bg-color | 背景色 | string | `#eee` | +| 参数 | 说明 | 类型 | 默认值 | +| --- | --- | --- | --- | +| size | 头像的大小,可选值为:`large`、`normal`、`small`,支持输入数字 | string \| number | `normal` | +| shape | 头像的形状,可选值为:`square`、`round ` | string | `round` | +| color | 字体颜色 | string | `#666` | +| bg-color | 背景色 | string | `#eee` | ### AvatarGroup Props -| 参数 | 说明 | 类型 | 默认值 | -| ------------ | ------------------------------------------------------------------------- | ---------------- | -------- | -| max-count | 显示的最大头像个数 | string \| number | - | -| max-content | 头像数量超出时,会出现一个头像折叠元素,该元素内容可为`...`、`more`、`+N` | string | `+N` | -| size | 头像的大小,可选值为:`large`、`normal`、`small`,支持直接输入数字 | string \| number | `normal` | -| shape | 头像的形状,可选值为:`square`、`round` | string | `round` | -| max-color | 头像折叠元素的字体颜色 | string | `#666` | -| max-bg-color | 头像折叠元素的背景色 | string | `#eee` | -| span | 头像之间的间距 | string | `-8` | -| zIndex | 组合头像之间的层级方向,可选值为:`left`、`right` | string | `left` | +| 参数 | 说明 | 类型 | 默认值 | +| --- | --- | --- | --- | +| max-count | 显示的最大头像个数 | string \| number | - | +| max-content | 头像数量超出时,会出现一个头像折叠元素,该元素内容可为`...`、`more`、`+N` | string | `+N` | +| size | 头像的大小,可选值为:`large`、`normal`、`small`,支持直接输入数字 | string \| number | `normal` | +| shape | 头像的形状,可选值为:`square`、`round` | string | `round` | +| max-color | 头像折叠元素的字体颜色 | string | `#666` | +| max-bg-color | 头像折叠元素的背景色 | string | `#eee` | +| span | 头像之间的间距 | string | `-8` | +| zIndex | 组合头像之间的层级方向,可选值为:`left`、`right` | string | `left` | ### Avatar Slots -| 名称 | 描述 | -| ------- | -------------------------------------- | +| 名称 | 描述 | +| --- | --- | | default | 默认插槽,可放置图片、图标、文本等元素 | ## 主题定制 @@ -234,13 +90,13 @@ const handleClick = () => { 组件提供了下列 CSS 变量,可用于自定义样式,使用方法请参考 [ConfigProvider 组件]()。 -| 名称 | 默认值 | -| ----------------------------- | --------- | +| 名称 | 默认值 | +| --- | --- | | --nut-actionsheet-light-color | _#f6f6f6_ | -| --nut-avatar-square | _5px_ | -| --nut-avatar-large-width | _60px_ | -| --nut-avatar-large-height | _60px_ | -| --nut-avatar-small-width | _32px_ | -| --nut-avatar-small-height | _32px_ | -| --nut-avatar-normal-width | _40px_ | -| --nut-avatar-normal-height | _40px_ | +| --nut-avatar-square | _5px_ | +| --nut-avatar-large-width | _60px_ | +| --nut-avatar-large-height | _60px_ | +| --nut-avatar-small-width | _32px_ | +| --nut-avatar-small-height | _32px_ | +| --nut-avatar-normal-width | _40px_ | +| --nut-avatar-normal-height | _40px_ |