diff --git a/data.json b/data.json index 98afe93d..0976fff2 100644 --- a/data.json +++ b/data.json @@ -35,10 +35,40 @@ "type":"图像处理" }, { - "name":"思维导图", + "name":"在线思维导图编辑器", "url":"/lib/tools/mind-map/", "type":"图像处理" }, + { + "name":"多功能图像处理工具", + "url":"/lib/tools/webp2jpg-online/", + "type":"图像处理" + }, + { + "name":"在线图片格式转换", + "url":"/lib/tools/webp2jpg-online/", + "type":"图像处理" + }, + { + "name":"在线图片批量添加水印工具", + "url":"/lib/tools/webp2jpg-online/", + "type":"图像处理" + }, + { + "name":"在线批量重命名图片工具", + "url":"/lib/tools/webp2jpg-online/", + "type":"图像处理" + }, + { + "name":"在线图片裁剪", + "url":"/lib/tools/webp2jpg-online/", + "type":"图像处理" + }, + { + "name":"在线拼接视频字幕截图", + "url":"/lib/tools/webp2jpg-online/splicing.html#/splicing", + "type":"图像处理" + }, { "name":"本站后台管理页面", "url":"/management/", diff --git a/js/api.js b/js/api.js index ba1b6420..10cc7b3e 100644 --- a/js/api.js +++ b/js/api.js @@ -31,15 +31,46 @@ var classify = [{ "id": 2, "name": "图像处理", "list": [{ - "name": "思维导图", + "name": "在线思维导图编辑器", "url": "/incert/?link=/lib/tools/mind-map/", "hot": 1, "img": "" + }, { + "name": "在线图片裁剪", + "url": "/lib/tools/webp2jpg-online/", + "hot": 1, + "img": "" + }, { + "name": "多功能图片处理工具", + "url": "/lib/tools/webp2jpg-online/", + "hot": 1, + "img": "" + }, { + "name": "在线图片格式转换", + "url": "/lib/tools/webp2jpg-online/", + "hot": 1, + "img": "" + }, { + "name": "在线图片批量添加水印工具", + "url": "/lib/tools/webp2jpg-online/", + "hot": 1, + "img": "" + }, { + "name": "在线批量重命名图片工具", + "url": "/lib/tools/webp2jpg-online/", + "hot": 0, + "img": "" + }, { + "name": "在线拼接视频字幕截图", + "url": "/incert/?link=/lib/tools/webp2jpg-online/splicing.html#/splicing", + "hot": 0, + "img": "" }, { "name": "字符生成图片", "url": "/lib/tools/geopattern/", "hot": 0, "img": "" + }, { }] }, { "id": 3, diff --git a/tools/webp2jpg-online/.gitignore b/tools/webp2jpg-online/.gitignore new file mode 100644 index 00000000..fcf2720e --- /dev/null +++ b/tools/webp2jpg-online/.gitignore @@ -0,0 +1,23 @@ +.DS_Store +node_modules +/dist + +/psd +超多图片处理测试包 +# local env files +.env.local +.env.*.local +-= +# Log files +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw* diff --git a/tools/webp2jpg-online/ChangeLog.md b/tools/webp2jpg-online/ChangeLog.md new file mode 100644 index 00000000..c6c25b39 --- /dev/null +++ b/tools/webp2jpg-online/ChangeLog.md @@ -0,0 +1,55 @@ + +## 更新日志 + +### v3.0 -2021.07.24 + + 强化-[处理速度]-🚀优化1000张以上图片数量的处理速度(针对jpg、webp、png)、优化内存管理和cpu占用率, 页面崩溃概率大范围减少 + 强化-[gif/webp动画]- 比原来更稳定一点点 + + 新增-[输入格式]-psd、psb、hdr、heic、heif、tiff、tif、bmp、tga、xcf、miff、dcm、xpm、pcx、fits、ppm、pgm、pfm、mng、dds、otb + 新增-[输出png压缩]-png-tiny(压缩png,效果参考tinypng.com) + 新增-[输出svg压缩] + 新增-[输出ico] + 新增-[尺寸]-按高度、按比例 + 新增-[变换]-旋转、翻转 + 新增-[水印]-图片水印、文字水印 + 新增-[水印]-快速定位、平铺模式、比例模式、透明度、选择、边距、缩放、水印预览、隐藏开关、文字样式细节修改... + 新增-[修剪]-按像素数、按图片比例 + 新增-[重命名] + 全新UI-暗色/亮色主题、三栏布局让使用流程更清晰、语言选择增至21种、更易用的选项框和滑块 + + 其他-[格式识别]-识别图片的真实格式, 当后缀名与实际不符时给出提示 + 其他-[设置]-png转jpg时的背景色、另存所有参数、声音提示、进程数 + 其他-[效果对比]-类似squoosh.app的图片前后对比,测试做好了没加上,实在没力气了,下次再搞 +### v2.2 -2020.10.09 + 新增格式-mozjpeg,压缩率更高/画质更好的jpg + 新增格式-avif,逆天的压缩率 + 修复-对比模式 +### v2.1 2020-08-17 + 新增功能-输出指定大小 + 新增功能-颜色数量选项(gif、png-8) + 新增功能-自动宽度输出 + 新增格式-8位png + 新增格式-base64 + 修复-选项删除功能 + 修复-多文件下载遗漏 + 修复-压缩包文件非英数乱码 + 修复-大写后缀不识别 + 修复-强调提示不支持文件格式 + 删除-ico格式输出(假的ico实际还是png) +### v2.0 2020-06-26 + 使用vue重构 + 支持gif动图转webp动图 + 尺寸和画质可自定义 + 选项数据持久化 + 可开启图片追加模式 + 可开启转换效果对比 + 优化了UI + 支持多语言 + 页面文件也变大了,初次打开会比较慢,第二次之后就快了 +### [v1.0](https://github.com/renzhezhilu/webp2jpg-online/tree/v1.0) 2020-01-14 + 项目建立 + 支持jpeg、webp、png互转 + 可选输出宽度 + 可选输出画质 + 可批量处理 diff --git a/tools/webp2jpg-online/LICENSE b/tools/webp2jpg-online/LICENSE new file mode 100644 index 00000000..261eeb9e --- /dev/null +++ b/tools/webp2jpg-online/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/tools/webp2jpg-online/README.md b/tools/webp2jpg-online/README.md new file mode 100644 index 00000000..c3ac16f1 --- /dev/null +++ b/tools/webp2jpg-online/README.md @@ -0,0 +1,98 @@ + +English | [简体中文](./README_CN.md) | [日本語](./README_JP.md) + +