From e4c738fecad65850e83fb2193f10c5501814b8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=80=9D=E7=BB=B4=E7=A9=BA=E9=97=B4?= Date: Tue, 20 Nov 2018 13:41:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E6=AC=A1?= =?UTF-8?q?=E8=BD=BD=E5=85=A5=E8=BF=9B=E5=BA=A6=E6=9D=A1=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 3a25d5d794979cff66f10d65712d699ebf6c9347 [formerly 3a25d5d794979cff66f10d65712d699ebf6c9347 [formerly 3a25d5d794979cff66f10d65712d699ebf6c9347 [formerly 3a25d5d794979cff66f10d65712d699ebf6c9347 [formerly bcedb7b22fbf7a9c621c766ffd40113d3cecbdb2 [formerly a7d5563b2eb000f625d0904cfe4cbef7159a9573]]]]] Former-commit-id: 02c4ec9a7790a9b5d4c648a4c6d6678ca89d9b41 Former-commit-id: 4120486d553a345a996a350bad9f91980b62263c Former-commit-id: 329a0d014817c53b2cfe94b7fa8cbd9ca9c6c84f [formerly 7dd0a4a2f2a4fd2bf9501a2792818357e44921b1] Former-commit-id: 8ab85d6864d298ae6e2b2650a9153dc92d0dcd65 Former-commit-id: 09f2f9cc341ebd21099131d72cf715ddeed7699a Former-commit-id: d4821d90b702d94aba9eb29607b8da7bdf41e3ed Former-commit-id: 52c0cf5054a66f8f9a698d0fec74d415549cf06c Former-commit-id: fb3322bc79a8c4495578a9c118106a066cc55315 --- src/router/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/router/index.js b/src/router/index.js index 496b9504..c84f6cd0 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -44,6 +44,8 @@ router.beforeEach((to, from, next) => { redirect: to.fullPath } }) + // https://github.com/d2-projects/d2-admin/issues/138 + NProgress.done() } } else { // 不需要身份校验 直接通过 From a1a82dbf7691b0911ee2c1723c2e1255b161e253 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 20 Nov 2018 14:07:09 +0800 Subject: [PATCH 2/2] update Former-commit-id: a5afeaeb4c86cbfe2e0bdf0db6b96bfe0313a49b [formerly a5afeaeb4c86cbfe2e0bdf0db6b96bfe0313a49b [formerly a5afeaeb4c86cbfe2e0bdf0db6b96bfe0313a49b [formerly a5afeaeb4c86cbfe2e0bdf0db6b96bfe0313a49b [formerly ff6c31bae7c0185463a8c7f82a8bafb5a6b65f67 [formerly 7fcaa0a34e06513c032877361e1c0aac6d98c47f]]]]] Former-commit-id: 8dc0612c5a634edb118fdf95288271f6e2038852 Former-commit-id: e81ee356b10115dd1bbb136dc43a96c69cf79249 Former-commit-id: a6151c39129742ddc978879573c310ef5901c8c0 [formerly 8b00eecc8755b66b74277b2617a76e965862021e] Former-commit-id: f2ad29d7f309380644d4eff0c906d4becae608cc Former-commit-id: 9cf4b7f682ac166081369cfde672d58593a8380a Former-commit-id: 8f54f6607608d2089b05c7fc70b9f0f05bd4f77a Former-commit-id: 17dc779c962c48c9a5947f0afe9476283a3837bb Former-commit-id: dc49cf46c0c65be09fdf9715f3842c9b1816f3ae --- src/components/d2-ueditor/ueditor.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/d2-ueditor/ueditor.config.js b/src/components/d2-ueditor/ueditor.config.js index 984a0f9a..8cff9bb8 100644 --- a/src/components/d2-ueditor/ueditor.config.js +++ b/src/components/d2-ueditor/ueditor.config.js @@ -1,5 +1,5 @@ export default { - UEDITOR_HOME_URL: './lib/UEditor/', + UEDITOR_HOME_URL: '/lib/UEditor/', // 编辑器不自动被内容撑高 autoHeightEnabled: false, // 初始容器高度