diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index c322a28429eec242f0ebfe5e9ab9a5d36098aba2..f249d562f01e862b82b1162f0026c7a84c6276a9 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -57,7 +57,7 @@ jobs:
npx cypress version --component node
- name: Cypress run
- uses: cypress-io/github-action@v2
+ uses: cypress-io/github-action@v2.2.7
with:
install: true
start: npm run dev:ssr
diff --git a/packages/playground/ssr/src/components/ssr-icon/ssr-icon.vue b/packages/playground/ssr/src/components/ssr-icon/ssr-icon.vue
new file mode 100644
index 0000000000000000000000000000000000000000..a9171d8ff0ae55711b8782c5d20deb945e378b79
--- /dev/null
+++ b/packages/playground/ssr/src/components/ssr-icon/ssr-icon.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+ 成功
+ 用于表示操作顺利完成
+
+
+
+
+
+ 提示
+ 用于表示信息提示；也常用于缺乏条件的操作拦截，提示用户所需信息
+
+
+
+
+
+ 普通警告
+ 用于表示操作后将引起一定后果的情况；也用于表示由于系统原因而造成的负向结果
+
+
+
+
+
+ 强烈警告
+ 用于表示由于用户原因造成的负向结果；也用于表示操作后将引起不可挽回的严重后果的情况
+
+
+
+
+
+ 等待
+ 用于表示等待，告知用户结果需等待
+
+
+
+
+
+
+
+ 多选控件图标_已选择
+ 用于多选控件中，表示已选择该项目
+
+
+
+
+
+
+
+ 多选控件图标_未选择
+ 用于多选控件中，表示该项目可被选择，但还未选择
+
+
+
+
+
+
+
+ 错误提示
+ 用于在表单中表示出现错误
+
+
+
+
+
+
+
+ 单选控件图标_已选择
+ 用于单选控件中，表示已选择该项目
+
+
+
+
+
+
+
+ 下载
+ 用于表示可下载
+
+
+
+
+
+
+
+ 提示
+ 用于在表单中表示有信息提示
+
+
+
+
+
+
+
+ 停止或关闭
+ 用于在表单中，表示关闭或停止
+
+
+
+
+
+
+
+ 搜索
+ 用于搜索控件中，表示可搜索
+
+
+
+
\ No newline at end of file
diff --git a/packages/playground/ssr/src/pages/index/index.vue b/packages/playground/ssr/src/pages/index/index.vue
index b3a513147a7e6187f5f617fc9bf6a2da127ba2e3..81346eda7bd45606258149015f0f80a6c2335c79 100644
--- a/packages/playground/ssr/src/pages/index/index.vue
+++ b/packages/playground/ssr/src/pages/index/index.vue
@@ -1,6 +1,7 @@
+
diff --git a/packages/uni-components/src/components/icon/index.tsx b/packages/uni-components/src/components/icon/index.tsx
index a85a34d03ad5d1566108f3d4aafc07f80a21d763..247406e9c384771fc6dbd2fc04d9bf92dfa6a0cb 100644
--- a/packages/uni-components/src/components/icon/index.tsx
+++ b/packages/uni-components/src/components/icon/index.tsx
@@ -78,15 +78,19 @@ export default /*#__PURE__*/ defineComponent({
},
setup(props) {
const path = computed(() => ICONS[props.type as keyof typeof ICONS])
- return () => (
-
- {path.value.d &&
- createSvgIconVNode(
- path.value.d,
- props.color || path.value.c,
- rpx2px(props.size)
- )}
-
- )
+ return () => {
+ const { value } = path
+ return (
+
+ {value &&
+ value.d &&
+ createSvgIconVNode(
+ value.d,
+ props.color || value.c,
+ rpx2px(props.size)
+ )}
+
+ )
+ }
},
})
diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js
index a83fbd091dbc7e4cf5e4ef2843a7e4532ab75268..7506903ab6312ca42dfcac0f376d2430ca6a5bc3 100644
--- a/packages/uni-h5/dist/uni-h5.cjs.js
+++ b/packages/uni-h5/dist/uni-h5.cjs.js
@@ -2713,7 +2713,12 @@ var index$h = /* @__PURE__ */ vue.defineComponent({
},
setup(props2) {
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 = {
diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js
index 08e792fa0377788b7d0977a57ad995522276ed83..277d474a07ecffd3d1f739a3b8a61fdcf93b0099 100644
--- a/packages/uni-h5/dist/uni-h5.es.js
+++ b/packages/uni-h5/dist/uni-h5.es.js
@@ -7073,7 +7073,12 @@ var index$h = /* @__PURE__ */ defineComponent({
},
setup(props2) {
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 = {