From 061cb81a15c045580ab722ec51d2abb968a7baef Mon Sep 17 00:00:00 2001
From: zhenyuWang <13641039885@163.com>
Date: Tue, 28 May 2024 20:55:25 +0800
Subject: [PATCH] refactor(render function): render

---
 pages/index/index.uvue                        | 52 +++++++++----------
 .../render/render-composition.uvue            | 47 +++++++----------
 pages/render-function/render/render.test.js   |  6 +--
 3 files changed, 49 insertions(+), 56 deletions(-)

diff --git a/pages/index/index.uvue b/pages/index/index.uvue
index c0060f3..036dbcf 100644
--- a/pages/index/index.uvue
+++ b/pages/index/index.uvue
@@ -976,20 +976,20 @@ export default {
             {
               id: 'render',
               name: 'render & h()',
-              children: [
-                {
-                  id: 'render-options',
-                  name: 'render 选项式 API',
-                  url: 'render-options'
-                },
-                {
-                  id: 'render-composition',
-                  name: 'render 组合式 API',
-                  // #ifdef APP-IOS
-                  enable: false,
-                  // #endif
-                  url: 'render-composition'
-                },
+              children: [
+                {
+                  id: 'render-options',
+                  name: 'render 选项式 API',
+                  url: 'render-options'
+                },
+                {
+                  id: 'render-composition',
+                  name: 'render 组合式 API',
+                  // #ifdef APP-ANDROID
+                  enable: false,
+                  // #endif
+                  url: 'render-composition'
+                },
               ]
             },
             {
@@ -1019,9 +1019,9 @@ export default {
                 },
                 {
                   id: 'cloneVNode-composition',
-                  name: 'cloneVNode 组合式 API',
-                  // #ifdef APP-IOS
-                  enable: false,
+                  name: 'cloneVNode 组合式 API',
+                  // #ifdef APP-IOS
+                  enable: false,
                   // #endif
                   url: 'cloneVNode-composition'
                 },
@@ -1054,9 +1054,9 @@ export default {
                 },
                 {
                   id: 'resolveComponent-composition',
-                  name: 'resolveComponent 组合式 API',
-                  // #ifdef APP-IOS
-                  enable: false,
+                  name: 'resolveComponent 组合式 API',
+                  // #ifdef APP-IOS
+                  enable: false,
                   // #endif
                   url: 'resolveComponent-composition'
                 },
@@ -1073,9 +1073,9 @@ export default {
                 },
                 {
                   id: 'withDirectives-composition',
-                  name: 'withDirectives 组合式 API',
-                  // #ifdef APP-IOS
-                  enable: false,
+                  name: 'withDirectives 组合式 API',
+                  // #ifdef APP-IOS
+                  enable: false,
                   // #endif
                   url: 'withDirectives-composition'
                 },
@@ -1092,9 +1092,9 @@ export default {
                 },
                 {
                   id: 'withModifiers-composition',
-                  name: 'withModifiers 组合式 API',
-                  // #ifdef APP-IOS
-                  enable: false,
+                  name: 'withModifiers 组合式 API',
+                  // #ifdef APP-IOS
+                  enable: false,
                   // #endif
                   url: 'withModifiers-composition'
                 },
diff --git a/pages/render-function/render/render-composition.uvue b/pages/render-function/render/render-composition.uvue
index 5080576..2c556c3 100644
--- a/pages/render-function/render/render-composition.uvue
+++ b/pages/render-function/render/render-composition.uvue
@@ -1,36 +1,29 @@
 <script setup lang="uts">
 import CompForHFunction from '@/components/CompForHFunction.uvue'
 
-defineOptions({
-  data() {
-    return {
-      msg: 'default msg'
-    }
-  },
-  render(): VNode {
-    const instance = getCurrentInstance()!.proxy!
-    
-    return h('view', { class: 'page' }, [
-      h(CompForHFunction, {}, (): VNode[] => [h('text', { class: 'comp-slot' }, 'component slot')]),
-      h('text', { class: 'uni-common-mt msg', style: { color: 'blue' } }, instance.$data['msg']),
-      h(
-        'button',
-        {
-          class: 'uni-common-mt btn',
-          type: 'primary',
-          onClick: () => {
-            instance.$data['msg'] = 'new msg'
-          }
-        },
-        'click'
-      )
-    ])
-  }
-})
+const msg = ref('default msg')
+
+const render = ():VNode => h('view', { class: 'page' }, [
+  h(CompForHFunction, {}, (): VNode[] => [h('text', { class: 'comp-slot' }, 'component slot')]),
+  h('text', { class: 'uni-common-mt msg', style: { color: 'blue' } }, msg.value),
+  h(
+    'button',
+    {
+      class: 'uni-common-mt btn',
+      type: 'primary',
+      onClick: () => {
+        msg.value = 'new msg'
+      }
+    },
+    'click'
+  )
+])
 </script>
 
+<template><render /></template>
+
 <style>
 .btn {
   color: red;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/render-function/render/render.test.js b/pages/render-function/render/render.test.js
index 26ba059..1dc30f8 100644
--- a/pages/render-function/render/render.test.js
+++ b/pages/render-function/render/render.test.js
@@ -4,7 +4,7 @@ const COMPOSITION_PAGE_PATH = '/pages/render-function/render/render-composition'
 describe('render-function render', () => {
   const platformInfo = process.env.uniTestPlatformInfo.toLocaleLowerCase()
   const isWeb = platformInfo.startsWith('web')
-  const isIos = platformInfo.startsWith('ios')
+  const isAndroid = platformInfo.startsWith('android')
   if (isWeb) {
     it("web platform test cannot get render dom", async () => {
       expect(1).toBe(1);
@@ -38,10 +38,10 @@ describe('render-function render', () => {
   })
 
   it('render composition API', async () => {
-    if (!isIos) {
+    if (!isAndroid) {
       await test(COMPOSITION_PAGE_PATH)
     } else {
-      // TODO: ios 端 defineOptions + render 页面空白
+      // TODO: android 端 报错 java.lang.IndexOutOfBoundsException: Index: 0, Size: 0
       expect(1).toBe(1);
     }
   })
-- 
GitLab