Merge branch 'hotfix/UEDITOR_HOME_URL' into develop

Former-commit-id: 57bc4dabe0d0bec830ddbcb32493d655a866283d [formerly a06797bef732b07b60c8e13ae8c9c58f83b15739] [formerly 57bc4dabe0d0bec830ddbcb32493d655a866283d [formerly a06797bef732b07b60c8e13ae8c9c58f83b15739] [formerly 57bc4dabe0d0bec830ddbcb32493d655a866283d [formerly a06797bef732b07b60c8e13ae8c9c58f83b15739] [formerly a06797bef732b07b60c8e13ae8c9c58f83b15739 [formerly 2a6cd9f031c1e5e27a84f9ef12935701bf669697 [formerly 2b9f8d53e392e4de26a8c9d2b1c560cbde0270e3]]]]] Former-commit-id: a34310a34210f59e06652e2ce160953bef3ce3ab Former-commit-id: 3558d925954646c41c5dee2415df625d9fa6b61e Former-commit-id: 08baa70e3d5b034bce91e5cb6fe988c792971289 [formerly 6651dd283bfe45ca8718cf69c1ffce51285c817a] Former-commit-id: b1a3048b1a0b903c4857587276be07d8bdd8473a Former-commit-id: 96f1424a2cdc4a386853f4d890ad530c92bffc37 Former-commit-id: 57b0aa80cd2cb55e012c9cb956af2267c796173a Former-commit-id: c7f299c04afc9b4f726a01ed2908bcc2ce1b2b9f Former-commit-id: d46d5a38c81e61fa8838c9f2a5c14c7ea0be4ba0
2018-11-20 14:07:17 +08:00
parent 9795e91abc a1a82dbf76
commit 3b478dd045
2 changed files with 3 additions and 1 deletions
--- 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,
  // 初始容器高度
--- 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 {
    // 不需要身份校验 直接通过