Skip to content
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

fix(calendar): 新增初始化位置方法 #2082

Closed
wants to merge 118 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
c805a21
feat: 添加range组件、calendar组件在线文档
Jan 20, 2022
55c6e33
fix: 文档调整
Jan 21, 2022
bad287f
fix: 重构calendar组件
Feb 18, 2022
bffc56e
Merge branch 'upstream_next' into next
Feb 18, 2022
24a9967
Merge branch 'next' into lk-nutui
Feb 18, 2022
86140ef
feat: 日历组件重构,文档修改,功能完善
Feb 23, 2022
455d613
Merge branch 'lk-nutui' of ssh://github.com/lkjh3214/nutui into lk-nutui
Feb 23, 2022
097935f
fix: 格式化
Feb 23, 2022
cc8eac2
Merge branch 'next' of ssh://github.com/lkjh3214/nutui into next
Feb 23, 2022
5c26c3f
fix: 代码格式化调整。
Feb 23, 2022
64a74bd
fix: 去除无用代码
Feb 23, 2022
261674e
Merge branch 'lk-nutui' into next
Feb 23, 2022
34e7f5a
fix: 文档调整
Feb 23, 2022
83c3252
fix: 文档调整
Feb 23, 2022
246c7ef
fix: taro demo 样式修改
Feb 23, 2022
13a64e3
Merge branch 'upstream_next' into lk-nutui
Feb 23, 2022
6ca304c
Merge branch 'upstream_next' into lk-nutui
Mar 22, 2022
06bfbd7
Merge branch 'upstream_next' into lk-nutui
Mar 22, 2022
8af99db
feat: range组件功能完善,新增 竖向操作,刻度展示。
Mar 22, 2022
32920b1
Merge branch 'upstream_next' into lk-nutui
Mar 22, 2022
d5cb5d0
fix: 冲突解决
Mar 22, 2022
d096a28
feat: taro功能新增,兼容处理,文档修改
Mar 22, 2022
fc48524
Merge branch 'upstream_next' into lk-nutui
Mar 22, 2022
967affa
Merge branch 'next' into lk-nutui
szg2008 Mar 25, 2022
b20666e
Merge branch 'upstream_next' into lk-nutui
Mar 25, 2022
7721d7b
feat: 添加range组件,jdt主题色
Mar 25, 2022
170a777
Merge branch 'upstream_next' into lk-nutui
Mar 30, 2022
6aa79b4
Merge branch 'upstream_next' into lk-nutui
Apr 6, 2022
3a18252
Merge branch 'upstream_next' into lk-nutui
Apr 21, 2022
cc0ec20
fix: 修改组件初始化逻辑
Apr 24, 2022
e41e7df
Merge branch 'upstream_next' into lk-nutui
Apr 24, 2022
5fa9702
feat: 新增h5 日期多选功能
May 9, 2022
8fcd6ff
Merge branch 'lk-nutui' into lk-dev-calendar
May 20, 2022
fa6f570
feat: taro版本添加 日期多选功能
May 20, 2022
58e8f79
fix: 修复多选,无法选中开头结尾日期问题
Jun 21, 2022
7e99775
Merge branch 'upstream_next' into lk-dev-calendar
Jun 21, 2022
5089372
fix: 文档修改,添加en-US 文档
Jun 21, 2022
3078dca
Merge branch 'upstream_next' into lk-dev-calendar
Jun 21, 2022
b8c28eb
fix: 文档完善
Jun 23, 2022
b27a36d
Merge branch 'upstream_next' into lk-dev-calendar
Jun 23, 2022
5988e41
Merge branch 'upstream_next' into lk-dev-calendar
Sep 7, 2022
95f7f83
fix: calendar,demo错误修复
Sep 7, 2022
693fc13
fix: swiper文档修改
Sep 8, 2022
5f88508
Merge branch 'upstream_next' into lk-dev-calendar
Sep 29, 2022
6fbad82
fix: 日历组件问题修复
Sep 29, 2022
9d9305c
Merge branch 'upstream_next' into lk-dev-calendar
Sep 29, 2022
e17b9e5
Merge branch 'upstream_next' into lk-dev-calendar
Sep 30, 2022
557e93e
Merge branch 'upstream_next' into lk-dev-calendar
Oct 10, 2022
1c36f93
fix: calendar taro兼容问题调整
Oct 12, 2022
8fc03b7
Merge branch 'upstream_next' into lk-dev-calendar
Oct 12, 2022
03474a4
fix: taro转h5问题修改
Oct 17, 2022
00110fe
Merge branch 'upstream_next' into lk-dev-calendar
Oct 17, 2022
d6fb21d
fix: 日历组件修改,vite配置修改,新增plugin
Oct 19, 2022
fd22642
Merge branch 'upstream_next' into lk-dev-calendar
Oct 19, 2022
a6bc9a3
fix: 配置项修改
Oct 21, 2022
112c514
Merge branch 'upstream_next' into lk-dev-calendar
Oct 26, 2022
16c04b4
Merge branch 'upstream_next' into lk-dev-calendar
Oct 26, 2022
ebcac7c
fix: 指定taro版本
Nov 3, 2022
42b19ba
fix: taro版本指定为3.5.6
Nov 3, 2022
9546953
fix: 修复scroll-view标签问题
Nov 3, 2022
e92613f
Merge branch 'upstream_next' into lk-dev-calendar
Nov 3, 2022
943c85b
feat: 日历组件,暴露初始化定位方法
Nov 11, 2022
31b900f
Merge branch 'upstream_next' into lk-dev-calendar
Nov 11, 2022
ac14c73
fix: infiniteloading 组件review内容修改 (#1904)
yangxiaolu1993 Dec 5, 2022
37654cc
refactor(swiper): optimize code
szg2008 Dec 7, 2022
3149d7b
fix: Tabs 组件 getScrollTopRoot 函数替换 (#1910)
yangxiaolu1993 Dec 9, 2022
5fe5390
fix: tabbar优化 (#1912)
Drjingfubo Dec 9, 2022
8683bd5
fix: 修改文档,调整全局样式
Dec 12, 2022
d260211
fix: range组件Taro H5修改 (#1915)
lkjh3214 Dec 12, 2022
b5348bb
refactor: swiper
szg2008 Dec 12, 2022
1c1d30d
fix: 修复 Picker 在 Taro H5 下无法使用问题 #1911 #1921 (#1926)
yangxiaolu1993 Dec 14, 2022
eaf379b
feat: popover 组件增加新功能 (#1932)
yangxiaolu1993 Dec 15, 2022
abef536
feat: Picker 组件新增 showOkText、showCancelText (#1933)
yangxiaolu1993 Dec 15, 2022
bb2416a
fix(price): add new props strike-through (#1934)(#1907)
Drjingfubo Dec 15, 2022
01f2cd6
docs(tabbar): edit doc (#1941)
Drjingfubo Dec 16, 2022
c7e370d
fix(tabs): taro env sticky tips bug #1889
richard1015 Dec 16, 2022
94671cc
docs(Menu): 修正自定义图标文档错误 、设置class-prefix不生效问题 (#1942)
yangjinjun3 Dec 16, 2022
ac6d9ba
docs(menu): edit desc
richard1015 Dec 16, 2022
412539d
fix(price): taro h5 style problem (#1944)
Drjingfubo Dec 16, 2022
09dcaf8
docs: 组件文案修改 (#1945)
yangxiaolu1993 Dec 16, 2022
1bd3de8
release: v3.3.1
richard1015 Dec 16, 2022
7d7866f
Merge branch 'next' of https://github.com/jdf2e/nutui into next
richard1015 Dec 16, 2022
6f5276d
docs(uploader): 组件的文档补充 (#1949)
HuziG Dec 20, 2022
5af4df7
fix(tabbar): type edit (#1979)
Drjingfubo Dec 26, 2022
394527e
fix: barrage 小程序不展示问题处理 (#1987)
Ymm0008 Dec 29, 2022
39369a0
feat: popup增加自定义遮罩层类名及样式 (#1962)
zy-hub Dec 29, 2022
2d96a72
upd: swiper is-center
szg2008 Dec 29, 2022
29116af
fix(tabbar): router jump problem (#1993)
Drjingfubo Dec 30, 2022
0acf1e0
feat(menu): 小程序添加open和close方法 (#1985)
yangjinjun3 Jan 3, 2023
a9e27a7
chore: build es entry
richard1015 Jan 3, 2023
9a7027c
fix: Tab title bar supports automatic scrolling with content (#1950)
gyt95 Jan 4, 2023
3766a2d
fix(tabs): taro env dev bug (#2002)
jiang577 Jan 4, 2023
69b499a
release: v3.3.2
richard1015 Jan 4, 2023
027b387
fix(tabs): the automatic scrolling fails while updating title bar dat…
gyt95 Jan 7, 2023
271f15c
fix: cdn minify bug 3.3.3
richard1015 Jan 9, 2023
4006ec6
fix: 4.0测试期间发现的问题3.0同步修改 (#2055)
yangxiaolu1993 Jan 13, 2023
0426429
fix: sku问题修改 (#2057)
yangxiaolu1993 Jan 16, 2023
d4c0cfd
fix(progress): component optimization (#2060)
Drjingfubo Jan 16, 2023
fdeb122
fix: price、input、addresslist问题 (#2063)
ailululu Jan 17, 2023
fd09186
fix: 修复uploader组件的is-deletable在列表模式下不生效 (#2062)
Jan 17, 2023
c24e557
docs(tabbar): fix format (#2018)
gyt95 Jan 17, 2023
dc1d00f
fix(collapse、signature): collapse 渲染卡顿问题、signature 组件增加空值返回 (#2061)
Ymm0008 Jan 17, 2023
19c67c8
fix: 国际化 treeshaking 修复
richard1015 Jan 17, 2023
bc40bcd
style: add reset.css
richard1015 Jan 17, 2023
a27bf8b
fix(cell): desc-text-align bug
richard1015 Jan 17, 2023
5c9e939
fix(barrage): slot 模式优化 (#2066)
Ymm0008 Jan 17, 2023
98d27f7
fix(rate): readonly state disable touch
richard1015 Jan 17, 2023
1506f64
feat(config-provider): 覆盖nut-icon属性 (#2016)
thx125 Jan 17, 2023
4228300
release: v3.3.3-beta.0
richard1015 Jan 17, 2023
a435362
fix(numberkeyboard): type edit (#2067)
Drjingfubo Jan 18, 2023
0fdb147
fix: cdn use bug
richard1015 Jan 18, 2023
fe9f008
release: v3.3.3-beta.1
richard1015 Jan 18, 2023
f80c978
docs: changelog 3.3.3
richard1015 Jan 18, 2023
d83d972
release: v3.3.3
richard1015 Jan 18, 2023
68551f2
feat(checkbox): add checkbox new props of shape (#1978)
mikasayw Jan 18, 2023
fe3deea
fix: 组件文档完善,bug修改 (#2070)
yangxiaolu1993 Jan 18, 2023
784231c
Merge branch 'upstream_next' into lk-dev-calendar
Jan 31, 2023
5991a5d
fix: calendar 文档修改
Jan 31, 2023
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ src/packages/vscode-extension/*.vsix
src/packages/vscode-extension/yarn.lock
/.nyc_output
/coverage
/tsc/test
/tsc
/site_docs
/publish/**/dist/
/src/sites/mobile-taro/vue/src/app.config.ts

# local env files
Expand Down
60 changes: 60 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,63 @@
## v3.3.3

`2022-1-18`

小程序版本依赖 Taro ^3.5.6

NutUI 非常感谢您对开源事业做出的贡献!🌷🌷🌷
本次社区贡献者 @gyt95 @thx125 @rocwong-cn


* :zap: feat(config-provider): 支持统一自定义 icon 、font-class-name、class-prefix (#2016) @thx125
* :bug: fix(numberkeyboard): type edit (#2067) @Drjingfubo
* :bug: fix(progress): component optimization (#2060) @Drjingfubo
* :bug: fix(tabs): the automatic scrolling fails while updating title bar data @gyt95
* :bug: fix(comment、ellipsis、noticebar、picker、sku): v4 bug 同步修复 @yangxiaolu1993
* :bug: fix(input、price、addresslist): v4 bug 同步修复 & v3 taro环境input使用bug @ailululu
* :bug: fix(uploader): is-deletable在列表模式下不生效 (#2062) @rocwong-cn
* :bug: fix(collapse、signature): collapse 渲染卡顿问题、signature 组件增加空值返回 (#2061) @Ymm0008
* :bug: fix: cdn minify bug 3.3.3 @richard1015
* :bug: fix: 国际化 treeshaking 修复 @richard1015
* :bug: fix(cell): desc-text-align bug @richard1015
* :bug: fix(rate): readonly state disable touch @richard1015
* :bug: fix(barrage): slot 模式优化 (#2066) @Ymm0008
* 📖 docs(tabbar): fix format (#2018) @gyt95

## v3.3.2

`2022-1-4`

小程序版本依赖 Taro ^3.5.6

NutUI 非常感谢您对开源事业做出的贡献!🌷🌷🌷
本次社区贡献者 @gyt95 @zy-hub @HuziG


* :zap: chore: vite工具按需加载功能修复(测试 Button 组件减少193kb) @richard1015
* :zap: feat(tabs): 支持点击时自动居中功能 @gyt95
* :zap: feat(menu): taro 环境新增 open、close方法 (#1985) @yangjinjun3
* :zap: feat(popup): popup增加自定义遮罩层类名及样式 (#1962) @zy-hub
* :bug: fix(price): add new props strike-through (#1934)(#1907) @Drjingfubo
* :bug: fix(tabbar): router jump problem (#1993) @Drjingfubo
* :bug: fix(barrage): 小程序不展示问题处理 (#1987) @Ymm0008
* 📖 docs(uploader): 组件的文档补充 (#1949) @HuziG


## v3.3.1

`2022-12-16`

小程序版本依赖 Taro ^3.5.6

* :zap: feat(imagepreview、infiniteloading、tabs、tabbar): 优化内部逻辑 @nutui-team
* :zap: feat(picker): 新增 showOkText、showCancelText (#1933) @yangxiaolu1993
* :bug: fix(price): add new props strike-through (#1934)(#1907) @Drjingfubo
* :bug: fix(tabs): taro env sticky tips bug #1889 @richard1015
* :bug: fix(price): taro h5 style problem (#1944) @Drjingfubo
* :bug: fix(menu): 修正自定义图标文档错误 、设置class-prefix不生效问题 (#1942) @yangjinjun3
* :bug: fix: range 组件Taro H5修改 (#1915) @lkjh3214


## v3.3.0

`2022-12-02`
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ npm i @nutui/nutui@2

```bash
// Vue3 H5 项目
npm i @nutui/nutui
npm i @nutui/nutui@3
```

```bash
// Vue3 小程序项目
npm i @nutui/nutui-taro
npm i @nutui/nutui-taro@3
```

## 示例
Expand Down
4 changes: 2 additions & 2 deletions README_EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ npm i @nutui/nutui@2

```bash
// Vue3 H5
npm i @nutui/nutui
npm i @nutui/nutui@3
```

```bash
// Vue3 Mini Programs
npm i @nutui/nutui-taro
npm i @nutui/nutui-taro@3
```

## Usage
Expand Down
26 changes: 26 additions & 0 deletions jd/copy-dist.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/env node
let target = process.argv[2];
const packageConfig = require('../package.json');
if (!target) {
console.error('缺少 nutui or nutui-taro 参数!');
return;
}
let copyfile = ['dist', 'README.md', 'LICENSE', 'CHANGELOG.md'];
const path = require('path');
const fs = require('fs-extra');
// 清空 dist
fs.emptyDirSync(path.resolve(__dirname, `../publish/${target}/dist`));
copyfile.forEach((filename) => {
fs.copy(path.resolve(__dirname, `../${filename}`), path.resolve(__dirname, `../publish/${target}/${filename}`)).then(
(res) => {
console.log(`publish/${target}/${filename} 写入成功`);
}
);
});
const targetPkgPath = path.resolve(__dirname, `../publish/${target}/package.json`);
const targetPkgStr = fs.readFileSync(targetPkgPath);
const targetPkgObj = JSON.parse(targetPkgStr);
targetPkgObj.version = packageConfig.version;
fs.outputFile(targetPkgPath, JSON.stringify(targetPkgObj, null, 2), 'utf8', () => {
console.log(`${targetPkgPath} 写入成功`);
});
67 changes: 67 additions & 0 deletions jd/generate-entry-es.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
const config = require('../src/config.json');
const packageConfig = require('../package.json');
const path = require('path');
const fs = require('fs-extra');

// 获取依赖关系
const styleMap = new Map();
const tasks = [];
let outputFileEntry = ``;
let components = [];
// import Locale from './packages/locale';\n
config.nav.forEach((item) => {
item.packages.forEach((element) => {
styleMap.set(element.name, {
name: element.name,
children: element.styleDeps
});
// gen entry
let outputMjs = `import '../../styles/reset.css';\nimport _${element.name} from '../_es/${element.name}.js';
const treeshaking = (t) => t;
const ${element.name} = treeshaking(_${element.name});
export { ${element.name} };`;

tasks.push(
fs.outputFile(path.resolve(__dirname, `../dist/packages/${element.name}/index.mjs`), outputMjs, 'utf8', () => {
// console.log('')
})
);
let folderName = element.name.toLowerCase();
outputFileEntry += `export * from "./packages/${folderName}/index.mjs";\n`;
components.push(element.name);
});
});
outputFileEntry += components
.map((name) => `import { ${name} } from "./packages/${name.toLowerCase()}/index.mjs";`)
.join('\n');
outputFileEntry += `\nimport { Locale } from "./packages/locale/lang";
function install(app) {
const packages = [${components.join(',')}];
packages.forEach((item) => {
if (item.install) {
app.use(item);
} else if (item.name) {
app.component(item.name, item);
}
});
}
const version = '${packageConfig.version}';
var stdin_default = {
install,
version,
Locale
};
export {
stdin_default as default,
install,
version,
Locale
};`;

tasks.push(
fs.outputFile(path.resolve(__dirname, `../dist/nutui.es.js`), outputFileEntry, 'utf8', () => {
// console.log('')
})
);

Promise.all(tasks);
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nutui/nutui",
"version": "3.3.0",
"version": "3.3.3",
"description": "京东风格的轻量级移动端 Vue2、Vue3 组件库(支持小程序开发)",
"main": "dist/nutui.umd.js",
"module": "dist/nutui.es.js",
Expand Down Expand Up @@ -48,8 +48,8 @@
"build:site": "npm run checked && vite build",
"build:site-jdt": "npm run checked && vite build --config vite.config.jdt.ts ",
"build:site:oss": "npm run checked && vite build --base=/nutui/3x/",
"build": "npm run checked && vite build --config vite.config.build.ts && vite build --config vite.config.build.disperse.ts && npm run generate:types && npm run generate:themes && vite build --config vite.config.build.css.ts && vite build --config vite.config.build.locale.ts && npm run attrs",
"build:taro:vue": "npm run checked:taro:vue && vite build --config vite.config.build.taro.vue.ts && vite build --config vite.config.build.taro.vue.disperse.ts && npm run generate:types:taro && npm run generate:themes && vite build --config vite.config.build.css.ts && vite build --config vite.config.build.locale.ts && npm run attrs",
"build": "npm run checked && vite build --config vite.config.build.ts && vite build --config vite.config.build.disperse.ts && npm run generate:types && npm run generate:themes && vite build --config vite.config.build.css.ts && vite build --config vite.config.build.locale.ts && npm run attrs && node jd/generate-entry-es.js && node jd/copy-dist.js nutui",
"build:taro:vue": "npm run checked:taro:vue && vite build --config vite.config.build.taro.vue.ts && vite build --config vite.config.build.taro.vue.disperse.ts && npm run generate:types:taro && npm run generate:themes && vite build --config vite.config.build.css.ts && vite build --config vite.config.build.locale.ts && npm run attrs && node jd/copy-dist.js nutui-taro",
"serve": "vite preview",
"upload": "yarn build:site:oss && node ./jd/upload.js",
"add": "node jd/createComponentMode.js",
Expand All @@ -74,7 +74,6 @@
}
},
"dependencies": {
"@tarojs/components": "3.5.6",
"consola": "2.15.3",
"sass": "^1.50.0",
"vscode": "^1.1.37",
Expand All @@ -83,6 +82,7 @@
"devDependencies": {
"@commitlint/cli": "^10.0.0",
"@commitlint/config-conventional": "^10.0.0",
"@tarojs/components": "3.5.6",
"@tarojs/taro": "3.5.6",
"@types/jest": "^26.0.22",
"@types/node": "^17.0.16",
Expand All @@ -102,7 +102,7 @@
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-vue": "^7.8.0",
"eslint-visitor-keys": "2",
"fs-extra": "^9.1.0",
"fs-extra": "^11.1.0",
"highlight.js": "^10.3.1",
"husky": "^6.0.0",
"inquirer": "^8.2.0",
Expand Down
Loading