diff --git a/Web/package.json b/Web/package.json index 7c932a7..c51e772 100644 --- a/Web/package.json +++ b/Web/package.json @@ -13,6 +13,7 @@ "core-js": "^3.6.5", "crypto-js": "^4.0.0", "echarts": "^5.0.2", + "highlight.js": "^10.7.2", "less": "^3.12.2", "less-loader": "4.1.0", "lodash": "^4.17.21", @@ -20,6 +21,7 @@ "swiper": "^6.5.0", "vue": "^2.6.11", "vue-awesome-swiper": "^4.1.1", + "vue-highlight.js": "^3.1.0", "vue-router": "^3.5.1" }, "devDependencies": { diff --git a/Web/public/doc-code/seed/addForm.vue b/Web/public/doc-code/seed/addForm.vue new file mode 100644 index 0000000..28c81b2 --- /dev/null +++ b/Web/public/doc-code/seed/addForm.vue @@ -0,0 +1,78 @@ + + \ No newline at end of file diff --git a/Web/public/doc-code/seed/editForm.vue b/Web/public/doc-code/seed/editForm.vue new file mode 100644 index 0000000..6f96748 --- /dev/null +++ b/Web/public/doc-code/seed/editForm.vue @@ -0,0 +1,79 @@ + + \ No newline at end of file diff --git a/Web/public/doc-code/seed/form.vue b/Web/public/doc-code/seed/form.vue new file mode 100644 index 0000000..ab74d56 --- /dev/null +++ b/Web/public/doc-code/seed/form.vue @@ -0,0 +1,100 @@ + + \ No newline at end of file diff --git a/Web/public/doc-code/seed/query.vue b/Web/public/doc-code/seed/query.vue new file mode 100644 index 0000000..c88a70c --- /dev/null +++ b/Web/public/doc-code/seed/query.vue @@ -0,0 +1,189 @@ + + \ No newline at end of file diff --git a/Web/public/doc-code/seed/vue.json b/Web/public/doc-code/seed/vue.json new file mode 100644 index 0000000..6ff84f8 --- /dev/null +++ b/Web/public/doc-code/seed/vue.json @@ -0,0 +1,9 @@ +{ + "seed-index.vue": { + "prefix": "seed.index", + "body": [ + "" + ] + } +} \ No newline at end of file diff --git a/Web/src/App.vue b/Web/src/App.vue index 67822e7..bd456df 100644 --- a/Web/src/App.vue +++ b/Web/src/App.vue @@ -9,10 +9,6 @@ \ No newline at end of file diff --git a/Web/src/components/yoTreeLayout/index.js b/Web/src/components/yoTreeLayout/index.js index 2cdac96..e50a0d8 100644 --- a/Web/src/components/yoTreeLayout/index.js +++ b/Web/src/components/yoTreeLayout/index.js @@ -122,6 +122,10 @@ export default { this.onUpdateSwiper() }, + onUnexpandAll() { + this.expandedKeys = [] + }, + onSearch(value) { const expandedKeys = this.list .map(p => { @@ -136,6 +140,10 @@ export default { this.expandedKeys = expandedKeys this.autoExpandParent = true + this.$nextTick(() => { + this.onUpdateSwiper() + }) + }, onSelect(selectedKeys) { @@ -238,6 +246,11 @@ export default { +
+ + + +
diff --git a/Web/src/main.js b/Web/src/main.js index a4b1f0f..731d3a5 100644 --- a/Web/src/main.js +++ b/Web/src/main.js @@ -25,6 +25,10 @@ import getAwesomeSwiper from 'vue-awesome-swiper/dist/exporter' SwiperClass.use([Pagination, Mousewheel, Autoplay, Scrollbar]) Vue.use(getAwesomeSwiper(SwiperClass)) +import hljs from 'highlight.js' +import 'highlight.js/styles/vs2015.css' +Vue.use(hljs.vuePlugin); + /** * api全局化 */ @@ -36,7 +40,30 @@ Vue.prototype.$api = api */ import _ from 'lodash' Vue.prototype.$_ = _ - +/** + * moment全局化 + */ +import moment from 'moment' +import 'moment/locale/zh-cn' +moment.updateLocale('zh-cn', { + meridiem: function (hour, minute, isLowercase) { + if (hour < 9) { + return '早上' + } else if (hour < 11) { + return '上午' + } else if (hour < 13) { + return '中午' + } else if (hour < 18) { + return '下午' + } else { + return '晚上' + } + } +}) +Vue.prototype.$moment = moment +/** + * 权限验证全局化 + */ import { auth } from './components/authorized' Vue.prototype.$auth = auth diff --git a/Web/src/pages/css/app.css b/Web/src/pages/css/app.css deleted file mode 100644 index e69de29..0000000 diff --git a/Web/src/pages/doc/use.vue b/Web/src/pages/doc/use.vue deleted file mode 100644 index 0bc6fc9..0000000 --- a/Web/src/pages/doc/use.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/Web/src/pages/home/index.vue b/Web/src/pages/home/index.vue index 493baf3..b5ccad3 100644 --- a/Web/src/pages/home/index.vue +++ b/Web/src/pages/home/index.vue @@ -6,17 +6,14 @@
- +

- 上午好, - 软件开发人员,欢迎您登录系统! + {{ $moment().format('A') }}好, + {{ $root.global.info.nickName || $root.global.info.name }},欢迎您登录系统!

-

上次IP:115.217.160.156 上次登录时间:2021-04-06 13:10:13

+

上次IP:{{ $root.global.info.lastLoginIp }} 上次登录时间:{{ $root.global.info.lastLoginTime }}

diff --git a/Web/src/pages/home/notice.vue b/Web/src/pages/home/notice.vue index 205f806..1e7144c 100644 --- a/Web/src/pages/home/notice.vue +++ b/Web/src/pages/home/notice.vue @@ -3,7 +3,10 @@ 更多 - + @@ -11,8 +14,6 @@ \ No newline at end of file diff --git a/Web/src/pages/system/config/form.vue b/Web/src/pages/system/config/form.vue index 16e8277..e12a41f 100644 --- a/Web/src/pages/system/config/form.vue +++ b/Web/src/pages/system/config/form.vue @@ -37,7 +37,6 @@ diff --git a/Web/src/pages/system/doc/seed/form.vue b/Web/src/pages/system/doc/seed/form.vue new file mode 100644 index 0000000..5dc650c --- /dev/null +++ b/Web/src/pages/system/doc/seed/form.vue @@ -0,0 +1,33 @@ + + \ No newline at end of file diff --git a/Web/src/pages/system/doc/seed/index.vue b/Web/src/pages/system/doc/seed/index.vue new file mode 100644 index 0000000..ac99884 --- /dev/null +++ b/Web/src/pages/system/doc/seed/index.vue @@ -0,0 +1,45 @@ + + \ No newline at end of file diff --git a/Web/src/pages/system/doc/seed/query.vue b/Web/src/pages/system/doc/seed/query.vue new file mode 100644 index 0000000..6d2555f --- /dev/null +++ b/Web/src/pages/system/doc/seed/query.vue @@ -0,0 +1,19 @@ + + \ No newline at end of file diff --git a/Web/src/pages/system/doc/usage.vue b/Web/src/pages/system/doc/usage.vue new file mode 100644 index 0000000..383e738 --- /dev/null +++ b/Web/src/pages/system/doc/usage.vue @@ -0,0 +1,17 @@ + + \ No newline at end of file diff --git a/Web/src/pages/system/log/oplog/index.vue b/Web/src/pages/system/log/oplog/index.vue index cb37a3b..38ffa4f 100644 --- a/Web/src/pages/system/log/oplog/index.vue +++ b/Web/src/pages/system/log/oplog/index.vue @@ -44,7 +44,7 @@