Skip to content

Commit f86d595

Browse files
oasis-cloudoasis-cloud
committed
Merge branch 'feat_v3.x' into feat_skeleton_harmony
2 parents 9a76cbc + 2a74f0f commit f86d595

File tree

83 files changed

+394
-634
lines changed

Some content is hidden

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

83 files changed

+394
-634
lines changed

‎.github/workflows/sync-h5.yml‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎.github/workflows/sync-migrate.yml‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎.github/workflows/sync-taro.yml‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
`2025-03-07`
44

5+
- fix(sidebar): 禁用属性和内容显示异常 (#3084)
6+
- fix: 示例中 toast 的用法修复 (#3083)
7+
- chore: 移除废弃的 github action (#3085)
8+
- chore(deps): 升级 actions/github-script 到 v7 (#3012)
9+
10+
# v3.0.3
11+
12+
`2025-03-07`
13+
514
- refactor(pagination): 组件重构, hooks 实现数据抽象 (#2988)
615
- refactor(cascader): 组件重构，修订 lazy 属性的定义 (#3007)
716
- fix(countdown): 秒位补 0 展示 (#3072)

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nutui/nutui-react-taro",
3-
"version": "3.0.3",
3+
"version": "3.0.4",
44
"style": "dist/style.css",
55
"main": "dist/nutui.react.umd.js",
66
"module": "dist/es/packages/nutui.react.build.js",

‎packages/nutui-taro-demo/config/index.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const config = {
112112
'../../../src/packages/lottie/animation/dark/pulltorefresh-white.json'
113113
),
114114

115-
'@nutui/nutui-react-taro/dist/locales/en-US': path.resolve(
115+
'@nutui/nutui-react-taro/dist/es/locales/en-US': path.resolve(
116116
__dirname,
117117
'../../../src/locales/en-US.ts'
118118
),
@@ -121,6 +121,7 @@ const config = {
121121
'@/locales': path.resolve(__dirname, '../../../src/locales'),
122122
'@/utils': path.resolve(__dirname, '../../../src/utils'),
123123
'@/hooks': path.resolve(__dirname, '../../../src/hooks'),
124+
'@/types': path.resolve(__dirname, '../../../src/types'),
124125
'@nutui/nutui-react-taro': path.resolve(
125126
__dirname,
126127
'../../../src/packages/nutui.react.taro.ts'

‎scripts/copy-docs-h5-or-taro.js‎

Lines changed: 0 additions & 126 deletions
This file was deleted.

‎scripts/copy-migrate-from-v1.js‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎scripts/copy-migrate-from-v2.js‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎scripts/generate-nutui.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ fs.outputFile(
7171

7272
let fileStr = `${importStr}
7373
${importScssStr}
74+
export * from '@/types';
7475
export { ${packages.join(',')} };`
7576
fs.outputFile(
7677
path.resolve(__dirname, '../src/packages/nutui.react.ts'),

0 commit comments

Comments
 (0)