Fix #58 (#59)

* refactor * remove unused statement * refactor * extract router * move to props * injectable * move logic * move directive installer * change layout * remove local vue * use package * fix pkg * fix markup
sterashima78 · Feb 12, 2021 · 18747f6 · 18747f6
1 parent 8a499ed
commit 18747f6
Show file tree

Hide file tree

Showing 14 changed files with 447 additions and 468 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,12 +12,13 @@
     "build:all": "npm-run-all -s build build:docs"
   },
   "dependencies": {
-    "@sterashima/vue-component-render": "^0.0.1-alpha.5",
+    "@sterashima/vue-component-sandbox": "^0.0.1-alpha.6",
     "@vue/composition-api": "^1.0.0-rc.1",
     "core-js": "^3.6.4",
     "downloadjs": "^1.4.7",
     "ejs": "^3.0.1",
     "fp-ts": "^2.5.1",
+    "klona": "^2.0.4",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",
     "lodash.throttle": "^4.1.1",
@@ -27,7 +28,6 @@
     "uuid": "^7.0.3",
     "vue": "^2.6.12",
     "vue-gtag": "^1.6.2",
-    "vue-iframe-sandbox": "^0.1.4",
     "vue-router": "^3.1.5",
     "vuetify": "^2.2.11"
   },

diff --git a/src/components/PageMenu.vue b/src/components/PageMenu.vue
@@ -18,7 +18,7 @@
         :key="route"
         :style="{ background: currentRoute === route ? '#eee' : '' }"
         :disabled="currentRoute === route"
-        @click="routing.push({ path: route })"
+        @click="emit('update:route', route)"
       >
         <v-list-item-content>
           <v-list-item-title v-text="route" />
@@ -56,19 +56,12 @@ import { AliasDaoInjectionKey } from "@/domain/alias";
 
 export default defineComponent({
   props: {
-    addRoute: {
-      type: Function,
-      default: () => console.log("not init")
-    },
     currentRoute: {
-      type: String
-    },
-    routing: {
-      type: Object as PropType<{ push: (option: { path: string }) => void }>,
-      default: () => ({ push: (opt: any) => console.log(opt) })
+      type: String as PropType<string>,
+      default: ""
     }
   },
-  setup(props: { addRoute: (path: string) => void }) {
+  setup(_, { emit }) {
     const nodeDao = inject(NodeDaoInjectionKey);
     const aliasDao = inject(AliasDaoInjectionKey);
     if (!nodeDao || !aliasDao) {
@@ -78,14 +71,14 @@ export default defineComponent({
     const newPath = ref("");
     const createRoute = () => {
       addNewPath(newPath.value);
-      props.addRoute(newPath.value);
       newPath.value = "";
     };
     return {
       newPath,
       addNewPath,
       allRoute,
-      createRoute
+      createRoute,
+      emit
     };
   }
 });

diff --git a/src/components/VueCanvas.vue b/src/components/VueCanvas.vue
diff --git a/src/compositions/useLocalVue/cloneObject.worker.ts b/src/compositions/useLocalVue/cloneObject.worker.ts
diff --git a/src/compositions/useLocalVue/createInstance.ts b/src/compositions/useLocalVue/createInstance.ts
diff --git a/src/compositions/useLocalVue/index.ts b/src/compositions/useLocalVue/index.ts
diff --git a/...s/useLocalVue/__tests__/converter.test.ts → .../useNodeState/__tests__/converter.test.ts b/...s/useLocalVue/__tests__/converter.test.ts → .../useNodeState/__tests__/converter.test.ts
diff --git a/src/compositions/useLocalVue/converter.ts → src/compositions/useNodeState/converter.ts b/src/compositions/useLocalVue/converter.ts → src/compositions/useNodeState/converter.ts
@@ -1,5 +1,5 @@
 import { NodeData } from "@/types";
-import { EleNode, NodeTree } from "@sterashima/vue-component-render";
+import { EleNode, NodeTree } from "@sterashima/vue-component-sandbox";
 
 export type NodeDataToNodeTree = (node: NodeData) => NodeTree;
 export const toNodeTree: NodeDataToNodeTree = node => {

diff --git a/...ions/useLocalVue/createNodeData.worker.ts → ...ons/useNodeState/createNodeData.worker.ts b/...ions/useLocalVue/createNodeData.worker.ts → ...ons/useNodeState/createNodeData.worker.ts
@@ -1,5 +1,5 @@
 import { NodeTree, NodeData, RouteNodeTreeData, RouteNodeTree } from "@/types";
-import clone from "lodash.clonedeep";
+import { klona as clone } from "klona/json";
 const toNodeData = (hoverNodeId: string, dropNodeId: string) => (
   tree: NodeTree
 ): NodeData => {
@@ -19,11 +19,6 @@ const toNodeData = (hoverNodeId: string, dropNodeId: string) => (
         id,
         draggable: true
       },
-      directives: [
-        {
-          name: "web-builder"
-        }
-      ],
       props: attributes,
       style: styles,
       class: classes,