导航栏样式修改

行政区划选择器修改,数据缩减至区级
master
toesbieya 6 years ago
parent 925036e6f8
commit 156a4d8a79
  1. 1
      vue/public/static/json/region-pca.json
  2. 1
      vue/public/static/json/region-pcas.json
  3. 14
      vue/src/components/RegionSelector/Tab/index.vue
  4. 2
      vue/src/config/index.js
  5. 4
      vue/src/layout/components/Header.vue
  6. 1
      vue/src/layout/components/Navbar/style.scss

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -65,7 +65,6 @@
const PROVINCE_CITIES = ['北京市', '天津市', '上海市', '重庆市'] const PROVINCE_CITIES = ['北京市', '天津市', '上海市', '重庆市']
const DEFAULT_TABS = [{name: '省/直辖市'}, {name: '市'}, {name: '区/县'}, {name: '乡/镇/街道'}] const DEFAULT_TABS = [{name: '省/直辖市'}, {name: '市'}, {name: '区/县'}, {name: '乡/镇/街道'}]
const DEFAULT_MAX_LEVEL = 4
export default { export default {
name: "RegionTabSelector", name: "RegionTabSelector",
@ -74,6 +73,7 @@
props: { props: {
value: [String, Array], value: [String, Array],
maxLevel: {type: Number, default: 3},
separation: {type: String, default: ','} separation: {type: String, default: ','}
}, },
@ -82,7 +82,7 @@
loading: false, loading: false,
searchText: '', searchText: '',
currentLevel: 1, currentLevel: 1,
maxLevel: DEFAULT_MAX_LEVEL, realMaxLevel: this.maxLevel,
selected: [], selected: [],
treeData: [], treeData: [],
items: [] items: []
@ -143,18 +143,18 @@
//-1''tab //-1''tab
if (PROVINCE_CITIES.includes(item.name)) { if (PROVINCE_CITIES.includes(item.name)) {
next.splice(1, 1) next.splice(1, 1)
this.maxLevel = DEFAULT_MAX_LEVEL - 1 this.realMaxLevel = this.maxLevel - 1
} }
else this.maxLevel = DEFAULT_MAX_LEVEL else this.realMaxLevel = this.maxLevel
} }
this.selected = prev.concat(next.slice(level, this.maxLevel)) this.selected = prev.concat(next.slice(level, this.realMaxLevel))
}, },
nextTab() { nextTab() {
this.searchText = '' this.searchText = ''
// //
if (this.currentLevel >= this.maxLevel) { if (this.currentLevel >= this.realMaxLevel) {
this.done() this.done()
} }
else this.currentLevel++ else this.currentLevel++
@ -202,7 +202,7 @@
}, },
removeAll() { removeAll() {
this.maxLevel = DEFAULT_MAX_LEVEL this.realMaxLevel = this.maxLevel
this.selected = JSON.parse(JSON.stringify(DEFAULT_TABS)) this.selected = JSON.parse(JSON.stringify(DEFAULT_TABS))
this.currentLevel = 1 this.currentLevel = 1
this.searchText = '' this.searchText = ''

@ -40,5 +40,5 @@ module.exports = {
filePreviewPrefix: isDevelopment ? 'http://localhost:8012' : 'https://preview.toesbieya.cn', filePreviewPrefix: isDevelopment ? 'http://localhost:8012' : 'https://preview.toesbieya.cn',
//省市地区json数据请求地址 //省市地区json数据请求地址
regionDataUrl: `${contextPath}static/json/region-pcas.json` regionDataUrl: `${contextPath}static/json/region-pca.json`
} }

@ -96,6 +96,10 @@
&.hide-header { &.hide-header {
height: 0; height: 0;
> .navbar {
height: 0;
}
} }
} }
</style> </style>

@ -2,6 +2,7 @@
.navbar { .navbar {
height: $nav-height; height: $nav-height;
transition: height .3s ease-in-out;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
z-index: 9; z-index: 9;

Loading…
Cancel
Save