From 3f257081f4014516265e882ace072465d9cff3ce Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Tue, 26 Nov 2019 11:49:45 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/layout/index.vue | 1 +
src/views/system/user/index.vue | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 889b7dc..9674163 100644
--- 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 {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d812391..ee55d35 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -60,13 +60,13 @@
-
+
-
+
Date: Tue, 26 Nov 2019 13:59:25 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=BC=82=E5=B8=B8?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8A=A0=E5=85=A5=E4=BB=A3=E7=A0=81=E9=AB=98?=
=?UTF-8?q?=E4=BA=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 3 ++-
src/main.js | 3 +++
src/views/login.vue | 2 +-
src/views/monitor/log/errorLog.vue | 16 +++++++++++-----
src/views/system/timing/log.vue | 14 +++++++++++---
src/views/system/user/index.vue | 2 +-
src/views/tools/email/send.vue | 2 +-
7 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/package.json b/package.json
index 7012a52..49eb142 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/src/main.js b/src/main.js
index 6bb9280..989a3d8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,6 +11,8 @@ import permission from './components/Permission'
import 'mavon-editor/dist/css/index.css'
import './assets/styles/element-variables.scss'
import './assets/styles/index.scss' // global css
+import VueHighlightJS from 'vue-highlightjs'
+import 'highlight.js/styles/atom-one-dark.css'
import App from './App'
import store from './store'
@@ -19,6 +21,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)
diff --git a/src/views/login.vue b/src/views/login.vue
index 5095120..cc81d5f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -22,7 +22,7 @@
![]()
-
+
记住我
diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index 31f5fd0..506c441 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -31,10 +31,8 @@
-
-
- {{ errorInfo }}
-
+
+
-
diff --git a/src/views/system/timing/log.vue b/src/views/system/timing/log.vue
index 3606d9b..d29d866 100644
--- a/src/views/system/timing/log.vue
+++ b/src/views/system/timing/log.vue
@@ -55,9 +55,7 @@
-
- {{ errorInfo }}
-
+
+
+
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ee55d35..86f4d45 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -75,7 +75,7 @@
/>
-
+
-
+
发送邮件
From cbded8ce20fa480ab38cd236715a36c2e89bb9b1 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Tue, 26 Nov 2019 16:03:42 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
src/components/JavaEdit/index.vue | 78 +++++++++++++++++++++++++++++++
src/components/YamlEdit/index.vue | 2 +-
src/main.js | 14 ++++--
src/views/generator/index.vue | 6 ++-
src/views/generator/preview.vue | 38 +++++++++++++++
6 files changed, 134 insertions(+), 6 deletions(-)
create mode 100644 src/components/JavaEdit/index.vue
create mode 100644 src/views/generator/preview.vue
diff --git a/package.json b/package.json
index 49eb142..6ebca5b 100644
--- 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",
diff --git a/src/components/JavaEdit/index.vue b/src/components/JavaEdit/index.vue
new file mode 100644
index 0000000..c703829
--- /dev/null
+++ b/src/components/JavaEdit/index.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/YamlEdit/index.vue b/src/components/YamlEdit/index.vue
index 8ad48fa..83778f4 100644
--- 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: {
diff --git a/src/main.js b/src/main.js
index 989a3d8..a0bd192 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,12 +5,20 @@ 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'
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index 25b4008..0dbca20 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -23,7 +23,11 @@
- 预览
+
+
+ 预览
+
+
编辑
diff --git a/src/views/generator/preview.vue b/src/views/generator/preview.vue
new file mode 100644
index 0000000..8ee6cac
--- /dev/null
+++ b/src/views/generator/preview.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
From a0a997391165fc007df0a9f5fb4c864cd198ceb8 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Tue, 26 Nov 2019 17:43:29 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E6=89=93=E5=8C=85=E4=B8=8B=E8=BD=BD?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/generator/generator.js | 3 ++-
src/views/generator/index.vue | 9 ++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/api/generator/generator.js b/src/api/generator/generator.js
index 194f629..85ba185 100644
--- 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' : ''
})
}
diff --git a/src/views/generator/index.vue b/src/views/generator/index.vue
index 0dbca20..4c31ea6 100644
--- a/src/views/generator/index.vue
+++ b/src/views/generator/index.vue
@@ -21,13 +21,14 @@
{{ parseTime(scope.row.createTime) }}
-
+
预览
+ 下载
编辑
@@ -78,6 +79,12 @@ export default {
duration: 2500
})
})
+ },
+ toDownload(tableName) {
+ // 打包下载
+ generator(tableName, 2).then(data => {
+ this.downloadFile(data, tableName, 'zip')
+ })
}
}
}
From 11d1a803eea8fde704a17b4a4bdb4adc21cf5593 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Wed, 27 Nov 2019 12:42:52 +0800
Subject: [PATCH 5/5] update
---
LICENSE | 204 ++++++++++++++++++++++--
src/layout/components/Sidebar/index.vue | 6 -
2 files changed, 187 insertions(+), 23 deletions(-)
diff --git a/LICENSE b/LICENSE
index 6151575..78a36cb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -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.
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 4687b29..c029f61 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -52,9 +52,3 @@ export default {
}
}
-
-