Merge branch 'master' of jianyu/jy-docs into tsz

jydocs-pc/.browserslistrc

@@ -1,2 +1,3 @@
 > 1%
 last 2 versions
+ie >= 11

jydocs-pc/.editorconfig

@@ -0,0 +1,5 @@
+[*.{js,jsx,ts,tsx,vue}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true

jydocs-pc/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
 VUE_APP_BASE_API='/api-docs/'
-VUE_APP_BASE_URL='/swordfish/frontPage/docs/sess/index'
+VUE_APP_BASE_URL='/swordfish/docs/index'
 VUE_APP_MOCK=true
 VUE_APP_BASE_PUBLIC='http://localhost:8080/'

jydocs-pc/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
 VUE_APP_BASE_API='/api-docs/'
-VUE_APP_BASE_URL='/'
-VUE_APP_BASE_PUBLIC='/'
+VUE_APP_BASE_URL='/swordfish/docs/index'
+VUE_APP_BASE_PUBLIC='/page_docs/'

jydocs-pc/.eslintrc.js

@@ -0,0 +1,20 @@
+module.exports = {
+  root: true,
+  env: {
+    node: true
+  },
+  extends: [
+    'plugin:vue/essential',
+    '@vue/standard'
+  ],
+  globals: {
+    loginflag: true
+  },
+  parserOptions: {
+    parser: 'babel-eslint'
+  },
+  rules: {
+    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
+  }
+}

jydocs-pc/README.md

@@ -50,7 +50,21 @@
 
     > 文件地址 /src/web/templates/frontRouter/pc/docs/sess/index.html
 
-3. 访问`/swordfish/frontPage/docs/sess/index`
+3. 访问`/swordfish/docs/index`
 
 ##### 部署
-> 待确认
+
+###### nginx
+```
+# 剑鱼文库 前端配置
+location ^~/page_docs {
+    if ($uri ~ \.html$) {
+		add_header         Pragma   no-cache;
+        add_header         Expires  0;
+        add_header         Cache-Control no-cache,no-store,must-revalidate;
+    }
+    root /opt/nginx/nginx/html/;
+    index index.html;
+    try_files $uri $uri/ /page_docs/index.html;
+}
+```

jydocs-pc/babel.config.js

@@ -2,12 +2,12 @@ module.exports = {
   presets: [
     '@vue/cli-plugin-babel/preset'
   ],
-  "plugins": [
+  plugins: [
     [
-      "component",
+      'component',
       {
-        "libraryName": "element-ui",
-        "styleLibraryName": "theme-chalk"
+        libraryName: 'element-ui',
+        styleLibraryName: 'theme-chalk'
       }
     ]
   ]

jydocs-pc/package.json

@@ -5,7 +5,8 @@
   "scripts": {
     "serve": "vue-cli-service serve --port 8080",
     "serve:alone": "vue-cli-service serve --mode alone",
-    "build": "vue-cli-service build"
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint --fix"
   },
   "dependencies": {
     "axios": "^0.21.1",
@@ -18,12 +19,21 @@
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.1.0",
+    "@vue/cli-plugin-eslint": "~4.5.0",
+    "@vue/eslint-config-standard": "^5.1.2",
     "@vue/cli-plugin-router": "^4.1.0",
     "@vue/cli-service": "^4.1.0",
     "babel-plugin-component": "^1.1.1",
     "vue-cli-plugin-single-spa": "^1.0.1",
     "vue-template-compiler": "^2.6.10",
     "sass": "^1.26.5",
-    "sass-loader": "^8.0.2"
+    "sass-loader": "^8.0.2",
+    "babel-eslint": "^10.1.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.0",
+    "eslint-plugin-vue": "^6.2.2"
   }
 }

jydocs-pc/src/App.vue

@@ -6,35 +6,35 @@
 </template>
 
 <script>
-  export default {
-    components: {},
-    data () {
-      return {
-        links: [
-          {
-            to: '/',
-            text:'首页'
-          },
-          {
-            to: '/content/12',
-            text:'内容页'
-          },
-          {
-            to: '/search',
-            text:'列表页'
-          },
-          {
-            to: '/keep',
-            text:'收藏页'
-          },
-          {
-            to: '/mine',
-            text:'我的'
-          }
-        ]
-      }
+export default {
+  components: {},
+  data () {
+    return {
+      links: [
+        {
+          to: '/',
+          text: '首页'
+        },
+        {
+          to: '/content/12',
+          text: '内容页'
+        },
+        {
+          to: '/search',
+          text: '列表页'
+        },
+        {
+          to: '/keep',
+          text: '收藏页'
+        },
+        {
+          to: '/mine',
+          text: '我的'
+        }
+      ]
     }
   }
+}
 </script>
 <style lang="scss">
     .link-item {

jydocs-pc/src/assets/style/_mixin.scss

@@ -10,3 +10,13 @@
 @function addFooter($a) {
   @return $footerHeight + $a;
 }
+
+@mixin diy-icon ($name, $size: 24) {
+  .el-icon-jy-#{$name} {
+    background: url("~@/assets/images/icon/#{$name}.png") no-repeat;
+    background-size: cover;
+    display: inline-block;
+    width: #{$size}px;
+    height: #{$size}px;
+  }
+}

jydocs-pc/src/components/CardItem.vue

@@ -13,12 +13,12 @@
 </template>
 
 <script>
-  export default {
-    name: 'Card-Item',
-    props: {
-      msg: String
-    }
+export default {
+  name: 'Card-Item',
+  props: {
+    msg: String
   }
+}
 </script>
 
 <style scoped lang="scss">

jydocs-pc/src/components/HelloWorld.vue

@@ -1,32 +0,0 @@
-<template>
-  <div class="hello">
-    {{msg}}
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'HelloWorld',
-  props: {
-    msg: String
-  }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-h3 {
-  margin: 40px 0 0;
-}
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-a {
-  color: #42b983;
-}
-</style>

jydocs-pc/src/components/List.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import ListItem from "./ListItem";
+import ListItem from './ListItem'
 export default {
   name: 'List-Group',
   components: {

jydocs-pc/src/components/Search.vue

@@ -1,20 +1,130 @@
 <template>
     <div class="search-input">
-        <input type="text" placeholder="公用顶部输入框"/>
+        <el-input
+                placeholder="搜索文档"
+                v-model.trim="input"
+                @keyup.enter.native="submitSearch"
+                clearable>
+            <el-button @click="submitSearch" slot="append" icon="el-icon-jy-search"></el-button>
+        </el-input>
+        <el-tabs v-model="type">
+          <el-tab-pane v-for="item in tabs" :key="item.type" :label="item.label" :name="item.type"></el-tab-pane>
+        </el-tabs>
     </div>
 </template>
 
 <script>
-  export default {
-    name: 'Search-Input',
-    props: {
-      msg: String
+import { Input, Button, Tabs, TabPane } from 'element-ui'
+export default {
+  name: 'Search-Input',
+  props: {
+    msg: String
+  },
+  components: {
+    [Input.name]: Input,
+    [Tabs.name]: Tabs,
+    [TabPane.name]: TabPane,
+    [Button.name]: Button
+  },
+  data () {
+    return {
+      input: '',
+      type: 'all1',
+      tabs: [
+        {
+          type: 'all1',
+          label: '全部'
+        },
+        {
+          type: 'all2',
+          label: '招标'
+        },
+        {
+          type: 'all3',
+          label: '法律法规'
+        },
+        {
+          type: 'all4',
+          label: '行业报告'
+        }
+      ]
+    }
+  },
+  beforeMount() {
+    const qUrl = this.$route.query
+    qUrl && qUrl.text && (this.input = qUrl.text)
+    qUrl && qUrl.type && (this.type = qUrl.type)
+  },
+  methods: {
+    submitSearch () {
+      if (!this.input.length) {
+        return
+      }
+      this.$emit('submit', {
+        type: this.type,
+        text: this.input
+      })
     }
   }
+}
 </script>
 
 <style scoped lang="scss">
     .search-input {
+        width: 640px;
+        margin: 0 auto;
+        @include diy-icon('search', 24);
+        ::v-deep .el-tabs__nav-wrap::after {
+          background-color: transparent;
+        }
+        ::v-deep .el-tabs__item {
+          height: 48px;
+          line-height: 48px;
+          font-size: 14px;
+          color: #686868;
+        }
+      ::v-deep .el-tabs__active-bar {
+        background-color: #2CB7CA;
+      }
+      ::v-deep .el-tabs__item.is-active {
+        color: #2CB7CA;
+      }
+      ::v-deep .el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2),
+      ::v-deep .el-tabs--bottom .el-tabs__item.is-top:nth-child(2),
+      ::v-deep .el-tabs--top .el-tabs__item.is-bottom:nth-child(2),
+      ::v-deep .el-tabs--top .el-tabs__item.is-top:nth-child(2) {
+        padding-left: 20px;
+      }
+
+      ::v-deep .el-tabs--bottom .el-tabs__item.is-bottom:last-child,
+      ::v-deep .el-tabs--bottom .el-tabs__item.is-top:last-child,
+      ::v-deep .el-tabs--top .el-tabs__item.is-bottom:last-child,
+      ::v-deep .el-tabs--top .el-tabs__item.is-top:last-child {
+        padding-right: 20px;
+      }
 
+        ::v-deep .el-input__inner {
+            border-radius: 22px 0 0 22px;
+            background: #FFFFFF;
+            border: 1px solid #E0E0E0;
+            padding-left: 24px;
+            color: #1D1D1D;
+            font-family: Microsoft YaHei;
+            font-size: 16px;
+            line-height: 24px;
+            height: 42px;
+        }
+        ::v-deep .el-input-group__append {
+            height: 42px;
+            box-sizing: border-box;
+            text-align: center;
+            border: none;
+            border-radius: 0px 22px 22px 0px;
+            background: #2CB7CA;
+            .el-button {
+              padding: 8px 24px;
+              margin-top: -4px;
+            }
+        }
     }
 </style>

jydocs-pc/src/main.js

@@ -1,17 +1,16 @@
-import Vue from 'vue';
-import App from './App.vue';
-import router from './router';
-import singleSpaVue from 'single-spa-vue';
+import Vue from 'vue'
+import App from './App.vue'
+import router from './router'
+import singleSpaVue from 'single-spa-vue'
 
-Vue.config.productionTip = false;
+Vue.config.productionTip = false
 
 const vueOptions = {
   el: '#single-spa-app',
   router,
-  render: (h) => h(App),
+  render: (h) => h(App)
 }
 
-
 let vueLifecycles = {}
 if (process.env.VUE_APP_ALONE) {
   delete vueOptions.el
@@ -19,13 +18,12 @@ if (process.env.VUE_APP_ALONE) {
 } else {
   vueLifecycles = singleSpaVue({
     Vue,
-    appOptions: vueOptions,
-  });
+    appOptions: vueOptions
+  })
 }
 
-export const bootstrap = vueLifecycles.bootstrap;
-export const mount = vueLifecycles.mount;
-export const unmount = vueLifecycles.unmount;
+export const bootstrap = vueLifecycles.bootstrap
+export const mount = vueLifecycles.mount
+export const unmount = vueLifecycles.unmount
 
 export default vueLifecycles
-

jydocs-pc/src/router.js

@@ -6,7 +6,7 @@ Vue.use(Router)
 
 export default new Router({
   mode: 'history',
-  base:  process.env.VUE_APP_BASE_URL,
+  base: process.env.VUE_APP_BASE_URL,
   routes: [
     {
       path: '/',

jydocs-pc/src/set-public-path.js

@@ -3,4 +3,3 @@ import { setPublicPath } from 'systemjs-webpack-interop'
 if (!process.env.VUE_APP_ALONE) {
   setPublicPath('app', 2)
 }
-

jydocs-pc/src/views/404.vue

@@ -3,4 +3,3 @@
     <h3>这里什么也没有</h3>
   </div>
 </template>
-

jydocs-pc/src/views/Content.vue

@@ -6,14 +6,12 @@
 </template>
 
 <script>
-import HelloWorld from '@/components/HelloWorld.vue'
-import { ajaxGetTest } from "../api/modules/user";
-import { Button } from 'element-ui';
+import { ajaxGetTest } from '../api/modules/user'
+import { Button } from 'element-ui'
 
 export default {
   name: 'home',
   components: {
-    HelloWorld,
     [Button.name]: Button
   },
   data () {

jydocs-pc/src/views/Home.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="home">
 
-      <search-input></search-input>
+      <search-input @submit="goSubmit"></search-input>
 
       <h3>最新标讯</h3>
       <div class="new-list-group flex-r-c">
@@ -32,17 +32,16 @@
       </div>
 
       <el-button @click="getTest" :loading="fullscreenLoading" type="primary">模拟Ajax</el-button>
-      <el-button  @click="getLoginStatus" type="info">获取登录状态</el-button>
+      <el-button  @click="getLoginStatus" type="info" icon="el-icon-jy-search">获取登录状态</el-button>
   </div>
 </template>
 
 <script>
-import HelloWorld from '@/components/HelloWorld.vue'
-import { ajaxGetTest } from "../api/modules/user";
-import { Button } from 'element-ui';
-import SearchInput from "../components/Search";
-import ListItem from "../components/ListItem";
-import CardItem from "../components/CardItem";
+import { ajaxGetTest } from '../api/modules/user'
+import { Button } from 'element-ui'
+import SearchInput from '../components/Search'
+import ListItem from '../components/ListItem'
+import CardItem from '../components/CardItem'
 
 export default {
   name: 'home',
@@ -50,15 +49,20 @@ export default {
     CardItem,
     ListItem,
     SearchInput,
-    HelloWorld,
     [Button.name]: Button
   },
   data () {
     return {
-      fullscreenLoading: false,
+      fullscreenLoading: false
     }
   },
   methods: {
+    goSubmit (search) {
+      this.$router.push({
+        name: 'search',
+        query: search
+      })
+    },
     getTest () {
       this.fullscreenLoading = true
       ajaxGetTest().then(res => {
@@ -76,6 +80,9 @@ export default {
     .link-item {
         margin: 0 10px;
     }
+
+    @include diy-icon('search', 24);
+
     .new-list-group {
         .flex-c-c {
             padding: 20px;

jydocs-pc/src/views/Keep.vue

@@ -6,14 +6,12 @@
 </template>
 
 <script>
-import HelloWorld from '@/components/HelloWorld.vue'
-import { ajaxGetTest } from "../api/modules/user";
-import { Button } from 'element-ui';
+import { ajaxGetTest } from '../api/modules/user'
+import { Button } from 'element-ui'
 
 export default {
   name: 'home',
   components: {
-    HelloWorld,
     [Button.name]: Button
   },
   data () {

jydocs-pc/src/views/Mine.vue

@@ -6,14 +6,12 @@
 </template>
 
 <script>
-import HelloWorld from '@/components/HelloWorld.vue'
-import { ajaxGetTest } from "../api/modules/user";
-import { Button } from 'element-ui';
+import { ajaxGetTest } from '../api/modules/user'
+import { Button } from 'element-ui'
 
 export default {
   name: 'home',
   components: {
-    HelloWorld,
     [Button.name]: Button
   },
   data () {

jydocs-pc/src/views/Search.vue

@@ -1,19 +1,20 @@
 <template>
   <div class="home">
+      <search-input @submit="goSubmit"></search-input>
       <el-button @click="getTest" :loading="fullscreenLoading" type="primary">模拟Ajax</el-button>
       <el-button  @click="getLoginStatus" type="info">获取登录状态</el-button>
   </div>
 </template>
 
 <script>
-import HelloWorld from '@/components/HelloWorld.vue'
-import { ajaxGetTest } from "../api/modules/user";
-import { Button } from 'element-ui';
+import { ajaxGetTest } from '../api/modules/user'
+import { Button } from 'element-ui'
+import SearchInput from "../components/Search";
 
 export default {
   name: 'home',
   components: {
-    HelloWorld,
+    SearchInput,
     [Button.name]: Button
   },
   data () {
@@ -22,6 +23,13 @@ export default {
     }
   },
   methods: {
+    goSubmit (search) {
+      this.$router.replace({
+        name: 'search',
+        query: search
+      })
+      console.log(search)
+    },
     getTest () {
       this.fullscreenLoading = true
       ajaxGetTest().then(res => {

jydocs-pc/vue.config.js

@@ -29,7 +29,7 @@ module.exports = {
       config.devServer.set('inline', false)
       config.devServer.set('hot', true)
       if (process.env.NODE_ENV !== 'production') {
-        config.output.filename(`js/[name].js`)
+        config.output.filename('js/[name].js')
       }
       config.externals(['vue', 'vue-router'])
     }