tangning 1 year ago
parent
commit
d4ea9a8b6f
2 changed files with 36 additions and 55 deletions
  1. 35 34
      packages/app-cdfg/src/components/Menuer/index.vue
  2. 1 21
      yarn.lock

+ 35 - 34
packages/app-cdfg/src/components/Menuer/index.vue

@@ -1,34 +1,35 @@
-<template>
-    <ui-editor-menu :name="name" :menu="menu" @menu-click="onMenuClick" v-show="!full && !module"></ui-editor-menu>
-</template>
-<script setup>
-import { computed } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-import { useStore } from 'vuex'
-import { useI18n } from '@/i18n'
-const { t } = useI18n({ useScope: 'global' })
-const store = useStore()
-const router = useRouter()
-const route = useRoute()
-const name = computed(() => route.name)
-const menu = computed(() => {
-    let menu = store.getters.menu
-    menu.map(item => {
-        item.title = t(`menu.${item.name}`)
-    })
-    return menu
-})
-const full = computed(() => {
-    if (store.getters.sceneFull) {
-        return true
-    }
-    if (store.getters.toolbar && store.getters.toolbar.show && store.getters.toolbx && store.getters.toolbx.show) {
-        return true
-    }
-})
-const module = computed(() => store.getters.editModule)
-
-const onMenuClick = name => {
-    router.push({ name })
-}
-</script>
+<template>
+    <ui-editor-menu :name="name" :menu="menu" @menu-click="onMenuClick" v-show="!full && !module"></ui-editor-menu>
+</template>
+<script setup>
+import { computed } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { useStore } from 'vuex'
+import { useI18n } from '@/i18n'
+const { t } = useI18n({ useScope: 'global' })
+const store = useStore()
+const router = useRouter()
+const route = useRoute()
+const name = computed(() => route.name)
+const menu = computed(() => {
+    let menu = store.getters.menu
+    menu.map(item => {
+        item.title = t(`menu.${item.name}`)
+    })
+    return menu
+})
+const full = computed(() => {
+    if (store.getters.sceneFull) {
+        return true
+    }
+    if (store.getters.toolbar && store.getters.toolbar.show && store.getters.toolbx && store.getters.toolbx.show) {
+        return true
+    }
+})
+const module = computed(() => store.getters.editModule)
+
+const onMenuClick = name => {
+    console.log('ui-editor-menu', name)
+    router.push({ name })
+}
+</script>

+ 1 - 21
yarn.lock

@@ -2872,14 +2872,6 @@
     estree-walker "^2.0.1"
     picomatch "^2.2.2"
 
-"@simaq/core@1.1.2-beta.4":
-  version "1.1.2-beta.4"
-  resolved "http://192.168.0.47:4873/@simaq/core/-/core-1.1.2-beta.4.tgz#98bd1c29f04444ef43092147eecd09c2006d413e"
-  integrity sha512-6A05/1UlQ7MVkZek6aVazbPXFYZagY/rh5zsnAERJbcPj1bTht+IZlL2jdMuuF477B/yIVTFxuiKk3qxJpXsbg==
-  dependencies:
-    eventemitter3 "^4.0.7"
-    rxjs "~7.5.7"
-
 "@soda/friendly-errors-webpack-plugin@^1.7.1":
   version "1.8.0"
   resolved "https://registry.npm.taobao.org/@soda/friendly-errors-webpack-plugin/download/@soda/friendly-errors-webpack-plugin-1.8.0.tgz?cache=0&sync_timestamp=1607927438775&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40soda%2Ffriendly-errors-webpack-plugin%2Fdownload%2F%40soda%2Ffriendly-errors-webpack-plugin-1.8.0.tgz#84751d82a93019d5c92c0cf0e45ac59087cd2240"
@@ -6047,11 +6039,6 @@ dotenv@^8.2.0:
   resolved "https://registry.nlark.com/dotenv/download/dotenv-8.6.0.tgz?cache=0&sync_timestamp=1621627076012&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdotenv%2Fdownload%2Fdotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
   integrity sha1-Bhr2ZNGff02PxuT/m1hM4jety4s=
 
-driver.js@^0.9.8:
-  version "0.9.8"
-  resolved "https://registry.npmmirror.com/driver.js/-/driver.js-0.9.8.tgz#4b327f4537b1c9b9fb19419de86174be821ae32a"
-  integrity sha512-bczjyKdX6XmFyCDkwtRmlaORDwfBk1xXmRO0CAe5VwNQTM98aWaG2LAIiIdTe53iV/B7W5lXlIy2xYtf0JRb7Q==
-
 duplexer@^0.1.1:
   version "0.1.2"
   resolved "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
@@ -6354,7 +6341,7 @@ eventemitter3@^2.0.3:
   resolved "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-2.0.3.tgz?cache=0&sync_timestamp=1598517820291&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feventemitter3%2Fdownload%2Feventemitter3-2.0.3.tgz#b5e1079b59fb5e1ba2771c0a993be060a58c99ba"
   integrity sha1-teEHm1n7XhuidxwKmTvgYKWMmbo=
 
-eventemitter3@^4.0.0, eventemitter3@^4.0.4, eventemitter3@^4.0.7:
+eventemitter3@^4.0.0, eventemitter3@^4.0.4:
   version "4.0.7"
   resolved "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha1-Lem2j2Uo1WRO9cWVJqG0oHMGFp8=
@@ -11487,13 +11474,6 @@ rxjs@^6.6.0, rxjs@^6.6.7:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@~7.5.7:
-  version "7.5.7"
-  resolved "http://192.168.0.47:4873/rxjs/-/rxjs-7.5.7.tgz#2ec0d57fdc89ece220d2e702730ae8f1e49def39"
-  integrity sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==
-  dependencies:
-    tslib "^2.1.0"
-
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz?cache=0&sync_timestamp=1599054209520&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsafe-buffer%2Fdownload%2Fsafe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"