From 39011884ddd6a9ef3f40590fe6db9d18e4ec2aa9 Mon Sep 17 00:00:00 2001 From: KonghaYao <20192831006@m.scnu.edu.cn> Date: Wed, 4 Aug 2021 21:46:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E9=93=BE=E6=8E=A5=20ui=20=E5=92=8C?= =?UTF-8?q?=20jspider?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/JSpider.esm.min.js | 2 +- dist/JSpider.min.js | 2 +- package/jspider-ui/LICENSE | 201 ++++++++++++++++++++++++ package/jspider-ui/index.html | 47 +++++- package/jspider-ui/lib/vue.min.js | 6 - package/jspider-ui/package.json | 2 +- package/jspider-ui/rollup.config.dev.js | 29 ++-- package/jspider-ui/src/App.vue | 57 +++++-- package/jspider-ui/src/ControlPanel.vue | 43 ++++- package/jspider-ui/src/dot.vue | 42 +++++ package/jspider-ui/src/header/index.vue | 24 +++ package/jspider-ui/src/index.js | 10 +- package/jspider-ui/src/main/index.vue | 108 +++++++++++++ package/jspider-ui/src/main/popup.vue | 31 ++++ package/jspider-ui/src/store.js | 14 ++ test.html | 47 +----- test/ui.js | 12 +- 17 files changed, 582 insertions(+), 95 deletions(-) delete mode 100644 package/jspider-ui/lib/vue.min.js create mode 100644 package/jspider-ui/src/dot.vue create mode 100644 package/jspider-ui/src/header/index.vue create mode 100644 package/jspider-ui/src/main/index.vue create mode 100644 package/jspider-ui/src/main/popup.vue create mode 100644 package/jspider-ui/src/store.js diff --git a/dist/JSpider.esm.min.js b/dist/JSpider.esm.min.js index 1aff737..a1c4420 100644 --- a/dist/JSpider.esm.min.js +++ b/dist/JSpider.esm.min.js @@ -18160,7 +18160,7 @@ var index = Object.assign(Spider, tools, { Task, TaskGroup: TaskGroup$1, version: "3.1.8", - buildDate: new Date(1627982200573), + buildDate: new Date(1628082806861), }); export default index; diff --git a/dist/JSpider.min.js b/dist/JSpider.min.js index 25de4ed..cad7f14 100644 --- a/dist/JSpider.min.js +++ b/dist/JSpider.min.js @@ -18163,7 +18163,7 @@ var JSpider = (function () { Task, TaskGroup: TaskGroup$1, version: "3.1.8", - buildDate: new Date(1627982200573), + buildDate: new Date(1628082806861), }); return index; diff --git a/package/jspider-ui/LICENSE b/package/jspider-ui/LICENSE index e69de29..8e5e18a 100644 --- a/package/jspider-ui/LICENSE +++ b/package/jspider-ui/LICENSE @@ -0,0 +1,201 @@ + 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: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) 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 + + (d) 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 2021 KonghaYao 江夏尧 + + 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/package/jspider-ui/index.html b/package/jspider-ui/index.html index aabe014..0e81975 100644 --- a/package/jspider-ui/index.html +++ b/package/jspider-ui/index.html @@ -4,28 +4,63 @@ jspider-vue + +
- +
- + - diff --git a/package/jspider-ui/src/ControlPanel.vue b/package/jspider-ui/src/ControlPanel.vue index e8812d8..f938cc2 100644 --- a/package/jspider-ui/src/ControlPanel.vue +++ b/package/jspider-ui/src/ControlPanel.vue @@ -1,15 +1,48 @@ + - diff --git a/package/jspider-ui/src/dot.vue b/package/jspider-ui/src/dot.vue new file mode 100644 index 0000000..01d676f --- /dev/null +++ b/package/jspider-ui/src/dot.vue @@ -0,0 +1,42 @@ + + + + + diff --git a/package/jspider-ui/src/header/index.vue b/package/jspider-ui/src/header/index.vue new file mode 100644 index 0000000..b553124 --- /dev/null +++ b/package/jspider-ui/src/header/index.vue @@ -0,0 +1,24 @@ + + + + + + diff --git a/package/jspider-ui/src/index.js b/package/jspider-ui/src/index.js index 65844f2..5b18fb0 100644 --- a/package/jspider-ui/src/index.js +++ b/package/jspider-ui/src/index.js @@ -1,7 +1,9 @@ // src/index.js // 这里import 的 btn和btnDemo.vue的name属性名相同 ！ -import App from './App.vue' +import JSpiderInterface from './App.vue'; -App.install = Vue => Vue.component('js-spider', App) - -export default App; +export default { + install(Vue) { + return Vue.component('js-spider', JSpiderInterface); + }, +}; diff --git a/package/jspider-ui/src/main/index.vue b/package/jspider-ui/src/main/index.vue new file mode 100644 index 0000000..c111618 --- /dev/null +++ b/package/jspider-ui/src/main/index.vue @@ -0,0 +1,108 @@ + + + + + + diff --git a/package/jspider-ui/src/main/popup.vue b/package/jspider-ui/src/main/popup.vue new file mode 100644 index 0000000..1492af4 --- /dev/null +++ b/package/jspider-ui/src/main/popup.vue @@ -0,0 +1,31 @@ + + + + + + diff --git a/package/jspider-ui/src/store.js b/package/jspider-ui/src/store.js new file mode 100644 index 0000000..c0a904d --- /dev/null +++ b/package/jspider-ui/src/store.js @@ -0,0 +1,14 @@ +export const store = new Vuex.Store({ + state: { + panelVisible: true, + view: null, + }, + mutations: { + changePanelVisible(state) { + state.panelVisible = !state.panelVisible; + }, + viewInit(state, view) { + state.view = view; + }, + }, +}); diff --git a/test.html b/test.html index dd2063a..736f936 100644 --- a/test.html +++ b/test.html @@ -11,54 +11,13 @@
- - -
- {{item.uuid}} - {{item.status}} - -
- -
{{item.originData}}
- +
- - + - diff --git a/test/ui.js b/test/ui.js index 955db9a..19fc0b7 100644 --- a/test/ui.js +++ b/test/ui.js @@ -1,7 +1,11 @@ -export async function ui(views) { - var app = new Vue({ +import UI from '../package/jspider-ui/dist/jspider-user-interface.js'; +export async function ui(view) { + Vue.use(UI); + window.vm = new Vue({ el: '#app', - data: { views: views.tasks }, - methods: {}, + + data: { + view, + }, }); }