{{ scope.row.id }}
@@ -87,7 +87,7 @@ export default {
listLoading: true,
listQuery: {
page: 1,
- limit: 10
+ limit: 20
}
}
},
diff --git a/src/views/excel/components/AutoWidthOption.vue b/src/views/excel/components/AutoWidthOption.vue
new file mode 100644
index 00000000..06aad430
--- /dev/null
+++ b/src/views/excel/components/AutoWidthOption.vue
@@ -0,0 +1,30 @@
+
+
+
+
+ True
+ False
+
+
+
+
+
diff --git a/src/views/excel/components/BookTypeOption.vue b/src/views/excel/components/BookTypeOption.vue
new file mode 100644
index 00000000..9970b0e4
--- /dev/null
+++ b/src/views/excel/components/BookTypeOption.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/excel/components/FilenameOption.vue b/src/views/excel/components/FilenameOption.vue
new file mode 100644
index 00000000..5cc931ad
--- /dev/null
+++ b/src/views/excel/components/FilenameOption.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/excel/exportExcel.vue b/src/views/excel/exportExcel.vue
index ae32b3aa..551b89f8 100644
--- a/src/views/excel/exportExcel.vue
+++ b/src/views/excel/exportExcel.vue
@@ -2,14 +2,15 @@
-
-
-
-
- True
- False
-
-
{{ $t('excel.export') }} Excel
+
@@ -46,15 +47,22 @@
import { fetchList } from '@/api/article'
import { parseTime } from '@/utils'
+// options components
+import FilenameOption from './components/FilenameOption'
+import AutoWidthOption from './components/AutoWidthOption'
+import BookTypeOption from './components/BookTypeOption'
+
export default {
name: 'ExportExcel',
+ components: { FilenameOption, AutoWidthOption, BookTypeOption },
data() {
return {
list: null,
listLoading: true,
downloadLoading: false,
filename: '',
- autoWidth: true
+ autoWidth: true,
+ bookType: 'xlsx'
}
},
created() {
@@ -79,7 +87,8 @@ export default {
header: tHeader,
data,
filename: this.filename,
- autoWidth: this.autoWidth
+ autoWidth: this.autoWidth,
+ bookType: this.bookType
})
this.downloadLoading = false
})
diff --git a/src/views/excel/selectExcel.vue b/src/views/excel/selectExcel.vue
index 7e5366f4..2695bfb4 100644
--- a/src/views/excel/selectExcel.vue
+++ b/src/views/excel/selectExcel.vue
@@ -3,6 +3,9 @@
{{ $t('excel.selectedExport') }}
+
+ Documentation
+
-
+
+
+
{{ $t('i18nView.default') }}
@@ -57,7 +57,6 @@ export default {
data() {
return {
date: '',
- currentPage: 5,
tableData: [{
date: '2016-05-03',
name: 'Tom',
@@ -77,7 +76,9 @@ export default {
date: '2016-05-01',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
- }]
+ }],
+ options: [],
+ value: ''
}
},
computed: {
@@ -91,11 +92,35 @@ export default {
}
}
},
+ watch: {
+ lang() {
+ this.setOptions()
+ }
+ },
created() {
if (!this.$i18n.getLocaleMessage('en')[viewName]) {
this.$i18n.mergeLocaleMessage('en', local.en)
this.$i18n.mergeLocaleMessage('zh', local.zh)
}
+ this.setOptions() // set default select options
+ },
+ methods: {
+ setOptions() {
+ this.options = [
+ {
+ value: '1',
+ label: this.$t('i18nView.one')
+ },
+ {
+ value: '2',
+ label: this.$t('i18nView.two')
+ },
+ {
+ value: '3',
+ label: this.$t('i18nView.three')
+ }
+ ]
+ }
}
}
diff --git a/src/views/i18n-demo/local.js b/src/views/i18n-demo/local.js
index 7977d2f9..1c39608e 100644
--- a/src/views/i18n-demo/local.js
+++ b/src/views/i18n-demo/local.js
@@ -5,6 +5,7 @@ export default {
title: '切换语言',
note: '本项目国际化基于 vue-i18n',
datePlaceholder: '请选择日期',
+ selectPlaceholder: '请选择',
tableDate: '日期',
tableName: '姓名',
tableAddress: '地址',
@@ -13,15 +14,18 @@ export default {
success: '成功按钮',
info: '信息按钮',
warning: '警告按钮',
- danger: '危险按钮'
+ danger: '危险按钮',
+ one: '一',
+ two: '二',
+ three: '三'
}
-
},
en: {
i18nView: {
title: 'Switch Language',
note: 'The internationalization of this project is based on vue-i18n',
datePlaceholder: 'Pick a day',
+ selectPlaceholder: 'Select',
tableDate: 'tableDate',
tableName: 'tableName',
tableAddress: 'tableAddress',
@@ -30,7 +34,10 @@ export default {
success: 'success',
info: 'info',
warning: 'warning',
- danger: 'danger'
+ danger: 'danger',
+ one: 'One',
+ two: 'Two',
+ three: 'Three'
}
}
}
diff --git a/src/views/layout/components/Sidebar/FixiOSBug.js b/src/views/layout/components/Sidebar/FixiOSBug.js
new file mode 100644
index 00000000..5e0a9262
--- /dev/null
+++ b/src/views/layout/components/Sidebar/FixiOSBug.js
@@ -0,0 +1,26 @@
+export default {
+ computed: {
+ device() {
+ return this.$store.state.app.device
+ }
+ },
+ mounted() {
+ // In order to fix the click on menu on the ios device will trigger the mouseeleave bug
+ // https://github.com/PanJiaChen/vue-element-admin/issues/1135
+ this.fixBugIniOS()
+ },
+ methods: {
+ fixBugIniOS() {
+ const $submenu = this.$refs.submenu
+ if ($submenu) {
+ const handleMouseleave = $submenu.handleMouseleave
+ $submenu.handleMouseleave = (e) => {
+ if (this.device === 'mobile') {
+ return
+ }
+ handleMouseleave(e)
+ }
+ }
+ }
+ }
+}
diff --git a/src/views/layout/components/Sidebar/Link.vue b/src/views/layout/components/Sidebar/Link.vue
new file mode 100644
index 00000000..07793b9a
--- /dev/null
+++ b/src/views/layout/components/Sidebar/Link.vue
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
index 6e461d4a..9398af87 100644
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ b/src/views/layout/components/Sidebar/SidebarItem.vue
@@ -1,27 +1,33 @@
-
+
export default {
beforeCreate() {
- const path = this.$route.params.path
- this.$router.replace('/' + path)
+ const { params, query } = this.$route
+ const { path } = params
+ this.$router.replace({ path: '/' + path, query })
},
render: function(h) {
return h() // avoid warning message
diff --git a/src/views/table/complexTable.vue b/src/views/table/complexTable.vue
index 205fb001..b7fc076c 100644
--- a/src/views/table/complexTable.vue
+++ b/src/views/table/complexTable.vue
@@ -24,7 +24,7 @@
border
fit
highlight-current-row
- style="width: 100%;min-height:1000px;">
+ style="width: 100%;">
{{ scope.row.id }}
@@ -81,7 +81,7 @@
@@ -111,8 +111,7 @@