Merge branch 'develop' of github.com:TaleLin/lin-cms-vue into develop

Author: GongJS

.eslintrc.js

@@ -13,7 +13,6 @@ module.exports = {
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'linebreak-style': [0, 'error', 'windows'],
     'import/extensions': 0, // import不需要写文件扩展名
     'import/no-unresolved': 0,
     // 'import/no-duplicates': 0,

package-lock.json

@@ -13,11 +13,11 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
-    "@babel/polyfill": "^7.2.5",
+    "@babel/polyfill": "^7.4.4",
     "@tinymce/tinymce-vue": "^2.1.0",
     "axios": "~0.18.0",
-    "element-ui": "^2.8.2",
-    "event-source-polyfill": "^0.0.16",
+    "element-ui": "^2.10.1",
+    "event-source-polyfill": "^1.0.7",
     "fastscan": "^1.0.4",
     "good-storage": "^1.1.0",
     "js-cookie": "^2.2.0",
@@ -26,41 +26,41 @@
     "photoswipe": "^4.1.2",
     "screenfull": "^4.2.0",
     "tinymce": "^5.0.12",
-    "vue": "^2.6.8",
+    "vue": "^2.6.10",
     "vue-awesome-swiper": "^3.1.3",
     "vue-croppa": "^1.3.8",
-    "vue-router": "~3.0.1",
-    "vuex": "~3.0.1",
-    "vuex-persist": "^2.0.0"
+    "vue-router": "^3.0.7",
+    "vuex": "^3.1.1",
+    "vuex-persist": "^2.0.1"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.4.0",
-    "@vue/cli-plugin-eslint": "^3.4.0",
-    "@vue/cli-plugin-unit-jest": "^3.7.0",
-    "@vue/cli-service": "^3.4.0",
-    "@vue/eslint-config-airbnb": "^4.0.0",
+    "@vue/cli-plugin-babel": "^3.9.2",
+    "@vue/cli-plugin-eslint": "^3.9.2",
+    "@vue/cli-plugin-unit-jest": "^3.9.0",
+    "@vue/cli-service": "^3.9.2",
+    "@vue/eslint-config-airbnb": "^4.0.1",
     "@vue/test-utils": "1.0.0-beta.29",
     "babel-core": "7.0.0-bridge.0",
-    "babel-eslint": "^10.0.1",
-    "babel-jest": "^23.6.0",
+    "babel-eslint": "^10.0.2",
+    "babel-jest": "^24.8.0",
     "babel-plugin-component": "^1.1.1",
     "chalk": "^2.4.2",
     "child_process": "^1.0.2",
     "cz-conventional-changelog": "^2.1.0",
-    "directory-tree": "^2.2.1",
-    "ejs": "^2.6.1",
-    "eslint": "^5.8.0",
-    "eslint-plugin-vue": "^5.0.0",
-    "fs-extra": "^7.0.1",
-    "inquirer": "^6.2.2",
-    "js-yaml": "^3.12.2",
+    "directory-tree": "^2.2.3",
+    "ejs": "^2.6.2",
+    "eslint": "^6.0.1",
+    "eslint-plugin-vue": "^5.2.3",
+    "fs-extra": "^8.1.0",
+    "inquirer": "^6.5.0",
+    "js-yaml": "^3.13.1",
     "node-sass": "^4.12.0",
     "sass-loader": "^7.1.0",
-    "semver": "^5.6.0",
+    "semver": "^6.2.0",
     "shelljs": "^0.8.3",
     "validate-npm-package-name": "^3.0.0",
     "vue-markdown-loader": "^2.4.1",
-    "vue-template-compiler": "^2.6.8",
+    "vue-template-compiler": "^2.6.10",
     "yaml-front-matter": "^4.0.0"
   },
   "postcss": {

package.json

@@ -80,9 +80,8 @@
 </template>
 
 <script>
-import Utils from '@/lin/utils/util'
-/* eslint-disable no-restricted-syntax */
 import { mapGetters } from 'vuex'
+import Utils from '@/lin/utils/util'
 
 export default {
   props: ['isCollapse'],

src/components/layout/SideBar.vue

@@ -106,9 +106,9 @@
 
 <script>
 import { mapActions, mapGetters } from 'vuex'
-import User from '@/lin/models/user'
 import Vue from 'vue'
 import Croppa from 'vue-croppa'
+import User from '@/lin/models/user'
 import 'vue-croppa/dist/vue-croppa.css'
 import defaultAvatar from '@/assets/img/user/user.png'
 

src/components/layout/User.vue

@@ -1,5 +1,5 @@
 const Config = {
-  baseUrl: 'http://dev.lin.colorful3.com/',
+  baseUrl: process.env.VUE_APP_BASE_URL,
   stagnateTime: 1 * 60 * 60 * 1000, // 无操作停滞时间  默认1小时
   openAutoJumpOut: true, // 是否开启无操作跳出
   notLoginRoute: ['login'], // 无需登录即可访问的路由 name,

src/config/index.js

@@ -4,6 +4,7 @@ import axios from 'axios'
 import Config from '@/config'
 import store from '@/store'
 import { getToken } from '@/lin/utils/token'
+// eslint-disable-next-line import/no-cycle
 import User from '@/lin/models/user'
 
 

src/lin/plugins/axios.js

@@ -7,6 +7,7 @@ import '@/lin/filter'
 import '@/lin/plugins'
 import '@/lin/directives'
 
+import CollapseTransition from 'element-ui/lib/transitions/collapse-transition'
 import router from '@/router'
 import store from '@/store'
 import App from '@/App.vue'
@@ -15,10 +16,10 @@ import StickyTop from '@/components/base/sticky-top/sticky-top'
 import LIcon from '@/components/base/icon/lin-icon'
 import SourceCode from '@/components/base/source-code/source-code'
 
-import CollapseTransition from 'element-ui/lib/transitions/collapse-transition'
 
 import '@/assets/styles/index.scss' // eslint-disable-line
 import '@/assets/styles/realize/element-variables.scss'
+import 'element-ui/lib/theme-chalk/display.css'
 
 Vue.config.productionTip = false
 

src/main.js

@@ -27,8 +27,8 @@
           >
             <el-input size="medium"  clearable type="password" v-model="form.confirm_password" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item v-if="pageType !== 'password'" label="选择分组">
-            <el-select  size="medium" filterable v-model="form.group_id" placeholder="请选择分组">
+          <el-form-item v-if="pageType !== 'password'" label="选择分组" >
+            <el-select  size="medium" filterable v-model="form.group_id" :disabled="groups.length === 0" placeholder="请选择分组">
               <el-option
                 v-for="item in groups"
                 :key="item.id"
@@ -122,7 +122,7 @@ export default {
         password: '',
         confirm_password: '',
         email: '',
-        group_id: 0,
+        group_id: '请先创建分组',
       },
       // 验证规则
       rules: {

src/views/admin/user/UserInfo.vue

@@ -67,11 +67,11 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import log from 'lin/models/log'
+import { searchLogKeyword } from 'lin/utils/search'
 import LinSearch from '@/components/base/search/lin-search'
 import LinDatePicker from '@/components/base/date-picker/lin-date-picker'
-import { searchLogKeyword } from 'lin/utils/search'
-import { mapGetters } from 'vuex'
 
 export default {
   components: {