Merge branches '2.4dev' and '2.4opt' of https://gitee.com/elunez/eladmin-web into 2.4opt

2019-11-27 15:06:31 +08:00
parent ad9cd8594e 11d1a803ee
commit 2d1d4e82d3
15 changed files with 364 additions and 45 deletions
--- a/204
+++ b/204
@@ -1,21 +1,191 @@
-MIT License
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/

-Copyright (c) 2017-present PanJiaChen
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+1. Definitions.

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "{}" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright 2019 Zheng Jie
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
    "@riophae/vue-treeselect": "0.1.0",
    "axios": "0.18.1",
    "clipboard": "2.0.4",
-    "codemirror": "^5.38.0",
+    "codemirror": "^5.49.2",
    "connect": "3.6.6",
    "echarts": "4.2.1",
    "echarts-gl": "^1.1.1",
@@ -59,7 +59,8 @@
    "vue-splitpane": "1.0.4",
    "vuex": "3.1.0",
    "wangeditor": ">=3.0.0",
-    "xlsx": "^0.11.16"
+    "xlsx": "^0.11.16",
+    "vue-highlightjs": "^1.3.3"
  },
  "devDependencies": {
    "@babel/core": "7.0.0",
--- a/src/api/generator/generator.js
+++ b/src/api/generator/generator.js
@@ -10,7 +10,8 @@ export function getAllTable() {
 export function generator(tableName, type) {
  return request({
    url: 'api/generator/' + tableName + '/' + type,
-    method: 'post'
+    method: 'post',
+    responseType: type === 2 ? 'blob' : ''
  })
 }

--- a/src/components/JavaEdit/index.vue
+++ b/src/components/JavaEdit/index.vue
@@ -0,0 +1,78 @@
+<template>
+  <div class="json-editor">
+    <textarea ref="textarea" />
+  </div>
+</template>
+
+<script>
+import CodeMirror from 'codemirror'
+import 'codemirror/lib/codemirror.css'
+// 替换主题这里需修改名称
+import 'codemirror/theme/idea.css'
+import 'codemirror/mode/clike/clike'
+export default {
+  props: {
+    value: {
+      type: String,
+      required: true
+    },
+    height: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      editor: false
+    }
+  },
+  watch: {
+    value(value) {
+      const editorValue = this.editor.getValue()
+      if (value !== editorValue) {
+        this.editor.setValue(this.value)
+      }
+    },
+    height(value) {
+      this.editor.setSize('auto', this.height)
+    }
+  },
+  mounted() {
+    this.editor = CodeMirror.fromTextArea(this.$refs.textarea, {
+      mode: 'text/x-java',
+      lineNumbers: true,
+      lint: true,
+      lineWrapping: true,
+      tabSize: 2,
+      cursorHeight: 0.9,
+      // 替换主题这里需修改名称
+      theme: 'idea',
+      readOnly: true
+    })
+    this.editor.setSize('auto', this.height)
+    this.editor.setValue(this.value)
+  },
+  methods: {
+    getValue() {
+      return this.editor.getValue()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .json-editor{
+    height: 100%;
+    margin-bottom: 10px;
+  }
+  .json-editor >>> .CodeMirror {
+    font-size: 14px;
+    overflow-y:auto;
+    font-weight:normal
+  }
+  .json-editor >>> .CodeMirror-scroll{
+  }
+  .json-editor >>> .cm-s-rubyblue span.cm-string {
+    color: #F08047;
+  }
+</style>
--- a/src/components/YamlEdit/index.vue
+++ b/src/components/YamlEdit/index.vue
@@ -9,7 +9,7 @@ import CodeMirror from 'codemirror'
 import 'codemirror/lib/codemirror.css'
 // 替换主题这里需修改名称
 import 'codemirror/theme/idea.css'
-require('codemirror/mode/yaml/yaml.js')
+import 'codemirror/mode/yaml/yaml'
 export default {
  props: {
    value: {
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -52,9 +52,3 @@ export default {
  }
 }
 </script>
-
-<style scoped>
-  /deep/ .el-scrollbar__wrap{
-    margin-right: -22px !important;
-  }
-</style>
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -90,6 +90,7 @@ export default {
    z-index: 9;
    width: calc(100% - #{$sideBarWidth});
    transition: width 0.28s;
+    padding: 0;
  }

  .hideSidebar .fixed-header {
--- a/src/main.js
+++ b/src/main.js
@@ -5,12 +5,22 @@ import Cookies from 'js-cookie'
 import 'normalize.css/normalize.css'

 import Element from 'element-ui'
+//
 import mavonEditor from 'mavon-editor'
-import dict from './components/Dict'
-import permission from './components/Permission'
 import 'mavon-editor/dist/css/index.css'
+
+// 数据字典
+import dict from './components/Dict'
+
+// 权限指令
+import permission from './components/Permission'
 import './assets/styles/element-variables.scss'
-import './assets/styles/index.scss' // global css
+// global css
+import './assets/styles/index.scss'
+
+// 代码高亮
+import VueHighlightJS from 'vue-highlightjs'
+import 'highlight.js/styles/atom-one-dark.css'

 import App from './App'
 import store from './store'
@@ -19,6 +29,7 @@ import router from './router/routers'
 import './assets/icons' // icon
 import './router/index' // permission control

+Vue.use(VueHighlightJS)
 Vue.use(mavonEditor)
 Vue.use(permission)
 Vue.use(dict)
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -21,9 +21,14 @@
          <span>{{ parseTime(scope.row.createTime) }}</span>
        </template>
      </el-table-column>
-      <el-table-column label="操作" width="140px" align="center" fixed="right">
+      <el-table-column label="操作" width="160px" align="center" fixed="right">
        <template slot-scope="scope">
-          <el-button size="mini" style="margin-right: 2px" type="text">预览</el-button>
+          <el-button size="mini" style="margin-right: 2px" type="text">
+            <router-link :to="'/sys-tools/generator/preview/' + scope.row.tableName">
+              预览
+            </router-link>
+          </el-button>
+          <el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="toDownload(scope.row.tableName)">下载</el-button>
          <el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text">
            <router-link :to="'/sys-tools/generator/config/' + scope.row.tableName">
              编辑
@@ -74,6 +79,12 @@ export default {
          duration: 2500
        })
      })
+    },
+    toDownload(tableName) {
+      // 打包下载
+      generator(tableName, 2).then(data => {
+        this.downloadFile(data, tableName, 'zip')
+      })
    }
  }
 }
--- a/src/views/generator/preview.vue
+++ b/src/views/generator/preview.vue
@@ -0,0 +1,38 @@
+<template>
+  <el-tabs v-if="!error" v-model="activeName" type="card">
+    <el-tab-pane v-for="item in data" :key="item.name" :lazy="true" :label="item.name" :name="item.name">
+      <Java :value="item.content" :height="height" />
+    </el-tab-pane>
+  </el-tabs>
+  <div v-else class="app-container">
+    <el-alert
+      :title="error"
+      type="error"
+    />
+  </div>
+</template>
+
+<script>
+import Java from '@/components/JavaEdit/index'
+import { generator } from '@/api/generator/generator'
+export default {
+  name: 'Preview',
+  components: { Java },
+  data() {
+    return {
+      data: null, error: null, height: '', activeName: 'Entity'
+    }
+  },
+  created() {
+    this.height = document.documentElement.clientHeight - 180 + 'px'
+    const tableName = this.$route.params.tableName
+    this.$nextTick(() => {
+      generator(tableName, 1).then(data => {
+        this.data = data
+      }).catch(err => {
+        this.error = err.response.data.message
+      })
+    })
+  }
+}
+</script>
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -22,7 +22,7 @@
          <img :src="codeUrl" @click="getCode">
        </div>
      </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">
+      <el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">
        记住我
      </el-checkbox>
      <el-form-item style="width:100%;">
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -31,10 +31,8 @@
        </template>
      </el-table-column>
    </el-table>
-    <el-dialog :visible.sync="dialog" title="异常详情" append-to-body top="0" width="85%">
-      <pre>
-        {{ errorInfo }}
-      </pre>
+    <el-dialog :visible.sync="dialog" title="异常详情" append-to-body top="30px" width="85%">
+      <pre v-highlightjs="errorInfo"><code class="java" /></pre>
    </el-dialog>
    <!--分页组件-->
    <el-pagination
@@ -84,7 +82,7 @@ export default {
 }
 </script>

-<style>
+<style scoped>
  .demo-table-expand {
    font-size: 0;
  }
@@ -101,4 +99,12 @@ export default {
    font-size: 12px;

  }
+  /deep/ .el-dialog__body{
+    padding: 0 20px 10px 20px !important;
+  }
+  .java.hljs{
+    color: #444;
+    background: #ffffff !important;
+    height: 630px !important;
+  }
 </style>
--- a/src/views/system/timing/log.vue
+++ b/src/views/system/timing/log.vue
@@ -55,9 +55,7 @@
      </el-table-column>
    </el-table>
    <el-dialog :visible.sync="errorDialog" append-to-body title="异常详情" width="85%">
-      <pre>
-        {{ errorInfo }}
-      </pre>
+      <pre v-highlightjs="errorInfo"><code class="java" /></pre>
    </el-dialog>
    <!--分页组件-->
    <el-pagination
@@ -106,3 +104,13 @@ export default {
  }
 }
 </script>
+
+<style scoped>
+  .java.hljs{
+    color: #444;
+    background: #ffffff !important;
+  }
+  /deep/ .el-dialog__body{
+    padding: 0 20px 10px 20px !important;
+  }
+</style>
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -60,13 +60,13 @@
              <el-input v-model.number="form.phone" />
            </el-form-item>
            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" />
+              <el-input v-model="form.email" style="width: 191px" />
            </el-form-item>
            <el-form-item label="部门" prop="dept.id">
              <treeselect v-model="form.dept.id" :options="depts" style="width: 178px" placeholder="选择部门" @select="selectFun" />
            </el-form-item>
            <el-form-item label="岗位" prop="job.id">
-              <el-select v-model="form.job.id" style="width: 178px" placeholder="请先选择部门">
+              <el-select v-model="form.job.id" placeholder="请先选择部门">
                <el-option
                  v-for="(item, index) in jobs"
                  :key="item.name + index"
@@ -75,7 +75,7 @@
                />
              </el-select>
            </el-form-item>
-            <el-form-item style="margin-bottom: 0px;" label="角色" prop="roles">
+            <el-form-item style="margin-bottom: 0;" label="角色" prop="roles">
              <el-select v-model="form.roles" style="width: 450px;" multiple placeholder="请选择">
                <el-option
                  v-for="item in roles"
--- a/src/views/tools/email/send.vue
+++ b/src/views/tools/email/send.vue
@@ -11,7 +11,7 @@
      >
        <el-input v-model="domain.value" style="width: 31%" />
        <el-button icon="el-icon-plus" @click="addDomain" />
-        <el-button style="margin-left:0px;" icon="el-icon-minus" @click.prevent="removeDomain(domain)" />
+        <el-button style="margin-left:0;" icon="el-icon-minus" @click.prevent="removeDomain(domain)" />
      </el-form-item>
      <div ref="editor" class="editor" />
      <el-button :loading="loading" style="margin-left:1.6%;" size="medium" type="primary" @click="doSubmit">发送邮件</el-button>