diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100755 index 00000000..1a114bc0 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,33 @@ +--- +name: Bug report(报告问题) +about: Create a report to help us improve +--- + + + +## Bug report(问题描述) + +#### Steps to reproduce(问题复现步骤) + + +#### Screenshot or Gif(截图或动态图) + + +#### Link to minimal reproduction(最小可在线还原demo) + + + +#### Other relevant information(格外信息) +- Your OS: +- Node.js version: +- vue-element-admin version: diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100755 index 00000000..c33d10d4 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,7 @@ +--- +name: Feature Request(新功能建议) +about: Suggest an idea for this project +--- + +## Feature request(新功能建议) + diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md new file mode 100755 index 00000000..96be4532 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.md @@ -0,0 +1,14 @@ +--- +name: Question(提问) +about: Asking questions about use +--- + +## Question(提问) + + diff --git a/mock/role/routes.js b/mock/role/routes.js index d8eaf42a..14413d48 100644 --- a/mock/role/routes.js +++ b/mock/role/routes.js @@ -19,7 +19,7 @@ export const constantRoutes = [ }, { path: '/auth-redirect', - component: 'views/login/authredirect', + component: 'views/login/authRedirect', hidden: true }, { diff --git a/src/components/DndList/index.vue b/src/components/DndList/index.vue index a4643c0a..23ca006e 100644 --- a/src/components/DndList/index.vue +++ b/src/components/DndList/index.vue @@ -2,7 +2,7 @@

{{ list1Title }}

- +
{{ element.id }}[{{ element.author }}] {{ element.title }} @@ -94,6 +94,11 @@ export default { if (this.isNotInList1(ele)) { this.list1.push(ele) } + }, + setData(dataTransfer) { + // to avoid Firefox bug + // Detail see : https://github.com/RubaXa/Sortable/issues/1012 + dataTransfer.setData('Text', '') } } } diff --git a/src/components/Kanban/index.vue b/src/components/Kanban/index.vue index 1171b5b8..c2cb4691 100644 --- a/src/components/Kanban/index.vue +++ b/src/components/Kanban/index.vue @@ -7,6 +7,7 @@ :list="list" v-bind="$attrs" class="board-column-content" + :set-data="setData" >
{{ element.name }} {{ element.id }} @@ -39,6 +40,13 @@ export default { return [] } } + }, + methods: { + setData(dataTransfer) { + // to avoid Firefox bug + // Detail see : https://github.com/RubaXa/Sortable/issues/1012 + dataTransfer.setData('Text', '') + } } } diff --git a/src/lang/index.js b/src/lang/index.js index 7c9c8af6..c443f41b 100644 --- a/src/lang/index.js +++ b/src/lang/index.js @@ -24,11 +24,24 @@ const messages = { ...elementEsLocale } } +export function getLanguage() { + const chooseLanguage = Cookies.get('language') + if (chooseLanguage) return chooseLanguage + // if has not choose language + const language = (navigator.language || navigator.browserLanguage).toLowerCase() + const locales = Object.keys(messages) + for (const locale of locales) { + if (language.indexOf(locale) > -1) { + return locale + } + } + return 'en' +} const i18n = new VueI18n({ // set locale // options: en | zh | es - locale: Cookies.get('language') || 'en', + locale: getLanguage(), // set locale messages messages }) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index b0ee54c1..d544f079 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,19 +1,19 @@