diff --git a/README.md b/README.md index 7bd28da..0f2139d 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ module.exports = { //是否开启主题配置按钮 themeBar: true, //是否显示多标签页 - tagsBar: true, + tabsBar: true, //是否显示骨架屏 skeleton: false, //配后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8 @@ -235,14 +235,14 @@ $base-logo-height: 75px; //顶部nav-bar的高度 $base-nav-bar-height: 60px; //顶部多标签页tags-bar的高度 -$base-tags-bar-height: 55px; +$base-tabs-bar-height: 55px; //顶部多标签页tags-bar中每一个item的高度 $base-tag-item-height: 34px; //菜单li标签的高度 $base-menu-item-height: 50px; //app-main的高度 $base-app-main-height: calc( - 100vh - #{$base-nav-bar-height} - #{$base-tags-bar-height} - + 100vh - #{$base-nav-bar-height} - #{$base-tabs-bar-height} - #{$base-padding} - #{$base-padding} - 55px - 30px ); //纵向布局时左侧导航未折叠时的宽度 diff --git a/mock/controller/changeLog.js b/mock/controller/changeLog.js index 641b75c..83868a6 100644 --- a/mock/controller/changeLog.js +++ b/mock/controller/changeLog.js @@ -98,7 +98,7 @@ const data = [ timestamp: "2020-05-16", }, { - content: "又被人骂了 挺好的 让我下定决心重写了tagsBar", + content: "又被人骂了 挺好的 让我下定决心重写了tabsBar", timestamp: "2020-05-20", }, { @@ -122,7 +122,7 @@ const data = [ timestamp: "2020-06-19", }, { - content: "彻底完成了tagsbar多标签页的重构", + content: "彻底完成了tabsBar多标签页的重构", timestamp: "2020-06-22", }, { @@ -186,6 +186,10 @@ const data = [ content: "完善路由后端渲染方案,弃用之前写法", timestamp: "2020-09-30", }, + { + content: "大版本迭代,请关注github tag", + timestamp: "2020-09-30", + }, ]; module.exports = [ diff --git a/package.json b/package.json index 5ab4110..78c1ad0 100644 --- a/package.json +++ b/package.json @@ -30,14 +30,12 @@ "type": "git", "url": "git+https://github.com/chuzhixin/vue-admin-beautiful.git" }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } + "gitHooks": { + "pre-commit": "lint-staged" }, "lint-staged": { - "src/**/*.{js,vue}": [ - "eslint --fix", + "*.{js,scss,vue}": [ + "vue-cli-service lint", "git add" ] }, @@ -47,7 +45,7 @@ "clipboard": "^2.0.6", "codemirror": "^5.58.1", "core-js": "^3.6.5", - "dayjs": "^1.9.0", + "dayjs": "^1.9.1", "echarts": "^4.9.0", "echarts-wordcloud": "^1.1.3", "element-ui": "^2.13.2", @@ -72,12 +70,12 @@ "zx-count": "^0.3.7", "zx-icon": "^1.1.9", "zx-keel": "^0.9.4", - "zx-layouts": "^0.6.13", + "zx-layouts": "^0.6.14", "zx-magnifie": "^0.4.0", "zx-markdown-editor": "^0.0.2", "zx-player": "^1.0.1", "zx-quill": "^0.0.2", - "zx-templates": "^0.0.22", + "zx-templates": "^0.0.23", "zx-verify": "^0.0.2" }, "devDependencies": { @@ -94,9 +92,8 @@ "compression-webpack-plugin": "^6.0.2", "eslint": "^7.10.0", "eslint-plugin-prettier": "^3.1.4", - "eslint-plugin-vue": "^6.2.2", + "eslint-plugin-vue": "^7.0.0", "filemanager-webpack-plugin": "^2.0.5", - "husky": "^4.3.0", "image-webpack-loader": "^7.0.1", "increase-memory-limit": "^1.0.7", "lint-staged": "^10.4.0", diff --git a/src/colorfulIcon/index.js b/src/colorfulIcon/index.js index 245c2b2..7637b53 100644 --- a/src/colorfulIcon/index.js +++ b/src/colorfulIcon/index.js @@ -1,7 +1,7 @@ import Vue from "vue"; import { ColorfullIcon } from "@/layouts/components"; -Vue.component("vab-colorful-icon", ColorfullIcon); +Vue.component("VabColorfulIcon", ColorfullIcon); const req = require.context("./svg", false, /\.svg$/), requireAll = (requireContext) => { /*let a = requireContext.keys().map(requireContext); diff --git a/src/components/VabImage/index.vue b/src/components/VabImage/index.vue index 1a51db5..e9b424e 100644 --- a/src/components/VabImage/index.vue +++ b/src/components/VabImage/index.vue @@ -41,10 +41,10 @@ mounted() {}, methods: { clickBig() { - this.$emit("clickBig"); + this.$emit("click-big"); }, clickSmall() { - this.$emit("clickSmall"); + this.$emit("click-small"); }, }, }; diff --git a/src/components/VabUpload/index.vue b/src/components/VabUpload/index.vue index 4032841..65fc0b2 100644 --- a/src/components/VabUpload/index.vue +++ b/src/components/VabUpload/index.vue @@ -161,7 +161,7 @@ this.imgSuccessNum = this.imgSuccessNum + 1; if (fileList.length === this.imgNum) { setTimeout(() => { - this.$emit("fetchDatas"); + this.$emit("fetch-datas"); this.$baseMessage( `上传完成! 共上传${fileList.length}张图片`, "success" diff --git a/src/config/settings.js b/src/config/settings.js index f237168..c1566c8 100644 --- a/src/config/settings.js +++ b/src/config/settings.js @@ -59,7 +59,7 @@ module.exports = { //是否开启主题配置按钮 themeBar: true, //是否显示多标签页 - tagsBar: true, + tabsBar: true, //是否显示骨架屏 skeleton: false, //配后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8 diff --git a/src/layouts/components/index.js b/src/layouts/components/index.js index 645619d..4f9ca57 100644 --- a/src/layouts/components/index.js +++ b/src/layouts/components/index.js @@ -11,7 +11,7 @@ export { default as Logo } from "zx-layouts/Logo"; export { default as Avatar } from "zx-layouts/Avatar"; export { default as Ad } from "./Ad"; export { default as AppMain } from "zx-layouts/AppMain"; -export { default as TagsBar } from "zx-layouts/TagsBar"; +export { default as TabsBar } from "zx-layouts/TabsBar"; export { default as SideBar } from "zx-layouts/SideBar"; export { default as Breadcrumb } from "zx-layouts/Breadcrumb"; export { default as FullScreenBar } from "zx-layouts/FullScreenBar"; diff --git a/src/layouts/index.vue b/src/layouts/index.vue index 60b2ba7..643c3b7 100644 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -5,17 +5,17 @@ class="layout-container-horizontal" :class="{ fixed: header === 'fixed', - 'no-tags-bar': tagsBar === 'false' || tagsBar === false, + 'no-tabs-bar': tabsBar === 'false' || tabsBar === false, }" >
- +
@@ -29,7 +29,7 @@ class="layout-container-vertical" :class="{ fixed: header === 'fixed', - 'no-tags-bar': tagsBar === 'false' || tagsBar === false, + 'no-tabs-bar': tabsBar === 'false' || tabsBar === false, }" >
- +
@@ -52,7 +52,7 @@