diff --git a/README.md b/README.md index 61d61dec..9663d0fd 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,7 @@ cnpm run build - vite - wangeditor - cropperjs +- @antv/g6 #### 特别感谢 diff --git a/package.json b/package.json index cb6d4394..0eeafef2 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "build": "vite build" }, "dependencies": { + "@antv/g6": "^4.1.16", "axios": "^0.21.1", "clipboard": "^2.0.6", "countup.js": "^2.0.7", diff --git a/src/components/auth/auth.vue b/src/components/auth/auth.vue index 061636f3..832ef637 100644 --- a/src/components/auth/auth.vue +++ b/src/components/auth/auth.vue @@ -8,13 +8,13 @@ import { computed } from "vue"; import { useStore } from "/@/store/index.ts"; export default { + name: "auth", props: { value: { type: String, default: () => "", }, }, - nane: "auth", setup(props) { const store = useStore(); // 获取 vuex 中的用户权限 diff --git a/src/components/auth/authAll.vue b/src/components/auth/authAll.vue index ba23b152..b47901c1 100644 --- a/src/components/auth/authAll.vue +++ b/src/components/auth/authAll.vue @@ -9,7 +9,7 @@ import { computed } from "vue"; import { useStore } from "/@/store/index.ts"; import { judementSameArr } from "/@/utils/arrayOperation.ts"; export default { - nane: "authAll", + name: "authAll", props: { value: { type: Array, diff --git a/src/components/auth/auths.vue b/src/components/auth/auths.vue index db80c656..b9293ab3 100644 --- a/src/components/auth/auths.vue +++ b/src/components/auth/auths.vue @@ -8,13 +8,13 @@ import { computed } from "vue"; import { useStore } from "/@/store/index.ts"; export default { + name: "auths", props: { value: { type: Array, default: () => [], }, }, - nane: "auths", setup(props) { const store = useStore(); // 获取 vuex 中的用户权限 diff --git a/src/router/index.ts b/src/router/index.ts index d1220e03..d0e4cf79 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -406,6 +406,21 @@ export const dynamicRoutes = [ auth: ['admin', 'test'], icon: 'iconfont icon-caijian' } + }, + { + path: '/fun/mindMap', + name: 'mindMap', + component: () => import('/@/views/fun/mindMap/index.vue'), + meta: { + title: 'G6 思维导图', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + auth: ['admin', 'test'], + icon: 'iconfont icon-siweidaotu' + } } ] }, diff --git a/src/utils/setIconfont.ts b/src/utils/setIconfont.ts index 73643398..9f3dcde1 100644 --- a/src/utils/setIconfont.ts +++ b/src/utils/setIconfont.ts @@ -1,6 +1,6 @@ // 字体图标 url const cssCdnUrlList: Array = [ - '//at.alicdn.com/t/font_2298093_sctkh48ml1.css', + '//at.alicdn.com/t/font_2298093_eee6zjvjt5a.css', '//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css' ] // 第三方 js url diff --git a/src/views/fun/mindMap/index.vue b/src/views/fun/mindMap/index.vue new file mode 100644 index 00000000..b1fda678 --- /dev/null +++ b/src/views/fun/mindMap/index.vue @@ -0,0 +1,292 @@ + + + + + \ No newline at end of file diff --git a/src/views/fun/wangEditor/index.vue b/src/views/fun/wangEditor/index.vue index 265fe8cd..e2b9841a 100644 --- a/src/views/fun/wangEditor/index.vue +++ b/src/views/fun/wangEditor/index.vue @@ -13,7 +13,6 @@ import { toRefs, reactive, onMounted } from "vue"; import wangeditor from "wangeditor"; export default { name: "wangeditor", - components: {}, setup() { const state = reactive({}); // 初始化富文本