From 48d36e227d97b29e4d695bb652eac3c80bfb44b4 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Tue, 11 May 2021 15:34:02 +0800
Subject: [PATCH] chore(workflows): e2e.yml

---
 .github/workflows/e2e.yml                     |   2 +-
 .../ssr/src/components/ssr-icon/ssr-icon.vue  | 111 ++++++++++++++++++
 .../playground/ssr/src/pages/index/index.vue  |   1 +
 .../src/components/icon/index.tsx             |  24 ++--
 packages/uni-h5/dist/uni-h5.cjs.js            |   7 +-
 packages/uni-h5/dist/uni-h5.es.js             |   7 +-
 6 files changed, 139 insertions(+), 13 deletions(-)
 create mode 100644 packages/playground/ssr/src/components/ssr-icon/ssr-icon.vue

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index c322a28429..f249d562f0 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 0000000000..a9171d8ff0
--- /dev/null
+++ b/packages/playground/ssr/src/components/ssr-icon/ssr-icon.vue
@@ -0,0 +1,111 @@
+<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
diff --git a/packages/playground/ssr/src/pages/index/index.vue b/packages/playground/ssr/src/pages/index/index.vue
index b3a513147a..81346eda7b 100644
--- a/packages/playground/ssr/src/pages/index/index.vue
+++ b/packages/playground/ssr/src/pages/index/index.vue
@@ -1,6 +1,7 @@
 <template>
   <ssr-cover-image />
   <ssr-cover-view />
+  <ssr-icon />
   <!-- <ssr-match-media /> -->
   <!-- <ssr-movable-area /> -->
   <ssr-progress />
diff --git a/packages/uni-components/src/components/icon/index.tsx b/packages/uni-components/src/components/icon/index.tsx
index a85a34d03a..247406e9c3 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 () => (
-      <uni-icon>
-        {path.value.d &&
-          createSvgIconVNode(
-            path.value.d,
-            props.color || path.value.c,
-            rpx2px(props.size)
-          )}
-      </uni-icon>
-    )
+    return () => {
+      const { value } = path
+      return (
+        <uni-icon>
+          {value &&
+            value.d &&
+            createSvgIconVNode(
+              value.d,
+              props.color || value.c,
+              rpx2px(props.size)
+            )}
+        </uni-icon>
+      )
+    }
   },
 })
diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js
index a83fbd091d..7506903ab6 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 08e792fa03..277d474a07 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 = {
-- 
GitLab