From a5bca8a81bda32aab5059d5d8179ebdc258764ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AF=9B=E7=91=9E?= Date: Tue, 30 Jun 2020 18:33:17 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=20=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + README.md | 2 + package.json | 8 +- src/config/index.ts | 1 + src/functions/router/index.ts | 5 +- src/libs/components/senior.scss | 5 + src/pages/index/components/charts/Line.vue | 8 +- src/pages/index/components/charts/Rose.vue | 8 +- .../index/components/visual/Ripple/ripple.ts | 1 + tsconfig.json | 5 +- yarn.lock | 1186 +++++++++-------- 11 files changed, 625 insertions(+), 605 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e94d38..32854f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## v 1.3.0 - 通用鉴权等 +- 累积更新 ## v 1.2.18 diff --git a/README.md b/README.md index 60cf616..9f336a3 100644 --- a/README.md +++ b/README.md @@ -911,6 +911,8 @@ http { 2. 先执行 `yarn lint` 等相关命令, 待消除所有错误后, 再提交 3. 确保开发时无相关报错(浏览器中页面遮罩显示错误, 控制台打印警告), 特别注意 `console.log` , `debugger` 和 `定义但未使用变量`, 只在开发环境是警告, 其他都是错误 +- class 组件不要使用全局 API 函数, 比如 refresh 等 + ### 问题及思考 - Vue 异步组件加载失败重试: 最好还是 Vue 对异步组件提供支持[#9788](https://github.com/vuejs/vue/issues/9788) diff --git a/package.json b/package.json index 8976849..a64d93e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-tpl", - "version": "1.3.0", + "version": "1.3.1", "private": false, "description": "vue + vuex + vue router + TypeScript(支持 JavaScript) 模板", "author": "毛瑞 ", @@ -29,12 +29,12 @@ "register-service-worker": "^1.7.1", "screenfull": "^5.0.2", "three": "^0.118.3", - "tinymce": "^5.3.2", + "tinymce": "^5.4.0", "vue": "^2.6.11", "vue-class-component": "^7.2.3", - "vue-property-decorator": "^9.0.0", + "vue-property-decorator": "9.0.0", "vue-router": "^3.3.4", - "vuex": "^3.4.0", + "vuex": "^3.5.1", "vuex-class": "^0.3.2", "vuex-module-decorators": "^0.17.0", "zdog": "^1.1.2", diff --git a/src/config/index.ts b/src/config/index.ts index 7eb5bf8..b7b2ea2 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -47,6 +47,7 @@ export default { [SPA.error]: '50x', /*! 【↑ SPA配置 ↑】 */ + /*! 路由模式 */ /* 路由模式 */ mode: 'hash', diff --git a/src/functions/router/index.ts b/src/functions/router/index.ts index 58179a1..23b3453 100644 --- a/src/functions/router/index.ts +++ b/src/functions/router/index.ts @@ -14,7 +14,7 @@ export interface RouteMeta { /** 标题 */ title: string /** 父路由 */ - parent?: IRouteConfig + parent?: RouteConfig /** 路由最大缓存时间 */ alive?: number /** 下次访问路由是否需要重新加载 */ @@ -30,9 +30,6 @@ declare global { interface IRoute extends Route { meta: RouteMeta } - interface IRouteConfig extends RouteConfig { - meta: RouteMeta - } } /** 跳转地址对象 */ diff --git a/src/libs/components/senior.scss b/src/libs/components/senior.scss index fe87123..272b903 100644 --- a/src/libs/components/senior.scss +++ b/src/libs/components/senior.scss @@ -97,3 +97,8 @@ background: $colorScrollBarHover; } } + +// 弹窗 +.el-dialog__header { + border-bottom: $borderBase; +} diff --git a/src/pages/index/components/charts/Line.vue b/src/pages/index/components/charts/Line.vue index 4f59f2f..67ba8c0 100644 --- a/src/pages/index/components/charts/Line.vue +++ b/src/pages/index/components/charts/Line.vue @@ -4,7 +4,7 @@ * @Date: 2019-07-08 16:57:33 -->