Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
genary
uni-app
提交
15ab81eb
U
uni-app
项目概览
genary
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
15ab81eb
编写于
2月 11, 2022
作者:
fxy060608
浏览文件
操作
浏览文件
下载
差异文件
chore: merge
上级
b66b1855
0146b8c5
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
46 addition
and
22 deletion
+46
-22
packages/uni-components/dist/components.js
packages/uni-components/dist/components.js
+19
-10
packages/uni-components/src/nvue/button/index.tsx
packages/uni-components/src/nvue/button/index.tsx
+10
-8
packages/uni-components/src/nvue/utils.ts
packages/uni-components/src/nvue/utils.ts
+13
-1
packages/uni-components/vite.config.ts
packages/uni-components/vite.config.ts
+2
-1
pnpm-lock.yaml
pnpm-lock.yaml
+2
-2
未找到文件。
packages/uni-components/dist/components.js
浏览文件 @
15ab81eb
import
{
defineComponent
,
createVNode
,
mergeProps
,
getCurrentInstance
,
provide
,
watch
,
onUnmounted
,
ref
,
inject
,
onBeforeUnmount
,
resolveCompone
nt
,
Text
,
isVNode
,
Fragment
,
onMounted
,
computed
}
from
"
vue
"
;
import
{
hasOwn
,
isPlainObject
,
extend
}
from
"
@vue/shared
"
;
import
{
createElementVNode
,
defineComponent
,
createVNode
,
mergeProps
,
getCurrentInstance
,
provide
,
watch
,
onUnmounted
,
ref
,
inject
,
onBeforeUnmou
nt
,
Text
,
isVNode
,
Fragment
,
onMounted
,
computed
}
from
"
vue
"
;
import
{
hasOwn
,
extend
,
isPlainObject
}
from
"
@vue/shared
"
;
import
{
cacheStringFunction
}
from
"
@dcloudio/uni-shared
"
;
const
OPEN_TYPES
=
[
"
navigate
"
,
...
...
@@ -97,6 +97,9 @@ function useHoverClass(props2) {
}
return
{};
}
function
createNVueTextVNode
(
text
,
attrs
)
{
return
createElementVNode
(
"
u-text
"
,
extend
({
appendAsTree
:
true
},
attrs
),
text
);
}
const
navigatorStyles
=
[{
"
navigator-hover
"
:
{
backgroundColor
:
"
rgba(0,0,0,0.1)
"
,
...
...
@@ -506,13 +509,13 @@ var Button = defineComponent({
const
wrapSlots
=
()
=>
{
if
(
!
slots
.
default
)
return
[];
const
_slots
=
slots
.
default
();
return
_slots
.
map
((
slot
)
=>
{
if
(
slot
.
type
===
Text
)
{
return
createVNode
(
"
text
"
,
null
,
[
slot
]);
const
vnodes
=
slots
.
default
();
if
(
vnodes
.
length
===
1
&&
vnodes
[
0
].
type
===
Text
)
{
return
[
createNVueTextVNode
(
vnodes
[
0
].
children
,
{
class
:
"
ub-t
"
+
_getClass
(
"
-t
"
)
})];
}
return
slot
;
});
return
vnodes
;
};
return
()
=>
{
return
createVNode
(
"
div
"
,
mergeProps
({
...
...
@@ -522,7 +525,7 @@ var Button = defineComponent({
hoverClass
:
_getHoverClass
(
""
)
}),
{
"
onClick
"
:
onClick
}),
[
props2
.
loading
?
createVNode
(
resolveComponent
(
"
loading-indicator
"
)
,
mergeProps
({
}),
[
props2
.
loading
?
createVNode
(
"
loading-indicator
"
,
mergeProps
({
"
class
"
:
[
"
ub-loading
"
,
`ub-
${
TYPES
[
type
]}
-loading`
]
},
{
arrow
:
"
false
"
,
...
...
@@ -1338,6 +1341,7 @@ function useMovableViewState(props2, trigger, rootRef) {
return
false
;
}
_updateScale
(
_scale
,
true
);
_updateOldScale
(
_scale
);
}
function
_setScaleValue
(
scale
)
{
if
(
!
props2
.
scale
)
{
...
...
@@ -1345,6 +1349,7 @@ function useMovableViewState(props2, trigger, rootRef) {
}
scale
=
_adjustScale
(
scale
);
_updateScale
(
scale
,
true
);
_updateOldScale
(
scale
);
return
scale
;
}
function
__handleTouchStart
()
{
...
...
@@ -1540,6 +1545,9 @@ function useMovableViewState(props2, trigger, rootRef) {
}
}
}
function
_updateOldScale
(
scale
)
{
_oldScale
=
scale
;
}
function
_adjustScale
(
scale
)
{
scale
=
Math
.
max
(
0.5
,
scaleMinNumber
.
value
,
scale
);
scale
=
Math
.
min
(
10
,
scaleMaxNumber
.
value
,
scale
);
...
...
@@ -1653,6 +1661,7 @@ function useMovableViewState(props2, trigger, rootRef) {
let
x
=
limitXY
.
x
;
let
y
=
limitXY
.
y
;
_setTransform
(
x
,
y
,
scale
,
""
,
true
);
_updateOldScale
(
scale
);
}
onMounted
(()
=>
{
useTouchtrack
((
event
)
=>
{
...
...
packages/uni-components/src/nvue/button/index.tsx
浏览文件 @
15ab81eb
import
{
inject
,
onBeforeUnmount
,
ref
,
defineComponent
,
Text
}
from
'
vue
'
import
{
uniLabelKey
,
UniLabelCtx
}
from
'
../label
'
import
{
useListeners
}
from
'
../../helpers/useListeners
'
import
{
useHoverClass
}
from
'
../utils
'
import
{
createNVueTextVNode
,
useHoverClass
}
from
'
../utils
'
import
{
buttonProps
}
from
'
../../components/button
'
import
{
extend
}
from
'
@vue/shared
'
...
...
@@ -256,13 +256,15 @@ export default defineComponent({
const
wrapSlots
=
()
=>
{
if
(
!
slots
.
default
)
return
[]
const
_slots
=
slots
.
default
()
return
_slots
.
map
((
slot
)
=>
{
if
(
slot
.
type
===
Text
)
{
return
<
text
>
{
slot
}
</
text
>
const
vnodes
=
slots
.
default
()
if
(
vnodes
.
length
===
1
&&
vnodes
[
0
].
type
===
Text
)
{
return
[
createNVueTextVNode
(
vnodes
[
0
].
children
as
string
,
{
class
:
'
ub-t
'
+
_getClass
(
'
-t
'
),
}),
]
}
return
slot
})
return
vnodes
}
return
()
=>
{
...
...
packages/uni-components/src/nvue/utils.ts
浏览文件 @
15ab81eb
import
{
hasOwn
}
from
'
@vue/shared
'
import
{
createElementVNode
}
from
'
vue
'
import
{
extend
,
hasOwn
}
from
'
@vue/shared
'
interface
HoverProps
{
hoverClass
?:
string
...
...
@@ -22,3 +23,14 @@ export function useHoverClass(props: HoverProps) {
}
return
{}
}
export
function
createNVueTextVNode
(
text
:
string
,
attrs
?:
Record
<
string
,
unknown
>
)
{
return
createElementVNode
(
'
u-text
'
,
extend
({
appendAsTree
:
true
},
attrs
),
text
)
}
packages/uni-components/vite.config.ts
浏览文件 @
15ab81eb
...
...
@@ -2,6 +2,7 @@ import path from 'path'
import
{
defineConfig
}
from
'
vite
'
import
vue
from
'
@vitejs/plugin-vue
'
import
vueJsx
from
'
@vitejs/plugin-vue-jsx
'
import
{
isAppNVueNativeTag
}
from
'
@dcloudio/uni-shared
'
function
resolve
(
file
:
string
)
{
return
path
.
resolve
(
__dirname
,
file
)
...
...
@@ -47,5 +48,5 @@ export default defineConfig({
},
},
},
plugins
:
[
vue
(),
vueJsx
({})],
plugins
:
[
vue
(),
vueJsx
({
isCustomElement
:
isAppNVueNativeTag
})],
})
pnpm-lock.yaml
浏览文件 @
15ab81eb
...
...
@@ -5343,8 +5343,8 @@ packages:
engines
:
{
node
:
'
>=
0.6'
}
/fs-extra/10.0.0
:
resolution
:
{
integrity
:
sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
,
tarball
:
fs-extra/-/fs-extra-10.0.0.tgz
}
engines
:
{
node
:
'
>=1
0
'
}
resolution
:
{
integrity
:
sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
}
engines
:
{
node
:
'
>=1
2
'
}
dependencies
:
at-least-node
:
1.0.0
graceful-fs
:
4.2.8
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录