From 51186622f61be9cbdd77412093c4fb0596761f39 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 26 Jun 2018 22:20:59 +0800 Subject: [PATCH] no message Former-commit-id: 2ac08bdf73416d40f32a3f7965369cb28d4329d3 [formerly 2ac08bdf73416d40f32a3f7965369cb28d4329d3 [formerly 2ac08bdf73416d40f32a3f7965369cb28d4329d3 [formerly 2ac08bdf73416d40f32a3f7965369cb28d4329d3 [formerly 7edbaec35ed1435f9b321dc93a6fc638390e62c1 [formerly 2b79008703fe8c1f2dfc0e74d07589f55f68fa15]]]]] Former-commit-id: 43f9f620117aa19760d79743b2358e02473f45e6 Former-commit-id: 447bd2d9ae835cc47ceab1283c3b24a5406a234e Former-commit-id: 0d221eda984865e1d036159f6d92c2858634055c [formerly b6c26e2313ea3786c93d68c6394e4b2c59bdbe17] Former-commit-id: 79fdc885d3dc2a91ec43a48a11242c8a9f3ffdb1 Former-commit-id: 0959cb5dcdfe874efcb14c4ad8ed2fd5a1886516 Former-commit-id: c7cee26e0b0a5dd22d724c43c0e92828d84fab99 Former-commit-id: f75348850386038a04efa082a8bf71d5d5663f6b Former-commit-id: 65e82442f2b596e30e183f0522bb4e3a64408738 --- deploy-doc.sh | 4 +- deploy-preview.sh | 4 +- docs/.vuepress/dist | 2 +- docs/zh/components/charts.md | 6 +- docs/zh/guide/question.md | 135 ++++++++++- .../charts/G2/components/Area/base.vue | 43 ---- .../charts/G2/components/Bar/base.vue | 35 --- .../charts/G2/components/Column/base.vue | 32 --- .../charts/G2/components/Line/base.vue | 44 ---- .../charts/G2/components/Line/step.vue | 33 --- .../G2/components/NightingaleRose/base.vue | 52 ----- .../charts/G2/components/Pie/base.vue | 77 ------- .../charts/G2/components/Radar/base.vue | 88 -------- src/components/charts/G2/mixins/G2.js | 123 ----------- .../charts/G2/mixins/props/chart.js | 49 ---- src/components/charts/G2/mixins/props/d2.js | 26 --- src/components/charts/register.js | 16 -- .../components/-menu-side/index.vue | 1 - src/components/core/d2-layout-main/index.vue | 4 +- src/components/index.js | 2 - src/menu/index.js | 30 +-- src/mock/chart/G2Area.js | 24 -- src/mock/chart/G2Bar.js | 14 -- src/mock/chart/G2Column.js | 14 -- src/mock/chart/G2Line.js | 28 --- src/mock/chart/G2NightingaleRose.js | 14 -- src/mock/chart/G2Pie.js | 14 -- src/mock/chart/G2Radar.js | 18 -- src/mock/chart/_fn.js | 11 - src/mock/chart/register.js | 7 - src/mock/register.js | 2 - .../components/d2-demo-chart-card-header.vue | 52 ----- src/pages/demo/chart/all/index.vue | 166 -------------- src/pages/demo/chart/all/style.scss | 21 -- src/pages/demo/chart/demo/PieBase.vue | 33 --- src/pages/demo/chart/demo/areaBase.vue | 33 --- src/pages/demo/chart/demo/barBase.vue | 33 --- src/pages/demo/chart/demo/columnBase.vue | 33 --- .../demo/components/d2-demo-chart-card.vue | 66 ------ src/pages/demo/chart/demo/lineBase.vue | 33 --- src/pages/demo/chart/demo/lineStep.vue | 33 --- src/pages/demo/chart/demo/mixins/public.js | 6 - .../demo/chart/demo/nightingaleRoseBase.vue | 33 --- src/pages/demo/chart/demo/radarBase.vue | 33 --- .../components/d2-demo-chart-card-header.vue | 52 ----- src/pages/demo/chart/dynamicSize/index.vue | 209 ------------------ src/pages/demo/chart/dynamicSize/style.scss | 28 --- src/pages/demo/chart/index/index.vue | 9 - src/router/index.js.REMOVED.git-id | 2 +- 49 files changed, 150 insertions(+), 1677 deletions(-) delete mode 100644 src/components/charts/G2/components/Area/base.vue delete mode 100644 src/components/charts/G2/components/Bar/base.vue delete mode 100644 src/components/charts/G2/components/Column/base.vue delete mode 100644 src/components/charts/G2/components/Line/base.vue delete mode 100644 src/components/charts/G2/components/Line/step.vue delete mode 100644 src/components/charts/G2/components/NightingaleRose/base.vue delete mode 100644 src/components/charts/G2/components/Pie/base.vue delete mode 100644 src/components/charts/G2/components/Radar/base.vue delete mode 100644 src/components/charts/G2/mixins/G2.js delete mode 100644 src/components/charts/G2/mixins/props/chart.js delete mode 100644 src/components/charts/G2/mixins/props/d2.js delete mode 100644 src/components/charts/register.js delete mode 100644 src/mock/chart/G2Area.js delete mode 100644 src/mock/chart/G2Bar.js delete mode 100644 src/mock/chart/G2Column.js delete mode 100644 src/mock/chart/G2Line.js delete mode 100644 src/mock/chart/G2NightingaleRose.js delete mode 100644 src/mock/chart/G2Pie.js delete mode 100644 src/mock/chart/G2Radar.js delete mode 100644 src/mock/chart/_fn.js delete mode 100644 src/mock/chart/register.js delete mode 100644 src/pages/demo/chart/all/components/d2-demo-chart-card-header.vue delete mode 100644 src/pages/demo/chart/all/index.vue delete mode 100644 src/pages/demo/chart/all/style.scss delete mode 100644 src/pages/demo/chart/demo/PieBase.vue delete mode 100644 src/pages/demo/chart/demo/areaBase.vue delete mode 100644 src/pages/demo/chart/demo/barBase.vue delete mode 100644 src/pages/demo/chart/demo/columnBase.vue delete mode 100644 src/pages/demo/chart/demo/components/d2-demo-chart-card.vue delete mode 100644 src/pages/demo/chart/demo/lineBase.vue delete mode 100644 src/pages/demo/chart/demo/lineStep.vue delete mode 100644 src/pages/demo/chart/demo/mixins/public.js delete mode 100644 src/pages/demo/chart/demo/nightingaleRoseBase.vue delete mode 100644 src/pages/demo/chart/demo/radarBase.vue delete mode 100644 src/pages/demo/chart/dynamicSize/components/d2-demo-chart-card-header.vue delete mode 100644 src/pages/demo/chart/dynamicSize/index.vue delete mode 100644 src/pages/demo/chart/dynamicSize/style.scss delete mode 100644 src/pages/demo/chart/index/index.vue diff --git a/deploy-doc.sh b/deploy-doc.sh index 16894375..33257899 100755 --- a/deploy-doc.sh +++ b/deploy-doc.sh @@ -20,4 +20,6 @@ git commit -m 'deploy' # git push -f git@github.com:FairyEver/d2-admin.git master:gh-pages git push -f git@gitee.com:fairyever/d2-admin-doc.git master -cd - \ No newline at end of file +cd - + +echo "publish to https://fairyever.gitee.io/d2-admin-doc/zh/" \ No newline at end of file diff --git a/deploy-preview.sh b/deploy-preview.sh index 310ee2ce..ad4b631b 100755 --- a/deploy-preview.sh +++ b/deploy-preview.sh @@ -22,4 +22,6 @@ git commit -m 'deploy' # 如果发布到 https://.github.io/ git push -f git@gitee.com:fairyever/d2-admin-preview.git master -cd - \ No newline at end of file +cd - + +echo "publish to https://fairyever.gitee.io/d2-admin-preview/#/index" \ No newline at end of file diff --git a/docs/.vuepress/dist b/docs/.vuepress/dist index 6a49eba4..ba65e258 160000 --- a/docs/.vuepress/dist +++ b/docs/.vuepress/dist @@ -1 +1 @@ -Subproject commit 6a49eba420f6c627b7f4394666bae7d06580b7c3 +Subproject commit ba65e258b05435f93c8a671be7c63b2505d3be07 diff --git a/docs/zh/components/charts.md b/docs/zh/components/charts.md index 13e21434..0c3f1355 100644 --- a/docs/zh/components/charts.md +++ b/docs/zh/components/charts.md @@ -1,4 +1,8 @@ -# 图表 +# 图表 [ G2 ] + +::: tip +此文档仅对 `1.1.0` 及其以下版本有效，`1.1.1` 开始变更了图表库 +::: ## 介绍 diff --git a/docs/zh/guide/question.md b/docs/zh/guide/question.md index 62f5bbb8..70fda771 100644 --- a/docs/zh/guide/question.md +++ b/docs/zh/guide/question.md @@ -6,7 +6,7 @@ 首先建议您升级 node 版本 > 8，在以下环境测试可用 -``` +```{10} ➜ ~ npm -v 5.6.0 ➜ ~ node -v @@ -37,4 +37,135 @@ el-scrollbar 组件是 ElementUI 自带的一个隐藏组件，没有写入文 ## 兼容性 -首先 vue.js 和 ElementUI 做不到兼容的，D2Admin 肯定也兼容不了，实测在 macOS 下 Chrome 和新版本的火狐浏览器以及 Safari 都正常使用，这类管理系统一般是内部使用，通常不必太纠结兼容低版本浏览器，如果你发现了显示的 bug，可以加 QQ 群反应，如果你可以修复这个 bug 使其在你的浏览器上显示正常，欢迎你的 pr。 \ No newline at end of file +首先 vue.js 和 ElementUI 做不到兼容的，D2Admin 肯定也兼容不了，实测在 macOS 下 Chrome 和新版本的火狐浏览器以及 Safari 都正常使用，这类管理系统一般是内部使用，通常不必太纠结兼容低版本浏览器，如果你发现了显示的 bug，可以加 QQ 群反应，如果你可以修复这个 bug 使其在你的浏览器上显示正常，欢迎你的 pr。 + +## 删除项目里的 G2 图表库 + +出于为用户考虑，作者个人实现的图表集成方案肯定不如其它专门做这方面的开源产品（这是肯定的，客观来讲作者的个人水平和 v-charts 的团队水平不在一个等级），所以G2 图表库在 `1.1.1` 版本删除，后续版本换成 `v-charts`。如果你在开始使用 D2Admin 是在 `1.1.0` 以及之前，你的项目里应该有 G2 图表库，如果你不想保留，下面的向导将会指导你删除它 + +::: tip +下面的教程都是在 `1.1.0` 版本（行号为下载后没进行任何改动的行号）基础上 +::: + +1. 删除相关路由 + +删除文件 `src/router/index.js` 中 **34 ~ 53** 行代码 + +``` js +{ + path: '/demo/chart', + name: 'demo-chart', + meta, + redirect: { name: 'demo-chart-index' }, + component: () => import('@/components/core/d2-layout-main'), + children: (pre => [ + ... + ])('demo-chart-') +}, +``` + +2. 删除菜单 + +删除文件 `src/menu/index.js` 中 **119 ~ 143** 以及 **240** 和 **256** 行代码 + +``` js +// 路由菜单 图表 +const demoChart = { + path: '/demo/chart', + title: '图表 G2', + icon: 'pie-chart', + children: (pre => [ + ... + ])('/demo/chart/') +} +``` + +``` js{5,12} +export const side = [ + demoPlugins, + demoComponents, + demoElement, + demoChart // <- 注意这里 +] +// 修改为 +export const side = [ + demoPlugins, + demoComponents, + demoElement + // 删除了 demoChart +] +``` + +``` js{13,31} +export default [ + { + path: '/index', + title: '首页' + }, + { + path: '/demo', + title: '集成功能', + children: [ + demoPlugins, + demoComponents, + demoElement, + demoChart, // <- 注意这里 + { + title: '空菜单演示', + icon: 'folder-o', + children: [ ... +// 修改为 +export default [ + { + path: '/index', + title: '首页' + }, + { + path: '/demo', + title: '集成功能', + children: [ + demoPlugins, + demoComponents, + demoElement, + // 删除了 demoChart + { + title: '空菜单演示', + icon: 'folder-o', + children: [ ... +``` + +3. 删除文件 + +* 删除 `src/components/charts` 目录 + +* 删除 `src/components/index.js` 中的相关内容（高亮部分） + +```js{5-6} +// 核心组件 +import './core/register' +// 非核心组件 只是在很多演示页面中用到的组件 +import './demo/register' +// 图表组件 +import './charts/register' +``` + +* 删除 `src/mock/chart` 目录 + +* 删除 `src/mock/register.js` 中的相关内容（高亮部分） + +```js{7} +import Mock from 'mockjs' + +import '@/mock/ajax-demo' + +import '@/mock/login' + +import '@/mock/chart/register.js' + +// 设置全局延时 没有延时的话有时候会检测不到数据变化 建议保留 +Mock.setup({ + timeout: '300-600' +}) +``` + +* 删除 `src/pages/demo/chart` 目录 \ No newline at end of file diff --git a/src/components/charts/G2/components/Area/base.vue b/src/components/charts/G2/components/Area/base.vue deleted file mode 100644 index 8b816d8c..00000000 --- a/src/components/charts/G2/components/Area/base.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - diff --git a/src/components/charts/G2/components/Bar/base.vue b/src/components/charts/G2/components/Bar/base.vue deleted file mode 100644 index c7b08880..00000000 --- a/src/components/charts/G2/components/Bar/base.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - diff --git a/src/components/charts/G2/components/Column/base.vue b/src/components/charts/G2/components/Column/base.vue deleted file mode 100644 index 3283eb4d..00000000 --- a/src/components/charts/G2/components/Column/base.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - diff --git a/src/components/charts/G2/components/Line/base.vue b/src/components/charts/G2/components/Line/base.vue deleted file mode 100644 index 653f6650..00000000 --- a/src/components/charts/G2/components/Line/base.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - diff --git a/src/components/charts/G2/components/Line/step.vue b/src/components/charts/G2/components/Line/step.vue deleted file mode 100644 index 708e2754..00000000 --- a/src/components/charts/G2/components/Line/step.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - diff --git a/src/components/charts/G2/components/NightingaleRose/base.vue b/src/components/charts/G2/components/NightingaleRose/base.vue deleted file mode 100644 index 60f2a822..00000000 --- a/src/components/charts/G2/components/NightingaleRose/base.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - diff --git a/src/components/charts/G2/components/Pie/base.vue b/src/components/charts/G2/components/Pie/base.vue deleted file mode 100644 index 312a8a40..00000000 --- a/src/components/charts/G2/components/Pie/base.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - diff --git a/src/components/charts/G2/components/Radar/base.vue b/src/components/charts/G2/components/Radar/base.vue deleted file mode 100644 index ab0c10f5..00000000 --- a/src/components/charts/G2/components/Radar/base.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - diff --git a/src/components/charts/G2/mixins/G2.js b/src/components/charts/G2/mixins/G2.js deleted file mode 100644 index 94a7103a..00000000 --- a/src/components/charts/G2/mixins/G2.js +++ /dev/null @@ -1,123 +0,0 @@ -// 所有 G2 图表组件都引用此 mixin -import G2 from '@antv/g2' -import * as DataSet from '@antv/data-set' - -// Chart对象属性参数 -import propsChart from './props/chart' -// 扩展属性 -import propsD2 from './props/d2' - -// 工具 -const sleep = async (time = 0) => { - return new Promise((resolve, reject) => { - setTimeout(() => { - resolve() - }, time) - }) -} - -// 关闭 G2 的体验改进计划打点请求 -G2.track(false) - -export default { - props: { - // Chart对象属性参数 - ...propsChart, - // 扩展属性 - ...propsD2 - }, - data () { - return { - // 在页面中不需要再引入 直接使用 this.G2 - G2, - // 数据处理模块 - DataSet, - // 图表实例 - chart: null - } - }, - mounted () { - // 如果设置了在 mounted 后自动初始化 就在这里初始化 - if (this.autoInit) { - this.startInit() - } - this.$emit('ready') - }, - watch: { - // 数据改变 - data () { - if (this.chart) { - this.changeData() - } else { - this.startInit() - } - } - }, - methods: { - // 开始初始化 - async startInit () { - // 延时 - await sleep(this.autoInitDelay) - // 初始化 - this.$nextTick(() => { - if (this.chart) { - this.chart.destroy() - } - this.init() - }) - }, - // 创建图表对象 - creatChart () { - // http://antv.alipay.com/zh-cn/g2/3.x/api/chart.html - this.chart = new this.G2.Chart({ - // 对应图表的 DOM 容器 - container: this.$refs.chart, - // 指定图表的宽度 - width: this.width, - // 高度 - // 设置 autoHeight = true 后取 $refs.chart 的高度 - // 设置 autoHeight = false 后取 this.height - height: this.autoHeight ? this.G2.DomUtil.getHeight(this.$refs.chart) : this.height, - // 设置图表的内边距 - padding: this.padding, - // 设置图表整体的边框和背景样式 - background: this.background, - // 图表绘图区域的边框和背景样式 - plotBackground: this.plotBackground, - // 自动宽度 - forceFit: this.forceFit, - // 动画开关 - animate: this.animate, - // 设置设备像素比 - pixelRatio: this.pixelRatio - }) - }, - // 重绘大小 - resize (width, height) { - // 如果已经初始化过图表 - if (this.chart) { - const w = width || this.G2.DomUtil.getWidth(this.$refs.chart) - const h = height || this.G2.DomUtil.getHeight(this.$refs.chart) - this.chart.changeSize(w, h) - } else { - // 以后看着办 - } - }, - // 初始化 - init () { - this.$log( - '@/components/charts/G2/mixins/G2.js', - '图表没有正确初始化', - '如果你看到这条消息 请检查是否在图表组件中设置init方法' - ) - }, - // 更新数据 - changeData () { - this.$log( - '@/components/charts/G2/mixins/G2.js', - '图表没有正确刷新数据', - '如果你看到这条消息 请检查是否在图表组件中设置changeData方法' - ) - } - } -} diff --git a/src/components/charts/G2/mixins/props/chart.js b/src/components/charts/G2/mixins/props/chart.js deleted file mode 100644 index 0e3ad868..00000000 --- a/src/components/charts/G2/mixins/props/chart.js +++ /dev/null @@ -1,49 +0,0 @@ -export default { - // 宽度 http://antv.alipay.com/zh-cn/g2/3.x/api/chart.html#_width - width: { - type: Number, - required: false, - default: 400 - }, - // 高度 http://antv.alipay.com/zh-cn/g2/3.x/api/chart.html#_height - height: { - type: Number, - required: false, - default: 300 - }, - // 设置图表的内边距 http://antv.alipay.com/zh-cn/g2/3.x/api/chart.html#_padding - padding: { - required: false, - default: () => [30, 40, 40, 50] - }, - // 设置图表整体的边框和背景样式 http://antv.alipay.com/zh-cn/g2/3.x/api/chart.html#_background - background: { - type: Object, - required: false, - default: () => ({}) - }, - // 图表绘图区域的边框和背景样式 http://antv.alipay.com/zh-cn/g2/3.x/api/chart.html#_plotBackground - plotBackground: { - type: Object, - required: false, - default: () => ({}) - }, - // 图表的宽度自适应开关 http://antv.alipay.com/zh-cn/g2/3.x/api/chart.html#_forceFit - forceFit: { - type: Boolean, - required: false, - default: true - }, - // 图表动画开关 http://antv.alipay.com/zh-cn/g2/3.x/api/chart.html#_animate - animate: { - type: Boolean, - required: false, - default: true - }, - // 设置设备像素比 http://antv.alipay.com/zh-cn/g2/3.x/api/chart.html#_pixelRatio - pixelRatio: { - type: Number, - required: false, - default: window.devicePixelRatio - } -} diff --git a/src/components/charts/G2/mixins/props/d2.js b/src/components/charts/G2/mixins/props/d2.js deleted file mode 100644 index fd5a8ec6..00000000 --- a/src/components/charts/G2/mixins/props/d2.js +++ /dev/null @@ -1,26 +0,0 @@ -export default { - // 图表数据 此 data 非 官方文档中的 data - data: { - type: Array, - required: false, - default: () => [] - }, - // 高度 开启自动填充父元素 (非G2自带) - autoHeight: { - type: Boolean, - required: false, - default: true - }, - // 在组件 mounted 后自动初始化图表 (非G2自带) - autoInit: { - type: Boolean, - required: false, - default: false - }, - // 在组件 mounted 后自动初始化图表的 延时 (非G2自带) - autoInitDelay: { - type: Number, - required: false, - default: 0 - } -} diff --git a/src/components/charts/register.js b/src/components/charts/register.js deleted file mode 100644 index 076be273..00000000 --- a/src/components/charts/register.js +++ /dev/null @@ -1,16 +0,0 @@ -import Vue from 'vue' - -Vue.component('d2-chart-area-base', () => import('@/components/charts/G2/components/Area/base.vue')) - -Vue.component('d2-chart-bar-base', () => import('@/components/charts/G2/components/Bar/base.vue')) - -Vue.component('d2-chart-column-base', () => import('@/components/charts/G2/components/Column/base.vue')) - -Vue.component('d2-chart-line-base', () => import('@/components/charts/G2/components/Line/base.vue')) -Vue.component('d2-chart-line-step', () => import('@/components/charts/G2/components/Line/step.vue')) - -Vue.component('d2-chart-nightingale-rose-base', () => import('@/components/charts/G2/components/NightingaleRose/base.vue')) - -Vue.component('d2-chart-pie-base', () => import('@/components/charts/G2/components/Pie/base.vue')) - -Vue.component('d2-chart-radar-base', () => import('@/components/charts/G2/components/Radar/base.vue')) diff --git a/src/components/core/d2-layout-main/components/-menu-side/index.vue b/src/components/core/d2-layout-main/components/-menu-side/index.vue index 8a8013da..834a7cf3 100644 --- a/src/components/core/d2-layout-main/components/-menu-side/index.vue +++ b/src/components/core/d2-layout-main/components/-menu-side/index.vue @@ -63,7 +63,6 @@ export default { methods: { updateAsideHeight () { this.asideHeight = this.$el.offsetHeight - console.log(this.asideHeight) } } } diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue index 20715910..22e534f3 100644 --- a/src/components/core/d2-layout-main/index.vue +++ b/src/components/core/d2-layout-main/index.vue @@ -65,7 +65,9 @@ export default { }), styleLayoutMainGroup () { return { - ...this.themeBackGroundImage ? {backgroundImage: `url('${this.$assetsPublicPath}${this.themeBackGroundImage}')`} : {} + ...this.themeBackGroundImage ? { + backgroundImage: `url('${this.$assetsPublicPath}${this.themeBackGroundImage}')` + } : {} } } }, diff --git a/src/components/index.js b/src/components/index.js index f41677cd..b21692f3 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -2,5 +2,3 @@ import './core/register' // 非核心组件 只是在很多演示页面中用到的组件 import './demo/register' -// 图表组件 -import './charts/register' diff --git a/src/menu/index.js b/src/menu/index.js index 9270bab1..38910874 100644 --- a/src/menu/index.js +++ b/src/menu/index.js @@ -116,32 +116,6 @@ const demoComponents = { ])('/demo/components/') } -// 路由菜单 图表 -const demoChart = { - path: '/demo/chart', - title: '图表 G2', - icon: 'pie-chart', - children: (pre => [ - { path: `${pre}index`, title: '图表首页' }, - { - path: `${pre}demo`, - title: '单图示例', - children: [ - { path: `${pre}demo/areaBase`, title: '区域折线图' }, - { path: `${pre}demo/barBase`, title: '条形图' }, - { path: `${pre}demo/columnBase`, title: '柱形图' }, - { path: `${pre}demo/lineBase`, title: '折线图' }, - { path: `${pre}demo/lineStep`, title: '阶梯折线图' }, - { path: `${pre}demo/nightingaleRoseBase`, title: '南丁格尔玫瑰图' }, - { path: `${pre}demo/PieBase`, title: '饼图' }, - { path: `${pre}demo/radarBase`, title: '雷达图' } - ] - }, - { path: `${pre}all`, title: '示例' }, - { path: `${pre}dynamicSize`, title: '动态尺寸与可拖拽' } - ])('/demo/chart/') -} - // 路由菜单 组件库 const demoElement = { path: '/demo/element', @@ -236,8 +210,7 @@ const demoElement = { export const side = [ demoPlugins, demoComponents, - demoElement, - demoChart + demoElement ] // 菜单 顶栏 @@ -253,7 +226,6 @@ export default [ demoPlugins, demoComponents, demoElement, - demoChart, { title: '空菜单演示', icon: 'folder-o', diff --git a/src/mock/chart/G2Area.js b/src/mock/chart/G2Area.js deleted file mode 100644 index 7fb99b85..00000000 --- a/src/mock/chart/G2Area.js +++ /dev/null @@ -1,24 +0,0 @@ -import Mock from 'mockjs' -import * as fn from './_fn' - -Mock.mock('/api/chart/G2Area', 'post', ({body, type, url}) => { - const _body = JSON.parse(body) - switch (_body.type) { - // 基础折线图 - case 'base': { - let last = 0 - const data = ['3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月'].map(x => ({ - x, - y: 0 - })).map(e => { - e.y = last + fn.r() - last = e.y - return e - }) - last = 0 - return fn.returnMaker(data) - } - default: - return {} - } -}) diff --git a/src/mock/chart/G2Bar.js b/src/mock/chart/G2Bar.js deleted file mode 100644 index 1f42427a..00000000 --- a/src/mock/chart/G2Bar.js +++ /dev/null @@ -1,14 +0,0 @@ -import Mock from 'mockjs' -import * as fn from './_fn' - -Mock.mock('/api/chart/G2Bar', 'post', ({body, type, url}) => { - const _body = JSON.parse(body) - switch (_body.type) { - // 基础折线图 - case 'base': { - return fn.returnMaker(['中国', '日本', '美国', '法国', '英国'].map(x => ({x, y: fn.r()})).sort((a, b) => a.y - b.y)) - } - default: - return {} - } -}) diff --git a/src/mock/chart/G2Column.js b/src/mock/chart/G2Column.js deleted file mode 100644 index ac2ee53d..00000000 --- a/src/mock/chart/G2Column.js +++ /dev/null @@ -1,14 +0,0 @@ -import Mock from 'mockjs' -import * as fn from './_fn' - -Mock.mock('/api/chart/G2Column', 'post', ({body, type, url}) => { - const _body = JSON.parse(body) - switch (_body.type) { - // 基础折线图 - case 'base': { - return fn.returnMaker(['3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月'].map(x => ({x, y: fn.r()}))) - } - default: - return {} - } -}) diff --git a/src/mock/chart/G2Line.js b/src/mock/chart/G2Line.js deleted file mode 100644 index 2f0dee3f..00000000 --- a/src/mock/chart/G2Line.js +++ /dev/null @@ -1,28 +0,0 @@ -import Mock from 'mockjs' -import * as fn from './_fn' - -Mock.mock('/api/chart/G2Line', 'post', ({body, type, url}) => { - const _body = JSON.parse(body) - switch (_body.type) { - // 基础折线图 - case 'base': { - let last = 0 - const data = ['2010', '2011', '2012', '2013', '2014', '2015', '2016', '2017', '2018'].map(x => ({ - x, - y: 0 - })).map(e => { - e.y = last + fn.r() - last = e.y - return e - }) - last = 0 - return fn.returnMaker(data) - } - // 阶梯折线图 - case 'step': { - return fn.returnMaker(['3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月'].map(x => ({x, y: fn.r()}))) - } - default: - return {} - } -}) diff --git a/src/mock/chart/G2NightingaleRose.js b/src/mock/chart/G2NightingaleRose.js deleted file mode 100644 index 3baa5802..00000000 --- a/src/mock/chart/G2NightingaleRose.js +++ /dev/null @@ -1,14 +0,0 @@ -import Mock from 'mockjs' -import * as fn from './_fn' - -Mock.mock('/api/chart/G2NightingaleRose', 'post', ({body, type, url}) => { - const _body = JSON.parse(body) - switch (_body.type) { - // 基础南丁格尔玫瑰图 - case 'base': { - return fn.returnMaker(['中国', '日本', '美国', '法国', '英国'].map(e => ({item: e, count: 100 + fn.r()}))) - } - default: - return {} - } -}) diff --git a/src/mock/chart/G2Pie.js b/src/mock/chart/G2Pie.js deleted file mode 100644 index b2a26347..00000000 --- a/src/mock/chart/G2Pie.js +++ /dev/null @@ -1,14 +0,0 @@ -import Mock from 'mockjs' -import * as fn from './_fn' - -Mock.mock('/api/chart/G2Pie', 'post', ({body, type, url}) => { - const _body = JSON.parse(body) - switch (_body.type) { - // 基础饼图 - case 'base': { - return fn.returnMaker(['中国', '日本', '美国', '法国', '英国'].map(e => ({item: e, count: fn.r()}))) - } - default: - return {} - } -}) diff --git a/src/mock/chart/G2Radar.js b/src/mock/chart/G2Radar.js deleted file mode 100644 index 74c307a0..00000000 --- a/src/mock/chart/G2Radar.js +++ /dev/null @@ -1,18 +0,0 @@ -import Mock from 'mockjs' -import * as fn from './_fn' - -Mock.mock('/api/chart/G2Radar', 'post', ({body, type, url}) => { - const _body = JSON.parse(body) - switch (_body.type) { - // 基础折线图 - case 'base': { - return fn.returnMaker(['中国', '日本', '美国', '法国', '英国'].map(e => ({ - item: e, - a: fn.r(), - b: fn.r() - }))) - } - default: - return {} - } -}) diff --git a/src/mock/chart/_fn.js b/src/mock/chart/_fn.js deleted file mode 100644 index 80fde36f..00000000 --- a/src/mock/chart/_fn.js +++ /dev/null @@ -1,11 +0,0 @@ -export const r = (add = 0) => { - return Math.round(Math.random() * 100) + add -} - -export const returnMaker = (data = []) => { - return { - code: 0, - msg: '请求成功', - data - } -} diff --git a/src/mock/chart/register.js b/src/mock/chart/register.js deleted file mode 100644 index c58bfcdb..00000000 --- a/src/mock/chart/register.js +++ /dev/null @@ -1,7 +0,0 @@ -import './G2Area' -import './G2Bar' -import './G2Column' -import './G2Line' -import './G2NightingaleRose' -import './G2Pie' -import './G2Radar' diff --git a/src/mock/register.js b/src/mock/register.js index 27e32ca5..10582b39 100644 --- a/src/mock/register.js +++ b/src/mock/register.js @@ -4,8 +4,6 @@ import '@/mock/ajax-demo' import '@/mock/login' -import '@/mock/chart/register.js' - // 设置全局延时 没有延时的话有时候会检测不到数据变化 建议保留 Mock.setup({ timeout: '300-600' diff --git a/src/pages/demo/chart/all/components/d2-demo-chart-card-header.vue b/src/pages/demo/chart/all/components/d2-demo-chart-card-header.vue deleted file mode 100644 index 18d4c20f..00000000 --- a/src/pages/demo/chart/all/components/d2-demo-chart-card-header.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - diff --git a/src/pages/demo/chart/all/index.vue b/src/pages/demo/chart/all/index.vue deleted file mode 100644 index 0837f774..00000000 --- a/src/pages/demo/chart/all/index.vue +++ /dev/null @@ -1,166 +0,0 @@ - - - - - diff --git a/src/pages/demo/chart/all/style.scss b/src/pages/demo/chart/all/style.scss deleted file mode 100644 index 2ee0cadd..00000000 --- a/src/pages/demo/chart/all/style.scss +++ /dev/null @@ -1,21 +0,0 @@ -@import '~@/assets/style/public.scss'; -.demo-chart-index { - .col { - height: 340px; - margin-bottom: 20px; - .el-card { - @extend %unable-select; - height: 100%; - .el-card__body { - height: 100%; - padding: 0px; - } - // 有header的卡片的body高度需要减去header - &.header-in { - .el-card__body { - height: calc(100% - 59px); - } - } - } - } -} \ No newline at end of file diff --git a/src/pages/demo/chart/demo/PieBase.vue b/src/pages/demo/chart/demo/PieBase.vue deleted file mode 100644 index d347ba64..00000000 --- a/src/pages/demo/chart/demo/PieBase.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - diff --git a/src/pages/demo/chart/demo/areaBase.vue b/src/pages/demo/chart/demo/areaBase.vue deleted file mode 100644 index eb324ca8..00000000 --- a/src/pages/demo/chart/demo/areaBase.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - diff --git a/src/pages/demo/chart/demo/barBase.vue b/src/pages/demo/chart/demo/barBase.vue deleted file mode 100644 index f31fcc5a..00000000 --- a/src/pages/demo/chart/demo/barBase.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - diff --git a/src/pages/demo/chart/demo/columnBase.vue b/src/pages/demo/chart/demo/columnBase.vue deleted file mode 100644 index eab38ea2..00000000 --- a/src/pages/demo/chart/demo/columnBase.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - diff --git a/src/pages/demo/chart/demo/components/d2-demo-chart-card.vue b/src/pages/demo/chart/demo/components/d2-demo-chart-card.vue deleted file mode 100644 index ff692e71..00000000 --- a/src/pages/demo/chart/demo/components/d2-demo-chart-card.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - diff --git a/src/pages/demo/chart/demo/lineBase.vue b/src/pages/demo/chart/demo/lineBase.vue deleted file mode 100644 index 434fa57e..00000000 --- a/src/pages/demo/chart/demo/lineBase.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - diff --git a/src/pages/demo/chart/demo/lineStep.vue b/src/pages/demo/chart/demo/lineStep.vue deleted file mode 100644 index fd559668..00000000 --- a/src/pages/demo/chart/demo/lineStep.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - diff --git a/src/pages/demo/chart/demo/mixins/public.js b/src/pages/demo/chart/demo/mixins/public.js deleted file mode 100644 index c1a62e8f..00000000 --- a/src/pages/demo/chart/demo/mixins/public.js +++ /dev/null @@ -1,6 +0,0 @@ -import d2DemoChartCard from '../components/d2-demo-chart-card.vue' -export default { - components: { - 'd2-demo-chart-card': d2DemoChartCard - } -} diff --git a/src/pages/demo/chart/demo/nightingaleRoseBase.vue b/src/pages/demo/chart/demo/nightingaleRoseBase.vue deleted file mode 100644 index 0e52ce20..00000000 --- a/src/pages/demo/chart/demo/nightingaleRoseBase.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - diff --git a/src/pages/demo/chart/demo/radarBase.vue b/src/pages/demo/chart/demo/radarBase.vue deleted file mode 100644 index e319081b..00000000 --- a/src/pages/demo/chart/demo/radarBase.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - diff --git a/src/pages/demo/chart/dynamicSize/components/d2-demo-chart-card-header.vue b/src/pages/demo/chart/dynamicSize/components/d2-demo-chart-card-header.vue deleted file mode 100644 index 18d4c20f..00000000 --- a/src/pages/demo/chart/dynamicSize/components/d2-demo-chart-card-header.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - diff --git a/src/pages/demo/chart/dynamicSize/index.vue b/src/pages/demo/chart/dynamicSize/index.vue deleted file mode 100644 index c3bbd56b..00000000 --- a/src/pages/demo/chart/dynamicSize/index.vue +++ /dev/null @@ -1,209 +0,0 @@ - - - - - diff --git a/src/pages/demo/chart/dynamicSize/style.scss b/src/pages/demo/chart/dynamicSize/style.scss deleted file mode 100644 index c3e9bd6b..00000000 --- a/src/pages/demo/chart/dynamicSize/style.scss +++ /dev/null @@ -1,28 +0,0 @@ -@import '~@/assets/style/public.scss'; -.demo-chart-index { - .vue-grid-layout { - margin: -10px; - .el-card { - @extend %unable-select; - height: 100%; - .el-card__body { - height: 100%; - padding: 0px; - } - // 有header的卡片的body高度需要减去header - &.header-in { - .el-card__body { - height: calc(100% - 59px); - } - } - } - .vue-resizable-handle { - bottom: 6px; - right: 6px; - opacity: .3; - &:hover{ - opacity: 1; - } - } - } -} \ No newline at end of file diff --git a/src/pages/demo/chart/index/index.vue b/src/pages/demo/chart/index/index.vue deleted file mode 100644 index 59f30df0..00000000 --- a/src/pages/demo/chart/index/index.vue +++ /dev/null @@ -1,9 +0,0 @@ - \ No newline at end of file diff --git a/src/router/index.js.REMOVED.git-id b/src/router/index.js.REMOVED.git-id index 293fcced..7f166dbd 100644 --- a/src/router/index.js.REMOVED.git-id +++ b/src/router/index.js.REMOVED.git-id @@ -1 +1 @@ -919c478f2e165432104d6811b3b855f7b049ea39 \ No newline at end of file +89e063c3ddd8c257b9e34b7c88bc6d39efbc4ad5 \ No newline at end of file