fix(vue-runtime-help): inject app 无效

Tencent · May 31, 2024 · aa25aa6 · aa25aa6
1 parent 3b87589
commit aa25aa6
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 67 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/runtime/vue-runtime-help/package.json b/runtime/vue-runtime-help/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.0.2",
+  "version": "0.0.3",
   "name": "@tmagic/vue-runtime-help",
   "type": "module",
   "sideEffects": false,
@@ -26,25 +26,34 @@
     "url": "https://github.com/Tencent/tmagic-editor.git"
   },
   "dependencies": {
-    "@tmagic/stage": "workspace:*",
     "vue-demi": "^0.14.7"
   },
   "peerDependencies": {
     "@tmagic/core": "workspace:*",
     "@tmagic/data-source": "workspace:*",
     "@tmagic/schema": "workspace:*",
+    "@tmagic/stage": "workspace:*",
     "@tmagic/utils": "workspace:*",
     "@vue/composition-api": ">=1.7.2",
+    "typescript": "*",
     "vue": ">=2.0.0 || >=3.0.0"
   },
   "peerDependenciesMeta": {
     "@vue/composition-api": {
       "optional": true
+    },
+    "@tmagic/schema": {
+      "optional": true
+    },
+    "@tmagic/stage": {
+      "optional": true
+    },
+    "typescript": {
+      "optional": true
     }
   },
   "devDependencies": {
     "@types/node": "^18.19.0",
-    "rimraf": "^3.0.2",
-    "typescript": "^5.4.5"
+    "rimraf": "^3.0.2"
   }
 }
diff --git a/runtime/vue-runtime-help/src/hooks/use-dsl.ts b/runtime/vue-runtime-help/src/hooks/use-dsl.ts
@@ -1,12 +1,11 @@
-import { inject, nextTick, reactive, ref } from 'vue-demi';
+import { nextTick, reactive, ref } from 'vue-demi';
 
 import Core from '@tmagic/core';
 import type { ChangeEvent } from '@tmagic/data-source';
 import type { MNode } from '@tmagic/schema';
 import { isPage, replaceChildNode } from '@tmagic/utils';
 
-export const useDsl = () => {
-  const app = inject<Core | undefined>('app');
+export const useDsl = (app: Core | undefined) => {
   const pageConfig = ref(app?.page?.data || {});
 
   app?.dataSourceManager?.on('update-data', (nodes: MNode[], sourceId: string, changeEvent: ChangeEvent) => {

diff --git a/runtime/vue-runtime-help/src/hooks/use-editor-dsl.ts b/runtime/vue-runtime-help/src/hooks/use-editor-dsl.ts
@@ -1,4 +1,4 @@
-import { computed, inject, nextTick, reactive, ref, watch } from 'vue-demi';
+import { computed, nextTick, reactive, ref, watch } from 'vue-demi';
 
 import Core from '@tmagic/core';
 import type { Id, MApp, MNode } from '@tmagic/schema';
@@ -11,9 +11,7 @@ declare global {
   }
 }
 
-export const useEditorDsl = (win = window) => {
-  const app = inject<Core | undefined>('app');
-
+export const useEditorDsl = (app: Core | undefined, win = window) => {
   const root = ref<MApp>();
   const curPageId = ref<Id>();
   const selectedId = ref<Id>();

diff --git a/runtime/vue2/package.json b/runtime/vue2/package.json
@@ -23,8 +23,9 @@
     "@tmagic/data-source": "1.4.7",
     "@tmagic/ui-vue2": "1.4.7",
     "@tmagic/schema": "1.4.7",
+    "@tmagic/stage": "1.4.7",
     "@tmagic/utils": "1.4.7",
-    "@tmagic/vue-runtime-help": "^0.0.2",
+    "@tmagic/vue-runtime-help": "^0.0.3",
     "axios": "^0.25.0",
     "terser": "^5.31.0",
     "vue": "^2.7.4"

diff --git a/runtime/vue2/page/App.vue b/runtime/vue2/page/App.vue
@@ -14,9 +14,8 @@ export default defineComponent({
   name: 'App',
 
   setup() {
-    const { pageConfig } = useDsl();
-
     const app = inject<Core | undefined>('app');
+    const { pageConfig } = useDsl(app);
 
     app?.on('page-change', (page?: Page) => {
       if (!page) {

diff --git a/runtime/vue2/playground/App.vue b/runtime/vue2/playground/App.vue
@@ -3,13 +3,14 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, inject } from 'vue';
 
 import { useEditorDsl } from '@tmagic/vue-runtime-help';
 
 export default defineComponent({
   setup() {
-    const { pageConfig } = useEditorDsl();
+    const app = inject<Core | undefined>('app');
+    const { pageConfig } = useEditorDsl(app);
 
     return {
       pageConfig,

diff --git a/runtime/vue3/package.json b/runtime/vue3/package.json
@@ -22,8 +22,9 @@
     "@tmagic/core": "1.4.7",
     "@tmagic/ui": "1.4.7",
     "@tmagic/schema": "1.4.7",
+    "@tmagic/stage": "1.4.7",
     "@tmagic/utils": "1.4.7",
-    "@tmagic/vue-runtime-help": "^0.0.2",
+    "@tmagic/vue-runtime-help": "^0.0.3",
     "axios": "^0.25.0",
     "vue": "^3.4.27"
   },

diff --git a/runtime/vue3/page/App.vue b/runtime/vue3/page/App.vue
@@ -10,9 +10,8 @@ import Core from '@tmagic/core';
 import { addParamToUrl } from '@tmagic/utils';
 import { useDsl } from '@tmagic/vue-runtime-help';
 
-const { pageConfig } = useDsl();
-
 const app = inject<Core | undefined>('app');
+const { pageConfig } = useDsl(app);
 
 app?.on('page-change', (page?: Page) => {
   if (!page) {

diff --git a/runtime/vue3/playground/App.vue b/runtime/vue3/playground/App.vue
@@ -3,7 +3,10 @@
 </template>
 
 <script lang="ts" setup>
+import { inject } from 'vue';
+
 import { useEditorDsl } from '@tmagic/vue-runtime-help';
 
-const { pageConfig } = useEditorDsl();
+const app = inject<Core | undefined>('app');
+const { pageConfig } = useEditorDsl(app);
 </script>