Skip to content

feat(Dialog): v15 #2845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 42 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
40099b0
fix(avatarcropper): 多语言支持 (#2666)
xiaoyatong Oct 30, 2024
b97e0a5
feat: replacing the css paths imported from a specified package (#2675)
oasis-cloud Nov 1, 2024
08bab87
fix(tabs): clicked tabs should be entirely visible (#2685)
Miles-hxy Nov 1, 2024
6764b61
feat: add plugin to remove rtl (#2673)
oasis-cloud Nov 1, 2024
d1037f1
chore: ci (#2687)
Miles-hxy Nov 1, 2024
5a3e7c3
chore(release): v2.7.0
oasis-cloud Nov 1, 2024
53571d1
chore: ci (#2690)
Miles-hxy Nov 1, 2024
d9151f1
chore: ci optimize (#2692)
Miles-hxy Nov 1, 2024
7f87c66
docs: 官方主题入口 (#2634)
oasis-cloud Nov 7, 2024
4e206b8
chore: jdesign 主题 (#2703)
oasis-cloud Nov 7, 2024
66e9d1b
fix(textarea): handle undefined placeholder explicitly (#2748)
Miles-hxy Nov 14, 2024
d3adf91
chore: update ci
oasis-cloud Nov 19, 2024
bd4b46c
chore: update ci
oasis-cloud Nov 19, 2024
2ab6b1e
fix(Form): Form 组件文档 demo 中 Switch 组件使用问题 (#2774)
zhangminggeek Nov 20, 2024
b3c6434
docs(infiniteLoading): optimize target description (#2770)
Miles-hxy Nov 20, 2024
ad9ba90
fix(toast): load dependent CSS (#2776)
oasis-cloud Nov 21, 2024
d107304
fix(popup): display should not trigger the scrollview to update (#2773)
oasis-cloud Nov 21, 2024
3fb4d5f
chore(release): v2.7.1
oasis-cloud Nov 22, 2024
543ec6d
docs(infiniteloading): remove deprecated usage (#2801)
Miles-hxy Nov 28, 2024
a767209
fix(Table): 给个默认背景色,解决在小程序中固定列与滚动内列混合 (#2789)
kid-kang Nov 28, 2024
92769e0
fix(deps): update dependency vitest to v2 (#2697)
renovate[bot] Dec 2, 2024
ca4621e
chore: migrate to v3
oasis-cloud Dec 2, 2024
f0309a4
fix: Uploade 组件无法预览图片 (#2822)
Madq92 Dec 4, 2024
6556d13
chore(uploader): use scss variable (#2825)
oasis-cloud Dec 4, 2024
402e32f
fix(uploader): 修复选择多个文件上传只会上传一个文件的问题 (#2807)
zhuddan Dec 5, 2024
161733d
fix: 解决微信小程序滚动报错问题 (#2833)
irisSong Dec 5, 2024
d8ab65e
feat(elevator): 采用唯一ID,避免未传入 className 导致的报错 (#2834)
oasis-cloud Dec 5, 2024
5588ad4
feat(form): add validateTrigger, setFieldValue and disabled (#2772)
oasis-cloud Dec 6, 2024
601b5d1
chore(release): v2.7.2
oasis-cloud Dec 6, 2024
49106e3
fix: dark 模式下arrow 未配置 (#2850)
xiaoyatong Dec 11, 2024
67e02b5
fix: 支持 button block (#2853)
xiaoyatong Dec 11, 2024
f0c47ec
fix(empty): actions add support for events (#2854)
oasis-cloud Dec 11, 2024
229b038
feat(popover): 增加最大宽度设置,支持文本超过最大宽度时,换行展示。 (#2851)
xiaoyatong Dec 12, 2024
5a5f7c4
feat(Video): web h5 下支持 ref 调用 (#2852)
xiaoyatong Dec 12, 2024
7bfd5e8
chore(release): v2.7.3
oasis-cloud Dec 13, 2024
7489260
fix: update variables-jmapp.scss
oasis-cloud Dec 13, 2024
4713330
fix(countup): 分隔符文字颜色支持css变量修改 (#2869)
irisSong Dec 18, 2024
441370a
fix: 修改小程序下自动吸边计算逻辑&&解决部分小程序写法不支持问题 (#2855)
irisSong Dec 18, 2024
663908a
fix(form): 修复label字号的css变量 (#2872)
oasis-cloud Dec 18, 2024
b7fa8cb
chore(release): v2.7.4
oasis-cloud Dec 20, 2024
9be61bf
fix: scss variables jmapp
oasis-cloud Dec 20, 2024
c53503a
fix: update backtop demos (#2865)
xiaoyatong Dec 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"extends": [
"config:base", "schedule:weekly", "group:allNonMajor"
],
"baseBranches": ["feat_v3.x"],
"rangeStrategy": "bump",
"labels": ["dependencies"],
"ignorePaths": [
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/add-label.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Add Label

on:
pull_request_target:
types: [opened, synchronize, reopened]
workflow_dispatch:

jobs:
add-label:
runs-on: ubuntu-latest

steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Determine label based on target branch
id: determine-label
run: |
echo "${{github.event_name}}"
if [[ "${{ github.event.pull_request.base.ref }}" == "next" ]]; then
echo "label=2.x" >> $GITHUB_ENV
elif [[ "${{ github.event.pull_request.base.ref }}" == "V3.0" ]]; then
echo "label=3.x" >> $GITHUB_ENV
else
echo "label=" >> $GITHUB_ENV
fi

- name: Add label to Pull Request
if: env.label != ''
uses: actions-ecosystem/action-add-labels@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
labels: ${{ env.label }}
88 changes: 44 additions & 44 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,71 +15,71 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4

- name: Install pnpm
run: corepack enable pnpm
- name: Install pnpm
run: corepack enable pnpm

- uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'pnpm'
- uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'pnpm'

- name: Install dependencies
run: pnpm install
- name: Install dependencies
run: pnpm install

- name: Run linter
run: npm run lint
- name: Run linter
run: npm run lint

test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4

- name: Install pnpm
run: corepack enable pnpm
- name: Install pnpm
run: corepack enable pnpm

- uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'pnpm'
- uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'pnpm'

- name: Install dependencies
run: pnpm install
- name: Install dependencies
run: pnpm install

- name: Run test
run: npm run test
- name: Run test
run: npm run test

- name: Upload coverage reports to Codecov
if: ${{ always() }}
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- name: Upload coverage reports to Codecov
if: ${{ always() }}
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4

- name: Install pnpm
run: corepack enable pnpm
- name: Install pnpm
run: corepack enable pnpm

- uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'pnpm'
- uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'pnpm'

- name: Install dependencies
run: pnpm install
- name: Install dependencies
run: pnpm install

- name: Build NutUI-React
run: npm run build
- name: Build NutUI-React
run: npm run build

- name: Build NutUI-React-Taro
run: npm run build:taro
- name: Build NutUI-React-Taro
run: npm run build:taro

- name: Build NutUI-React Demo
run: npm run build:site
- name: Build NutUI-React Demo
run: npm run build:site

- name: Build NutUI-React Taro H5 Demo
run: npm run build:taro:site
- name: Build NutUI-React Taro H5 Demo
run: npm run build:taro:site
61 changes: 61 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,64 @@
# v2.7.4

`2024-12-20`

- :bug: fix(form): 修复label字号的css变量 (#2872)
- :bug: fix: 修改小程序下自动吸边计算逻辑&&解决部分小程序写法不支持问题 (#2855)
- :bug: fix(countup): 分隔符文字颜色支持css变量修改 (#2869)
- :bug: fix: update variables-jmapp.scss

# v2.7.3

`2024-12-13`

- :sparkles: feat(Video): web h5 下支持 ref 调用 (#2852)
- :sparkles: feat(popover): 增加最大宽度设置,支持文本超过最大宽度时,换行展示 (#2851)
- :bug: fix(empty): actions add support for events (#2854)
- :bug: fix: 支持 button block (#2853)
- :bug: fix: dark 模式下arrow 未配置 (#2850)

# v2.7.2

`2024-12-06`

- 🏡 chore(uploader): use scss variable (#2825)
- 🏡 chore: migrate to v3
- 📖 docs(infiniteloading): remove deprecated usage (#2801)
- :sparkles: feat(form): add validateTrigger, setFieldValue and disabled (#2772)
- :sparkles: feat(elevator): 采用唯一ID,避免未传入 className 导致的报错 (#2834)
- :bug: fix: 解决微信小程序滚动报错问题 (#2833)
- :bug: fix(uploader): 修复选择多个文件上传只会上传一个文件的问题 (#2807)
- :bug: fix: Uploade 组件无法预览图片 (#2822)
- :bug: fix(deps): update dependency vitest to v2 (#2697)
- :bug: fix(Table): 给个默认背景色,解决在小程序中固定列与滚动内列混合 (#2789)

# v2.7.1

`2024-11-22`

- :bug: fix(popup): display should not trigger the scrollview to update (#2773)
- :bug: fix(toast): load dependent CSS (#2776)
- :bug: fix(Form): Form 组件文档 demo 中 Switch 组件使用问题 (#2774)
- :bug: fix(textarea): handle undefined placeholder explicitly (#2748)
- 🏡 chore: jdesign 主题 (#2703)
- 🏡 chore: ci optimize (#2692)
- 🏡 chore: ci (#2690)
- 📖 docs(infiniteLoading): optimize target description (#2770)
- 📖 docs: 官方主题入口 (#2634)

# v2.7.0

`2024-11-01`

- :sparkles: feat: add plugin to remove rtl (#2673)
- :sparkles: feat: replacing the css paths imported from a specified package (#2675)
- :sparkles: feat(replace icon): jmapp icon (#2672)
- :sparkles: feat: add plugin to replace icons (#2671)
- :bug: fix(tabs): clicked tabs should be entirely visible (#2685)
- :bug: fix(avatarcropper): multi-language support (#2666)
- :bug: fix: optimize vertical type syntax for divider (#2664)
- :bug: fix: @nutui/icons-react changed to @nutui/icons-react-taro (#2651)

# v2.6.23

`2024-10-18`
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nutui/nutui-react-taro",
"version": "2.6.23",
"version": "2.7.4",
"style": "dist/style.css",
"main": "dist/nutui.react.umd.js",
"module": "dist/esm/nutui-react.es.js",
Expand Down
31 changes: 31 additions & 0 deletions packages/nutui-optimize-css/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
通过配置 postcss 对组件库的 css 进行优化。

1. Taro 环境下的配置示例

```text
{
"mini": {
"postcss": {
"@nutui/optimize-css": {
"enable": true,
"config": {
"removeRtl": true,
"cssVariables": {
"include": [path.join(__dirname, 'variables.scss')],
"exclude": ["--nutui-color-primary-text"],
"type": "replace"
}
}
}
}
}
}
```

配置说明:

1. removeRtl:删除 rtl 相关样式
2. cssVariables
- include: 指定css变量的文件
- exclude: 设置哪些 css 变量不进行替换, 在 JS 控制 css 变量时可以使用 exclude 指定
- type: css 变量的替换方案,默认不处理,当设置 replace 时,可将 css 变量替换为实际值
18 changes: 18 additions & 0 deletions packages/nutui-optimize-css/build.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { defineBuildConfig } from 'unbuild'

export default defineBuildConfig({
failOnWarn: false,
entries: [
{
input: 'src/index',
outDir: 'dist',
format: 'cjs',
ext: 'cjs',
},
],
outDir: 'dist',
externals: ['postcss', 'postcss-css-variables', 'postcss-scss'],
rollup: {
emitCJS: true,
},
})
27 changes: 27 additions & 0 deletions packages/nutui-optimize-css/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"name": "@nutui/optimize-css",
"version": "1.0.0",
"description": "remove rtl",
"main": "dist/index.cjs",
"scripts": {
"build": "unbuild",
"test": "pnpm build && vitest"
},
"keywords": [],
"author": "",
"license": "ISC",
"devDependencies": {
"@types/lodash": "^4.17.1",
"@types/node": "^20.14.11",
"@types/postcss-css-variables": "^0.18.3",
"ts-node": "^10.9.2",
"unbuild": "^2.0.0",
"vitest": "^2.1.7"
},
"dependencies": {
"lodash": "^4.17.21",
"postcss": "^8.4.39",
"postcss-css-variables": "^0.19.0",
"postcss-scss": "^4.0.9"
}
}
3 changes: 3 additions & 0 deletions packages/nutui-optimize-css/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { optimizeCss } from './postcss-plugins'

export default optimizeCss
Loading
Loading