oipage 1.5.0-alpha.1 → 1.5.0-alpha.3

package/CHANGELOG

@@ -103,7 +103,12 @@ v1.5.0:
         - 修复bug
           1、修复404网站在手机浏览器显示高问题
           2、服务器响应类型由 Content-type 改为 Content-Type
+          3、修复dateFormat第二个参数无法缺省报错
+          4、修复numberFormat不支持负数问题
+        - 优化改造
+          1、优化run命令日志打印
         - 新增功能
           1、开发服务器 / 应用市场
             * 聊天工具
-            * 图片编辑器
+            * 图片编辑器
+            * 图片转PDF

package/README.md

@@ -74,6 +74,20 @@ oipage-cli serve -p 8080
 
 如果你需要在项目中使用，我们也提供了一些有用的API，具体可以访问[ 在线文档 ](https://oi-contrib.github.io/OIPage)进行了解。
 
+## 应用市场
+
+为了方便日常使用，内置了一个应用市场网站，比如有如下功能：
+
+### 群聊贴
+
+<img src="./snipping/chart.png" />
+
+### 图片编辑器
+
+<img src="./snipping/image-editor.png" />
+
+已有功能或更多功能我们将根据实际情况逐步完善和维护，当然，你可以通过 [issue](https://github.com/oi-contrib/VISLite/issues) 给我们留言，告诉我们你的改进意见。
+
 ## 版权
 
 MIT License

package/bin/run

@@ -72,22 +72,22 @@ else if (process.argv[2] === "run") {
 
         // 监听子线程的stdout
         child.stdout.on('data', (data) => {
-            console.log(`[${index + 1}] log:${data}`);
+            process.stdout.write(`${data}`);
         });
 
         // 监听子线程的stderr
         child.stderr.on('data', (data) => {
-            console.error(`[${index + 1}] error:${data}`);
+            process.stdout.write(`${data}`);
         });
 
         // 子线程结束处理
         child.on('close', (code) => {
-            console.log(`[${index + 1}] 子线程结束，退出码 ${code}`);
+            console.log(`子线程${index + 1}结束，退出码 ${code}`);
         });
 
         // 子线程出错处理
         child.on('error', (error) => {
-            console.error(`[${index + 1}] 子线程错误: ${error.message}`);
+            console.error(`子线程${index + 1}错误: ${error.message}`);
         });
     }
 

package/bin/serve.js

@@ -18,13 +18,13 @@ module.exports = function (config) {
     let startTime = new Date().valueOf();
 
     const cache = "cache" in config.devServer ? config.devServer.cache : true;
-    const port = config.devServer.port; // 端口号
+    const port = +config.devServer.port; // 端口号
     const basePath = (/^\./.test(config.devServer.baseUrl)) ? join(process.cwd(), config.devServer.baseUrl) : config.devServer.baseUrl; // 服务器根路径
 
-    const name = (config.name || "OIPage") + "-dev-server";
+    const name = (config.name || "OIPage") + "-http-server";
     const version = config.version || packageValue.version;
 
-    const wsHandler = WebSocketClass(port + 1, (config.name || "OIPage") + "-dev-websocket", version);
+    const wsHandler = WebSocketClass(port + 1, (config.name || "OIPage") + "-ws-server", version);
 
     let Server = createServer(function (request, response) {
         let headers = request.headers;

package/bin/tools/resolve404.js

@@ -18,9 +18,9 @@ module.exports = function (filePath, url) {
 
     try {
         subItems = readdirSync(filePath);
-        console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] Read Folder: " + url + '\x1b[0m ' + new Date().toLocaleString());
+        console.log("<i> \x1b[1m\x1b[32m[OIPage-http-server] Read Folder: " + url + '\x1b[0m ' + new Date().toLocaleString());
     } catch (e) {
-        console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] Read " + (/\/$/.test(url) ? "Folder" : "File") + ": \x1b[35m" + url + ' 404 Not Found\x1b[0m ' + new Date().toLocaleString());
+        console.log("<i> \x1b[1m\x1b[32m[OIPage-http-server] Read " + (/\/$/.test(url) ? "Folder" : "File") + ": \x1b[35m" + url + ' 404 Not Found\x1b[0m ' + new Date().toLocaleString());
         try {
             if (!/\/$/.test(url) || url === "/") {
                 filePath = join(filePath, "../");

package/bin/website-htmls/components/ui-select-file/index.html

@@ -0,0 +1,8 @@
+<div class="ui-select-file-view">
+    <h2 class="title" z-bind="_props.title"></h2>
+    <div class="tips" z-bind="_props.tips"></div>
+    <div class="file">
+        <input type="file" multiple id="input" z-on:change.stop="doChange" z-bind:accept="accept" />
+        <label for="input" z-bind="'选择'+_props.type+'文件'"></label>
+    </div>
+</div>

package/bin/website-htmls/components/ui-select-file/index.js

@@ -0,0 +1,38 @@
+import { defineElement } from "zipaper";
+import template from "./index.html";
+import style from "./index.scss";
+
+export default defineElement({
+    template,
+    emits: ["change"],
+    props: {
+        title: {
+            type: String,
+            required: true,
+        },
+        tips: {
+            type: String,
+            required: true,
+        },
+        type: {
+            type: String,
+            required: true,
+        },
+    },
+    data() {
+        return {
+            accept: {
+                pdf: "application/pdf",
+                image: "image/*"
+            }[this._props.type]
+        };
+    },
+    methods: {
+        doChange(event, target) {
+            this.$emit("change", target.files);
+        }
+    },
+    style: {
+        content: style
+    }
+});

package/bin/website-htmls/components/ui-select-file/index.scss

@@ -0,0 +1,45 @@
+.ui-select-file-view{
+    &>.title {
+    text-align: center;
+    font-weight: 700;
+    color: rgb(26, 26, 26);
+    font-size: 36px;
+    line-height: 48px;
+    padding-top: 30px;
+  }
+
+  &>.tips {
+    text-align: center;
+    line-height: 30px;
+    font-size: 22px;
+    color: rgb(26, 26, 26);
+    font-weight: 300;
+  }
+
+  &>.file {
+    text-align: center;
+    margin-top: 30px;
+
+    input {
+      display: none;
+    }
+
+    label {
+      line-height: 50px;
+      display: inline-block;
+      border: 1px solid gray;
+      background-image: url("./images/addFile.svg");
+      background-repeat: no-repeat;
+      background-position: 5px center;
+      background-size: auto 70%;
+      padding-left: 40px;
+      padding-right: 10px;
+      border-radius: 5px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+  }
+}

package/bin/website-htmls/images/addFile.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M13 12v-2h1v2h2v1h-2v2h-1v-2h-2v-1h2zm5 8H6V4H5v17h13v-1zm1 0v2H4V3h2V1h10l5 5v14h-2zM7 2v17h13V6l-4-4H7zm9 0l4 4h-4V2z"></path></svg>

package/bin/website-htmls/images/img-to-pdf.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M0 4C0 1.79086 1.79086 0 4 0H20C22.2091 0 24 1.79086 24 4V20C24 22.2091 22.2091 24 20 24H4C1.79086 24 0 22.2091 0 20V4Z" fill="#FFB700"></path><path fill-rule="evenodd" clip-rule="evenodd" d="M6.99992 8L13.9999 14.5625L16.9544 11.7927L24 17.5625V20L17.0455 14.3589L13.9999 17.2141L6.99992 10.6517L0 17.1875V14.5625L6.99992 8Z" fill="white"></path><circle cx="18" cy="6" r="3" fill="white"></circle></svg>

package/bin/website-htmls/main.js

@@ -3,10 +3,12 @@ import { createApp } from "zipaper"
 import App from "./pages/App/index.js"
 import router from "./router.config.js"
 import dialogs from "./dialogs/index.js"
+import uiSelectFile from "./components/ui-select-file/index.js"
 
 // https://oi-contrib.github.io/Zipaper/index.html
 
 createApp(App)
     .use(router) // 路由
     .use(dialogs) // 弹框
+    .component("ui-select-file", uiSelectFile)
     .mount(document.getElementById("root")) // 挂载到页面

package/bin/website-htmls/pages/appStore/index.html

@@ -15,5 +15,11 @@
                 图片编辑器
             </h2>
         </li>
+        <li z-on:click="goto" tag="img-to-pdf">
+            <img src="./images/img-to-pdf.svg" />
+            <h2>
+                图片转PDF
+            </h2>
+        </li>
     </ul>
 </div>

package/bin/website-htmls/pages/img-to-pdf/index.html

@@ -0,0 +1,4 @@
+<div class="img-to-pdf-view">
+    <ui-select-file z-on:change="doChange" title="图片转PDF" tips="选择一张或多张图片后，可以把这些图片拼接成一个PDF文件" type="image"></ui-select-file>
+    <iframe id="iframe"></iframe>
+</div>

package/bin/website-htmls/pages/img-to-pdf/index.js

@@ -0,0 +1,45 @@
+import { defineElement, ref } from "zipaper"
+import template from "./index.html"
+import style from "./index.scss"
+
+export default defineElement({
+    template,
+    methods: {
+        doChange(event) {
+            let files = event.data, promises = [], iframeEl = document.getElementById("iframe");
+
+            let template = "";
+            for (let index = 0; index < files.length; index++) {
+                let file = files[index];
+
+                promises.push(new Promise(function (resolve) {
+
+                    let reader = new FileReader();
+
+                    reader.onload = function () {
+
+                        template += '<div style="display: flex;justify-content: center;align-items: center;height: 100vh;width: 100vw;"><img src="' + reader.result + '" style="max-width: 100vw;max-height: 100vh;"></img></div>';
+                        resolve("");
+                    }
+                    reader.readAsDataURL(file);
+                }));
+            }
+
+            Promise.all(promises).then(function () {
+                    let iframeWindow = iframeEl.contentWindow;
+                    let iframeDocument = iframeEl.contentWindow?.document;
+
+                    iframeDocument.open();
+                    iframeDocument.write(`<style>body{margin:0px;}</style>` + template);
+                    iframeDocument.close();
+
+                    setTimeout(function () {
+                        iframeWindow.print();
+                    }, 500);
+            });
+        }
+    },
+    style: {
+        content: style
+    }
+})

package/bin/website-htmls/pages/img-to-pdf/index.scss

@@ -0,0 +1,5 @@
+.img-to-pdf-view {
+    iframe {
+        display: none;
+    }
+}

package/bin/website-htmls/router.config.js

@@ -13,5 +13,8 @@ export default defineRouter({
     }, {
         path: "/image-editor",
         component: () => import("./pages/image-editor/index.js"),
+    }, {
+        path: "/img-to-pdf",
+        component: () => import("./pages/img-to-pdf/index.js"),
     }]
 })

package/bin/website-plugins/intercept/oipage-vislite-intercept.js

@@ -14,7 +14,7 @@ module.exports = {
         if (request.headers["if-none-match"] === head["ETag"]) {
             response.writeHead('304', head);
             response.end();
-            console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] Cache File: VISLite\x1b[0m " + new Date().toLocaleString() + "\x1b[33m\x1b[1m 304\x1b[0m");;
+            console.log("<i> \x1b[1m\x1b[32m[OIPage-http-server] Cache File: VISLite\x1b[0m " + new Date().toLocaleString() + "\x1b[33m\x1b[1m 304\x1b[0m");;
             return;
         }
 

package/bin/website-plugins/intercept/oipage-zipaper-intercept.js

@@ -14,7 +14,7 @@ module.exports = {
         if (request.headers["if-none-match"] === head["ETag"]) {
             response.writeHead('304', head);
             response.end();
-            console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] Cache File: Zipaper\x1b[0m " + new Date().toLocaleString() + "\x1b[33m\x1b[1m 304\x1b[0m");;
+            console.log("<i> \x1b[1m\x1b[32m[OIPage-http-server] Cache File: Zipaper\x1b[0m " + new Date().toLocaleString() + "\x1b[33m\x1b[1m 304\x1b[0m");;
             return;
         }
 

package/nodejs/animation/index.js

@@ -1,5 +1,5 @@
 /*!
-* animation of OIPage v1.5.0-alpha.1
+* animation of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/cmdlog/index.js

@@ -1,5 +1,5 @@
 /*!
-* cmdlog of OIPage v1.5.0-alpha.1
+* cmdlog of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/disk/index.js

@@ -1,5 +1,5 @@
 /*!
-* disk of OIPage v1.5.0-alpha.1
+* disk of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/format/index.js

@@ -1,5 +1,5 @@
 /*!
-* format of OIPage v1.5.0-alpha.1
+* format of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
@@ -26,12 +26,12 @@ function numberFormat(input) {
             integerArray.unshift(integerValue.substring(index > 2 ? index - 3 : 0, index));
         }
 
-        return integerArray.join(",") + decimalValue;
+        return integerArray.join(",").replace(/^\-,/, "-") + decimalValue;
     }
 }
 
 function dateFormat(input, option) {
-    option = option || option;
+    option = option || {};
     var dateObj;
 
     // 如果无值，就用当前日期

package/nodejs/json/index.js

@@ -1,5 +1,5 @@
 /*!
-* json of OIPage v1.5.0-alpha.1
+* json of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 const {reader} = require("../reader/index.js");

package/nodejs/logform/index.js

@@ -1,5 +1,5 @@
 /*!
-* logform of OIPage v1.5.0-alpha.1
+* logform of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 const {linelog} = require("../cmdlog/index.js");

package/nodejs/reader/index.js

@@ -1,5 +1,5 @@
 /*!
-* reader of OIPage v1.5.0-alpha.1
+* reader of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/throttle/index.js

@@ -1,5 +1,5 @@
 /*!
-* throttle of OIPage v1.5.0-alpha.1
+* throttle of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oipage",
-  "version": "1.5.0-alpha.1",
+  "version": "1.5.0-alpha.3",
   "description": "前端网页或应用快速开发助手，包括开发服务器、辅助命令、实用API等",
   "sideEffects": false,
   "scripts": {

package/web/XMLHttpRequest/index.js

@@ -1,5 +1,5 @@
 /*!
-* XMLHttpRequest of OIPage v1.5.0-alpha.1
+* XMLHttpRequest of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/animation/index.js

@@ -1,5 +1,5 @@
 /*!
-* animation of OIPage v1.5.0-alpha.1
+* animation of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/format/index.js

@@ -1,5 +1,5 @@
 /*!
-* format of OIPage v1.5.0-alpha.1
+* format of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
@@ -26,12 +26,12 @@ export function numberFormat(input) {
             integerArray.unshift(integerValue.substring(index > 2 ? index - 3 : 0, index));
         }
 
-        return integerArray.join(",") + decimalValue;
+        return integerArray.join(",").replace(/^\-,/, "-") + decimalValue;
     }
 }
 
 export function dateFormat(input, option) {
-    option = option || option;
+    option = option || {};
     var dateObj;
 
     // 如果无值，就用当前日期

package/web/json/index.js

@@ -1,5 +1,5 @@
 /*!
-* json of OIPage v1.5.0-alpha.1
+* json of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 import {reader} from "../reader/index.js";

package/web/onReady/index.js

@@ -1,5 +1,5 @@
 /*!
-* onReady of OIPage v1.5.0-alpha.1
+* onReady of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/performChunk/index.js

@@ -1,5 +1,5 @@
 /*!
-* performChunk of OIPage v1.5.0-alpha.1
+* performChunk of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/reader/index.js

@@ -1,5 +1,5 @@
 /*!
-* reader of OIPage v1.5.0-alpha.1
+* reader of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/style/index.js

@@ -1,5 +1,5 @@
 /*!
-* style of OIPage v1.5.0-alpha.1
+* style of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/throttle/index.js

@@ -1,5 +1,5 @@
 /*!
-* throttle of OIPage v1.5.0-alpha.1
+* throttle of OIPage v1.5.0-alpha.3
 * git+https://github.com/oi-contrib/OIPage.git
 */