From 65be3556d0b6d70478685d05273ad67c9c3b676d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E6=9C=B5=E6=A2=A8=E8=8A=B1=E5=8E=8B=E6=B5=B7?= =?UTF-8?q?=E6=A3=A0?= Date: Fri, 9 Oct 2020 14:26:36 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=A2=84=E8=A7=88=20https://gitee.com/log4j/pig/issues/I1WQ3C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.zh.md | 2 +- package.json | 7 +- src/api/gen/gen.js | 17 +- src/components/editor/LICENSE | 193 ++++++++++++++++++++++ src/components/editor/index.vue | 78 +++++++++ src/const/crud/gen/gen.js | 2 + src/page/login/index.vue | 2 +- src/views/gen/index.vue | 282 +++++++++++++++++++------------- src/views/gen/preview.vue | 37 +++++ 9 files changed, 496 insertions(+), 124 deletions(-) create mode 100644 src/components/editor/LICENSE create mode 100644 src/components/editor/index.vue create mode 100644 src/views/gen/preview.vue diff --git a/README.zh.md b/README.zh.md index 1f9df5f..4ba5c33 100644 --- a/README.zh.md +++ b/README.zh.md @@ -2,7 +2,7 @@ **中文** | [English](https://github.com/pigxcloud/pig/blob/master/README.md)

- Build Status + Build Status Build Status Coverage Status Downloads diff --git a/package.json b/package.json index b7955be..48c6fe0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pig-ui", - "version": "2.9.1", + "version": "2.10.0", "private": true, "scripts": { "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ", @@ -11,12 +11,13 @@ }, "dependencies": { "@riophae/vue-treeselect": "^0.4.0", - "@smallwei/avue": "2.6.15", + "@smallwei/avue": "2.6.16", + "@sscfaith/avue-form-design": "1.3.2", "avue-plugin-ueditor": "^0.0.6", - "@sscfaith/avue-form-design": "1.2.9", "axios": "^0.19.0", "babel-polyfill": "^6.26.0", "classlist-polyfill": "^1.2.0", + "codemirror": "^5.58.1", "crypto-js": "^3.1.9-1", "element-ui": "^2.13.2", "js-cookie": "^2.2.1", diff --git a/src/api/gen/gen.js b/src/api/gen/gen.js index 9b2888d..977661d 100755 --- a/src/api/gen/gen.js +++ b/src/api/gen/gen.js @@ -12,7 +12,7 @@ * Neither the name of the pig4cloud.com developer nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. - * Author: test + * Author: lengleng */ import request from '@/router/axios' @@ -25,6 +25,14 @@ export function fetchList(query) { }) } +export function preview(table) { + return request({ + url: '/gen/generator/preview', + method: 'get', + params: table + }) +} + export function fetchDsList(query) { return request({ url: '/gen/dsconf/page', @@ -77,7 +85,7 @@ export function handleDown(table) { data: table, responseType: 'arraybuffer' }).then((response) => { // 处理返回的文件流 - const blob = new Blob([response.data], {type: 'application/zip'}) + const blob = new Blob([response.data], { type: 'application/zip' }) const filename = table.tableName + '.zip' const link = document.createElement('a') link.href = URL.createObjectURL(blob) @@ -95,7 +103,7 @@ export function handleDown(table) { export function getForm(tableName, dsName) { return request({ url: '/gen/form/info', - params: {tableName: tableName, dsName: dsName}, + params: { tableName: tableName, dsName: dsName }, method: 'get' }) } @@ -104,6 +112,7 @@ export function postForm(formInfo, tableName, dsId) { return request({ url: '/gen/form/', method: 'post', - data: Object.assign({formInfo, tableName, dsId}) + data: Object.assign({ formInfo, tableName, dsId }) }) } + diff --git a/src/components/editor/LICENSE b/src/components/editor/LICENSE new file mode 100644 index 0000000..56fa242 --- /dev/null +++ b/src/components/editor/LICENSE @@ -0,0 +1,193 @@ +source https://gitee.com/elunez/eladmin-web + +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +"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/components/editor/index.vue b/src/components/editor/index.vue new file mode 100644 index 0000000..e4eaf0a --- /dev/null +++ b/src/components/editor/index.vue @@ -0,0 +1,78 @@ +