Skip to content

Commit

Permalink
Fix: 类型错误
Browse files Browse the repository at this point in the history
  • Loading branch information
毛瑞 committed Jun 30, 2020
1 parent 783656e commit a5bca8a
Show file tree
Hide file tree
Showing 11 changed files with 625 additions and 605 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## v 1.3.0

- 通用鉴权等
- 累积更新

## v 1.2.18

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -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": "毛瑞 <[email protected]>",
Expand Down Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export default {
[SPA.error]: '50x',
/*! 【↑ SPA配置 ↑】 */

/*! 路由模式 */
/* 路由模式 */
mode: 'hash',

Expand Down
5 changes: 1 addition & 4 deletions src/functions/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export interface RouteMeta {
/** 标题 */
title: string
/** 父路由 */
parent?: IRouteConfig
parent?: RouteConfig
/** 路由最大缓存时间 */
alive?: number
/** 下次访问路由是否需要重新加载 */
Expand All @@ -30,9 +30,6 @@ declare global {
interface IRoute extends Route {
meta: RouteMeta
}
interface IRouteConfig extends RouteConfig {
meta: RouteMeta
}
}

/** 跳转地址对象 */
Expand Down
5 changes: 5 additions & 0 deletions src/libs/components/senior.scss
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,8 @@
background: $colorScrollBarHover;
}
}

// 弹窗
.el-dialog__header {
border-bottom: $borderBase;
}
8 changes: 4 additions & 4 deletions src/pages/index/components/charts/Line.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @Date: 2019-07-08 16:57:33
-->
<template>
<div @mouseenter="refresh" />
<div @mouseenter="update" />
</template>

<script lang="ts">
Expand Down Expand Up @@ -146,10 +146,10 @@ export default class extends Vue {
} as EChartOption
}

this.refresh()
this.update()
}

private refresh() {
private update() {
const option = this.option
const chart = echarts.getInstanceByDom(this.$el as HTMLDivElement)

Expand All @@ -158,7 +158,7 @@ export default class extends Vue {
chart.setOption(option)

this.clear()
this.interval = setInterval(() => this.refresh(), INTERVAL)
this.interval = setInterval(() => this.update(), INTERVAL)
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/pages/index/components/charts/Rose.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @Date: 2019-07-31 17:02:46
-->
<template>
<div @mouseenter="refresh" />
<div @mouseenter="update" />
</template>

<script lang="ts">
Expand Down Expand Up @@ -79,10 +79,10 @@ export default class extends Vue {
},
} as any

this.refresh()
this.update()
}

private refresh() {
private update() {
const option = this.option
const chart = echarts.getInstanceByDom(this.$el as HTMLDivElement)

Expand All @@ -91,7 +91,7 @@ export default class extends Vue {
chart.setOption(option)

this.clear()
this.interval = setInterval(() => this.refresh(), INTERVAL)
this.interval = setInterval(() => this.update(), INTERVAL)
}
}

Expand Down
1 change: 1 addition & 0 deletions src/pages/index/components/visual/Ripple/ripple.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ class Ripple extends AnimationLoop {
// Move the eye around the plane
uView: () =>
new Matrix4().lookAt({
up: [],
center: [0, 0, 0],
eye: [
(Math.cos(this.timeline.getTime(eyeXChannel)) * SIDE) / 2,
Expand Down
5 changes: 4 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@
"incremental": true,
"diagnostics": true,
"alwaysStrict": false,
"skipLibCheck": true,
"noEmitHelpers": true,
"importHelpers": true,
"esModuleInterop": true,
"tsBuildInfoFile": "compile/.buildInfo",
"moduleResolution": "node",
"noErrorTruncation": true,
"resolveJsonModule": true,
"allowUnusedLabels": true,
"strictBindCallApply": true,
"noImplicitUseStrict": true,
"skipDefaultLibCheck": true,
Expand Down Expand Up @@ -70,6 +72,7 @@
"tests/**/*.tsx"
],
"exclude": [
"node_modules"
"**/node_modules/**",
"**/__tests__/**"
]
}
1,186 changes: 598 additions & 588 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit a5bca8a

Please sign in to comment.