diff --git a/dolphinscheduler-ui/LICENSE b/dolphinscheduler-ui/LICENSE new file mode 100755 index 0000000000000000000000000000000000000000..261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64 --- /dev/null +++ b/dolphinscheduler-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 [yyyy] [name of copyright owner] + + 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/dolphinscheduler-ui/build/webpack.config.combined.js b/dolphinscheduler-ui/build/webpack.config.combined.js index cae3eb92a8b9a45a8e38a9600a228f710b4afe16..9f41c3973fef91ccba461fa4f7562d108a8b2394 100644 --- a/dolphinscheduler-ui/build/webpack.config.combined.js +++ b/dolphinscheduler-ui/build/webpack.config.combined.js @@ -19,7 +19,7 @@ const prodConfig = require('./webpack.config.prod') const config = merge.smart(prodConfig, { output: { - publicPath: '/escheduler/ui/' + publicPath: '/dolphinscheduler/ui/' } }) diff --git a/dolphinscheduler-ui/install-escheduler-ui.sh b/dolphinscheduler-ui/install-dolphinscheduler-ui.sh similarity index 88% rename from dolphinscheduler-ui/install-escheduler-ui.sh rename to dolphinscheduler-ui/install-dolphinscheduler-ui.sh index ad38e0e0ee788ad44d0a548ca88a593d12d35122..b908c36da46d44436bbc94706c90652d780d9112 100644 --- a/dolphinscheduler-ui/install-escheduler-ui.sh +++ b/dolphinscheduler-ui/install-dolphinscheduler-ui.sh @@ -1,3 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. + #!/bin/bash # current path esc_basepath=$(cd `dirname $0`; pwd) diff --git a/dolphinscheduler-ui/package.json b/dolphinscheduler-ui/package.json index 3a8d532e01fc0fd5de1058de03d2bb80356964d0..dab1d6a8b3b6de9ffebb1a7ae306b381afb67a7e 100644 --- a/dolphinscheduler-ui/package.json +++ b/dolphinscheduler-ui/package.json @@ -11,7 +11,7 @@ "lint:fix": "standard \"**/*.{js,vue}\" --fix", "start": "npm run dev", "combo": "node ./build/combo.js", - "build:combined": "npm run clean && cross-env NODE_ENV=production PUBLIC_PATH=/escheduler/ui webpack --config ./build/webpack.config.combined.js" + "build:combined": "npm run clean && cross-env NODE_ENV=production PUBLIC_PATH=/dolphinscheduler/ui webpack --config ./build/webpack.config.combined.js" }, "dependencies": { "autoprefixer": "^9.1.0", diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue index cd6f1788866ea95e844292c03995dca5f49d4cd7..ebfa064f07cd83c6d79008aee7d42c8d3ee8b772 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue @@ -153,7 +153,7 @@ * Download log */ _downloadLog () { - downloadFile('/escheduler/log/download-log', { + downloadFile('/dolphinscheduler/log/download-log', { taskInstId: this.stateId || this.logId }) }, diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/mysql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/mysql.vue index 1bc9f0d35e0e140cbc9269affbeb9ef0889a27b0..1fb85defde20ad2a822e309a0c84c98e5ba3a785 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/mysql.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/mysql.vue @@ -6,7 +6,7 @@
- {{$t('Health status')}} + {{$t('Health status')}}
@@ -22,7 +22,7 @@
- {{$t('Max connections')}} - {{item.date | formatDate}} + {{$t('Max connections')}} - {{item.date | formatDate}}
{{item.maxConnections}} @@ -35,7 +35,7 @@
- {{$t('Threads connections')}} + {{$t('Threads connections')}}
{{item.threadsConnections}} @@ -48,7 +48,7 @@
- {{$t('Max used connections')}} + {{$t('Max used connections')}}
{{item.maxUsedConnections}} @@ -61,7 +61,7 @@
- {{$t('Threads running connections')}} + {{$t('Threads running connections')}}
{{item.threadsRunningConnections}} diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss index e522b48bb8ce1e411fd17905f3022e96bf83a443..bea5211f2e14370c938b4dee3b597b8b66105832 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss +++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss @@ -32,7 +32,7 @@ border-bottom: 1px solid #E8E8E8; padding-left: 10px; span { - width: 80%; + width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -99,7 +99,7 @@ font-size: 12px; color: #444; &.sp { - margin-right: 10px; + margin-right: 6px; } } .left { diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue index a552e4cc00988b21d7ccfddc57f4aea2a704024c..9833b4522eaf84022b3c64b3fac36b3d34091912 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue @@ -6,7 +6,7 @@
- {{$t('process number of waiting for running')}} + {{$t('command number of waiting for running')}}
{{commandCountData.normalCount}} diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue index aa45114c1f1c6faf719e3aab3ed64d0c8682f7f4..566e875b7651dfb5d485c5202a14159460f56174 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue @@ -65,7 +65,7 @@ this.$router.push({ name: 'file' }) }, _downloadFile () { - downloadFile('/escheduler/resources/download', { + downloadFile('/dolphinscheduler/resources/download', { id: this.$route.params.id }) }, diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue index 89acc74dd6e6dfa186a971062b474fdbdeac2cc6..86b8eab8a9d877db0d3e25d541cbc8637c504731 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue @@ -131,7 +131,7 @@ this.$router.push({ path: `/resource/file/list/${item.id}` }) }, _downloadFile (item) { - downloadFile('/escheduler/resources/download', { + downloadFile('/dolphinscheduler/resources/download', { id: item.id }) }, diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue index 4077f13bc0680113bbfda8c9b21822c84cf6667d..631407d042c55026cc553c0550aebf3a9f0cd7ea 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue @@ -117,7 +117,7 @@ methods: { ...mapActions('resource', ['deleteResource']), _downloadFile (item) { - downloadFile('/escheduler/resources/download', { + downloadFile('/dolphinscheduler/resources/download', { id: item.id }) }, diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js index 13477fec34cd1748f95d87fb883568c0c7213786..1fc2615a21f642be4e6704ecdfcb6c56a6d1540b 100644 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js @@ -464,7 +464,7 @@ export default { 'Statement cannot be empty': 'Statement cannot be empty', 'Process Define Count': 'Process Define Count', 'Process Instance Running Count': 'Process Instance Running Count', - 'process number of waiting for running': 'process number of waiting for running', + 'command number of waiting for running': 'command number of waiting for running', 'failure command number': 'failure command number', 'tasks number of waiting running': 'tasks number of waiting running', 'task number of ready to kill': 'task number of ready to kill', diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js index cd8f620f3925d170dce3f2223bce0bc52d0fa97b..8e7d6263baf6935a2f2496780c02b16858a3be1a 100644 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -465,7 +465,7 @@ export default { 'Process Define Count': '流程定义个数', 'Process Instance Running Count': '运行流程实例个数', 'Please select a queue': '请选择队列', - 'process number of waiting for running': '待执行的流程数', + 'command number of waiting for running': '待执行的命令数', 'failure command number': '执行失败的命令数', 'tasks number of waiting running': '待运行任务数', 'task number of ready to kill': '待杀死任务数',