Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
touchx
uni-app
提交
ad6c4e4b
U
uni-app
项目概览
touchx
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ad6c4e4b
编写于
11月 25, 2022
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' into alpha
上级
994a314b
f9508b38
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
22 addition
and
14 deletion
+22
-14
build/postcssSplitMediaPlugin.js
build/postcssSplitMediaPlugin.js
+2
-2
packages/uni-cli-shared/components/ad-interactive.vue
packages/uni-cli-shared/components/ad-interactive.vue
+1
-9
packages/uni-h5/dist/index.dark.css
packages/uni-h5/dist/index.dark.css
+1
-1
packages/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js
packages/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js
+1
-1
src/platforms/app-plus/service/framework/plugins/data.js
src/platforms/app-plus/service/framework/plugins/data.js
+5
-0
src/platforms/app-plus/view/framework/plugins/data.js
src/platforms/app-plus/view/framework/plugins/data.js
+12
-1
未找到文件。
build/postcssSplitMediaPlugin.js
浏览文件 @
ad6c4e4b
...
...
@@ -15,10 +15,10 @@ module.exports = {
const
fs
=
require
(
'
fs
'
)
const
path
=
require
(
'
path
'
)
const
postcss
=
require
(
'
postcss
'
)
var
uglifycss
=
require
(
'
uglifycss
'
)
const
uglifycss
=
require
(
'
uglifycss
'
)
const
mediaRoot
=
postcss
.
root
()
mediaRoot
.
append
(
mediaQuerys
)
mediaRoot
.
append
(
mediaQuerys
.
sort
((
a
,
b
)
=>
a
.
source
.
input
.
file
>
b
.
source
.
input
.
file
?
1
:
-
1
)
)
fs
.
writeFileSync
(
path
.
resolve
(
outputDir
,
filename
),
...
...
packages/uni-cli-shared/components/ad-interactive.vue
浏览文件 @
ad6c4e4b
...
...
@@ -67,21 +67,13 @@
this
.
_uniAdPlugin
.
show
()
},
getAdData
()
{
if
(
!
this
.
adpid
)
{
this
.
$emit
(
events
.
error
,
{
code
:
-
5002
,
message
:
'
invalid adpid
'
})
return
}
this
.
loading
=
true
uni
.
request
({
url
:
AD_URL
,
method
:
'
POST
'
,
data
:
{
adpid
:
this
.
adpid
adpid
:
this
.
adpid
||
''
},
timeout
:
5000
,
dataType
:
'
json
'
,
...
...
packages/uni-h5/dist/index.dark.css
浏览文件 @
ad6c4e4b
@media
(
prefers-color-scheme
:
dark
){
html
{
--UI-BG-CLOLOR-ACTIVE
:
#373737
;
--UI-BORDER-CLOLOR-1
:
#373737
;
--UI-BG
:
#000
;
--UI-BG-0
:
#191919
;
--UI-BG-1
:
#1f1f1f
;
--UI-BG-2
:
#232323
;
--UI-BG-3
:
#2f2f2f
;
--UI-BG-4
:
#606060
;
--UI-BG-5
:
#2c2c2c
;
--UI-FG
:
#fff
;
--UI-FG-0
:
hsla
(
0
,
0%
,
100%
,
0.8
);
--UI-FG-HALF
:
hsla
(
0
,
0%
,
100%
,
0.6
);
--UI-FG-1
:
hsla
(
0
,
0%
,
100%
,
0.5
);
--UI-FG-2
:
hsla
(
0
,
0%
,
100%
,
0.3
);
--UI-FG-3
:
hsla
(
0
,
0%
,
100%
,
0.05
)}}
@media
(
prefers-color-scheme
:
dark
){
uni-page-body
{
background-color
:
#191919
;
color
:
hsla
(
0
,
0%
,
100%
,
0.8
)}}
@media
(
prefers-color-scheme
:
dark
){
uni-toast
.uni-toast
{
background-color
:
#606060
;
color
:
var
(
--UI-FG-0
)}
uni-toast
.uni-icon_toast.uni-icon-error
:before
,
uni-toast
.uni-icon_toast.uni-icon-success-no-circle
:before
{
color
:
rgba
(
255
,
255
,
255
,
0.9
)}}
@media
(
prefers-color-scheme
:
dark
){
uni-actionsheet
.uni-actionsheet__title
{
background-color
:
var
(
--UI-BG-1
);
border-bottom-color
:
var
(
--UI-BORDER-CLOLOR-1
)}
uni-actionsheet
.uni-actionsheet__action
,
uni-actionsheet
.uni-actionsheet__menu
{
background-color
:
var
(
--UI-BG-2
)}
uni-actionsheet
.uni-actionsheet__cell
:active
{
background-color
:
var
(
--UI-BG-CLOLOR-ACTIVE
)}
uni-actionsheet
.uni-actionsheet__cell
:before
{
border-top-color
:
var
(
--UI-BORDER-CLOLOR-1
);
color
:
var
(
--UI-BORDER-CLOLOR-1
)}}
@media
(
prefers-color-scheme
:
dark
){
uni-modal
.uni-modal
{
color
:
var
(
--UI-FG-0
);
background-color
:
var
(
--UI-BG-2
)}
uni-modal
.uni-modal__bd
{
color
:
var
(
--UI-FG-1
)}
uni-modal
.uni-modal__btn
:active
{
color
:
#aaa
;
background-color
:
var
(
--UI-BG-CLOLOR-ACTIVE
)}
uni-modal
.uni-modal__ft
:after
,
uni-modal
.uni-modal__btn
:after
{
color
:
var
(
--UI-BORDER-CLOLOR-1
);
border-color
:
var
(
--UI-BORDER-CLOLOR-1
)}}
\ No newline at end of file
@media
(
prefers-color-scheme
:
dark
){
html
{
--UI-BG-CLOLOR-ACTIVE
:
#373737
;
--UI-BORDER-CLOLOR-1
:
#373737
;
--UI-BG
:
#000
;
--UI-BG-0
:
#191919
;
--UI-BG-1
:
#1f1f1f
;
--UI-BG-2
:
#232323
;
--UI-BG-3
:
#2f2f2f
;
--UI-BG-4
:
#606060
;
--UI-BG-5
:
#2c2c2c
;
--UI-FG
:
#fff
;
--UI-FG-0
:
hsla
(
0
,
0%
,
100%
,
0.8
);
--UI-FG-HALF
:
hsla
(
0
,
0%
,
100%
,
0.6
);
--UI-FG-1
:
hsla
(
0
,
0%
,
100%
,
0.5
);
--UI-FG-2
:
hsla
(
0
,
0%
,
100%
,
0.3
);
--UI-FG-3
:
hsla
(
0
,
0%
,
100%
,
0.05
)}}
@media
(
prefers-color-scheme
:
dark
){
uni-actionsheet
.uni-actionsheet__title
{
background-color
:
var
(
--UI-BG-1
);
border-bottom-color
:
var
(
--UI-BORDER-CLOLOR-1
)}
uni-actionsheet
.uni-actionsheet__action
,
uni-actionsheet
.uni-actionsheet__menu
{
background-color
:
var
(
--UI-BG-2
)}
uni-actionsheet
.uni-actionsheet__cell
:active
{
background-color
:
var
(
--UI-BG-CLOLOR-ACTIVE
)}
uni-actionsheet
.uni-actionsheet__cell
:before
{
border-top-color
:
var
(
--UI-BORDER-CLOLOR-1
);
color
:
var
(
--UI-BORDER-CLOLOR-1
)}}
@media
(
prefers-color-scheme
:
dark
){
uni-modal
.uni-modal
{
color
:
var
(
--UI-FG-0
);
background-color
:
var
(
--UI-BG-2
)}
uni-modal
.uni-modal__bd
{
color
:
var
(
--UI-FG-1
)}
uni-modal
.uni-modal__btn
:active
{
color
:
#aaa
;
background-color
:
var
(
--UI-BG-CLOLOR-ACTIVE
)}
uni-modal
.uni-modal__ft
:after
,
uni-modal
.uni-modal__btn
:after
{
color
:
var
(
--UI-BORDER-CLOLOR-1
);
border-color
:
var
(
--UI-BORDER-CLOLOR-1
)}}
@media
(
prefers-color-scheme
:
dark
){
uni-toast
.uni-toast
{
background-color
:
#606060
;
color
:
var
(
--UI-FG-0
)}
uni-toast
.uni-icon_toast.uni-icon-error
:before
,
uni-toast
.uni-icon_toast.uni-icon-success-no-circle
:before
{
color
:
rgba
(
255
,
255
,
255
,
0.9
)}}
@media
(
prefers-color-scheme
:
dark
){
uni-page-body
{
background-color
:
#191919
;
color
:
hsla
(
0
,
0%
,
100%
,
0.8
)}}
\ No newline at end of file
packages/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js
浏览文件 @
ad6c4e4b
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
src/platforms/app-plus/service/framework/plugins/data.js
浏览文件 @
ad6c4e4b
...
...
@@ -155,6 +155,11 @@ function setData (id, name, value) {
break
case
V_FOR
:
return
setForData
.
call
(
this
,
id
,
value
)
case
'
is
'
:
{
if
(
typeof
value
===
'
function
'
)
{
value
=
value
.
options
}
}
}
return
((
this
.
_$newData
[
id
]
||
(
this
.
_$newData
[
id
]
=
{}))[
name
]
=
value
)
...
...
src/platforms/app-plus/view/framework/plugins/data.js
浏览文件 @
ad6c4e4b
...
...
@@ -114,7 +114,18 @@ function vdSync ({
function
getData
(
id
,
name
)
{
try
{
return
this
.
$r
[
id
][
name
]
const
data
=
this
.
$r
[
id
][
name
]
if
(
name
===
'
is
'
&&
typeof
data
===
'
object
'
)
{
const
components
=
this
.
$options
.
components
||
{}
for
(
const
key
in
components
)
{
const
value
=
components
[
key
]
const
options
=
typeof
value
===
'
function
'
?
value
.
options
:
value
if
(
options
.
__file
===
data
.
__file
)
{
return
options
}
}
}
return
data
}
catch
(
e
)
{
// console.error(this.$options.__file + `:[${this._$id}]$r[${id}][${name}] is undefined`)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录