diff --git a/package.json b/package.json
index 1e3cb758..ddb82f38 100644
--- a/package.json
+++ b/package.json
@@ -22,10 +22,12 @@
"echarts": "^4.1.0",
"element-ui": "^2.4.4",
"file-saver": "^1.3.3",
+ "flex.css": "^1.1.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.sortby": "^4.7.0",
"lodash.uniqueid": "^4.0.1",
"lowdb": "^1.0.0",
@@ -46,8 +48,7 @@
"vue-router": "^3.0.1",
"vue-splitpane": "^1.0.2",
"vuex": "^3.0.1",
- "xlsx": "^0.12.0",
- "flex.css": "^1.1.7"
+ "xlsx": "^0.12.0"
},
"devDependencies": {
"@kazupon/vue-i18n-loader": "^0.3.0",
diff --git a/src/components/d2-error-log-list/index.vue b/src/components/d2-error-log-list/index.vue
index ba4ad8b1..438ff7d7 100644
--- a/src/components/d2-error-log-list/index.vue
+++ b/src/components/d2-error-log-list/index.vue
@@ -1,11 +1,19 @@
-
+
+
+
+ label="地址"
+ prop="url"
+ width="140px"
+ :show-overflow-tooltip="true">
-
-
+
+
+
{{scope.row.vm ? scope.row.vm.$vnode.tag : ''}}
- {{scope.row.err}}
+
+
+
+
+
+
+ {{scope.row.err ? scope.row.err.name : ''}}
+
+
+
+
+
+ {{scope.row.err ? scope.row.err.message : ''}}
+
+
+
+
+
+
@@ -59,6 +107,12 @@ export default {
filterType (value, row) {
console.log('value', value)
return row.type === value
+ },
+ stackBeautify (err) {
+ if (!err) {
+ return ''
+ }
+ return err.stack
}
}
}
diff --git a/src/main.js b/src/main.js
index 3e84a151..66b3a9ab 100644
--- a/src/main.js
+++ b/src/main.js
@@ -65,10 +65,6 @@ new Vue({
this.$store.commit('d2adminLoginSuccessLoad')
// 初始化全屏监听
this.fullscreenListenerInit()
- window.onerror = function (message, url, line, column, error) {
- console.log('onerror')
- console.log(message, url, line, column, error)
- }
},
watch: {
// 监听路由 控制侧边栏显示
diff --git a/src/pages/demo/playground/log/error/index.vue b/src/pages/demo/playground/log/error/index.vue
index 5661d5a8..d26e72a4 100644
--- a/src/pages/demo/playground/log/error/index.vue
+++ b/src/pages/demo/playground/log/error/index.vue
@@ -10,7 +10,7 @@
export default {
methods: {
handleNewError () {
- console.log(a)
+ console.log(a) // eslint-disable-line
}
}
}
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 5298b777..4b9a2c4d 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-b79b9ceae995aa135d5f692a0e14798d496fba0f
\ No newline at end of file
+7b2790c378426c74689b83621eedf84a4250ff5e
\ No newline at end of file