From 0b8e3a61717ce331e306cc71ee9e9555ee926a1b Mon Sep 17 00:00:00 2001
From: hdx <hdx@dcloud.io>
Date: Sat, 1 Jul 2023 16:42:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor=EF=BC=9Apages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       | 166 ++++-----
 manifest.json                                 |   2 +-
 pages.json                                    |  48 +--
 pages/{ => directive}/v-bind/v-bind.test.js   |   2 +-
 pages/{ => directive}/v-bind/v-bind.uvue      |   0
 pages/{ => directive}/v-for/v-for.test.js     |   2 +-
 pages/{ => directive}/v-for/v-for.uvue        |   0
 pages/{ => directive}/v-if/v-if.test.js       |   2 +-
 pages/{ => directive}/v-if/v-if.uvue          |   0
 pages/{ => directive}/v-model/counter.uvue    |   0
 pages/{ => directive}/v-model/v-model.test.js |   2 +-
 pages/{ => directive}/v-model/v-model.uvue    |   0
 pages/{ => directive}/v-on/v-on.test.js       |   2 +-
 pages/{ => directive}/v-on/v-on.uvue          |   0
 pages/{ => directive}/v-once/v-once.test.js   |   2 +-
 pages/{ => directive}/v-once/v-once.uvue      |   0
 pages/{ => directive}/v-show/v-show.test.js   |   2 +-
 pages/{ => directive}/v-show/v-show.uvue      |   0
 pages/{ => directive}/v-slot/counter.uvue     |   0
 pages/{ => directive}/v-slot/v-slot.test.js   |   2 +-
 pages/{ => directive}/v-slot/v-slot.uvue      |   0
 pages/index.uvue                              | 337 ++++++++++++------
 .../component/component.test.js}              |   2 +-
 .../component/component.uvue}                 |  38 +-
 .../page/page.test.js}                        |   2 +-
 .../page/page.uvue}                           |  76 ++--
 26 files changed, 407 insertions(+), 280 deletions(-)
 rename pages/{ => directive}/v-bind/v-bind.test.js (79%)
 rename pages/{ => directive}/v-bind/v-bind.uvue (100%)
 rename pages/{ => directive}/v-for/v-for.test.js (85%)
 rename pages/{ => directive}/v-for/v-for.uvue (100%)
 rename pages/{ => directive}/v-if/v-if.test.js (86%)
 rename pages/{ => directive}/v-if/v-if.uvue (100%)
 rename pages/{ => directive}/v-model/counter.uvue (100%)
 rename pages/{ => directive}/v-model/v-model.test.js (88%)
 rename pages/{ => directive}/v-model/v-model.uvue (100%)
 rename pages/{ => directive}/v-on/v-on.test.js (91%)
 rename pages/{ => directive}/v-on/v-on.uvue (100%)
 rename pages/{ => directive}/v-once/v-once.test.js (78%)
 rename pages/{ => directive}/v-once/v-once.uvue (100%)
 rename pages/{ => directive}/v-show/v-show.test.js (94%)
 rename pages/{ => directive}/v-show/v-show.uvue (100%)
 rename pages/{ => directive}/v-slot/counter.uvue (100%)
 rename pages/{ => directive}/v-slot/v-slot.test.js (78%)
 rename pages/{ => directive}/v-slot/v-slot.uvue (100%)
 rename pages/{component-lifecycle/component-lifecycle.test.js => lifecycle/component/component.test.js} (95%)
 rename pages/{component-lifecycle/component-lifecycle.uvue => lifecycle/component/component.uvue} (70%)
 rename pages/{page-lifecycle/page-lifecycle.test.js => lifecycle/page/page.test.js} (97%)
 rename pages/{page-lifecycle/page-lifecycle.uvue => lifecycle/page/page.uvue} (88%)

diff --git a/App.vue b/App.vue
index 058ac5f..523d72a 100644
--- a/App.vue
+++ b/App.vue
@@ -1,103 +1,107 @@
 <script lang="ts">
-import { state, setLifeCycleNum } from './store/index.uts'
-export default {
-  onLaunch: function () {
-    setLifeCycleNum(state.lifeCycleNum + 1000)
-    console.log('App Launch')
+  import { state, setLifeCycleNum } from './store/index.uts'
+  export default {
+    onLaunch: function () {
+      setLifeCycleNum(state.lifeCycleNum + 1000)
+      console.log('App Launch')
 
-    const performance: Performance = uni.getPerformance()
-    const observer: PerformanceObserver = performance.createObserver((entryList: PerformanceObserverEntryList) => {
-      console.log("observer:entryList.getEntries()")
-      console.log(entryList.getEntries())
-    })
-    observer.observe({ entryTypes: ['render', 'navigation'] } as PerformanceObserverOptions)
-  },
-  onShow: function () {
-    setLifeCycleNum(state.lifeCycleNum + 100)
-    console.log('App Show')
-  },
-  onHide: function () {
-    setLifeCycleNum(state.lifeCycleNum - 100)
-    console.log('App Hide')
-  },
-  onLastPageBackPress(): boolean | null {
-    setLifeCycleNum(state.lifeCycleNum - 1000)
-    console.log('App onLastPageBackPress')
-    return null
-  },
-}
+      const performance : Performance = uni.getPerformance()
+      const observer : PerformanceObserver = performance.createObserver((entryList : PerformanceObserverEntryList) => {
+        console.log("observer:entryList.getEntries()")
+        console.log(entryList.getEntries())
+      })
+      observer.observe({ entryTypes: ['render', 'navigation'] } as PerformanceObserverOptions)
+    },
+    onShow: function () {
+      setLifeCycleNum(state.lifeCycleNum + 100)
+      console.log('App Show')
+    },
+    onHide: function () {
+      setLifeCycleNum(state.lifeCycleNum - 100)
+      console.log('App Hide')
+    },
+    onLastPageBackPress() : boolean | null {
+      setLifeCycleNum(state.lifeCycleNum - 1000)
+      console.log('App onLastPageBackPress')
+      return null
+    },
+  }
 </script>
 
 <style>
-/* @font-face {
+  /* @font-face {
     font-family: uniicons;
     font-weight: normal;
     font-style: normal;
     src: url('./static/fonts/uni.ttf') format('truetype');
   } */
 
-.page {
-  padding: 15px;
-}
+  .page {
+    padding: 15px;
+  }
 
-.uni-panel {
-  margin-bottom: 12px;
-}
+  .uni-panel {
+    margin-bottom: 12px;
+  }
 
-.uni-panel-h {
-  background-color: #ffffff;
-  flex-direction: row;
-  align-items: center;
-  padding: 12px;
-}
+  .uni-panel-h {
+    background-color: #ffffff;
+    flex-direction: row;
+    align-items: center;
+    padding: 12px;
+  }
 
-.uni-panel-h-on {
-  background-color: #f0f0f0;
-}
+  .uni-panel-h-on {
+    background-color: #f0f0f0;
+  }
 
-.uni-panel-text {
-  color: #000000;
-  font-size: 14px;
-  font-weight: normal;
-}
+  .uni-panel-text {
+    color: #000000;
+    font-size: 14px;
+    font-weight: normal;
+  }
+
+  .uni-panel-icon {}
 
-.uni-panel-icon {}
+  .uni-panel-icon-on {
+    transform: rotate(180deg);
+  }
 
-.uni-panel-icon-on {
-  transform: rotate(180deg);
-}
+  .uni-navigate-item {
+    flex-direction: row;
+    align-items: center;
+    background-color: #FFFFFF;
+    border-top-style: solid;
+    border-top-color: #f0f0f0;
+    border-top-width: 1px;
+    padding: 12px;
+    justify-content: space-between;
+  }
 
-.uni-navigate-item {
-  flex-direction: row;
-  align-items: center;
-  background-color: #FFFFFF;
-  border-top-style: solid;
-  border-top-color: #f0f0f0;
-  border-top-width: 1px;
-  padding: 12px;
-  justify-content: space-between;
-}
+  .uni-navigate-item:active {
+    background-color: #f8f8f8;
+  }
 
-.uni-navigate-item:active {
-  background-color: #f8f8f8;
-}
+  .uni-navigate-text {
+    color: #000000;
+    font-size: 12px;
+    opacity: 0.8;
+  }
 
-.uni-navigate-text {
-  color: #000000;
-  font-size: 12px;
-  opacity: 0.8;
-}
+  .uni-navigate-icon {
+    margin-left: 15px;
+    color: #999999;
+    font-size: 14px;
+    font-weight: normal;
+  }
 
-.uni-navigate-icon {
-  margin-left: 15px;
-  color: #999999;
-  font-size: 14px;
-  font-weight: normal;
-}
+  .text-disabled {
+    color: #a0a0a0;
+  }
 
-.split-title {
-  margin: 20px 0 5px;
-  padding: 5px 0;
-  border-bottom: 1px solid #dfdfdf;
-}
-</style>
+  .split-title {
+    margin: 20px 0 5px;
+    padding: 5px 0;
+    border-bottom: 1px solid #dfdfdf;
+  }
+</style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 4caff87..df20794 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "hello-uvue",
-    "appid" : "__UNI__CD1E05C",
+    "appid" : "",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
diff --git a/pages.json b/pages.json
index 4681437..7bc4624 100644
--- a/pages.json
+++ b/pages.json
@@ -6,61 +6,61 @@
       }
     },
     {
-      "path": "pages/v-bind/v-bind",
+      "path": "pages/directive/v-bind/v-bind",
       "style": {
         "navigationBarTitleText": "v-bind"
       }
     },
     {
-      "path": "pages/v-for/v-for",
+      "path": "pages/directive/v-for/v-for",
       "style": {
         "navigationBarTitleText": "v-for"
       }
     },
     {
-      "path": "pages/v-if/v-if",
+      "path": "pages/directive/v-if/v-if",
       "style": {
         "navigationBarTitleText": "v-if"
       }
     },
     {
-      "path": "pages/v-model/v-model",
+      "path": "pages/directive/v-model/v-model",
       "style": {
         "navigationBarTitleText": "v-model"
       }
     },
     {
-      "path": "pages/v-on/v-on",
+      "path": "pages/directive/v-on/v-on",
       "style": {
         "navigationBarTitleText": "v-on"
       }
     },
     {
-      "path": "pages/v-once/v-once",
+      "path": "pages/directive/v-once/v-once",
       "style": {
         "navigationBarTitleText": "v-once"
       }
     },
     {
-      "path": "pages/v-show/v-show",
+      "path": "pages/directive/v-show/v-show",
       "style": {
         "navigationBarTitleText": "v-show"
       }
     },
     {
-      "path": "pages/v-slot/v-slot",
+      "path": "pages/directive/v-slot/v-slot",
       "style": {
         "navigationBarTitleText": "v-slot"
       }
     },
     {
-      "path": "pages/page-lifecycle/page-lifecycle",
+      "path": "pages/lifecycle/page/page",
       "style": {
         "navigationBarTitleText": "page-lifecycle"
       }
     },
     {
-      "path": "pages/component-lifecycle/component-lifecycle",
+      "path": "pages/lifecycle/component/component",
       "style": {
         "navigationBarTitleText": "component-lifecycle"
       }
@@ -175,20 +175,20 @@
         "enablePullDownRefresh": false
       }
     },
-	 {
-	   "path": "pages/rendering/slots/slots",
-	   "style": {
-	     "navigationBarTitleText": "slots",
-	     "enablePullDownRefresh": false
-	   }
-	 },
-	 {
-	   "path": "pages/rendering/template/template",
-	   "style": {
-	     "navigationBarTitleText": "template",
-	     "enablePullDownRefresh": false
-	   }
-	 }
+    {
+      "path": "pages/rendering/slots/slots",
+      "style": {
+        "navigationBarTitleText": "slots",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/rendering/template/template",
+      "style": {
+        "navigationBarTitleText": "template",
+        "enablePullDownRefresh": false
+      }
+    }
   ],
   "globalStyle": {
     "pageOrientation": "portrait",
diff --git a/pages/v-bind/v-bind.test.js b/pages/directive/v-bind/v-bind.test.js
similarity index 79%
rename from pages/v-bind/v-bind.test.js
rename to pages/directive/v-bind/v-bind.test.js
index 8ed328b..d640733 100644
--- a/pages/v-bind/v-bind.test.js
+++ b/pages/directive/v-bind/v-bind.test.js
@@ -1,4 +1,4 @@
-const PAGE_PATH = '/pages/v-bind/v-bind'
+const PAGE_PATH = '/pages/directive/v-bind/v-bind'
 
 describe('v-bind', () => {
   let page
diff --git a/pages/v-bind/v-bind.uvue b/pages/directive/v-bind/v-bind.uvue
similarity index 100%
rename from pages/v-bind/v-bind.uvue
rename to pages/directive/v-bind/v-bind.uvue
diff --git a/pages/v-for/v-for.test.js b/pages/directive/v-for/v-for.test.js
similarity index 85%
rename from pages/v-for/v-for.test.js
rename to pages/directive/v-for/v-for.test.js
index 576099f..29dc902 100644
--- a/pages/v-for/v-for.test.js
+++ b/pages/directive/v-for/v-for.test.js
@@ -1,4 +1,4 @@
-const PAGE_PATH = '/pages/v-for/v-for'
+const PAGE_PATH = '/pages/directive/v-for/v-for'
 
 describe('v-for', () => {
   let page
diff --git a/pages/v-for/v-for.uvue b/pages/directive/v-for/v-for.uvue
similarity index 100%
rename from pages/v-for/v-for.uvue
rename to pages/directive/v-for/v-for.uvue
diff --git a/pages/v-if/v-if.test.js b/pages/directive/v-if/v-if.test.js
similarity index 86%
rename from pages/v-if/v-if.test.js
rename to pages/directive/v-if/v-if.test.js
index cd7f0dc..e6ac5fd 100644
--- a/pages/v-if/v-if.test.js
+++ b/pages/directive/v-if/v-if.test.js
@@ -1,4 +1,4 @@
-const PAGE_PATH = '/pages/v-if/v-if'
+const PAGE_PATH = '/pages/directive/v-if/v-if'
 
 describe('v-if', () => {
   let page
diff --git a/pages/v-if/v-if.uvue b/pages/directive/v-if/v-if.uvue
similarity index 100%
rename from pages/v-if/v-if.uvue
rename to pages/directive/v-if/v-if.uvue
diff --git a/pages/v-model/counter.uvue b/pages/directive/v-model/counter.uvue
similarity index 100%
rename from pages/v-model/counter.uvue
rename to pages/directive/v-model/counter.uvue
diff --git a/pages/v-model/v-model.test.js b/pages/directive/v-model/v-model.test.js
similarity index 88%
rename from pages/v-model/v-model.test.js
rename to pages/directive/v-model/v-model.test.js
index 5baa46f..d9a09c6 100644
--- a/pages/v-model/v-model.test.js
+++ b/pages/directive/v-model/v-model.test.js
@@ -1,4 +1,4 @@
-const PAGE_PATH = '/pages/v-model/v-model'
+const PAGE_PATH = '/pages/directive/v-model/v-model'
 
 describe('v-model', () => {
   let page
diff --git a/pages/v-model/v-model.uvue b/pages/directive/v-model/v-model.uvue
similarity index 100%
rename from pages/v-model/v-model.uvue
rename to pages/directive/v-model/v-model.uvue
diff --git a/pages/v-on/v-on.test.js b/pages/directive/v-on/v-on.test.js
similarity index 91%
rename from pages/v-on/v-on.test.js
rename to pages/directive/v-on/v-on.test.js
index 0d8a903..b212a55 100644
--- a/pages/v-on/v-on.test.js
+++ b/pages/directive/v-on/v-on.test.js
@@ -1,4 +1,4 @@
-const PAGE_PATH = '/pages/v-on/v-on'
+const PAGE_PATH = '/pages/directive/v-on/v-on'
 
 describe('v-on', () => {
   let page
diff --git a/pages/v-on/v-on.uvue b/pages/directive/v-on/v-on.uvue
similarity index 100%
rename from pages/v-on/v-on.uvue
rename to pages/directive/v-on/v-on.uvue
diff --git a/pages/v-once/v-once.test.js b/pages/directive/v-once/v-once.test.js
similarity index 78%
rename from pages/v-once/v-once.test.js
rename to pages/directive/v-once/v-once.test.js
index fc597cd..4330c01 100644
--- a/pages/v-once/v-once.test.js
+++ b/pages/directive/v-once/v-once.test.js
@@ -1,4 +1,4 @@
-const PAGE_PATH = '/pages/v-once/v-once'
+const PAGE_PATH = '/pages/directive/v-once/v-once'
 
 describe('v-once', () => {
   let page
diff --git a/pages/v-once/v-once.uvue b/pages/directive/v-once/v-once.uvue
similarity index 100%
rename from pages/v-once/v-once.uvue
rename to pages/directive/v-once/v-once.uvue
diff --git a/pages/v-show/v-show.test.js b/pages/directive/v-show/v-show.test.js
similarity index 94%
rename from pages/v-show/v-show.test.js
rename to pages/directive/v-show/v-show.test.js
index 40bd13f..2adfc98 100644
--- a/pages/v-show/v-show.test.js
+++ b/pages/directive/v-show/v-show.test.js
@@ -1,4 +1,4 @@
-const PAGE_PATH = '/pages/v-show/v-show'
+const PAGE_PATH = '/pages/directive/v-show/v-show'
 
 describe('v-show', () => {
   let page
diff --git a/pages/v-show/v-show.uvue b/pages/directive/v-show/v-show.uvue
similarity index 100%
rename from pages/v-show/v-show.uvue
rename to pages/directive/v-show/v-show.uvue
diff --git a/pages/v-slot/counter.uvue b/pages/directive/v-slot/counter.uvue
similarity index 100%
rename from pages/v-slot/counter.uvue
rename to pages/directive/v-slot/counter.uvue
diff --git a/pages/v-slot/v-slot.test.js b/pages/directive/v-slot/v-slot.test.js
similarity index 78%
rename from pages/v-slot/v-slot.test.js
rename to pages/directive/v-slot/v-slot.test.js
index a50efe2..d7ffd23 100644
--- a/pages/v-slot/v-slot.test.js
+++ b/pages/directive/v-slot/v-slot.test.js
@@ -1,4 +1,4 @@
-const PAGE_PATH = '/pages/v-slot/v-slot'
+const PAGE_PATH = '/pages/directive/v-slot/v-slot'
 
 describe('v-slot', () => {
   let page
diff --git a/pages/v-slot/v-slot.uvue b/pages/directive/v-slot/v-slot.uvue
similarity index 100%
rename from pages/v-slot/v-slot.uvue
rename to pages/directive/v-slot/v-slot.uvue
diff --git a/pages/index.uvue b/pages/index.uvue
index 04bfb03..af6964f 100644
--- a/pages/index.uvue
+++ b/pages/index.uvue
@@ -6,8 +6,9 @@
         <!-- <text class="uni-panel-icon uni-icon" :class="item.open ? 'uni-panel-icon-on' : ''">{{item.open ? '&#xe581;' : '&#xe470;'}}</text> -->
       </view>
       <view class="uni-panel-c" v-if="item.open">
-        <view class="uni-navigate-item" v-for="page in item.pages" :key="page.name" @click="goDetailPage(page)">
-          <text class="uni-navigate-text">{{page.name}}</text>
+        <view class="uni-navigate-item" v-for="page in item.pages" :key="page.name"
+          @click="goDetailPage(item.id, page)">
+          <text class="uni-navigate-text" :class="page.enable != true ? 'text-disabled' : ''">{{page.name}}</text>
           <!-- <text class="uni-navigate-icon uni-icon">&#xe470;</text> -->
         </view>
       </view>
@@ -16,30 +17,21 @@
 </template>
 
 <script lang="ts">
-  import { setLifeCycleNum, state } from '../store/index.uts'
-  const STORAGE_KEY_PREFIX = 'INDEX-STATUS'
-  let storageData : Array<string> = []
+  import { setLifeCycleNum, state } from '@/store/index.uts'
 
-  type ListItem = {
-    id : string,
+  type PageItem = {
     name : string,
-    open : boolean,
-    pages : IListPageItem[]
-  }
-
-  type IListPageItem = {
-    name: string
-    path: string
+    enable ?: boolean,
+    url ?: string
   }
 
-  function createPageItem (parent: string | null = null): (page: string) => IListPageItem {
-    return function (page: string): IListPageItem {
-      const routeName = page.replace(/\$/g, '').replace('()', '-function')
-      return {
-        name: page,
-        path: parent !== null ? `/pages/${parent}/${routeName}/${routeName}`: `/pages/${routeName}/${routeName}`
-      } as IListPageItem
-    }
+  type PageList = {
+    id : string,
+    name : string,
+    open : boolean,
+    pages : PageItem[],
+    url ?: string,
+    enable ?: boolean
   }
 
   export default {
@@ -51,129 +43,260 @@
             name: '生命周期',
             open: false,
             pages: [
-              'page-lifecycle',
-              'component-lifecycle'
-            ].map(createPageItem())
+              {
+                name: 'page',
+                url: 'page',
+                enable: true
+              },
+              {
+                name: 'component',
+                url: 'component',
+                enable: true
+              }
+            ] as PageItem[]
           },
           {
-            id: 'directives',
+            id: 'directive',
             name: '指令',
             open: false,
             pages: [
-              'v-for',
-              'v-if',
-              'v-show',
-              'v-on',
-              'v-bind',
-              'v-model',
-              'v-slot',
-              // 'v-pre',
-              'v-once',
-              // 'v-memo',
-              // 'v-cloak'
-            ].map(createPageItem())
+              {
+                name: 'v-for',
+                url: 'v-for',
+                enable: true
+              },
+              {
+                name: 'v-if',
+                url: 'v-if',
+                enable: true
+              },
+              {
+                name: 'v-show',
+                url: 'v-show',
+                enable: true
+              },
+              {
+                name: 'v-on',
+                url: 'v-on',
+                enable: true
+              },
+              {
+                name: 'v-bind',
+                url: 'v-bind',
+                enable: true
+              },
+              {
+                name: 'v-model',
+                url: 'v-model',
+                enable: true
+              },
+              {
+                name: 'v-slot',
+                url: 'v-slot',
+                enable: true
+              },
+              {
+                name: 'v-pre',
+                url: 'v-pre',
+                enable: false
+              },
+              {
+                name: 'v-once',
+                url: 'v-once',
+                enable: true
+              },
+              {
+                name: 'v-memo',
+                url: 'v-memo',
+                enable: false
+              },
+              {
+                name: 'v-cloak',
+                url: 'v-cloak',
+                enable: false
+              },
+            ] as PageItem[]
           },
           {
             id: 'state',
             name: '状态',
             open: false,
             pages: [
-              'data',
-              'props',
-              'computed',
-              'methods',
-              'watch'
-            ].map(createPageItem('state'))
+              {
+                name: 'data',
+                url: 'data',
+                enable: true
+              },
+              {
+                name: 'props',
+                url: 'props',
+                enable: true
+              },
+              {
+                name: 'computed',
+                url: 'computed',
+                enable: true
+              },
+              {
+                name: 'methods',
+                url: 'methods',
+                enable: true
+              },
+              {
+                name: 'watch',
+                url: 'watch',
+                enable: true
+              },
+            ] as PageItem[]
           },
           {
             id: 'rendering',
             name: '渲染选项',
             open: false,
             pages: [
-					'template', 
-					// 'render', 
-					'slots'].map(createPageItem('rendering'))
+              {
+                name: 'template',
+                url: 'template',
+                enable: true
+              },
+              {
+                name: 'render',
+                url: 'render',
+                enable: false
+              },
+              {
+                name: 'slots',
+                url: 'slots',
+                enable: true
+              },
+            ] as PageItem[]
           },
           {
             id: 'component-instance',
             name: '组件实例',
             open: false,
             pages: [
-              '$data',
-              '$props',
-              '$el',
-              '$options',
-              '$parent',
-              '$root',
-              '$slots',
-              '$refs',
-              '$attrs',
-              '$watch()',
-              '$emit()',
-              '$forceUpdate()',
-              '$nextTick()'
-            ].map(createPageItem('component-instance'))
+              {
+                name: '$data',
+                url: 'data',
+                enable: true
+              },
+              {
+                name: '$props',
+                url: 'props',
+                enable: true
+              },
+              {
+                name: '$el',
+                url: 'el',
+                enable: true
+              },
+              {
+                name: '$options',
+                url: 'options',
+                enable: true
+              },
+              {
+                name: '$parent',
+                url: 'parent',
+                enable: true
+              },
+              {
+                name: '$root',
+                url: 'root',
+                enable: true
+              },
+              {
+                name: '$slots',
+                url: 'slots',
+                enable: true
+              },
+              {
+                name: '$refs',
+                url: 'refs',
+                enable: true
+              },
+              {
+                name: '$attrs',
+                url: 'attrs',
+                enable: true
+              },
+              {
+                name: '$watch',
+                url: 'watch',
+                enable: true
+              },
+              {
+                name: '$emit',
+                url: 'emit',
+                enable: true
+              },
+              {
+                name: '$forceUpdate',
+                url: 'forceUpdate',
+                enable: true
+              },
+              {
+                name: '$nextTick',
+                url: 'nextTick',
+                enable: true
+              },
+            ] as PageItem[]
           },
           {
             id: 'composition',
             name: '组合选项',
             open: false,
             pages: [
-              'provide',
-              'inject',
-              'mixins',
-              'extends'
-            ].map(createPageItem('composition'))
-          }
-        ] as ListItem[]
+              {
+                name: 'provide',
+                url: 'provide',
+                enable: false
+              },
+              {
+                name: 'inject',
+                url: 'inject',
+                enable: false
+              },
+              {
+                name: 'mixins',
+                url: 'mixins',
+                enable: false
+              },
+              {
+                name: 'extends',
+                url: 'extends',
+                enable: false
+              },
+            ] as PageItem[]
+          },
+        ] as PageList[]
       }
     },
     onLoad() {
-      // uni.getStorage({
-      //   key: STORAGE_KEY_PREFIX,
-      //   success: function (res) {
-      //     storageData = JSON.parse(res.data as string) as Array<string>
-      //     console.log(storageData)
-      //     for (let i = 0; i < this.list.length; ++i) {
-      //       const item = this.list[i]
-      //       if (storageData.includes(item.id)) {
-      //         item.open = true
-      //       }
-      //     }
-      //   }
-      // })
     },
     methods: {
-      triggerCollapse(_ : ListItem, index : number) {
+      triggerCollapse(_ : PageList, index : number) {
         this.list[index].open = !this.list[index].open
-
-        // const id = item.id
-        // const value = this.list[index].open
-
-        // if (value) {
-        //   storageData.push(id)
-        // } else {
-        //   const index2: number = storageData.indexOf(id)
-        //   if (index2 > -1) {
-        //     storageData.splice(index2, 1)
-        //   }
-        // }
-
-        // uni.setStorage({
-        //   key: STORAGE_KEY_PREFIX,
-        //   data: storageData
-        // })
       },
-      goDetailPage(e : IListPageItem) {
+      goDetailPage(id : string, e : PageItem) {
+        if (e.enable == false) {
+          uni.showToast({
+            icon: 'none',
+            title: '暂不支持'
+          })
+          return
+        }
+
         uni.navigateTo({
-          url: e.path
+          url: `/pages/${id}/${e.url}/${e.url}`
         })
       },
-			setLifeCycleNum(num: number){
-				console.warn('index setLifeCycleNum', num)
-				setLifeCycleNum(num)
-			},
-      getLifeCycleNum(): number {
+      setLifeCycleNum(num : number) {
+        console.warn('index setLifeCycleNum', num)
+        setLifeCycleNum(num)
+      },
+      getLifeCycleNum() : number {
         return state.lifeCycleNum
       },
     }
@@ -199,4 +322,4 @@
   .arrow-down {
     transform: rotate(-135deg);
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/component-lifecycle/component-lifecycle.test.js b/pages/lifecycle/component/component.test.js
similarity index 95%
rename from pages/component-lifecycle/component-lifecycle.test.js
rename to pages/lifecycle/component/component.test.js
index 340d3d4..a2b7ac4 100644
--- a/pages/component-lifecycle/component-lifecycle.test.js
+++ b/pages/lifecycle/component/component.test.js
@@ -1,4 +1,4 @@
-const PAGE_PATH = '/pages/component-lifecycle/component-lifecycle'
+const PAGE_PATH = '/pages/lifecycle/component/component'
 const HOME_PATH = '/pages/index'
 
 describe('component-lifecycle', () => {
diff --git a/pages/component-lifecycle/component-lifecycle.uvue b/pages/lifecycle/component/component.uvue
similarity index 70%
rename from pages/component-lifecycle/component-lifecycle.uvue
rename to pages/lifecycle/component/component.uvue
index 14d0fe3..62a2cd9 100644
--- a/pages/component-lifecycle/component-lifecycle.uvue
+++ b/pages/lifecycle/component/component.uvue
@@ -1,19 +1,19 @@
-<template>
-	<view class="page">
-		<text>component lifecycle</text>
-		<component-lifecycle class="component-lifecycle" />
-	</view>
-</template>
-
-<script lang="ts">
-import ComponentLifecycle from '../../components/Lifecycle.uvue'
-import { state } from '../../store/index.uts'
-export default {
-	components: { ComponentLifecycle },
-	methods: {
-		getLifeCycleNum(): number {
-			return state.lifeCycleNum
-		}
-	},
-}
-</script>
+<template>
+	<view class="page">
+		<text>component lifecycle</text>
+		<component-lifecycle class="component-lifecycle" />
+	</view>
+</template>
+
+<script lang="ts">
+import ComponentLifecycle from '@/components/Lifecycle.uvue'
+import { state } from '@/store/index.uts'
+export default {
+	components: { ComponentLifecycle },
+	methods: {
+		getLifeCycleNum(): number {
+			return state.lifeCycleNum
+		}
+	},
+}
+</script>
diff --git a/pages/page-lifecycle/page-lifecycle.test.js b/pages/lifecycle/page/page.test.js
similarity index 97%
rename from pages/page-lifecycle/page-lifecycle.test.js
rename to pages/lifecycle/page/page.test.js
index a8328d2..c86311f 100644
--- a/pages/page-lifecycle/page-lifecycle.test.js
+++ b/pages/lifecycle/page/page.test.js
@@ -1,4 +1,4 @@
-const PAGE_PATH = '/pages/page-lifecycle/page-lifecycle'
+const PAGE_PATH = '/pages/lifecycle/page/page'
 const HOME_PATH = '/pages/index'
 
 describe('page-lifecycle', () => {
diff --git a/pages/page-lifecycle/page-lifecycle.uvue b/pages/lifecycle/page/page.uvue
similarity index 88%
rename from pages/page-lifecycle/page-lifecycle.uvue
rename to pages/lifecycle/page/page.uvue
index bc5bdc4..37e93ec 100644
--- a/pages/page-lifecycle/page-lifecycle.uvue
+++ b/pages/lifecycle/page/page.uvue
@@ -1,41 +1,41 @@
-<template>
-	<view class="page">
-		<text>page lifecycle</text>
-	</view>
-</template>
-
-<script lang="ts">
-	import { state, setLifeCycleNum } from '../../store/index.uts'
-	export default {
-		onLoad() {
-			setLifeCycleNum(state.lifeCycleNum + 100)
-			console.log('Page onLoad')
-		},
-		onShow() {
-			setLifeCycleNum(state.lifeCycleNum + 10)
-			console.log('Page onShow')
-		},
-		onReady() {
-			setLifeCycleNum(state.lifeCycleNum + 10)
+<template>
+	<view class="page">
+		<text>page lifecycle</text>
+	</view>
+</template>
+
+<script lang="ts">
+	import { state, setLifeCycleNum } from '@/store/index.uts'
+	export default {
+		onLoad() {
+			setLifeCycleNum(state.lifeCycleNum + 100)
+			console.log('Page onLoad')
+		},
+		onShow() {
+			setLifeCycleNum(state.lifeCycleNum + 10)
+			console.log('Page onShow')
+		},
+		onReady() {
+			setLifeCycleNum(state.lifeCycleNum + 10)
 			console.log('Page onReady')
-		},
-		onHide() {
-			setLifeCycleNum(state.lifeCycleNum - 10)
-			console.log('Page onHide')
-		},
-		onUnload() {
-			setLifeCycleNum(state.lifeCycleNum - 100)
-			console.log('Page onUnload')
-		},
-		onBackPress(options: Map<string, string>) : boolean | null {
-			setLifeCycleNum(state.lifeCycleNum - 10)
+		},
+		onHide() {
+			setLifeCycleNum(state.lifeCycleNum - 10)
+			console.log('Page onHide')
+		},
+		onUnload() {
+			setLifeCycleNum(state.lifeCycleNum - 100)
+			console.log('Page onUnload')
+		},
+		onBackPress(options: Map<string, string>) : boolean | null {
+			setLifeCycleNum(state.lifeCycleNum - 10)
 			console.log('Page onBackPress',options)
-			return null
-		},
-		methods: {
-			getLifeCycleNum() : number {
-				return state.lifeCycleNum
-			}
-		},
-	}
+			return null
+		},
+		methods: {
+			getLifeCycleNum() : number {
+				return state.lifeCycleNum
+			}
+		},
+	}
 </script>
\ No newline at end of file
-- 
GitLab