diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md index 3dbf2834..672b00d7 100644 --- a/docs/zh/guide/change-log.md +++ b/docs/zh/guide/change-log.md @@ -1,5 +1,9 @@ # 更新日志 +## v1.1.6 + +* [ 新增 ] 新增加了多页控制组件 tab 按钮上的右键操作菜单,现在你可以在 D2Admin 中像使用浏览器一样操作多标签页 + ## v1.1.5 * [ 修改 ] vue-cli3 项目重构,目录调整 diff --git a/package.json b/package.json index ae1ed8d7..0b9656a4 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/components/ExpandItem/index.vue b/src/components/d2-error-log-list/components/ExpandItem/index.vue new file mode 100644 index 00000000..531b9a24 --- /dev/null +++ b/src/components/d2-error-log-list/components/ExpandItem/index.vue @@ -0,0 +1,30 @@ + + + diff --git a/src/components/d2-error-log-list/index.vue b/src/components/d2-error-log-list/index.vue new file mode 100644 index 00000000..34a93065 --- /dev/null +++ b/src/components/d2-error-log-list/index.vue @@ -0,0 +1,195 @@ + + + + + diff --git a/src/components/index.js b/src/components/index.js index ca6a67f0..e2dd374e 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -16,6 +16,7 @@ Vue.component('d2-container', d2Container) Vue.component('d2-link-btn', d2LinkBtn) Vue.component('d2-page-cover', () => import('./d2-page-cover')) Vue.component('d2-count-up', () => import('./d2-count-up')) +Vue.component('d2-error-log-list', () => import('./d2-error-log-list')) Vue.component('d2-highlight', () => import('./d2-highlight')) Vue.component('d2-icon', () => import('./d2-icon')) Vue.component('d2-icon-select', () => import('./d2-icon-select/index.vue')) diff --git a/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue b/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue index 47a58c7b..06594cbb 100644 --- a/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue +++ b/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue @@ -32,17 +32,10 @@ export default { methods: { rowClick (event) { let target = event.target - try { - let count = 0 - while (!target.dataset.value && count < 6) { - target = target.parentNode - count++ - } - this.$emit('rowClick', target.dataset.value) - } catch (error) { - // 不做任何处理 - console.log(error) + while (!target.dataset.value) { + target = target.parentNode } + this.$emit('rowClick', target.dataset.value) } } } diff --git a/src/layout/header-aside/components/header-error-log/index.vue b/src/layout/header-aside/components/header-error-log/index.vue new file mode 100644 index 00000000..32b42c25 --- /dev/null +++ b/src/layout/header-aside/components/header-error-log/index.vue @@ -0,0 +1,65 @@ + + + diff --git a/src/layout/header-aside/components/header-help/index.vue b/src/layout/header-aside/components/header-help/index.vue index 6aeaa638..23fa633c 100644 --- a/src/layout/header-aside/components/header-help/index.vue +++ b/src/layout/header-aside/components/header-help/index.vue @@ -5,7 +5,11 @@ - +
diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue index 41c56f3d..9f672db9 100644 --- a/src/layout/header-aside/layout.vue +++ b/src/layout/header-aside/layout.vue @@ -19,6 +19,8 @@
+ + @@ -55,23 +57,17 @@ diff --git a/src/pages/demo/playground/log/log/index.vue b/src/pages/demo/playground/log/log/index.vue new file mode 100644 index 00000000..c8115578 --- /dev/null +++ b/src/pages/demo/playground/log/log/index.vue @@ -0,0 +1,27 @@ + + + diff --git a/src/plugin/error/index.js b/src/plugin/error/index.js new file mode 100644 index 00000000..463a74e7 --- /dev/null +++ b/src/plugin/error/index.js @@ -0,0 +1,27 @@ +import store from '@/store' +import util from '@/libs/util' + +export default { + install (Vue, options) { + Vue.config.errorHandler = function (err, vm, info) { + Vue.nextTick(() => { + store.commit('d2adminLogAdd', { + type: 'error', + err, + vm, + info + }) + // 只在开发模式下打印 log + if (process.env.NODE_ENV === 'development') { + util.log.capsule('D2Admin', 'ErrorHandler', 'danger') + util.log.danger('>>>>>> 错误信息 >>>>>>') + console.log(info) + util.log.danger('>>>>>> Vue 实例 >>>>>>') + console.log(vm) + util.log.danger('>>>>>> Error >>>>>>') + console.log(err) + } + }) + } + } +} diff --git a/src/plugin/log/index.js b/src/plugin/log/index.js new file mode 100644 index 00000000..6d56a13f --- /dev/null +++ b/src/plugin/log/index.js @@ -0,0 +1,16 @@ +import store from '@/store' +import util from '@/libs/util' + +export default { + install (Vue, options) { + // 快速打印 log + Vue.prototype.$log = util.log + // 快速记录日志 + Vue.prototype.$logAdd = function (info) { + store.commit('d2adminLogAdd', { + type: 'log', + info + }) + } + } +} diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index 21708707..66314f5e 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -b3aa52d67ec41a212ff824829e2d713f2c21111c \ No newline at end of file +ca12a11b6d9d0552250eb2da1e7bac555902f68d \ No newline at end of file diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id index 2ea59ae8..dc92c562 100644 --- a/src/store/modules/d2admin.js.REMOVED.git-id +++ b/src/store/modules/d2admin.js.REMOVED.git-id @@ -1 +1 @@ -f6b747b5dbf484da5c8b5876c9d54212c90c3550 \ No newline at end of file +082feab1bf6e53d7b8e4b5ec8fc6e0198453af65 \ No newline at end of file