Skip to content

Commit b4ffab4

Browse files
author
xiaoyatong
committed
fix: merge next
2 parents b041594 + 82c05a9 commit b4ffab4

File tree

362 files changed

+2124
-1762
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

362 files changed

+2124
-1762
lines changed

.github/workflows/sync-h5.yml

+15-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,21 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v4
18-
- run: npm i fs-extra --force
19-
- run: node scripts/copy-docs-h5-or-taro.js
18+
19+
- name: Install pnpm
20+
run: corepack enable pnpm
21+
22+
- uses: actions/setup-node@v4
23+
with:
24+
node-version: '18'
25+
cache: 'pnpm'
26+
27+
- name: Install dependencies
28+
run: pnpm install
29+
30+
- name: Generate doc files
31+
run: node scripts/copy-docs-h5-or-taro.js
32+
2033
- name : Sync
2134
uses : JamesIves/[email protected]
2235
with :

.github/workflows/sync-migrate.yml

+15-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,21 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v4
19-
- run: npm i fs-extra --force
20-
- run: node scripts/copy-migrate-from-v1.js
19+
20+
- name: Install pnpm
21+
run: corepack enable pnpm
22+
23+
- uses: actions/setup-node@v4
24+
with:
25+
node-version: '18'
26+
cache: 'pnpm'
27+
28+
- name: Install dependencies
29+
run: pnpm install
30+
31+
- name: Copy migrate from v1
32+
run: node scripts/copy-migrate-from-v1.js
33+
2134
- name : Sync
2235
uses : JamesIves/[email protected]
2336
with :

.github/workflows/sync-taro.yml

+15-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,21 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v4
18-
- run: npm i fs-extra --force
19-
- run: node scripts/copy-docs-h5-or-taro.js taro
18+
19+
- name: Install pnpm
20+
run: corepack enable pnpm
21+
22+
- uses: actions/setup-node@v4
23+
with:
24+
node-version: '18'
25+
cache: 'pnpm'
26+
27+
- name: Install dependencies
28+
run: pnpm install
29+
30+
- name: Generate doc files
31+
run: node scripts/copy-docs-h5-or-taro.js taro
32+
2033
- name : Sync
2134
uses : JamesIves/[email protected]
2235
with :

CHANGELOG.md

+28
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
# v2.6.11
2+
`2024-06-28`
3+
4+
5+
* :sparkles: feat(table): table新增自定义行 (#2390) @zanyuki-jd
6+
* :bug: fix(fixednav): 可拖拽元素样式缺失 (#2391) @oasis-cloud
7+
8+
9+
# v2.6.10
10+
`2024-06-21`
11+
12+
13+
* 🏡 chore: 文档未来规范 (#2373) @Alex-huxiyang
14+
* 🤖 ci: 统一使用 pnpm @oasis-cloud
15+
* :sparkles: feat(tabpane): 增添修改tabpane背景色的主题变量 (#2366) @Alex-huxiyang
16+
* :bug: fix(tabs): 修复tabs异步设置titles滚动失效(#2351) (#2369) @ShuchenEason
17+
* :bug: fix: umd 中替换环境变量 (#2368) @oasis-cloud
18+
19+
20+
# v2.6.9
21+
`2024-06-14`
22+
23+
24+
* :sparkles: feat(form): footer 容器增加 className (#2345) @oasis-cloud
25+
* :bug: fix: 解决Drag组件拖拽后会在原地留一个遮挡元素问题+解决weapp/taro-h5多个demo拖拽位置不正确问题 (#2330) @irisSong
26+
* :bug: fix(searchbar): 修复 clear 时未触发 change 的问题 (#2262) @eiinu
27+
28+
129
# v2.6.8
230
`2024-05-31`
331

package.json

+8-3
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,19 @@
112112
"@mdx-js/react": "^3.0.1",
113113
"@mdx-js/rollup": "^3.0.1",
114114
"@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
115+
"@rollup/plugin-babel": "^6.0.4",
116+
"@rollup/plugin-commonjs": "^26.0.1",
117+
"@rollup/plugin-node-resolve": "15.2.3",
118+
"@rollup/plugin-typescript": "^11.1.6",
115119
"@swc/core": "^1.4.8",
116120
"@tarojs/components": "4.0.0-beta.75",
117121
"@tarojs/plugin-platform-alipay": "4.0.0-beta.75",
118122
"@tarojs/plugin-platform-weapp": "4.0.0-beta.75",
119123
"@tarojs/react": "4.0.0-beta.75",
120124
"@tarojs/taro": "4.0.0-beta.75",
121125
"@testing-library/jest-dom": "^6.4.2",
122-
"@testing-library/react": "^15.0.4",
126+
"@testing-library/react": "^16.0.0",
127+
"@types/fs-extra": "^11.0.4",
123128
"@types/loadable__component": "^5.13.8",
124129
"@types/lodash.isequal": "^4.5.8",
125130
"@types/lodash.kebabcase": "^4.1.9",
@@ -148,7 +153,7 @@
148153
"eslint-plugin-prettier": "^5.1.3",
149154
"eslint-plugin-react": "^7.33.2",
150155
"eslint-plugin-react-hooks": "^4.6.0",
151-
"eslint-plugin-unused-imports": "^3.1.0",
156+
"eslint-plugin-unused-imports": "^4.0.0",
152157
"fs-extra": "^11.2.0",
153158
"glob": "^10.3.10",
154159
"gulp": "^5.0.0",
@@ -157,7 +162,7 @@
157162
"gulp-rename": "^2.0.0",
158163
"gulp-replace": "^1.1.4",
159164
"gulp-sass": "^5.1.0",
160-
"happy-dom": "^13.9.0",
165+
"happy-dom": "^14.2.0",
161166
"highlight.js": "^11.9.0",
162167
"husky": "^9.0.11",
163168
"inquirer": "^8.2.6",

pnpm-lock.yaml

+881-709
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/packages/actionsheet/doc.en-US.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# ActionSheet
22

3-
## Intro
3+
44

55
Action menu panel that pops up from the bottom.
66

7-
## Install
7+
## Import
88

99
```tsx
1010
import { ActionSheet } from '@nutui/nutui-react';

src/packages/actionsheet/doc.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# ActionSheet 动作面板
22

3-
## 介绍
3+
44

55
从底部弹出的动作菜单面板。
66

7-
## 安装
7+
## 引入
88

99
```tsx
1010
import { ActionSheet } from '@nutui/nutui-react';
1111
```
1212

13-
## 代码演示
13+
## 示例代码
1414

1515
### 基础用法
1616

src/packages/actionsheet/doc.taro.md

+100-102
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,100 @@
1-
# ActionSheet 动作面板
2-
3-
## 介绍
4-
5-
从底部弹出的动作菜单面板。
6-
7-
## 安装
8-
9-
```tsx
10-
import { ActionSheet } from '@nutui/nutui-react-taro';
11-
```
12-
13-
## 代码演示
14-
15-
### 基础用法
16-
17-
:::demo
18-
19-
<CodeBlock src='taro/demo1.tsx'></CodeBlock>
20-
21-
:::
22-
23-
### 展示取消按钮
24-
25-
:::demo
26-
27-
<CodeBlock src='taro/demo2.tsx'></CodeBlock>
28-
29-
:::
30-
31-
### 展示描述信息
32-
33-
:::demo
34-
35-
<CodeBlock src='taro/demo3.tsx'></CodeBlock>
36-
37-
:::
38-
39-
### 选项状态
40-
41-
:::demo
42-
43-
<CodeBlock src='taro/demo4.tsx'></CodeBlock>
44-
45-
:::
46-
47-
### 自定义内容
48-
49-
:::demo
50-
51-
<CodeBlock src='taro/demo5.tsx'></CodeBlock>
52-
53-
:::
54-
55-
### 自定义key
56-
57-
:::demo
58-
59-
<CodeBlock src='taro/demo6.tsx'></CodeBlock>
60-
61-
:::
62-
63-
## ActionSheet
64-
65-
### Props
66-
67-
| 属性 | 说明 | 类型 | 默认值 |
68-
| --- | --- | --- | --- |
69-
| visible | 遮罩层可见 | `boolean` | `false` |
70-
| title | 设置列表面板标题 | `string` | `-` |
71-
| description | 设置列表面板副标题/描述 | `string` | `-` |
72-
| options | 列表项 | `Array` | `[]` |
73-
| optionKey | 列表项的自定义设置 | `{ [key: string]: string }` | `-` |
74-
| cancelText | 取消文案 | `string` | `取消` |
75-
| onSelect | 选择之后触发 | `(item: any, index: number) => void` | `-` |
76-
| onCancel | 点击取消文案时触发 | `() => void` | `-` |
77-
78-
### options
79-
80-
| 属性 | 说明 | 类型 | 默认值 |
81-
| --- | --- | --- | --- |
82-
| name | 列表项的标题key值 | `string` | `-` |
83-
| description | 列表项的描述key值 | `string` | `-` |
84-
| danger | 高亮颜色 | `string` | `$color-primary` |
85-
| disabled | 禁用状态 | `string` | `$disabled-color` |
86-
87-
## 主题定制
88-
89-
### 样式变量
90-
91-
组件提供了下列 CSS 变量,可用于自定义样式,使用方法请参考 [ConfigProvider 组件](#/zh-CN/component/configprovider)
92-
93-
| 名称 | 说明 | 默认值 |
94-
| --- | --- | --- |
95-
| \--nutui-actionsheet-background-color | 背景色 | `$color-background-overlay` |
96-
| \--nutui-actionsheet-border-radius | 列表和取消按钮圆角 | `0` |
97-
| \--nutui-actionsheet-border-color | 标题和取消位置的border色值 | `#F7F8FC` |
98-
| \--nutui-actionsheet-item-text-align | 列表项的文字对齐方式 | `center` |
99-
| \--nutui-actionsheet-item-border-bottom | 列表项的底部border | `none` |
100-
| \--nutui-actionsheet-item-line-height | 列表项行高 | `24px` |
101-
| \--nutui-actionsheet-item-color | 列表项字色 | `$color-title` |
102-
| \--nutui-actionsheet-item-danger | 列表项danger字色 | `$color-primary` |
1+
# ActionSheet 动作面板
2+
3+
从底部弹出的动作菜单面板。
4+
5+
## 引入
6+
7+
```tsx
8+
import { ActionSheet } from '@nutui/nutui-react-taro';
9+
```
10+
11+
## 示例代码
12+
13+
### 基础用法
14+
15+
:::demo
16+
17+
<CodeBlock src='taro/demo1.tsx'></CodeBlock>
18+
19+
:::
20+
21+
### 展示取消按钮
22+
23+
:::demo
24+
25+
<CodeBlock src='taro/demo2.tsx'></CodeBlock>
26+
27+
:::
28+
29+
### 展示描述信息
30+
31+
:::demo
32+
33+
<CodeBlock src='taro/demo3.tsx'></CodeBlock>
34+
35+
:::
36+
37+
### 选项状态
38+
39+
:::demo
40+
41+
<CodeBlock src='taro/demo4.tsx'></CodeBlock>
42+
43+
:::
44+
45+
### 自定义内容
46+
47+
:::demo
48+
49+
<CodeBlock src='taro/demo5.tsx'></CodeBlock>
50+
51+
:::
52+
53+
### 自定义key
54+
55+
:::demo
56+
57+
<CodeBlock src='taro/demo6.tsx'></CodeBlock>
58+
59+
:::
60+
61+
## ActionSheet
62+
63+
### Props
64+
65+
| 属性 | 说明 | 类型 | 默认值 |
66+
| --- | --- | --- | --- |
67+
| visible | 遮罩层可见 | `boolean` | `false` |
68+
| title | 设置列表面板标题 | `string` | `-` |
69+
| description | 设置列表面板副标题/描述 | `string` | `-` |
70+
| options | 列表项 | `Array` | `[]` |
71+
| optionKey | 列表项的自定义设置 | `{ [key: string]: string }` | `-` |
72+
| cancelText | 取消文案 | `string` | `取消` |
73+
| onSelect | 选择之后触发 | `(item: any, index: number) => void` | `-` |
74+
| onCancel | 点击取消文案时触发 | `() => void` | `-` |
75+
76+
### options
77+
78+
| 属性 | 说明 | 类型 | 默认值 |
79+
| --- | --- | --- | --- |
80+
| name | 列表项的标题key值 | `string` | `-` |
81+
| description | 列表项的描述key值 | `string` | `-` |
82+
| danger | 高亮颜色 | `string` | `$color-primary` |
83+
| disabled | 禁用状态 | `string` | `$disabled-color` |
84+
85+
## 主题定制
86+
87+
### 样式变量
88+
89+
组件提供了下列 CSS 变量,可用于自定义样式,使用方法请参考 [ConfigProvider 组件](#/zh-CN/component/configprovider)
90+
91+
| 名称 | 说明 | 默认值 |
92+
| --- | --- | --- |
93+
| \--nutui-actionsheet-background-color | 背景色 | `$color-background-overlay` |
94+
| \--nutui-actionsheet-border-radius | 列表和取消按钮圆角 | `0` |
95+
| \--nutui-actionsheet-border-color | 标题和取消位置的border色值 | `#f6f6f6` |
96+
| \--nutui-actionsheet-item-text-align | 列表项的文字对齐方式 | `center` |
97+
| \--nutui-actionsheet-item-border-bottom | 列表项的底部border | `none` |
98+
| \--nutui-actionsheet-item-line-height | 列表项行高 | `24px` |
99+
| \--nutui-actionsheet-item-color | 列表项字色 | `$color-title` |
100+
| \--nutui-actionsheet-item-danger | 列表项danger字色 | `$color-primary` |

src/packages/actionsheet/doc.zh-TW.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# ActionSheet 動作面闆
22

3-
## 介紹
3+
44

55
從底部彈出的動作菜單面闆。
66

7-
## 安裝
7+
## 引入
88

99
```tsx
1010
import { ActionSheet } from '@nutui/nutui-react';
1111
```
1212

13-
## 代碼演示
13+
## 示例代碼
1414

1515
### 基礎用法
1616

0 commit comments

Comments
 (0)