From 4152906e62c5bf6a9479d78c9ba0493e8cbce5ed Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Mon, 25 Jun 2018 22:44:50 +0800 Subject: [PATCH] no message Former-commit-id: f478b02e16eb494d784689c460829fbbe71ddebe [formerly f478b02e16eb494d784689c460829fbbe71ddebe [formerly f478b02e16eb494d784689c460829fbbe71ddebe [formerly f478b02e16eb494d784689c460829fbbe71ddebe [formerly 4261ac15c7b2142ac5c33ee050e5318f26287db5 [formerly 7e88c45dd2435fe013a5d9d2cda40466b41d8a0f]]]]] Former-commit-id: 45719bed3d7157377fa23fcaee1fb5663246e65d Former-commit-id: 3af484d24d723bf778717c99a7ed2661d6a067eb Former-commit-id: 4a025df5f087d3accb56bb7d2aeaaa16d130c2f6 [formerly f39e32c34b1b25571c16d239104d2803f4293a26] Former-commit-id: 6485639ed635c32e1c2112a8487ce9e9a4445c9b Former-commit-id: 72305626fef59076904e678d0fd82b71cc719475 Former-commit-id: f5c54ba04475494eb6135e7782b8ce879d5b96aa Former-commit-id: 85f56f5c77e07bf7cd5b910c964805a958f3050d Former-commit-id: cdf29eccd3691cf03c334b9174bd3a1c95c9b2eb --- docs/zh/guide/README.md | 6 +++--- package.json | 1 + src/components/charts/G2/mixins/G2.js | 8 +++++++- src/pages/demo/plugins/mock/dpd.vue | 4 ++-- src/pages/demo/plugins/mock/dtd.vue | 4 ++-- src/utils/clone.js | 26 -------------------------- src/utils/sleep.js | 7 ------- 7 files changed, 15 insertions(+), 41 deletions(-) delete mode 100644 src/utils/clone.js delete mode 100644 src/utils/sleep.js diff --git a/docs/zh/guide/README.md b/docs/zh/guide/README.md index 3b153d7c..c7d74e19 100644 --- a/docs/zh/guide/README.md +++ b/docs/zh/guide/README.md @@ -108,9 +108,9 @@ D2Admin 仍然处于开发中,这里有一些暂时的计划: │ │ ├─ library │ │ └─ style │ ├─ components // 组件 -│ │ ├─ charts -│ │ ├─ core -│ │ └─ demo +│ │ ├─ charts // 图表组件 +│ │ ├─ core // 核心组件 +│ │ └─ demo // 示例组件 │ ├─ i18n // 多国语 │ ├─ menu // 菜单 │ ├─ mock // 模拟数据 diff --git a/package.json b/package.json index d76f9b78..f763e040 100755 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "github-markdown-css": "^2.10.0", "highlight.js": "^9.12.0", "js-cookie": "^2.2.0", + "lodash.clonedeep": "^4.5.0", "lodash.get": "^4.4.2", "lodash.uniqueid": "^4.0.1", "marked": "^0.3.9", diff --git a/src/components/charts/G2/mixins/G2.js b/src/components/charts/G2/mixins/G2.js index e0147a67..94a7103a 100644 --- a/src/components/charts/G2/mixins/G2.js +++ b/src/components/charts/G2/mixins/G2.js @@ -8,7 +8,13 @@ import propsChart from './props/chart' import propsD2 from './props/d2' // 工具 -import sleep from '@/utils/sleep.js' +const sleep = async (time = 0) => { + return new Promise((resolve, reject) => { + setTimeout(() => { + resolve() + }, time) + }) +} // 关闭 G2 的体验改进计划打点请求 G2.track(false) diff --git a/src/pages/demo/plugins/mock/dpd.vue b/src/pages/demo/plugins/mock/dpd.vue index 47a8c488..5c138aae 100644 --- a/src/pages/demo/plugins/mock/dpd.vue +++ b/src/pages/demo/plugins/mock/dpd.vue @@ -17,7 +17,7 @@