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: scroll-view标签问题修复 #1817

Merged
merged 61 commits into from
Nov 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 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
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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
}
},
"dependencies": {
"@tarojs/components": "^3.5.6",
"sass": "^1.50.0",
"vscode": "^1.1.37",
"vue-router": "^4.0.12"
Expand All @@ -82,7 +83,7 @@
"@commitlint/cli": "^10.0.0",
"@commitlint/config-conventional": "^10.0.0",
"@popperjs/core": "^2.11.5",
"@tarojs/taro": "^3.4.0",
"@tarojs/taro": "3.5.6",
"@types/jest": "^26.0.22",
"@types/node": "^17.0.16",
"@typescript-eslint/eslint-plugin": "^4.20.0",
Expand Down
8 changes: 6 additions & 2 deletions src/packages/__VUE/backtop/index.taro.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<template>
<view>
<scroll-view
<Nut-Scroll-View
:scroll-y="true"
:style="{ height }"
@scroll="scroll"
:scroll-top="scrollTop"
scroll-with-animation="true"
>
<slot name="content"></slot>
</scroll-view>
</Nut-Scroll-View>
<view :class="classes" :style="style" @click.stop="click">
<slot name="icon">
<nut-icon size="19px" class="nut-backtop-main" name="top"></nut-icon>
Expand All @@ -20,8 +20,12 @@
<script lang="ts">
import { reactive, computed, toRefs } from 'vue';
import { createComponent } from '@/packages/utils/create';
import NutScrollView from '../scrollView/index.taro.vue';
const { componentName, create } = createComponent('backtop');
export default create({
components: {
NutScrollView
},
props: {
height: {
type: String,
Expand Down
10 changes: 7 additions & 3 deletions src/packages/__VUE/calendaritem/index.taro.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</view>
</view>
<!-- content-->
<scroll-view
<Nut-Scroll-View
:scroll-top="scrollTop"
:scroll-y="true"
class="nut-calendar-content"
Expand Down Expand Up @@ -60,7 +60,7 @@
</view>
</view>
</view>
</scroll-view>
</Nut-Scroll-View>
<!-- footer-->
<view class="nut-calendar-footer" v-if="poppable && !isAutoBackFill">
<view class="calendar-confirm-btn" @click="confirm">{{ confirmText || translate('confirm') }}</view>
Expand All @@ -75,7 +75,7 @@ import Taro from '@tarojs/taro';
import Utils from '@/packages/utils/date';
import { useExpose } from '@/packages/utils/useExpose/index';
import requestAniFrame from '@/packages/utils/raf';

import NutScrollView from '../scrollView/index.taro.vue';
const TARO_ENV = Taro.getEnv();

type InputDate = string | string[];
Expand Down Expand Up @@ -119,6 +119,9 @@ interface MonthInfo {
}

export default create({
components: {
NutScrollView
},
props: {
type: {
type: String,
Expand Down Expand Up @@ -809,6 +812,7 @@ export default create({
}
scale = Number((screenWidth / 750).toFixed(toFixed));
scalePx.value = scale;
let transfromNum = Taro.pxTransform(64);
initData();
}
});
Expand Down
9 changes: 7 additions & 2 deletions src/packages/__VUE/elevator/index.taro.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<view :class="classes">
<scroll-view
<Nut-Scroll-View
class="nut-elevator__list scrollview"
:scroll-top="scrollTop"
:scroll-y="true"
Expand Down Expand Up @@ -33,7 +33,7 @@
<view class="nut-elevator__list__fixed" :style="fixedStyle" v-show="scrollY > 0" v-if="isSticky">
<span class="fixed-title">{{ indexList[currentIndex][acceptKey] }}</span>
</view>
</scroll-view>
</Nut-Scroll-View>
<view class="nut-elevator__code--current" v-show="scrollStart" v-if="indexList.length > 0">
{{ indexList[codeIndex][acceptKey] }}
</view>
Expand All @@ -57,13 +57,18 @@ import { computed, reactive, toRefs, nextTick, ref, Ref, watch } from 'vue';
import { createComponent } from '@/packages/utils/create';
import { useExpose } from '@/packages/utils/useExpose/index';
const { componentName, create } = createComponent('elevator');
import NutScrollView from '../scrollView/index.taro.vue';

import Taro from '@tarojs/taro';
interface ElevatorData {
name: string;
id: number | string;
[key: string]: string | number;
}
export default create({
components: {
NutScrollView
},
props: {
height: {
type: [Number, String],
Expand Down
8 changes: 5 additions & 3 deletions src/packages/__VUE/infiniteloading/index.taro.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<scroll-view
<Nut-Scroll-View
:class="classes"
scrollY="true"
style="height: 100%"
Expand Down Expand Up @@ -32,11 +32,12 @@
<view class="tips">{{ loadMoreTxt || translate('loadMoreTxt') }}</view>
</template>
</view>
</scroll-view>
</Nut-Scroll-View>
</template>
<script lang="ts">
import { toRefs, onMounted, reactive, computed, CSSProperties } from 'vue';
import { createComponent } from '@/packages/utils/create';
import NutScrollView from '../scrollView/index.taro.vue';
const { componentName, create, translate } = createComponent('infiniteloading');
import Icon from '../icon/index.taro.vue';
import Taro from '@tarojs/taro';
Expand Down Expand Up @@ -93,7 +94,8 @@ export default create({
},
emits: ['scroll-change', 'load-more', 'refresh'],
components: {
'nut-icon': Icon
'nut-icon': Icon,
NutScrollView
},
setup(props, { emit, slots }) {
const state = reactive({
Expand Down
8 changes: 6 additions & 2 deletions src/packages/__VUE/list/index.taro.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<scroll-view
<Nut-Scroll-View
:class="classes"
:scroll-y="true"
:style="{ height: `${getContainerHeight}px` }"
Expand All @@ -13,15 +13,19 @@
<slot :item="item" :index="index"></slot>
</div>
</div>
</scroll-view>
</Nut-Scroll-View>
</template>
<script lang="ts">
import { reactive, toRefs, computed, ref, Ref, watch } from 'vue';
import { createComponent } from '@/packages/utils/create';
import NutScrollView from '../scrollView/index.taro.vue';
import Taro from '@tarojs/taro';
const { componentName, create } = createComponent('list');
const clientHeight = Taro.getSystemInfoSync().windowHeight || 667;
export default create({
components: {
NutScrollView
},
props: {
height: {
type: [Number],
Expand Down
9 changes: 6 additions & 3 deletions src/packages/__VUE/menuitem/index.taro.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
@closed="handleClose"
:close-on-click-overlay="parent.props.closeOnClickOverlay"
>
<scroll-view :scroll-y="true" style="height: 100%">
<Nut-Scroll-View :scroll-y="true" style="height: 100%">
<view class="nut-menu-item__content">
<view
v-for="(option, index) in options"
Expand Down Expand Up @@ -55,7 +55,7 @@
</view>
<slot></slot>
</view>
</scroll-view>
</Nut-Scroll-View>
</nut-popup>
</view>
</template>
Expand All @@ -65,7 +65,9 @@ import { createComponent } from '@/packages/utils/create';
const { componentName, create } = createComponent('menu-item');
import Icon from '../icon/index.taro.vue';
import Popup from '../popup/index.taro.vue';
import NutScrollView from '../scrollView/index.taro.vue';
let _zIndex = 2000;

export default create({
props: {
title: String,
Expand All @@ -91,7 +93,8 @@ export default create({
},
components: {
[Icon.name]: Icon,
[Popup.name]: Popup
[Popup.name]: Popup,
NutScrollView
},
emits: ['update:modelValue', 'change'],
setup(props, { emit, slots }) {
Expand Down
34 changes: 34 additions & 0 deletions src/packages/__VUE/scrollView/index.taro.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<template>
<template v-if="ENV == ENV_TYPE.WEB">
<taro-scroll-view v-bind="$attrs">
<slot></slot>
</taro-scroll-view>
</template>
<template v-if="ENV != ENV_TYPE.WEB">
<scroll-view v-bind="$attrs">
<slot></slot>
</scroll-view>
</template>
</template>
<script lang="ts">
import { defineComponent, reactive, toRefs } from 'vue';
import Taro from '@tarojs/taro';
import taroScrollView from '@tarojs/components/dist-h5/vue3/components/scroll-view.js';
import { ScrollView } from '@tarojs/components/mini/index.js';
export default defineComponent({
name: 'NutScrollView',
components: {
ScrollView,
taroScrollView
},
setup() {
const state = reactive({
ENV: Taro.getEnv(),
ENV_TYPE: Taro.ENV_TYPE
});
return {
...toRefs(state)
};
}
});
</script>
2 changes: 2 additions & 0 deletions src/shims-vue.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ declare module '*.vue' {
const component: DefineComponent<{}, {}, any>;
export default component;
}
declare module '@tarojs/components/dist-h5/vue3/components/scroll-view.js';
declare module '@tarojs/components/mini/index.js';
24 changes: 12 additions & 12 deletions src/sites/mobile-taro/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,30 +36,30 @@
"author": "",
"dependencies": {
"@babel/runtime": "^7.7.7",
"@nutui/nutui-taro": "^3.1.18",
"@tarojs/components": "^3.4.14",
"@tarojs/mini-runner": "^3.4.14",
"@tarojs/runtime": "^3.4.14",
"@tarojs/taro": "^3.4.14",
"@nutui/nutui-taro": "^3.2.5",
"@tarojs/components": "3.5.6",
"@tarojs/mini-runner": "3.5.6",
"@tarojs/runtime": "3.5.6",
"@tarojs/taro": "3.5.6",
"vue": "^3.2.37"
},
"devDependencies": {
"@babel/core": "^7.8.0",
"@tarojs/cli": "^3.5.4",
"@tarojs/cli": "3.5.6",
"@vue/babel-plugin-jsx": "^1.0.6",
"@tarojs/mini-runner": "^3.5.4",
"@tarojs/plugin-framework-vue3": "^3.5.4",
"@tarojs/plugin-html": "^3.5.4",
"@tarojs/mini-runner": "3.5.6",
"@tarojs/plugin-framework-vue3": "3.5.6",
"@tarojs/plugin-html": "3.5.6",
"webpack": "^5.69.0",
"@tarojs/webpack5-runner": "^3.5.4",
"@tarojs/webpack5-runner": "3.5.6",
"@types/webpack-env": "^1.13.6",
"@typescript-eslint/eslint-plugin": "^4.15.1",
"@typescript-eslint/parser": "^4.15.1",
"@vue/compiler-sfc": "^3.0.0",
"babel-preset-taro": "^3.5.4",
"babel-preset-taro": "3.5.6",
"eslint": "^8.12.0",
"eslint-plugin-vue": "^8.0.0",
"eslint-config-taro": "^3.5.4",
"eslint-config-taro": "3.5.6",
"stylelint": "^9.3.0",
"style-loader": "^1.3.0",
"typescript": "^4.6.4",
Expand Down
60 changes: 0 additions & 60 deletions transformFinalCode.ts

This file was deleted.

Loading