Merge pull request #1 from ye17186/master-202005

1、国际化功能功能修复；2、Input组件集成

src/plugins/full-router.js → src/assets/config/full-router.js

@@ -2,12 +2,12 @@ const initFullRouters = function () {
  return {
  path: '/a',
  name: 'Admin',
- component: () => import('../components/layout/YcLayout'),
+ component: () => import('../../components/layout/YcLayout'),
  children: [
  {
  path: 'home',
  name: 'Home',
- component: () => import('../views/admin/Home'),
+ component: () => import('../../views/admin/Home'),
  meta: {
  title: '首页',
  icon: 'el-icon-exp-home',
@@ -16,7 +16,7 @@ const initFullRouters = function () {
  }, {
  path: 'example',
  name: '组件示例',
- component: () => import('../views/admin/EmptyPage'),
+ component: () => import('../../views/admin/EmptyPage'),
  meta: {
  title: '组件示例',
  icon: 'el-icon-s-grid'
@@ -25,7 +25,7 @@ const initFullRouters = function () {
  {
  path: 'basic',
  name: 'Basic',
- component: () => import('../views/admin/EmptyPage'),
+ component: () => import('../../views/admin/EmptyPage'),
  meta: {
  title: 'Basic',
  icon: 'el-icon-c-scale-to-original'
@@ -34,39 +34,39 @@ const initFullRouters = function () {
  {
  path: 'layout',
  name: 'Layout',
- component: () => import('../views/admin/example/basic/Layout'),
+ component: () => import('../../views/admin/example/basic/Layout'),
  meta: {
  title: 'Layout',
  icon: 'el-icon-document-copy'
  }
  }, {
  path: 'container',
  name: 'Container',
- component: () => import('../views/admin/example/basic/Container'),
+ component: () => import('../../views/admin/example/basic/Container'),
  meta: {
  title: 'Container',
  icon: 'el-icon-document'
  }
  }, {
  path: 'icon',
  name: 'Icon',
- component: () => import('../views/admin/example/basic/Icon'),
+ component: () => import('../../views/admin/example/basic/Icon'),
  meta: {
  title: 'Icon',
  icon: 'el-icon-finished'
  }
  }, {
  path: 'button',
  name: 'Button',
- component: () => import('../views/admin/example/basic/Button'),
+ component: () => import('../../views/admin/example/basic/Button'),
  meta: {
  title: 'Button',
  icon: 'el-icon-search'
  }
  }, {
  path: 'link',
  name: 'Link',
- component: () => import('../views/admin/example/basic/Link'),
+ component: () => import('../../views/admin/example/basic/Link'),
  meta: {
  title: 'Link',
  icon: 'el-icon-link'
@@ -76,7 +76,7 @@ const initFullRouters = function () {
  }, {
  path: 'form',
  name: 'Form',
- component: () => import('../views/admin/EmptyPage'),
+ component: () => import('../../views/admin/EmptyPage'),
  meta: {
  title: 'Form',
  icon: 'el-icon-film'
@@ -85,35 +85,43 @@ const initFullRouters = function () {
  {
  path: 'radio',
  name: 'Radio',
- component: () => import('../views/admin/example/form/Radio'),
+ component: () => import('../../views/admin/example/form/Radio'),
  meta: {
  title: 'Radio',
  icon: 'el-icon-open'
  }
  }, {
  path: 'checkbox',
  name: 'Checkbox',
- component: () => import('../views/admin/example/form/Checkbox'),
+ component: () => import('../../views/admin/example/form/Checkbox'),
  meta: {
  title: 'Checkbox',
  icon: 'el-icon-set-up'
  }
+ }, {
+ path: 'input',
+ name: 'Input',
+ component: () => import('../../views/admin/example/form/Input'),
+ meta: {
+ title: 'Input',
+ icon: 'el-icon-set-up'
+ }
  }
  ]
  }
  ]
  }, {
  path: 'p1',
  name: 'Page1',
- component: () => import('../views/admin/page1/Page1'),
+ component: () => import('../../views/admin/page1/Page1'),
  meta: {
  title: 'Page1',
  icon: 'el-icon-setting'
  }
  }, {
  path: 'p2',
  name: 'Page2',
- component: () => import('../views/admin/EmptyPage'),
+ component: () => import('../../views/admin/EmptyPage'),
  meta: {
  title: 'Page2',
  icon: 'el-icon-exp-account'
@@ -122,7 +130,7 @@ const initFullRouters = function () {
  {
  path: 'p2-1',
  name: 'Page2-1',
- component: () => import('../views/admin/page2/page2-1/Page2-1'),
+ component: () => import('../../views/admin/page2/page2-1/Page2-1'),
  meta: {
  title: 'Page2-1',
  icon: 'el-icon-exp-usergroup',
@@ -131,7 +139,7 @@ const initFullRouters = function () {
  }, {
  path: 'p2-Detail/:detailId',
  name: 'Page2-Detail',
- component: () => import('../views/admin/page2/page2-1/SubDetail'),
+ component: () => import('../../views/admin/page2/page2-1/SubDetail'),
  meta: {
  title: 'Page2-Detail',
  icon: 'el-icon-setting',
@@ -140,7 +148,7 @@ const initFullRouters = function () {
  }, {
  path: 'p2-2',
  name: 'Page2-2',
- component: () => import('../views/admin/page2/Page2'),
+ component: () => import('../../views/admin/page2/Page2'),
  meta: {
  key: 'Page2-2',
  title: 'Page2-2',

src/assets/i18n/i18n.js

@@ -1,17 +1,19 @@
 import Vue from 'vue'
 import locale from 'element-ui/lib/locale'
+import enLocale from 'element-ui/lib/locale/lang/en'
+import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
+
 import VueI18n from 'vue-i18n'
 import en from './lang/en'
-import cn from './lang/cn'
+import zhCN from './lang/zh-CN'
 Vue.use(VueI18n)
 
 const messages = {
- en: en,
- cn: cn
+ en: { ...en, ...enLocale },
+ 'zh-CN': { ...zhCN, ...zhLocale }
 }
-
 const i18n = new VueI18n({
- locale: 'cn', // 设置默认语言
+ locale: 'zh-CN', // 设置默认语言
  messages
 })
 locale.i18n((key, value) => i18n.t(key, value))

src/plugins/utils/RouteUtils.js

@@ -1,6 +1,6 @@
 import router from '../../router'
 import store from '../../store'
-import { getFullRouters } from '../full-router'
+import { getFullRouters } from '../../assets/config/full-router'
 
 /**
  * 递归构建用户路由

src/views/admin/example/form/Input.vue

@@ -0,0 +1,86 @@
+<template>
+ <div class="input-demo">
+ {{ $t('el.select.noData') }}
+ <section>
+ <el-divider content-position="left">基础用法</el-divider>
+ <el-input v-model="input" placeholder="请输入内容"></el-input>
+ </section>
+
+ <section>
+ <el-divider content-position="left">禁用状态</el-divider>
+ <el-input v-model="input1" placeholder="请输入内容" disabled></el-input>
+ </section>
+
+ <section>
+ <el-divider content-position="left">可清空</el-divider>
+ <el-input v-model="input2" placeholder="请输入内容" clearable></el-input>
+ </section>
+
+ <section>
+ <el-divider content-position="left">密码框</el-divider>
+ <el-input placeholder="请输入密码" v-model="input3" show-password></el-input>
+ </section>
+
+ <section>
+ <el-divider content-position="left">带icon的输入框</el-divider>
+ <el-input class="m-10-0" placeholder="请选择日期" suffix-icon="el-icon-date" v-model="input4"></el-input>
+ <el-input placeholder="请选择日期" prefix-icon="el-icon-date" v-model="input5"></el-input>
+ </section>
+
+ <section>
+ <el-divider content-position="left">文本域</el-divider>
+ <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="input6">
+ </el-input>
+ </section>
+
+ <section>
+ <el-divider content-position="left">可自适应文本高度的文本域</el-divider>
+ <el-input class="m-10-0" type="textarea" autosize placeholder="请输入内容" v-model="input7"></el-input>
+ <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="请输入内容" v-model="input8"></el-input>
+ </section>
+
+ <section>
+ <el-divider content-position="left">复合型输入框</el-divider>
+ <el-input placeholder="请输入内容" v-model="input9">
+ <template slot="prepend">Http://</template>
+ </el-input>
+ <el-input class="m-10-0" placeholder="请输入内容" v-model="input10">
+ <template slot="append">.com</template>
+ </el-input>
+ <el-input placeholder="请输入内容" v-model="input11">
+ <el-select slot="prepend" placeholder="请选择" v-model="select" :value="select" style="width: 130px;">
+ <el-option label="餐厅名" value="1"></el-option>
+ <el-option label="订单号" value="2"></el-option>
+ <el-option label="用户电话" value="3"></el-option>
+ </el-select>
+ <el-button slot="append" icon="el-icon-search"></el-button>
+ </el-input>
+ </section>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'Input',
+ data: function () {
+ return {
+ input: '',
+ input1: '',
+ input2: '',
+ input3: '',
+ input4: '',
+ input5: '',
+ input6: '',
+ input7: '',
+ input8: '',
+ input9: '',
+ input10: '',
+ input11: '',
+ select: ''
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>