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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 66 commits into from
Jan 31, 2023
Merged

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

merged 66 commits into from
Jan 31, 2023

Commits on Jan 20, 2022

  1. feat: 添加range组件、calendar组件在线文档

    lkjh3214 committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    c805a21 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2022

  1. fix: 文档调整

    lkjh3214 committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    55c6e33 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2022

  1. fix: 重构calendar组件

    lkjh3214 committed Feb 18, 2022
    Configuration menu
    Copy the full SHA
    bad287f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream_next' into next

    lkjh3214 committed Feb 18, 2022
    Configuration menu
    Copy the full SHA
    bffc56e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'next' into lk-nutui

    lkjh3214 committed Feb 18, 2022
    Configuration menu
    Copy the full SHA
    24a9967 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2022

  1. feat: 日历组件重构，文档修改，功能完善

    lkjh3214 committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    86140ef View commit details
    Browse the repository at this point in the history

  2. Merge branch 'lk-nutui' of ssh://github.com/lkjh3214/nutui into lk-nutui 

    # Conflicts:
#	src/packages/__VUE/calendar/doc.md
#	src/sites/mobile-taro/vue/project.config.json
    lkjh3214 committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    455d613 View commit details
    Browse the repository at this point in the history

  3. fix: 格式化

    lkjh3214 committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    097935f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'next' of ssh://github.com/lkjh3214/nutui into next 

    # Conflicts:
#	src/sites/mobile-taro/vue/project.config.json
    lkjh3214 committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    cc8eac2 View commit details
    Browse the repository at this point in the history

  5. fix: 代码格式化调整。

    lkjh3214 committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    5c26c3f View commit details
    Browse the repository at this point in the history

  6. fix: 去除无用代码

    lkjh3214 committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    64a74bd View commit details
    Browse the repository at this point in the history

  7. Merge branch 'lk-nutui' into next

    lkjh3214 committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    261674e View commit details
    Browse the repository at this point in the history

  8. fix: 文档调整

    lkjh3214 committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    34e7f5a View commit details
    Browse the repository at this point in the history

  9. fix: 文档调整

    lkjh3214 committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    83c3252 View commit details
    Browse the repository at this point in the history

  10. fix: taro demo 样式修改

    lkjh3214 committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    246c7ef View commit details
    Browse the repository at this point in the history

  11. Merge branch 'upstream_next' into lk-nutui

    lkjh3214 committed Feb 23, 2022
    Configuration menu
    Copy the full SHA
    13a64e3 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2022

  1. Merge branch 'upstream_next' into lk-nutui 

    # Conflicts:
#	src/packages/__VUE/calendar/index.scss
#	src/packages/__VUE/calendaritem/index.scss
#	src/packages/__VUE/calendaritem/index.taro.vue
#	src/packages/__VUE/calendaritem/index.vue
#	src/packages/styles/variables.scss
#	src/sites/mobile-taro/vue/project.config.json
    lkjh3214 committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    6ca304c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream_next' into lk-nutui

    lkjh3214 committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    06bfbd7 View commit details
    Browse the repository at this point in the history

  3. feat: range组件功能完善，新增 竖向操作，刻度展示。

    lkjh3214 committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    8af99db View commit details
    Browse the repository at this point in the history

  4. Merge branch 'upstream_next' into lk-nutui

    lkjh3214 committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    32920b1 View commit details
    Browse the repository at this point in the history

  5. fix: 冲突解决

    lkjh3214 committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    d5cb5d0 View commit details
    Browse the repository at this point in the history

  6. feat: taro功能新增，兼容处理，文档修改

    lkjh3214 committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    d096a28 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'upstream_next' into lk-nutui

    lkjh3214 committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    fc48524 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2022

  1. Merge branch 'next' into lk-nutui

    @szg2008
    szg2008 authored Mar 25, 2022
    Configuration menu
    Copy the full SHA
    967affa View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream_next' into lk-nutui

    lkjh3214 committed Mar 25, 2022
    Configuration menu
    Copy the full SHA
    b20666e View commit details
    Browse the repository at this point in the history

  3. feat: 添加range组件，jdt主题色

    lkjh3214 committed Mar 25, 2022
    Configuration menu
    Copy the full SHA
    7721d7b View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2022

  1. Merge branch 'upstream_next' into lk-nutui

    lkjh3214 committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    170a777 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

  1. Merge branch 'upstream_next' into lk-nutui

    lkjh3214 committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    6aa79b4 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2022

  1. Merge branch 'upstream_next' into lk-nutui

    lkjh3214 committed Apr 21, 2022
    Configuration menu
    Copy the full SHA
    3a18252 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2022

  1. fix: 修改组件初始化逻辑

    lkjh3214 committed Apr 24, 2022
    Configuration menu
    Copy the full SHA
    cc0ec20 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream_next' into lk-nutui

    lkjh3214 committed Apr 24, 2022
    Configuration menu
    Copy the full SHA
    e41e7df View commit details
    Browse the repository at this point in the history

Commits on May 9, 2022

  1. feat: 新增h5 日期多选功能

    lkjh3214 committed May 9, 2022
    Configuration menu
    Copy the full SHA
    5fa9702 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2022

  1. Merge branch 'lk-nutui' into lk-dev-calendar

    lkjh3214 committed May 20, 2022
    Configuration menu
    Copy the full SHA
    8fcd6ff View commit details
    Browse the repository at this point in the history

  2. feat: taro版本添加 日期多选功能

    lkjh3214 committed May 20, 2022
    Configuration menu
    Copy the full SHA
    fa6f570 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2022

  1. fix: 修复多选，无法选中开头结尾日期问题

    lkjh3214 committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    58e8f79 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream_next' into lk-dev-calendar

    lkjh3214 committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    7e99775 View commit details
    Browse the repository at this point in the history

  3. fix: 文档修改，添加en-US 文档

    lkjh3214 committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    5089372 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'upstream_next' into lk-dev-calendar

    lkjh3214 committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    3078dca View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2022

  1. fix: 文档完善

    lkjh3214 committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    b8c28eb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream_next' into lk-dev-calendar 

    # Conflicts:
#	src/packages/__VUE/calendar/doc.en-US.md
#	src/packages/__VUE/calendar/index.vue
#	src/packages/__VUE/calendaritem/index.taro.vue
    lkjh3214 committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    b27a36d View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2022

  1. Merge branch 'upstream_next' into lk-dev-calendar

    lkjh3214 committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    5988e41 View commit details
    Browse the repository at this point in the history

  2. fix: calendar，demo错误修复

    lkjh3214 committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    95f7f83 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2022

  1. fix: swiper文档修改

    lkjh3214 committed Sep 8, 2022
    Configuration menu
    Copy the full SHA
    693fc13 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2022

  1. Merge branch 'upstream_next' into lk-dev-calendar

    lkjh3214 committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    5f88508 View commit details
    Browse the repository at this point in the history

  2. fix: 日历组件问题修复

    lkjh3214 committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    6fbad82 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upstream_next' into lk-dev-calendar

    lkjh3214 committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    9d9305c View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2022

  1. Merge branch 'upstream_next' into lk-dev-calendar

    lkjh3214 committed Sep 30, 2022
    Configuration menu
    Copy the full SHA
    e17b9e5 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2022

  1. Merge branch 'upstream_next' into lk-dev-calendar

    lkjh3214 committed Oct 10, 2022
    Configuration menu
    Copy the full SHA
    557e93e View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2022

  1. fix: calendar taro兼容问题调整

    lkjh3214 committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    1c36f93 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream_next' into lk-dev-calendar

    lkjh3214 committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    8fc03b7 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2022

  1. fix: taro转h5问题修改

    lkjh3214 committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    03474a4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream_next' into lk-dev-calendar

    lkjh3214 committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    00110fe View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2022

  1. fix: 日历组件修改，vite配置修改，新增plugin

    lkjh3214 committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    d6fb21d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream_next' into lk-dev-calendar

    lkjh3214 committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    fd22642 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2022

  1. fix: 配置项修改

    lkjh3214 committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    a6bc9a3 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2022

  1. Merge branch 'upstream_next' into lk-dev-calendar

    lkjh3214 committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    112c514 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream_next' into lk-dev-calendar

    lkjh3214 committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    16c04b4 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2022

  1. fix: 指定taro版本

    lkjh3214 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    ebcac7c View commit details
    Browse the repository at this point in the history

  2. fix: taro版本指定为3.5.6

    lkjh3214 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    42b19ba View commit details
    Browse the repository at this point in the history

  3. fix: 修复scroll-view标签问题

    lkjh3214 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    9546953 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'upstream_next' into lk-dev-calendar

    lkjh3214 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    e92613f View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2022

  1. feat: 日历组件，暴露初始化定位方法

    lkjh3214 committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    943c85b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream_next' into lk-dev-calendar 

    # Conflicts:
#	package.json
    lkjh3214 committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    31b900f View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2022

  1. fix: 修改文档，调整全局样式

    lkjh3214 committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    8683bd5 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. Merge branch 'upstream_next' into lk-dev-calendar

    lkjh3214 committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    784231c View commit details
    Browse the repository at this point in the history

  2. fix: calendar 文档修改

    lkjh3214 committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    5991a5d View commit details
    Browse the repository at this point in the history