Merge pull request #238 from TaleLin/develop

Develop

Author: vanoneang

.env.production

@@ -1,3 +1,3 @@
 
 
-VUE_APP_BASE_URL = 'http://localhost:5000/'
+VUE_APP_BASE_URL = 'http://localhost:5000/'

.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,

README.md

@@ -89,7 +89,17 @@ QQ群搜索：林间有风 或 643205479
 
 ## 版本日志
 
-最新版本 `0.2.0`
+最新版本 `0.2.1`
+
+### 0.2.1
+
+1. `A` 新增一键清除 reuse tab
+2. `A` 新增侧边导航搜索，可在 config 配置是否启用
+3. `F` 修复 post put 等请求不能自动重发问题
+4. `U` 优化异常处理，框架默认弹出前端配置异常信息，可通过 handleError 和 showBackend 控制本次请求是否开发者自行处理和是否直接展示后端返回异常信息
+5. `C` 登录用户名字段由 nickname -> username，同时新增 nickname 为昵称字段，可以更新昵称(需后端同步修改)
+6. `U` 优化了一些移动端适配
+7. `C` 列表信息字段由 collection -> items, total_nums -> tatal, 增加 count、page、total_page字段（需后端同步修改）
 
 ### 0.2.0
 

package-lock.json

@@ -1,66 +1,66 @@
 {
   "name": "lin-cms",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "private": true,
   "scripts": {
     "serve": "node script/plugin-get-config.js && vue-cli-service serve",
     "build": "node script/plugin-get-config.js && vue-cli-service build",
     "lint": "vue-cli-service lint",
-    "commitizen": "commitizen init cz-conventional-changelog --save-dev --save-exact",
+    "commit": "git-cz",
     "plugin-init": "node script/plugin-init.js",
     "plugin-new": "node script/plugin-new.js",
     "plugin-reconfig": "node script/plugin-get-config.js",
     "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",
     "lodash": "^4.17.14",
     "moment": "^2.24.0",
     "photoswipe": "^4.1.2",
     "screenfull": "^4.2.0",
-    "tinymce": "^5.0.9",
-    "vue": "^2.6.8",
+    "tinymce": "^5.0.12",
+    "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

@@ -429,7 +429,7 @@ thead tr {
 }
 
 .el-menu-vertical-demo {
-  padding-top: 20px;
+  padding-top: 10px;
   border-right: 1px solid #1d2a60;
 }
 

public/iconfont.css

@@ -1,7 +1,7 @@
 $theme: #3963bc;
 
 /* 布局 */
-$sidebar-width: 175px;
+$sidebar-width: 190px;
 $sidebar-background: #192a5e;
 
 $navbar-height: 30px;

src/assets/styles/realize/element-variables.scss

@@ -0,0 +1,8 @@
+// eslint-disable-next-line
+const importAll = (requireContext) => requireContext.keys().forEach(requireContext)
+try {
+  // 导入所有插件
+  importAll(require.context('../../../../node_modules/tinymce/plugins', true))
+} catch (err) {
+  console.log(err)
+}

src/assets/styles/realize/lin-variables.scss

@@ -3,22 +3,12 @@
     <editor id="tinymceEditor" :init="tinymceInit" v-model="content" :key="tinymceFlag"></editor>
   </div>
 </template>
-
 <script>
 // eslint-disable-next-line
 import tinymce from 'tinymce/tinymce'
 import Editor from '@tinymce/tinymce-vue'
 import 'tinymce/themes/silver/theme'
-import 'tinymce/plugins/textcolor'
-import 'tinymce/plugins/advlist'
-import 'tinymce/plugins/table'
-import 'tinymce/plugins/lists'
-import 'tinymce/plugins/paste'
-import 'tinymce/plugins/preview'
-import 'tinymce/plugins/fullscreen'
-import 'tinymce/plugins/image'
-import 'tinymce/plugins/code'
-import 'tinymce/plugins/link'
+import './importAll'
 
 export default {
   name: 'TinymceEditor',
@@ -39,6 +29,11 @@ export default {
       type: Boolean,
       default: true,
     },
+    toolbar: {
+      type: String,
+      // eslint-disable-next-line
+      default: ' undo redo |formatselect | bold italic strikethrough forecolor backcolor formatpainter | link image | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent | removeformat | preview fullscreen code',
+    },
   },
   components: {
     Editor,
@@ -64,32 +59,25 @@ export default {
       statusbar: false, // 隐藏编辑器底部的状态栏
       paste_data_images: true, // 允许粘贴图像
       menubar: this.showMenubar, // 隐藏最上方menu
-      plugins: 'advlist table lists paste preview fullscreen image code link',
       // eslint-disable-next-line
-      toolbar:' undo redo |fontselect fontsizeselect forecolor backcolor bold italic underline strikethrough | alignleft aligncenter alignright alignjustify | link image | h1 h2 h3 blockquote table numlist bullist | preview fullscreen code',
+      plugins: 'print fullpage searchreplace autolink directionality visualblocks visualchars template codesample charmap hr pagebreak nonbreaking anchor toc insertdatetime wordcount textpattern help advlist table lists paste preview fullscreen image imagetools code link',
+      toolbar: this.toolbar,
       // eslint-disable-next-line
       images_upload_handler: async function(blobInfo, success, failure) {
-        // eslint-disable-next-line
-        let json
-        const xhr = new XMLHttpRequest()
-        xhr.withCredentials = false
-        xhr.open('POST', `${_this.upload_url}`)
-        // eslint-disable-next-line
-        xhr.onload = function() {
-          if (xhr.status !== 200) {
-            failure(`HTTP Error: ${xhr.status}`)
-            return
-          }
-          json = JSON.parse(xhr.responseText)
-          if (json[0] && json[0].url) {
-            success(json[0].url)
-          } else {
-            failure(`Invalid JSON: ${xhr.responseText}`)
+        const file = new File([blobInfo.blob()], blobInfo.filename(), {
+          type: 'image/*',
+        })
+        _this.$axios({
+          method: 'post',
+          url: '/cms/file',
+          data: {
+            file,
+          },
+        }).then((res) => {
+          if (res[0] && res[0].url) {
+            success(res[0].url)
           }
-        }
-        const formData = new FormData()
-        formData.append('file', blobInfo.blob(), blobInfo.filename())
-        xhr.send(formData)
+        }).catch(err => failure(err))
       },
     }
   },

src/components/base/tinymce/importAll.js

@@ -438,7 +438,7 @@ export default {
       })
       return this.$axios({
         method: 'post',
-        url: '/cms/file/',
+        url: '/cms/file',
         data,
       }).then((res) => {
         if (!Array.isArray(res) || res.length === 0) {

src/components/base/tinymce/index.vue

@@ -0,0 +1,29 @@
+<template>
+  <div title="关闭全部历史记录" class="tab" @click="closeReuseTab">
+    <i class="iconfont icon-moshubang"></i>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'CloseTab',
+  inject: ['eventBus'],
+  methods: {
+    closeReuseTab() {
+      this.eventBus.$emit('clearTap')
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.tab {
+  cursor: pointer;
+  margin-right: 10px;
+  i {
+    width: 40px;
+    height: 40px;
+    font-size: 20px;
+  }
+}
+</style>

src/components/base/upload-imgs/index.vue

@@ -7,6 +7,7 @@
       <!-- 暂时放这里 -->
       <div class="right-info">
         <notify v-auth="'消息推送'" v-show="false" />
+        <clear-tab></clear-tab>
         <screenfull />
         <user></user>
       </div>
@@ -19,6 +20,7 @@ import Notify from '@/components/notify/notify'
 import Breadcrumb from './Breadcrumb'
 import Screenfull from './Screenfull'
 import User from './User'
+import ClearTab from './ClearTab'
 
 export default {
   name: 'NavBar',
@@ -28,6 +30,7 @@ export default {
     User,
     Notify,
     Screenfull,
+    ClearTab,
   },
 }
 </script>

src/components/layout/ClearTab.vue

@@ -97,6 +97,9 @@ export default {
   },
   mounted() {
     this.init()
+    this.eventBus.$on('clearTap', () => {
+      this.histories = []
+    })
   },
   methods: {
     init() {

src/components/layout/NavBar.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="container">
+  <div class="container" title="全屏/正常">
     <i class="iconfont" :class="isFullscreen?'icon-quxiaoquanping':'icon-quanping'" @click="handleFullScreen"></i>
   </div>
 </template>