Skip to content

U
uni-app

MuGuiLin / uni-app
与 Fork 源项目一致

Fork自 DCloud / uni-app

通知 1
Star 1
Fork 0
U
uni-app

体验新版 GitCode，发现更多精彩内容 >>

提交 1f59921b 编写于 作者: fxy060608's avatar fxy060608
浏览文件
操作

chore: merge

上级 953dc5a3 3398d09e
显示空白变更内容
内联 并排
Showing with 32 addition and 32 deletion
package.json
浏览文件 @ 1f59921b
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
"semver": "^7.3.5", "semver": "^7.3.5",
"ts-jest": "^27.0.3", "ts-jest": "^27.0.3",
"typescript": "^4.5.3", "typescript": "^4.5.3",
"vite": "^2.8.1", "vite": "^2.8.2",
"vue": "3.2.30", "vue": "3.2.30",
"vue-router": "^4.0.12", "vue-router": "^4.0.12",
"yorkie": "^2.0.0" "yorkie": "^2.0.0"
......
packages/playground/ssr/package.json
浏览文件 @ 1f59921b
...@@ -21,6 +21,6 @@ ...@@ -21,6 +21,6 @@
"compression": "^1.7.4", "compression": "^1.7.4",
"cypress": "^7.3.0", "cypress": "^7.3.0",
"serve-static": "^1.14.1", "serve-static": "^1.14.1",
"vite": "^2.8.1" "vite": "^2.8.2"
} }
} }
packages/uni-components/dist/components.js
浏览文件 @ 1f59921b
...@@ -171,7 +171,7 @@ var Label = /* @__PURE__ */ defineComponent({ ...@@ -171,7 +171,7 @@ var Label = /* @__PURE__ */ defineComponent({
handlers.length && handlers[0]($event, true); handlers.length && handlers[0]($event, true);
} }
}; };
return () => createVNode("div", { return () => createVNode("view", {
"onClick": _onClick "onClick": _onClick
}, [slots.default && slots.default()]); }, [slots.default && slots.default()]);
} }
...@@ -648,7 +648,7 @@ var MovableArea = defineComponent({ ...@@ -648,7 +648,7 @@ var MovableArea = defineComponent({
return () => { return () => {
const defaultSlots = slots.default && slots.default(); const defaultSlots = slots.default && slots.default();
const movableViewItems = flatVNode(defaultSlots); const movableViewItems = flatVNode(defaultSlots);
return createVNode("div", mergeProps({ return createVNode("view", mergeProps({
"class": "uni-movable-area" "class": "uni-movable-area"
}, listeners), [movableViewItems]); }, listeners), [movableViewItems]);
}; };
...@@ -1200,7 +1200,7 @@ var MovableView = defineComponent({ ...@@ -1200,7 +1200,7 @@ var MovableView = defineComponent({
const attrs = { const attrs = {
preventGesture: true preventGesture: true
}; };
return createVNode("div", mergeProps({ return createVNode("view", mergeProps({
"ref": rootRef, "ref": rootRef,
"onTouchstart": touchStart, "onTouchstart": touchStart,
"class": "uni-movable-view", "class": "uni-movable-view",
......
packages/uni-components/src/nvue/label/index.tsx
浏览文件 @ 1f59921b
...@@ -39,7 +39,7 @@ export default /*#__PURE__*/ defineComponent({ ...@@ -39,7 +39,7 @@ export default /*#__PURE__*/ defineComponent({
} }
return () => ( return () => (
<div onClick={_onClick}>{slots.default && slots.default()}</div> <view onClick={_onClick}>{slots.default && slots.default()}</view>
) )
}, },
}) })
packages/uni-components/src/nvue/movable-area/index.tsx
浏览文件 @ 1f59921b
...@@ -120,9 +120,9 @@ export default defineComponent({ ...@@ -120,9 +120,9 @@ export default defineComponent({
const defaultSlots = slots.default && slots.default() const defaultSlots = slots.default && slots.default()
const movableViewItems = flatVNode(defaultSlots) const movableViewItems = flatVNode(defaultSlots)
return ( return (
<div class="uni-movable-area" {...listeners}> <view class="uni-movable-area" {...listeners}>
{movableViewItems} {movableViewItems}
</div> </view>
) )
} }
}, },
......
packages/uni-components/src/nvue/movable-view/index.tsx
浏览文件 @ 1f59921b
...@@ -148,7 +148,7 @@ export default defineComponent({ ...@@ -148,7 +148,7 @@ export default defineComponent({
preventGesture: true, preventGesture: true,
} }
return ( return (
<div <view
ref={rootRef} ref={rootRef}
onTouchstart={touchStart} onTouchstart={touchStart}
class="uni-movable-view" class="uni-movable-view"
...@@ -156,7 +156,7 @@ export default defineComponent({ ...@@ -156,7 +156,7 @@ export default defineComponent({
{...attrs} {...attrs}
> >
{slots.default && slots.default()} {slots.default && slots.default()}
</div> </view>
) )
} }
}, },
......
packages/uni-components/src/nvue/picker-view-column/index.tsx
浏览文件 @ 1f59921b
...@@ -153,14 +153,14 @@ export default defineComponent({ ...@@ -153,14 +153,14 @@ export default defineComponent({
} }
return ( return (
<div ref={rootRef} class="uni-picker-view-column"> <view ref={rootRef} class="uni-picker-view-column">
<scroll-view <scroll-view
class="uni-picker-view-group" class="uni-picker-view-group"
style="flex-direction:column;" style="flex-direction:column;"
onScrollend={onScrollend} onScrollend={onScrollend}
{...scrollOptions} {...scrollOptions}
> >
<div <view
ref={contentRef} ref={contentRef}
class="uni-picker-view-content" class="uni-picker-view-content"
style={{ style={{
...@@ -170,7 +170,7 @@ export default defineComponent({ ...@@ -170,7 +170,7 @@ export default defineComponent({
}} }}
> >
{createScrollViewChild(children)} {createScrollViewChild(children)}
</div> </view>
</scroll-view> </scroll-view>
<u-scalable class="uni-picker-view-mask" style={maskStyle}> <u-scalable class="uni-picker-view-mask" style={maskStyle}>
<u-scalable <u-scalable
...@@ -193,7 +193,7 @@ export default defineComponent({ ...@@ -193,7 +193,7 @@ export default defineComponent({
top: `${padding}px`, top: `${padding}px`,
})} })}
></u-scalable> ></u-scalable>
</div> </view>
) )
} }
}, },
......
packages/uni-components/src/nvue/picker-view/index.tsx
浏览文件 @ 1f59921b
...@@ -70,15 +70,15 @@ export default defineComponent({ ...@@ -70,15 +70,15 @@ export default defineComponent({
const defaultSlots = slots.default && slots.default() const defaultSlots = slots.default && slots.default()
columnVNodes = flatVNode(defaultSlots) columnVNodes = flatVNode(defaultSlots)
return ( return (
<div <view
ref={rootRef} ref={rootRef}
class="uni-picker-view" class="uni-picker-view"
{...{ {...{
preventGesture: true, preventGesture: true,
}} }}
> >
<div class="uni-picker-view-wrapper">{defaultSlots}</div> <view class="uni-picker-view-wrapper">{defaultSlots}</view>
</div> </view>
) )
} }
}, },
......
packages/vite-plugin-uni/package.json
浏览文件 @ 1f59921b
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
"chokidar": "^3.5.3" "chokidar": "^3.5.3"
}, },
"peerDependencies": { "peerDependencies": {
"vite": "^2.8.1" "vite": "^2.8.2"
}, },
"uni-app": { "uni-app": {
"compilerVersion": "3.3.8" "compilerVersion": "3.3.8"
......
pnpm-lock.yaml
浏览文件 @ 1f59921b
...@@ -47,7 +47,7 @@ importers: ...@@ -47,7 +47,7 @@ importers:
semver: ^7.3.5 semver: ^7.3.5
ts-jest: ^27.0.3 ts-jest: ^27.0.3
typescript: ^4.5.3 typescript: ^4.5.3
vite: ^2.8.1 vite: ^2.8.2
vue: 3.2.30 vue: 3.2.30
vue-router: ^4.0.12 vue-router: ^4.0.12
yorkie: ^2.0.0 yorkie: ^2.0.0
...@@ -67,7 +67,7 @@ importers: ...@@ -67,7 +67,7 @@ importers:
'@rollup/plugin-strip': 2.1.0_rollup@2.60.2 '@rollup/plugin-strip': 2.1.0_rollup@2.60.2
'@types/jest': 26.0.24 '@types/jest': 26.0.24
'@typescript-eslint/parser': 5.5.0_eslint@7.32.0+typescript@4.5.3 '@typescript-eslint/parser': 5.5.0_eslint@7.32.0+typescript@4.5.3
'@vitejs/plugin-vue': 2.2.0_vite@2.8.1+vue@3.2.30 '@vitejs/plugin-vue': 2.2.0_vite@2.8.2+vue@3.2.30
'@vitejs/plugin-vue-jsx': 1.3.7 '@vitejs/plugin-vue-jsx': 1.3.7
'@vue/reactivity': 3.2.30 '@vue/reactivity': 3.2.30
'@vue/runtime-core': 3.2.30 '@vue/runtime-core': 3.2.30
...@@ -95,7 +95,7 @@ importers: ...@@ -95,7 +95,7 @@ importers:
semver: 7.3.5 semver: 7.3.5
ts-jest: 27.1.0_560d4ec5932803928b08544817dafdad ts-jest: 27.1.0_560d4ec5932803928b08544817dafdad
typescript: 4.5.3 typescript: 4.5.3
vite: 2.8.1 vite: 2.8.2
vue: 3.2.30 vue: 3.2.30
vue-router: 4.0.12_vue@3.2.30 vue-router: 4.0.12_vue@3.2.30
yorkie: 2.0.0 yorkie: 2.0.0
...@@ -109,7 +109,7 @@ importers: ...@@ -109,7 +109,7 @@ importers:
compression: ^1.7.4 compression: ^1.7.4
cypress: ^7.3.0 cypress: ^7.3.0
serve-static: ^1.14.1 serve-static: ^1.14.1
vite: ^2.8.1 vite: ^2.8.2
vue: 3.2.30 vue: 3.2.30
vue-router: ^4.0.12 vue-router: ^4.0.12
vuex: ^4.0.2 vuex: ^4.0.2
...@@ -125,7 +125,7 @@ importers: ...@@ -125,7 +125,7 @@ importers:
compression: 1.7.4 compression: 1.7.4
cypress: 7.7.0 cypress: 7.7.0
serve-static: 1.14.1 serve-static: 1.14.1
vite: 2.8.1 vite: 2.8.2
packages/size-check: packages/size-check:
specifiers: specifiers:
...@@ -220,7 +220,7 @@ importers: ...@@ -220,7 +220,7 @@ importers:
'@dcloudio/uni-nvue-styler': link:../uni-nvue-styler '@dcloudio/uni-nvue-styler': link:../uni-nvue-styler
'@dcloudio/uni-shared': link:../uni-shared '@dcloudio/uni-shared': link:../uni-shared
'@rollup/pluginutils': 4.1.2 '@rollup/pluginutils': 4.1.2
'@vitejs/plugin-vue': 2.2.0_vite@2.8.1+vue@3.2.30 '@vitejs/plugin-vue': 2.2.0_vite@2.8.2+vue@3.2.30
'@vue/compiler-sfc': 3.2.30 '@vue/compiler-sfc': 3.2.30
debug: 4.3.3 debug: 4.3.3
fs-extra: 10.0.0 fs-extra: 10.0.0
...@@ -758,8 +758,8 @@ importers: ...@@ -758,8 +758,8 @@ importers:
'@dcloudio/uni-cli-shared': link:../uni-cli-shared '@dcloudio/uni-cli-shared': link:../uni-cli-shared
'@dcloudio/uni-shared': link:../uni-shared '@dcloudio/uni-shared': link:../uni-shared
'@rollup/pluginutils': 4.1.2 '@rollup/pluginutils': 4.1.2
'@vitejs/plugin-legacy': 1.7.1_vite@2.8.1 '@vitejs/plugin-legacy': 1.7.1_vite@2.8.2
'@vitejs/plugin-vue': 2.2.0_vite@2.8.1+vue@3.2.30 '@vitejs/plugin-vue': 2.2.0_vite@2.8.2+vue@3.2.30
'@vitejs/plugin-vue-jsx': 1.3.7 '@vitejs/plugin-vue-jsx': 1.3.7
'@vue/compiler-core': 3.2.30 '@vue/compiler-core': 3.2.30
'@vue/compiler-dom': 3.2.30 '@vue/compiler-dom': 3.2.30
...@@ -3127,7 +3127,7 @@ packages: ...@@ -3127,7 +3127,7 @@ packages:
eslint-visitor-keys: 3.1.0 eslint-visitor-keys: 3.1.0
dev: true dev: true
/@vitejs/plugin-legacy/1.7.1_vite@2.8.1: /@vitejs/plugin-legacy/1.7.1_vite@2.8.2:
resolution: {integrity: sha512-RqgILXsGpfV7NHodVCdBVau8ss5+ynMXp6JGF/F7nhSy0bnwSQPlMS3KFqh7twfifXK8VuMriqfU4CxOiqmNnA==} resolution: {integrity: sha512-RqgILXsGpfV7NHodVCdBVau8ss5+ynMXp6JGF/F7nhSy0bnwSQPlMS3KFqh7twfifXK8VuMriqfU4CxOiqmNnA==}
engines: {node: '>=12.0.0'} engines: {node: '>=12.0.0'}
peerDependencies: peerDependencies:
...@@ -3138,7 +3138,7 @@ packages: ...@@ -3138,7 +3138,7 @@ packages:
magic-string: 0.25.7 magic-string: 0.25.7
regenerator-runtime: 0.13.9 regenerator-runtime: 0.13.9
systemjs: 6.12.1 systemjs: 6.12.1
vite: 2.8.1 vite: 2.8.2
dev: false dev: false
/@vitejs/plugin-vue-jsx/1.3.7: /@vitejs/plugin-vue-jsx/1.3.7:
...@@ -3154,14 +3154,14 @@ packages: ...@@ -3154,14 +3154,14 @@ packages:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
/@vitejs/plugin-vue/2.2.0_vite@2.8.1+vue@3.2.30: /@vitejs/plugin-vue/2.2.0_vite@2.8.2+vue@3.2.30:
resolution: {integrity: sha512-wXigM1EwN2G7rZcwG6kLk9ivvIMhx2363tCEvMBiXcTu5nePM/12hUPVzPb83Uugt6U+zom1gTpJopi/Ow/jwg==} resolution: {integrity: sha512-wXigM1EwN2G7rZcwG6kLk9ivvIMhx2363tCEvMBiXcTu5nePM/12hUPVzPb83Uugt6U+zom1gTpJopi/Ow/jwg==}
engines: {node: '>=12.0.0'} engines: {node: '>=12.0.0'}
peerDependencies: peerDependencies:
vite: ^2.5.10 vite: ^2.5.10
vue: ^3.2.25 vue: ^3.2.25
dependencies: dependencies:
vite: 2.8.1 vite: 2.8.2
vue: 3.2.30 vue: 3.2.30
/@vue/babel-helper-vue-transform-on/1.0.2: /@vue/babel-helper-vue-transform-on/1.0.2:
...@@ -8566,8 +8566,8 @@ packages: ...@@ -8566,8 +8566,8 @@ packages:
extsprintf: 1.3.0 extsprintf: 1.3.0
dev: true dev: true
/vite/2.8.1: /vite/2.8.2:
resolution: {integrity: sha512-Typ8qjUnW0p53gBsJpisrKcZlEbUPZATja9BG6Z09QZjg9YrnEn/htkr/VH4WhnH7eNUQeSD+wKI1lHzQRWskw==} resolution: {integrity: sha512-zawfykcPVPYva4KusIWORNLr324Qx86/3NpfQSIOJdjnL5pYhwDoImLYMOh4lFLcP/7//tNuWM2vx2F5OSVC9w==}
engines: {node: '>=12.2.0'} engines: {node: '>=12.2.0'}
hasBin: true hasBin: true
peerDependencies: peerDependencies:
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或