Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
48d36e22
U
uni-app
项目概览
DCloud
/
uni-app
3 个月 前同步成功
通知
725
Star
38705
Fork
3642
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
7
列表
看板
标记
里程碑
合并请求
1
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
7
Issue
7
列表
看板
标记
里程碑
合并请求
1
合并请求
1
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
48d36e22
编写于
5月 11, 2021
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore(workflows): e2e.yml
上级
8bd89147
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
139 addition
and
13 deletion
+139
-13
.github/workflows/e2e.yml
.github/workflows/e2e.yml
+1
-1
packages/playground/ssr/src/components/ssr-icon/ssr-icon.vue
packages/playground/ssr/src/components/ssr-icon/ssr-icon.vue
+111
-0
packages/playground/ssr/src/pages/index/index.vue
packages/playground/ssr/src/pages/index/index.vue
+1
-0
packages/uni-components/src/components/icon/index.tsx
packages/uni-components/src/components/icon/index.tsx
+14
-10
packages/uni-h5/dist/uni-h5.cjs.js
packages/uni-h5/dist/uni-h5.cjs.js
+6
-1
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+6
-1
未找到文件。
.github/workflows/e2e.yml
浏览文件 @
48d36e22
...
@@ -57,7 +57,7 @@ jobs:
...
@@ -57,7 +57,7 @@ jobs:
npx cypress version --component node
npx cypress version --component node
-
name
:
Cypress run
-
name
:
Cypress run
uses
:
cypress-io/github-action@v2
uses
:
cypress-io/github-action@v2
.2.7
with
:
with
:
install
:
true
install
:
true
start
:
npm run dev:ssr
start
:
npm run dev:ssr
...
...
packages/playground/ssr/src/components/ssr-icon/ssr-icon.vue
0 → 100644
浏览文件 @
48d36e22
<
template
>
<view
class=
"container"
>
<view
class=
"icon-box"
>
<icon
class=
"icon-box-img"
type=
"success"
size=
"93"
></icon>
<view
class=
"icon-box-ctn"
>
<view
class=
"icon-box-title"
>
成功
</view>
<view
class=
"icon-box-desc"
>
用于表示操作顺利完成
</view>
</view>
</view>
<view
class=
"icon-box"
>
<icon
class=
"icon-box-img"
type=
"info"
size=
"93"
></icon>
<view
class=
"icon-box-ctn"
>
<view
class=
"icon-box-title"
>
提示
</view>
<view
class=
"icon-box-desc"
>
用于表示信息提示;也常用于缺乏条件的操作拦截,提示用户所需信息
</view>
</view>
</view>
<view
class=
"icon-box"
>
<icon
class=
"icon-box-img"
type=
"warn"
size=
"93"
color=
"#C9C9C9"
></icon>
<view
class=
"icon-box-ctn"
>
<view
class=
"icon-box-title"
>
普通警告
</view>
<view
class=
"icon-box-desc"
>
用于表示操作后将引起一定后果的情况;也用于表示由于系统原因而造成的负向结果
</view>
</view>
</view>
<view
class=
"icon-box"
>
<icon
class=
"icon-box-img"
type=
"warn"
size=
"93"
></icon>
<view
class=
"icon-box-ctn"
>
<view
class=
"icon-box-title"
>
强烈警告
</view>
<view
class=
"icon-box-desc"
>
用于表示由于用户原因造成的负向结果;也用于表示操作后将引起不可挽回的严重后果的情况
</view>
</view>
</view>
<view
class=
"icon-box"
>
<icon
class=
"icon-box-img"
type=
"waiting"
size=
"93"
></icon>
<view
class=
"icon-box-ctn"
>
<view
class=
"icon-box-title"
>
等待
</view>
<view
class=
"icon-box-desc"
>
用于表示等待,告知用户结果需等待
</view>
</view>
</view>
<view
class=
"icon-box"
>
<view
class=
"icon-small-wrp"
>
<icon
class=
"icon-small"
type=
"success_no_circle"
size=
"23"
></icon>
</view>
<view
class=
"icon-box-ctn"
>
<view
class=
"icon-box-title"
>
多选控件图标_已选择
</view>
<view
class=
"icon-box-desc"
>
用于多选控件中,表示已选择该项目
</view>
</view>
</view>
<view
class=
"icon-box"
>
<view
class=
"icon-small-wrp"
>
<icon
class=
"icon-small"
type=
"circle"
size=
"23"
></icon>
</view>
<view
class=
"icon-box-ctn"
>
<view
class=
"icon-box-title"
>
多选控件图标_未选择
</view>
<view
class=
"icon-box-desc"
>
用于多选控件中,表示该项目可被选择,但还未选择
</view>
</view>
</view>
<view
class=
"icon-box"
>
<view
class=
"icon-small-wrp"
>
<icon
class=
"icon-small"
type=
"warn"
size=
"23"
></icon>
</view>
<view
class=
"icon-box-ctn"
>
<view
class=
"icon-box-title"
>
错误提示
</view>
<view
class=
"icon-box-desc"
>
用于在表单中表示出现错误
</view>
</view>
</view>
<view
class=
"icon-box"
>
<view
class=
"icon-small-wrp"
>
<icon
class=
"icon-small"
type=
"success"
size=
"23"
></icon>
</view>
<view
class=
"icon-box-ctn"
>
<view
class=
"icon-box-title"
>
单选控件图标_已选择
</view>
<view
class=
"icon-box-desc"
>
用于单选控件中,表示已选择该项目
</view>
</view>
</view>
<view
class=
"icon-box"
>
<view
class=
"icon-small-wrp"
>
<icon
class=
"icon-small"
type=
"download"
size=
"23"
></icon>
</view>
<view
class=
"icon-box-ctn"
>
<view
class=
"icon-box-title"
>
下载
</view>
<view
class=
"icon-box-desc"
>
用于表示可下载
</view>
</view>
</view>
<view
class=
"icon-box"
>
<view
class=
"icon-small-wrp"
>
<icon
class=
"icon-small"
type=
"info_circle"
size=
"23"
></icon>
</view>
<view
class=
"icon-box-ctn"
>
<view
class=
"icon-box-title"
>
提示
</view>
<view
class=
"icon-box-desc"
>
用于在表单中表示有信息提示
</view>
</view>
</view>
<view
class=
"icon-box"
>
<view
class=
"icon-small-wrp"
>
<icon
class=
"icon-small"
type=
"cancel"
size=
"23"
></icon>
</view>
<view
class=
"icon-box-ctn"
>
<view
class=
"icon-box-title"
>
停止或关闭
</view>
<view
class=
"icon-box-desc"
>
用于在表单中,表示关闭或停止
</view>
</view>
</view>
<view
class=
"icon-box"
>
<view
class=
"icon-small-wrp"
>
<icon
class=
"icon-small"
type=
"search"
size=
"14"
></icon>
</view>
<view
class=
"icon-box-ctn"
>
<view
class=
"icon-box-title"
>
搜索
</view>
<view
class=
"icon-box-desc"
>
用于搜索控件中,表示可搜索
</view>
</view>
</view>
</view>
</
template
>
\ No newline at end of file
packages/playground/ssr/src/pages/index/index.vue
浏览文件 @
48d36e22
<
template
>
<
template
>
<ssr-cover-image
/>
<ssr-cover-image
/>
<ssr-cover-view
/>
<ssr-cover-view
/>
<ssr-icon
/>
<!--
<ssr-match-media
/>
-->
<!--
<ssr-match-media
/>
-->
<!--
<ssr-movable-area
/>
-->
<!--
<ssr-movable-area
/>
-->
<ssr-progress
/>
<ssr-progress
/>
...
...
packages/uni-components/src/components/icon/index.tsx
浏览文件 @
48d36e22
...
@@ -78,15 +78,19 @@ export default /*#__PURE__*/ defineComponent({
...
@@ -78,15 +78,19 @@ export default /*#__PURE__*/ defineComponent({
},
},
setup
(
props
)
{
setup
(
props
)
{
const
path
=
computed
(()
=>
ICONS
[
props
.
type
as
keyof
typeof
ICONS
])
const
path
=
computed
(()
=>
ICONS
[
props
.
type
as
keyof
typeof
ICONS
])
return
()
=>
(
return
()
=>
{
const
{
value
}
=
path
return
(
<
uni
-
icon
>
<
uni
-
icon
>
{
path
.
value
.
d
&&
{
value
&&
value
.
d
&&
createSvgIconVNode
(
createSvgIconVNode
(
path
.
value
.
d
,
value
.
d
,
props
.
color
||
path
.
value
.
c
,
props
.
color
||
value
.
c
,
rpx2px
(
props
.
size
)
rpx2px
(
props
.
size
)
)
}
)
}
</
uni
-
icon
>
</
uni
-
icon
>
)
)
}
},
},
})
})
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @
48d36e22
...
@@ -2713,7 +2713,12 @@ var index$h = /* @__PURE__ */ vue.defineComponent({
...
@@ -2713,7 +2713,12 @@ var index$h = /* @__PURE__ */ vue.defineComponent({
},
},
setup
(
props2
)
{
setup
(
props2
)
{
const
path
=
vue
.
computed
(()
=>
ICONS
[
props2
.
type
]);
const
path
=
vue
.
computed
(()
=>
ICONS
[
props2
.
type
]);
return
()
=>
vue
.
createVNode
(
"
uni-icon
"
,
null
,
[
path
.
value
.
d
&&
createSvgIconVNode
(
path
.
value
.
d
,
props2
.
color
||
path
.
value
.
c
,
rpx2px
(
props2
.
size
))]);
return
()
=>
{
const
{
value
}
=
path
;
return
vue
.
createVNode
(
"
uni-icon
"
,
null
,
[
value
&&
value
.
d
&&
createSvgIconVNode
(
value
.
d
,
props2
.
color
||
value
.
c
,
rpx2px
(
props2
.
size
))]);
};
}
}
});
});
const
props$h
=
{
const
props$h
=
{
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
48d36e22
...
@@ -7073,7 +7073,12 @@ var index$h = /* @__PURE__ */ defineComponent({
...
@@ -7073,7 +7073,12 @@ var index$h = /* @__PURE__ */ defineComponent({
},
},
setup
(
props2
)
{
setup
(
props2
)
{
const
path
=
computed
(()
=>
ICONS
[
props2
.
type
]);
const
path
=
computed
(()
=>
ICONS
[
props2
.
type
]);
return
()
=>
createVNode
(
"
uni-icon
"
,
null
,
[
path
.
value
.
d
&&
createSvgIconVNode
(
path
.
value
.
d
,
props2
.
color
||
path
.
value
.
c
,
rpx2px
(
props2
.
size
))]);
return
()
=>
{
const
{
value
}
=
path
;
return
createVNode
(
"
uni-icon
"
,
null
,
[
value
&&
value
.
d
&&
createSvgIconVNode
(
value
.
d
,
props2
.
color
||
value
.
c
,
rpx2px
(
props2
.
size
))]);
};
}
}
});
});
const
props$j
=
{
const
props$j
=
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录