diff --git a/build/generate/generateModifyVars.ts b/build/generate/generateModifyVars.ts index 8037324b7..bcbc83926 100644 --- a/build/generate/generateModifyVars.ts +++ b/build/generate/generateModifyVars.ts @@ -32,5 +32,6 @@ export function generateModifyVars(dark = false) { 'font-size-base': '14px', // Main font size 'border-radius-base': '2px', // Component/float fillet 'link-color': primary, // Link color + 'content-background': '#fafafa', // Link color }; } diff --git a/build/vite/plugin/theme.ts b/build/vite/plugin/theme.ts index 93bf142a9..9b0eeab42 100644 --- a/build/vite/plugin/theme.ts +++ b/build/vite/plugin/theme.ts @@ -53,6 +53,7 @@ export function configThemePlugin(isBuild: boolean): Plugin[] { 'border-color-base': '#303030', // 'border-color-split': '#30363d', 'item-active-bg': '#111b26', + 'content-background': '#ffffff0a', // Link color }, }), ]; diff --git a/package.json b/package.json index 6d62756fd..8ac74296e 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "prettier": "^2.2.1", "pretty-quick": "^3.1.0", "rimraf": "^3.0.2", - "rollup-plugin-visualizer": "5.3.6", + "rollup-plugin-visualizer": "5.3.4", "stylelint": "^13.12.0", "stylelint-config-prettier": "^8.0.2", "stylelint-config-standard": "^21.0.0", diff --git a/src/components/FlowChart/index.ts b/src/components/FlowChart/index.ts index 61f1cb6b4..a55cff9ad 100644 --- a/src/components/FlowChart/index.ts +++ b/src/components/FlowChart/index.ts @@ -1,17 +1,10 @@ import { App } from 'vue'; -import control from './src/Control.vue'; -import nodePanel from './src/NodePanel.vue'; import dataDialog from './src/DataDialog.vue'; +import flowChart from './src/index.vue'; -export const Control = Object.assign(control, { +export const FlowChart = Object.assign(flowChart, { install(app: App) { - app.component(control.name, control); - }, -}); - -export const NodePanel = Object.assign(nodePanel, { - install(app: App) { - app.component(nodePanel.name, nodePanel); + app.component(flowChart.name, flowChart); }, }); diff --git a/src/components/FlowChart/src/Control.vue b/src/components/FlowChart/src/Control.vue deleted file mode 100644 index a90843155..000000000 --- a/src/components/FlowChart/src/Control.vue +++ /dev/null @@ -1,150 +0,0 @@ - - - - - diff --git a/src/components/FlowChart/src/DataDialog.vue b/src/components/FlowChart/src/DataDialog.vue index a8272e3f6..71be83c4b 100644 --- a/src/components/FlowChart/src/DataDialog.vue +++ b/src/components/FlowChart/src/DataDialog.vue @@ -1,5 +1,5 @@ diff --git a/src/components/FlowChart/src/FlowChartToolbar.vue b/src/components/FlowChart/src/FlowChartToolbar.vue new file mode 100644 index 000000000..9708c2118 --- /dev/null +++ b/src/components/FlowChart/src/FlowChartToolbar.vue @@ -0,0 +1,156 @@ + + + diff --git a/src/components/FlowChart/src/NodePanel.vue b/src/components/FlowChart/src/NodePanel.vue deleted file mode 100644 index 2945b7b48..000000000 --- a/src/components/FlowChart/src/NodePanel.vue +++ /dev/null @@ -1,145 +0,0 @@ - - - - - diff --git a/src/components/FlowChart/src/adpterForTurbo.ts b/src/components/FlowChart/src/adpterForTurbo.ts index 5c0e0411d..b68b276c3 100644 --- a/src/components/FlowChart/src/adpterForTurbo.ts +++ b/src/components/FlowChart/src/adpterForTurbo.ts @@ -7,95 +7,6 @@ const TurboType = { EXCLUSIVE_GATEWAY: 6, }; -function getTurboType(type) { - switch (type) { - case 'bpmn:sequenceFlow': - return TurboType.SEQUENCE_FLOW; - case 'bpmn:startEvent': - return TurboType.START_EVENT; - case 'bpmn:endEvent': - return TurboType.END_EVENT; - case 'bpmn:userTask': - return TurboType.USER_TASK; - case 'bpmn:serviceTask': - return TurboType.SERVICE_TASK; - case 'bpmn:exclusiveGateway': - return TurboType.EXCLUSIVE_GATEWAY; - default: - return type; - } -} - -function convertNodeToTurboElement(node) { - const { id, type, x, y, text = '', properties } = node; - return { - incoming: [], - outgoing: [], - dockers: [], - type: getTurboType(node.type), - properties: { - ...properties, - name: (text && text.value) || '', - x: x, - y: y, - text, - logicFlowType: type, - }, - key: id, - }; -} - -function convertEdgeToTurboElement(edge) { - const { - id, - type, - sourceNodeId, - targetNodeId, - startPoint, - endPoint, - pointsList, - text = '', - properties, - } = edge; - return { - incoming: [sourceNodeId], - outgoing: [targetNodeId], - type: getTurboType(type), - dockers: [], - properties: { - ...properties, - name: (text && text.value) || '', - text, - startPoint, - endPoint, - pointsList, - logicFlowType: type, - }, - key: id, - }; -} - -export function toTurboData(data) { - const nodeMap = new Map(); - const turboData = { - flowElementList: [], - }; - data.nodes.forEach((node) => { - const flowElement = convertNodeToTurboElement(node); - turboData.flowElementList.push(flowElement); - nodeMap.set(node.id, flowElement); - }); - data.edges.forEach((edge) => { - const flowElement = convertEdgeToTurboElement(edge); - const sourceElement = nodeMap.get(edge.sourceNodeId); - sourceElement.outgoing.push(flowElement.key); - const targetElement = nodeMap.get(edge.targetNodeId); - targetElement.incoming.push(flowElement.key); - turboData.flowElementList.push(flowElement); - }); - return turboData; -} - function convertFlowElementToEdge(element) { const { incoming, outgoing, properties, key } = element; const { text, startPoint, endPoint, pointsList, logicFlowType } = properties; @@ -139,8 +50,12 @@ function convertFlowElementToNode(element) { return node; } -export function toLogicflowData(data) { - const lfData = { +export function toLogicFlowData(data) { + const lfData: { + // TODO type + nodes: any[]; + edges: any[]; + } = { nodes: [], edges: [], }; diff --git a/src/components/FlowChart/src/assets/background/bpmn-end.png b/src/components/FlowChart/src/assets/background/bpmn-end.png deleted file mode 100644 index 2263e16c7..000000000 Binary files a/src/components/FlowChart/src/assets/background/bpmn-end.png and /dev/null differ diff --git a/src/components/FlowChart/src/assets/background/bpmn-exclusiveGateway.png b/src/components/FlowChart/src/assets/background/bpmn-exclusiveGateway.png deleted file mode 100644 index e771da199..000000000 Binary files a/src/components/FlowChart/src/assets/background/bpmn-exclusiveGateway.png and /dev/null differ diff --git a/src/components/FlowChart/src/assets/background/bpmn-start.png b/src/components/FlowChart/src/assets/background/bpmn-start.png deleted file mode 100644 index d6da20bec..000000000 Binary files a/src/components/FlowChart/src/assets/background/bpmn-start.png and /dev/null differ diff --git a/src/components/FlowChart/src/assets/background/bpmn-user.png b/src/components/FlowChart/src/assets/background/bpmn-user.png deleted file mode 100644 index 4d8b2ab2d..000000000 Binary files a/src/components/FlowChart/src/assets/background/bpmn-user.png and /dev/null differ diff --git a/src/components/FlowChart/src/assets/background/click.png b/src/components/FlowChart/src/assets/background/click.png deleted file mode 100644 index 9679fb5e7..000000000 Binary files a/src/components/FlowChart/src/assets/background/click.png and /dev/null differ diff --git a/src/components/FlowChart/src/assets/background/download.png b/src/components/FlowChart/src/assets/background/download.png deleted file mode 100644 index d28cf951e..000000000 Binary files a/src/components/FlowChart/src/assets/background/download.png and /dev/null differ diff --git a/src/components/FlowChart/src/assets/background/end.png b/src/components/FlowChart/src/assets/background/end.png deleted file mode 100644 index 09899692f..000000000 Binary files a/src/components/FlowChart/src/assets/background/end.png and /dev/null differ diff --git a/src/components/FlowChart/src/assets/background/push.png b/src/components/FlowChart/src/assets/background/push.png deleted file mode 100644 index be493f4d1..000000000 Binary files a/src/components/FlowChart/src/assets/background/push.png and /dev/null differ diff --git a/src/components/FlowChart/src/assets/background/start.png b/src/components/FlowChart/src/assets/background/start.png deleted file mode 100644 index b1c3a5014..000000000 Binary files a/src/components/FlowChart/src/assets/background/start.png and /dev/null differ diff --git a/src/components/FlowChart/src/assets/background/time.png b/src/components/FlowChart/src/assets/background/time.png deleted file mode 100644 index a88350439..000000000 Binary files a/src/components/FlowChart/src/assets/background/time.png and /dev/null differ diff --git a/src/components/FlowChart/src/assets/background/user.png b/src/components/FlowChart/src/assets/background/user.png deleted file mode 100644 index 061b8efbc..000000000 Binary files a/src/components/FlowChart/src/assets/background/user.png and /dev/null differ diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.css b/src/components/FlowChart/src/assets/iconfont/iconfont.css deleted file mode 100644 index 3fb144100..000000000 --- a/src/components/FlowChart/src/assets/iconfont/iconfont.css +++ /dev/null @@ -1,48 +0,0 @@ -@font-face { - font-family: 'iconfont'; - src: url('iconfont.eot?t=1618544337340'); /* IE9 */ - src: url('iconfont.eot?t=1618544337340#iefix') format('embedded-opentype'), - /* IE6-IE8 */ - url('data:application/x-font-woff2;charset=utf-8;base64,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') - format('woff2'), - url('iconfont.woff?t=1618544337340') format('woff'), - url('iconfont.ttf?t=1618544337340') format('truetype'), - /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ - url('iconfont.svg?t=1618544337340#iconfont') format('svg'); /* iOS 4.1- */ -} - -.iconfont { - font-family: 'iconfont' !important; - font-size: 16px; - font-style: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.icon-full-screen-hs:before { - content: '\e656'; -} - -.icon-watch-hs:before { - content: '\e766'; -} - -.icon-download-hs:before { - content: '\e6af'; -} - -.icon-enlarge-hs:before { - content: '\e765'; -} - -.icon-previous-hs:before { - content: '\e84c'; -} - -.icon-zoom-out-hs:before { - content: '\e744'; -} - -.icon-next-step-hs:before { - content: '\e84b'; -} diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.eot b/src/components/FlowChart/src/assets/iconfont/iconfont.eot deleted file mode 100644 index c77503fb2..000000000 Binary files a/src/components/FlowChart/src/assets/iconfont/iconfont.eot and /dev/null differ diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.js b/src/components/FlowChart/src/assets/iconfont/iconfont.js deleted file mode 100644 index 267df3828..000000000 --- a/src/components/FlowChart/src/assets/iconfont/iconfont.js +++ /dev/null @@ -1,61 +0,0 @@ -!(function (c) { - var t, - e, - o, - a, - n, - l, - i = - '', - s = (s = document.getElementsByTagName('script'))[s.length - 1].getAttribute('data-injectcss'); - if (s && !c.__iconfont__svg__cssinject__) { - c.__iconfont__svg__cssinject__ = !0; - try { - document.write( - '' - ); - } catch (c) { - console && console.log(c); - } - } - function h() { - n || ((n = !0), o()); - } - (t = function () { - var c, t, e, o; - ((o = document.createElement('div')).innerHTML = i), - (i = null), - (e = o.getElementsByTagName('svg')[0]) && - (e.setAttribute('aria-hidden', 'true'), - (e.style.position = 'absolute'), - (e.style.width = 0), - (e.style.height = 0), - (e.style.overflow = 'hidden'), - (c = e), - (t = document.body).firstChild - ? ((o = c), (e = t.firstChild).parentNode.insertBefore(o, e)) - : t.appendChild(c)); - }), - document.addEventListener - ? ~['complete', 'loaded', 'interactive'].indexOf(document.readyState) - ? setTimeout(t, 0) - : ((e = function () { - document.removeEventListener('DOMContentLoaded', e, !1), t(); - }), - document.addEventListener('DOMContentLoaded', e, !1)) - : document.attachEvent && - ((o = t), - (a = c.document), - (n = !1), - (l = function () { - try { - a.documentElement.doScroll('left'); - } catch (c) { - return void setTimeout(l, 50); - } - h(); - })(), - (a.onreadystatechange = function () { - 'complete' == a.readyState && ((a.onreadystatechange = null), h()); - })); -})(window); diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.json b/src/components/FlowChart/src/assets/iconfont/iconfont.json deleted file mode 100644 index 6f91abb60..000000000 --- a/src/components/FlowChart/src/assets/iconfont/iconfont.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "id": "2491438", - "name": "liu'c'tu", - "font_family": "iconfont", - "css_prefix_text": "icon-", - "description": "", - "glyphs": [ - { - "icon_id": "755619", - "name": "自适应图标", - "font_class": "full-screen-hs", - "unicode": "e656", - "unicode_decimal": 58966 - }, - { - "icon_id": "14445801", - "name": "查看", - "font_class": "watch-hs", - "unicode": "e766", - "unicode_decimal": 59238 - }, - { - "icon_id": "9712640", - "name": "下载", - "font_class": "download-hs", - "unicode": "e6af", - "unicode_decimal": 59055 - }, - { - "icon_id": "1029099", - "name": "放大", - "font_class": "enlarge-hs", - "unicode": "e765", - "unicode_decimal": 59237 - }, - { - "icon_id": "20017362", - "name": "上一步", - "font_class": "previous-hs", - "unicode": "e84c", - "unicode_decimal": 59468 - }, - { - "icon_id": "1010015", - "name": "缩小", - "font_class": "zoom-out-hs", - "unicode": "e744", - "unicode_decimal": 59204 - }, - { - "icon_id": "20017363", - "name": "下一步", - "font_class": "next-step-hs", - "unicode": "e84b", - "unicode_decimal": 59467 - } - ] -} diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.svg b/src/components/FlowChart/src/assets/iconfont/iconfont.svg deleted file mode 100644 index 657d7c73f..000000000 --- a/src/components/FlowChart/src/assets/iconfont/iconfont.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - -Created by iconfont - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.ttf b/src/components/FlowChart/src/assets/iconfont/iconfont.ttf deleted file mode 100644 index b332ae7da..000000000 Binary files a/src/components/FlowChart/src/assets/iconfont/iconfont.ttf and /dev/null differ diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.woff b/src/components/FlowChart/src/assets/iconfont/iconfont.woff deleted file mode 100644 index 0743a9381..000000000 Binary files a/src/components/FlowChart/src/assets/iconfont/iconfont.woff and /dev/null differ diff --git a/src/components/FlowChart/src/assets/iconfont/iconfont.woff2 b/src/components/FlowChart/src/assets/iconfont/iconfont.woff2 deleted file mode 100644 index 98f6f354f..000000000 Binary files a/src/components/FlowChart/src/assets/iconfont/iconfont.woff2 and /dev/null differ diff --git a/src/components/FlowChart/src/enum.ts b/src/components/FlowChart/src/enum.ts new file mode 100644 index 000000000..8ea134ca5 --- /dev/null +++ b/src/components/FlowChart/src/enum.ts @@ -0,0 +1,11 @@ +export enum ToolbarTypeEnum { + ZOOM_IN = 'zoomIn', + ZOOM_OUT = 'zoomOut', + RESET_ZOOM = 'resetZoom', + + UNDO = 'undo', + REDO = 'redo', + + SNAPSHOT = 'snapshot', + VIEW_DATA = 'viewData', +} diff --git a/src/components/FlowChart/src/index.vue b/src/components/FlowChart/src/index.vue new file mode 100644 index 000000000..8b7161d74 --- /dev/null +++ b/src/components/FlowChart/src/index.vue @@ -0,0 +1,124 @@ + + diff --git a/src/components/FlowChart/src/types.ts b/src/components/FlowChart/src/types.ts new file mode 100644 index 000000000..94992ba1a --- /dev/null +++ b/src/components/FlowChart/src/types.ts @@ -0,0 +1,14 @@ +import { NodeConfig } from '@logicflow/core'; +import { ToolbarTypeEnum } from './enum'; + +export interface NodeItem extends NodeConfig { + icon: string; +} + +export interface ToolbarConfig { + type?: string | ToolbarTypeEnum; + tooltip?: string | boolean; + icon?: string; + disabled?: boolean; + separate?: boolean; +} diff --git a/src/components/FlowChart/src/useFlowContext.ts b/src/components/FlowChart/src/useFlowContext.ts new file mode 100644 index 000000000..7d15f3b34 --- /dev/null +++ b/src/components/FlowChart/src/useFlowContext.ts @@ -0,0 +1,17 @@ +import type LogicFlow from '@logicflow/core'; + +import { provide, inject } from 'vue'; + +const key = Symbol('flow-chart'); + +type Instance = { + logicFlow: LogicFlow; +}; + +export function createFlowChartContext(instance: Instance) { + provide(key, instance); +} + +export function useFlowChartContext(): Instance { + return inject(key) as Instance; +} diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue index 21a24a86f..c306839e0 100644 --- a/src/components/Table/src/BasicTable.vue +++ b/src/components/Table/src/BasicTable.vue @@ -298,27 +298,13 @@ @prefix-cls: ~'@{namespace}-basic-table'; - html[data-theme='light'] { - .@{prefix-cls} { - &-row__striped { - td { - background-color: #fafafa; - } - } - } - } - - html[data-theme='dark'] { - .@{prefix-cls} { - &-row__striped { - td { - background-color: rgb(255 255 255 / 4%); - } - } - } - } - .@{prefix-cls} { + &-row__striped { + td { + background-color: content-background; + } + } + &-form-container { padding: 16px; diff --git a/src/components/Tinymce/src/tinymce.ts b/src/components/Tinymce/src/tinymce.ts index 443b9aa89..ff36766b7 100644 --- a/src/components/Tinymce/src/tinymce.ts +++ b/src/components/Tinymce/src/tinymce.ts @@ -25,7 +25,7 @@ import 'tinymce/plugins/save'; import 'tinymce/plugins/searchreplace'; import 'tinymce/plugins/spellchecker'; import 'tinymce/plugins/tabfocus'; -import 'tinymce/plugins/table'; +// import 'tinymce/plugins/table'; import 'tinymce/plugins/template'; import 'tinymce/plugins/textpattern'; import 'tinymce/plugins/visualblocks'; @@ -38,12 +38,12 @@ import 'tinymce/plugins/wordcount'; // colorpicker/contextmenu/textcolor plugin is now built in to the core editor, please remove it from your editor configuration export const plugins = [ - 'advlist anchor autolink autosave code codesample directionality fullscreen hr insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textpattern visualblocks visualchars wordcount', + 'advlist anchor autolink autosave code codesample directionality fullscreen hr insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus template textpattern visualblocks visualchars wordcount', ]; export const toolbar = [ 'fontsizeselect lineheight searchreplace bold italic underline strikethrough alignleft aligncenter alignright outdent indent blockquote undo redo removeformat subscript superscript code codesample', - 'hr bullist numlist link preview anchor pagebreak insertdatetime media table forecolor backcolor fullscreen', + 'hr bullist numlist link preview anchor pagebreak insertdatetime media forecolor backcolor fullscreen', ]; export { tinymce }; diff --git a/src/locales/lang/en/routes/demo/comp.ts b/src/locales/lang/en/routes/demo/comp.ts index 11bbfc8e9..c68ea5cd9 100644 --- a/src/locales/lang/en/routes/demo/comp.ts +++ b/src/locales/lang/en/routes/demo/comp.ts @@ -35,5 +35,4 @@ export default { time: 'Relative Time', cropperImage: 'Cropper Image', - flowChart: 'Flow Chart', }; diff --git a/src/locales/lang/en/routes/demo/flow.ts b/src/locales/lang/en/routes/demo/flow.ts new file mode 100644 index 000000000..e4fbb9c2b --- /dev/null +++ b/src/locales/lang/en/routes/demo/flow.ts @@ -0,0 +1,4 @@ +export default { + name: 'Graphics editor', + flowChart: 'FlowChart', +}; diff --git a/src/locales/lang/zh_CN/routes/demo/comp.ts b/src/locales/lang/zh_CN/routes/demo/comp.ts index 291c8c415..2bd3614a1 100644 --- a/src/locales/lang/zh_CN/routes/demo/comp.ts +++ b/src/locales/lang/zh_CN/routes/demo/comp.ts @@ -34,5 +34,4 @@ export default { time: '相对时间', cropperImage: '图片裁剪', - flowChart: '流程图', }; diff --git a/src/locales/lang/zh_CN/routes/demo/flow.ts b/src/locales/lang/zh_CN/routes/demo/flow.ts new file mode 100644 index 000000000..f87c3e12b --- /dev/null +++ b/src/locales/lang/zh_CN/routes/demo/flow.ts @@ -0,0 +1,4 @@ +export default { + name: '图形编辑器', + flowChart: '流程图', +}; diff --git a/src/router/menus/modules/demo/comp.ts b/src/router/menus/modules/demo/comp.ts index c9909ea60..15e91f434 100644 --- a/src/router/menus/modules/demo/comp.ts +++ b/src/router/menus/modules/demo/comp.ts @@ -123,13 +123,6 @@ const menu: MenuModule = { content: 'new', }, }, - { - path: 'flowChart', - name: t('routes.demo.comp.flowChart'), - tag: { - content: 'new', - }, - }, { path: 'countTo', name: t('routes.demo.comp.countTo'), diff --git a/src/router/menus/modules/demo/flow.ts b/src/router/menus/modules/demo/flow.ts new file mode 100644 index 000000000..7cbd6a2b6 --- /dev/null +++ b/src/router/menus/modules/demo/flow.ts @@ -0,0 +1,18 @@ +import type { MenuModule } from '/@/router/types'; +import { t } from '/@/hooks/web/useI18n'; + +const menu: MenuModule = { + orderNo: 5000, + menu: { + name: t('routes.demo.flow.name'), + path: '/flow', + + children: [ + { + path: 'flowChart', + name: t('routes.demo.flow.flowChart'), + }, + ], + }, +}; +export default menu; diff --git a/src/router/routes/modules/demo/comp.ts b/src/router/routes/modules/demo/comp.ts index 47c70eaaa..d5f0dcd71 100644 --- a/src/router/routes/modules/demo/comp.ts +++ b/src/router/routes/modules/demo/comp.ts @@ -240,14 +240,7 @@ const comp: AppRouteModule = { title: t('routes.demo.comp.cropperImage'), }, }, - { - path: 'flowChart', - name: 'flowChartDemo', - component: () => import('/@/views/demo/comp/flow-chart/index.vue'), - meta: { - title: t('routes.demo.comp.flowChart'), - }, - }, + { path: 'timestamp', name: 'TimeDemo', diff --git a/src/router/routes/modules/demo/flow.ts b/src/router/routes/modules/demo/flow.ts new file mode 100644 index 000000000..c4bc8911c --- /dev/null +++ b/src/router/routes/modules/demo/flow.ts @@ -0,0 +1,27 @@ +import type { AppRouteModule } from '/@/router/types'; + +import { LAYOUT } from '/@/router/constant'; +import { t } from '/@/hooks/web/useI18n'; + +const charts: AppRouteModule = { + path: '/flow', + name: 'FlowDemo', + component: LAYOUT, + redirect: '/flow/flowChart', + meta: { + icon: 'tabler:chart-dots', + title: t('routes.demo.flow.name'), + }, + children: [ + { + path: 'flowChart', + name: 'flowChartDemo', + component: () => import('/@/views/demo/comp/flow-chart/index.vue'), + meta: { + title: t('routes.demo.flow.flowChart'), + }, + }, + ], +}; + +export default charts; diff --git a/src/views/demo/comp/flow-chart/index.vue b/src/views/demo/comp/flow-chart/index.vue index 273d95d9f..4d28c4f09 100644 --- a/src/views/demo/comp/flow-chart/index.vue +++ b/src/views/demo/comp/flow-chart/index.vue @@ -1,133 +1,23 @@ - - diff --git a/yarn.lock b/yarn.lock index 96f956fc3..4d123a9e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7719,17 +7719,17 @@ rollup-plugin-terser@^7.0.0: serialize-javascript "^4.0.0" terser "^5.0.0" -rollup-plugin-visualizer@5.3.6: - version "5.3.6" - resolved "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.3.6.tgz#df6317b242f4aa58b6a03261335dbc64ea6fe0df" - integrity sha512-USIyYkzRuvIJZyUoFWSvejy/c8F9jm9mHbyB+01oE7m0Vc0Ll67HlZgRsY59IqU/j/qF1adPsXKSDkEXS6tzfg== +rollup-plugin-visualizer@5.3.4: + version "5.3.4" + resolved "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.3.4.tgz#216300acca6e31b139be92eed98280c5662a5818" + integrity sha512-n3wYwKrZ3nhYJj8apzFuxmiu4y+ygDNJYLqQCOxludg3Pnhkql9WYc8iupgsMI+jGREA0dFsfDlzDAKcmXZIMQ== dependencies: nanoid "^3.1.22" open "^7.4.2" source-map "^0.7.3" yargs "^16.2.0" -rollup@^2.25.0, rollup@^2.38.5, rollup@^2.44.0, rollup@^2.45.2: +rollup@^2.25.0, rollup@^2.38.5, rollup@^2.44.0: version "2.45.2" resolved "https://registry.npmjs.org/rollup/-/rollup-2.45.2.tgz#8fb85917c9f35605720e92328f3ccbfba6f78b48" integrity sha512-kRRU7wXzFHUzBIv0GfoFFIN3m9oteY4uAsKllIpQDId5cfnkWF2J130l+27dzDju0E6MScKiV0ZM5Bw8m4blYQ==