修改插件的实现和文档

README.md

@@ -91,8 +91,9 @@ src/
 
 ```tsx
 // 首页 页面
-import { Autobind, Component, Link, Mut, VueComponent } from 'vue3-oop'
+import { Component, Ref, Setup, Vue } from 'vue-facing-decorator'
-import Header from '@/components/Header'
+import Header from '../components/Header'
+import { RouteLocationNormalizedLoaded, Router, useRoute, useRouter } from "vue-router";
 
 interface ListItemType {
     id: number
@@ -100,44 +101,52 @@ interface ListItemType {
 }
 
 @Component()
-export default class Home extends VueComponent {
+export default class Home extends Vue {
 
-    @Mut()
+    counter: number = 1;
-    count: number = 1
 
-    @Mut()
+    @Ref
-    text: string = "Home props 传给 Header 的字符串"
+    readonly refH1!: HTMLDivElement
+
+    @Setup((props, ctx) => useRouter())
+    router!: Router
+
+    @Setup((props, ctx) => useRoute())
+    route!: RouteLocationNormalizedLoaded
 
-    @Mut()
     newList: ListItemType[] = [
         { id: 1, title: '新闻1' },
         { id: 2, title: '新闻2' },
         { id: 3, title: '新闻3' },
     ]
 
-    @Link() H1?: HTMLDivElement
+    addCount() {
-
+        // console.log("ref dom: ", this.refH1)
-    @Autobind()
+        // this.router.push({ name: 'about' })
-    async addCount() {
+        // this.route.query
-        this.count++
+        this.counter++
-        this.text = "22222"
-        console.log(this.H1)
     }
 
+    testHtml() {
+        return <p>测试html jsx 函数</p>
+    }
+
+
     render() {
         return (
-            <div class="home" ref="H1">
+            <div class="home">
-                <h1>首页</h1>
+                <h1 ref="refH1">首页</h1>
-                <p onClick={ this.addCount }>count响应式变量（点我）：{ this.count }</p>
+                <p onClick={ this.addCount }>counter 响应式变量（点我）：{ this.counter }</p>
                 <Header
-                    v-slots={ {
+                    list={ this.newList }
+                    text={ "测试" }>
+                    { {
                         default: () => <div class="default">父到子 default 插槽</div>,
                         haveName: () => <div class="haveName">父到子 具名 插槽</div>,
-                        item: (val) => <li key={ val.id }>{ val.title }</li>
+                        item: (val: ListItemType) => <li key={ val.id }>{ val.title }</li>
                     } }
-                    list={ this.newList }
-                    text={ this.text }>
                 </Header>
+                { this.testHtml }
             </div>
         )
     }
@@ -146,53 +155,43 @@ export default class Home extends VueComponent {
 
 ```tsx
 // 头部组件
-import { Component, ComponentProps, Hook, useProps, VueComponent } from 'vue3-oop'
+import { Component, Prop, TSX, Vue } from 'vue-facing-decorator'
-import { JSX } from "vue/jsx-runtime";
+
-import { VNodeChild } from "vue";
+interface Props {
+    text?: string
+    list?: ListItemType[]
+}
 
 interface ListItemType {
     id: number
     title: string
 }
 
-interface HeaderProps {
-    text?: string;
-    list: ListItemType[]
-    slots: {
-        default: () => JSX.Element;
-        haveName: () => JSX.Element;
-        item: (val: ListItemType) => VNodeChild;
-    }
-}
-
 @Component()
-export default class Header extends VueComponent<HeaderProps> {
+export default class Header extends TSX<Props>()(Vue) implements Props {
 
-    // required 的 true or false 需要和 类型中 text的? 对应
+    @Prop({ default: '默认数值' })
-    static defaultProps: ComponentProps<HeaderProps> = {
+    text!: string;
-        text: { default: '默认数值', required: true },
-        list: { default: () => [] }
-    };
 
-    @Hook('Mounted')
+    @Prop()
-    mounted() {
+    list!: ListItemType[];
-        console.log("this: ", this);
+
-        console.log('Header 组件的 mounted 生命周期...')
+    created() {
+        console.log("created: ", this)
     }
 
     render() {
-        const { text, list } = useProps<HeaderProps>();
         return (
             <div class="header">
                 头部组件
-                <p>{ text }</p>
+                <p>{ this.text }</p>
-                { this.context.slots.default?.() }
+                { this.$slots.default?.() }
-                { this.context.slots.haveName?.() }
+                { this.$slots.haveName?.() }
                 <ul>
                     {
-                        list.map(
+                        this.list.map(
                             item =>
-                                this.context.slots.item?.(item)
+                                this.$slots.item?.(item)
                         )
                     }
                 </ul>

front-end/main-app/package.json

@@ -16,6 +16,7 @@
   "dependencies": {
     "pinia": "^3.0.3",
     "vue": "^3.5.18",
+    "vue-facing-decorator": "^4.0.1",
     "vue-router": "^4.0.6"
   },
   "devDependencies": {

front-end/main-app/src/app/App.tsx

@@ -1,8 +1,8 @@
-import { Component, VueComponent } from 'vue3-oop'
+import { Component, Vue } from 'vue-facing-decorator'
 import { RouterLink, RouterView } from "vue-router";
 
 @Component()
-export class App extends VueComponent {
+export default class App extends Vue {
     render() {
         return (
             <>

front-end/main-app/src/app/components/Header.tsx

@@ -1,50 +1,40 @@
-import { Component, ComponentProps, Hook, useProps, VueComponent } from 'vue3-oop'
+import { Component, Prop, TSX, Vue } from 'vue-facing-decorator'
-import { JSX } from "vue/jsx-runtime";
+
-import { VNodeChild } from "vue";
+interface Props {
+    text?: string
+    list?: ListItemType[]
+}
 
 interface ListItemType {
     id: number
     title: string
 }
 
-interface HeaderProps {
-    text?: string;
-    list: ListItemType[]
-    slots: {
-        default: () => JSX.Element;
-        haveName: () => JSX.Element;
-        item: (val: ListItemType) => VNodeChild;
-    }
-}
-
 @Component()
-export default class Header extends VueComponent<HeaderProps> {
+export default class Header extends TSX<Props>()(Vue) implements Props {
 
-    // required 的 true or false 需要和 类型中 text的? 对应
+    @Prop({ default: '默认数值' })
-    static defaultProps: ComponentProps<HeaderProps> = {
+    text!: string;
-        text: { default: '默认数值', required: true },
-        list: { default: () => [] }
-    };
 
-    @Hook('Mounted')
+    @Prop()
-    mounted() {
+    list!: ListItemType[];
-        console.log("this: ", this);
+
-        console.log('Header 组件的 mounted 生命周期...')
+    created() {
+        console.log("created: ", this)
     }
 
     render() {
-        const { text, list } = useProps<HeaderProps>();
         return (
             <div class="header">
                 头部组件
-                <p>{ text }</p>
+                <p>{ this.text }</p>
-                { this.context.slots.default?.() }
+                { this.$slots.default?.() }
-                { this.context.slots.haveName?.() }
+                { this.$slots.haveName?.() }
                 <ul>
                     {
-                        list.map(
+                        this.list.map(
                             item =>
-                                this.context.slots.item?.(item)
+                                this.$slots.item?.(item)
                         )
                     }
                 </ul>
@@ -52,3 +42,4 @@ export default class Header extends VueComponent<HeaderProps> {
         )
     }
 }
+

front-end/main-app/src/app/main.ts

@@ -2,10 +2,9 @@
 import '@abraham/reflection'
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'
-import { App } from './App'
+import App from './App'
 import router from './router'
 
-
 class Main {
     constructor() {
         createApp(App)

front-end/main-app/src/app/views/About.tsx

@@ -1,7 +1,7 @@
-import {Component, VueComponent} from 'vue3-oop'
+import { Component, Vue } from 'vue-facing-decorator'
 
 @Component()
-export default class About extends VueComponent {
+export default class About extends Vue {
     render() {
         return (
             <div class="about">

front-end/main-app/src/app/views/Home.tsx

@@ -1,5 +1,6 @@
-import { Autobind, Component, Link, Mut, VueComponent } from 'vue3-oop'
+import { Component, Ref, Setup, Vue } from 'vue-facing-decorator'
-import Header from '@/components/Header'
+import Header from '../components/Header'
+import { RouteLocationNormalizedLoaded, Router, useRoute, useRouter } from "vue-router";
 
 interface ListItemType {
     id: number
@@ -7,44 +8,52 @@ interface ListItemType {
 }
 
 @Component()
-export default class Home extends VueComponent {
+export default class Home extends Vue {
 
-    @Mut()
+    counter: number = 1;
-    count: number = 1
 
-    @Mut()
+    @Ref
-    text: string = "Home props 传给 Header 的字符串"
+    readonly refH1!: HTMLDivElement
+
+    @Setup((props, ctx) => useRouter())
+    router!: Router
+
+    @Setup((props, ctx) => useRoute())
+    route!: RouteLocationNormalizedLoaded
 
-    @Mut()
     newList: ListItemType[] = [
         { id: 1, title: '新闻1' },
         { id: 2, title: '新闻2' },
         { id: 3, title: '新闻3' },
     ]
 
-    @Link() H1?: HTMLDivElement
+    addCount() {
-
+        // console.log("ref dom: ", this.refH1)
-    @Autobind()
+        // this.router.push({ name: 'about' })
-    async addCount() {
+        // this.route.query
-        this.count++
+        this.counter++
-        this.text = "22222"
-        console.log(this.H1)
     }
 
+    testHtml() {
+        return <p>测试html jsx 函数</p>
+    }
+
+
     render() {
         return (
-            <div class="home" ref="H1">
+            <div class="home">
-                <h1>首页</h1>
+                <h1 ref="refH1">首页</h1>
-                <p onClick={ this.addCount }>count响应式变量（点我）：{ this.count }</p>
+                <p onClick={ this.addCount }>counter 响应式变量（点我）：{ this.counter }</p>
                 <Header
-                    v-slots={ {
+                    list={ this.newList }
+                    text={ "测试" }>
+                    { {
                         default: () => <div class="default">父到子 default 插槽</div>,
                         haveName: () => <div class="haveName">父到子 具名 插槽</div>,
-                        item: (val) => <li key={ val.id }>{ val.title }</li>
+                        item: (val: ListItemType) => <li key={ val.id }>{ val.title }</li>
                     } }
-                    list={ this.newList }
-                    text={ this.text }>
                 </Header>
+                { this.testHtml }
             </div>
         )
     }

front-end/main-app/src/app/views/NotFound.tsx

@@ -1,11 +1,24 @@
-import { defineComponent } from 'vue'
+// import { defineComponent } from 'vue'
+//
+// export default defineComponent({
+//     setup() {
+//         return () => (
+//             <div class="404">
+//                 <h1>404</h1>
+//             </div>
+//         )
+//     }
+// })
 
-export default defineComponent({
+import { Component, Vue } from 'vue-facing-decorator'
-    setup() {
+
-        return () => (
+@Component()
+export default class About extends Vue {
+    render() {
+        return (
             <div class="404">
                 <h1>404</h1>
             </div>
         )
     }
-})
+}

front-end/main-app/tsconfig.json

@@ -3,9 +3,7 @@
     "target": "ESNext",
     "module": "ESNext",
     "importHelpers": true,
-    "isolatedModules": true,
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
     "useDefineForClassFields": false,
     "moduleResolution": "Bundler",
     "strict": true,