oipage 0.1.0 → 0.2.0-alpha.1

package/CHANGELOG

@@ -1,21 +1,9 @@
 v0.1.0:
-    date:2023-09-21
+    date:2024-09-21
     changes:
       - 初始化版本
         1、命令
-          * --help, -h 获得帮助
-          * --server, -s 启动服务器
-          * --version, -v 查看版本
-          * --config, -c 启动配置文件
-          * --delete 删除文件或文件夹
-          * --copy 复制文件或文件夹
-          * --pick 提取文件夹文件到指定位置
-          * --move 移动文件或文件夹
-          * --network 查看网络信息
-          * --get 发送get请求
-          * --post 发送post请求
-          * --cat 查看文本内容
-          * --run 多进程运行任务
+          （包括：help、server、version、config、delete、copy、pick、move、network、get、post、cat、run）
         2、corejs
           * animation 动画
           * throttle 节流函数
@@ -27,12 +15,29 @@ v0.1.0:
           * options 命令行参数解析
           * file 文件相关操作
           * console 控制台打印
+            （包括：log、warn、error、linelog、deeplog）
           * ajax 网络请求
           * network 网络信息等
           * data 资源数据
           * image 图片相关操作
           * loader 文件解析
+            （simpleScss、xhtml）
         5、stylecss
           * 统一浏览器样式 normalize.css
           * 十二栅格化 rasterize.css
-          * 架屏动画 skeleton.css
+          * 架屏动画 skeleton.css
+v0.2.0:
+    date:
+    changes:
+      - 优化改造
+        1、nodejs
+          * linelog新增清除行记录重置功能
+          * deeplog新增清除行记录重置功能
+      - 新增功能
+        1、nodejs
+          * plain 读取文本内容
+          * form 表单录入
+            （包括：input输入框、select列表选择）
+          * server hander方法补充api
+            （包括：getFileInfo()、filePath）
+        

package/README.md

@@ -1,5 +1,5 @@
 # [OIPage](https://github.com/oi-contrib/OIPage)
-OI页面快速开发辅助库
+OI页面快速开发辅助库，包括核心包、Nodejs、浏览器、样式文件等
 
 <p>
     <a href="https://zxl20070701.github.io/toolbox/#/npm-download?packages=oipage&interval=7">
@@ -70,7 +70,7 @@ oipage-cli -s 8080
 对于更复杂的业务，我们推荐使用配置文件的方式。比如我们准备了配置文件 oipage.config.js ，那么就可以：
 
 ```shell
-devby -c ./oipage.config.js
+oipage-cli -c ./oipage.config.js
 ```
 
 配置文件的内容如下：
@@ -100,7 +100,9 @@ module.exports = {
 - [网络信息等](./docs/nodejs/network.md)
 - [资源数据](./docs/nodejs/data.md)
 - [图片相关操作](./docs/nodejs/image.md)
-- [文件解析Loader](./docs/nodejs/loader.md)
+- [文件解析](./docs/nodejs/loader.md)
+- [文件读取](./docs/nodejs/reader.md)
+- [表单录入](./docs/nodejs/form.md)
 
 ### 浏览器
 

package/bin/run

@@ -6,12 +6,12 @@ process.title = 'OIPage';
 
 const server = require('../nodejs/core/server');
 const { options, help } = require('./options');
-const path = require('path');
 const { log, error } = require('../nodejs/core/log');
 const { deleteSync, copySync, moveSync, listFileSync, fullPathSync } = require("../nodejs/core/file");
 const network = require("../nodejs/core/network");
 const { get, post } = require("../nodejs/core/remote");
 const fs = require("fs");
+const path = require("path");
 const { exec } = require('child_process');
 
 const jsonfile = require("../package.json");
@@ -26,6 +26,7 @@ for (let key in options) {
 const parsed = require("../nodejs/core/options")(shortHands, process.argv);
 
 (() => {
+
     // 打印版本
     if (Array.isArray(parsed.version)) {
         log("\nOIPage@v" + jsonfile.version + "\n");

package/browserjs/index.d.ts

@@ -1,10 +1,13 @@
 import { getStyleType } from "./getStyle"
+import { setStyleType } from "./setStyle"
 import { onReadyType } from "./onReady"
 
 export default class Corejs {
     static getStyle: getStyleType
+    static setStyle: setStyleType
     static onReady: onReadyType
 }
 
 export let getStyle: getStyleType
+export let setStyle: setStyleType
 export let onReady: onReadyType

package/browserjs/index.js

@@ -1,7 +1,9 @@
 import { getStyle } from "./getStyle/index.js";
+import { setStyle } from "./setStyle/index.js";
 import { onReady } from "./onReady/index.js";
 
 export default {
     getStyle: getStyle,
+    setStyle: setStyle,
     onReady: onReady
 };

package/browserjs/setStyle/index.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 设置节点样式
+ */
+export interface setStyleType {
+    (el: HTMLElement, styles: {
+        [key: string]: string | number
+    }): void
+}
+
+export let setStyle: setStyleType

package/browserjs/setStyle/index.js

@@ -0,0 +1,5 @@
+export function setStyle(el, styles) {
+    for (var key in styles) {
+        el.style[key] = styles[key];
+    }
+};

package/nodejs/core/log.js

@@ -32,6 +32,10 @@ const linelog = (function (stream) {
 
     // 返回实际同行打印的方法
     return function (nextStr) {
+        if (arguments.length == 0) {
+            prevLineCount = 0;
+            return;
+        }
         let txt = "";
 
         // 清除屏幕
@@ -62,6 +66,10 @@ exports.linelog = linelog;
  * @param {string} stream 说明文字,可选择
  */
 exports.deeplog = function (percentum, stream) {
+    if (arguments.length == 0) {
+        linelog();
+        return;
+    }
 
     if (arguments.length <= 1) stream = "";
 

package/nodejs/core/server.js

@@ -44,12 +44,40 @@ module.exports = function (config = {}) {
             request.on('end', () => {
                 let url = decodeURIComponent(request.url);
 
+                url = url.split("?")[0];
+
+                // 请求的文件路径
+                let filePath = path.join(basePath, url == "/" ? "index.html" : url.replace(/^\//, ""));
+
                 log("[" + index++ + "]" + url);
 
+                let getFileInfo = function (filePath) {
+                    let dotName = /\./.test(filePath) ? filePath.match(/\.([^.]+)$/)[1] : "";
+                    let type = mineTypes[dotName];
+                    if (fs.existsSync(filePath) && !fs.lstatSync(filePath).isDirectory()) {
+                        return {
+                            type,
+                            path: filePath
+                        };
+                    } else {
+                        for (let suffix of suffixs) {
+                            if (fs.existsSync(filePath + suffix) && !fs.lstatSync(filePath + suffix).isDirectory()) {
+                                type = mineTypes[suffix.replace(/^\./, "")];
+                                return {
+                                    type,
+                                    path: filePath + suffix
+                                };
+                            }
+                        }
+                    }
+                };
+
                 // 自定义拦截
                 if (handler.call({
                     data: requestData,
-                    base: basePath
+                    base: basePath,
+                    getFileInfo,
+                    filePath
                 }, request, response)) return;
 
                 // proxy拦截
@@ -101,13 +129,6 @@ module.exports = function (config = {}) {
                     }
                 }
 
-                url = url.split("?")[0];
-
-                // 请求的文件路径
-                let filePath = path.join(basePath, url == "/" ? "index.html" : url.replace(/^\//, ""));
-
-                let dotName = /\./.test(filePath) ? filePath.match(/\.([^.]+)$/)[1] : "";
-
                 let is404 = true;
                 let doResponse = function (type, filePath) {
                     response.writeHead(200, {
@@ -119,17 +140,9 @@ module.exports = function (config = {}) {
                     is404 = false;
                 };
 
-                // 文件类型
-                type = mineTypes[dotName];
-                if (fs.existsSync(filePath) && !fs.lstatSync(filePath).isDirectory()) {
-                    doResponse(type, filePath);
-                } else {
-                    for (let suffix of suffixs) {
-                        if (fs.existsSync(filePath + suffix) && !fs.lstatSync(filePath + suffix).isDirectory()) {
-                            type = mineTypes[suffix.replace(/^\./, "")];
-                            doResponse(type, filePath + suffix);
-                        }
-                    }
+                let fileInfo = getFileInfo(filePath);
+                if (fileInfo) { // 如果文件存在
+                    doResponse(fileInfo.type, fileInfo.path);
                 }
 
                 if (is404) {

package/nodejs/form/common.js

@@ -0,0 +1,3 @@
+exports.getTitle = (title) => {
+    return "➤ " + title;
+}; 

package/nodejs/form/index.js

@@ -0,0 +1,80 @@
+const { getTitle } = require("./common");
+const { logView } = require("./select");
+const { linelog } = require("../core/log");
+
+module.exports = function (form) {
+    const rl = require("readline").createInterface({
+        input: process.stdin,
+        output: process.stdout
+    });
+
+    return new Promise(function (resolve, reject) {
+        let result = [], keyback = () => { };
+
+        console.log("");
+
+        process.stdin.on("keypress", (_str, key) => {
+            keyback(key.name);
+        });
+
+        let getResult = (index) => {
+            if (index >= form.length) {
+                process.removeAllListeners("keypress");
+                rl.close();
+                resolve(result);
+            } else {
+                let item = form[index];
+
+                // 文本输入
+                if (item.type == "input") {
+
+                    rl.question(getTitle(item.label), (answer) => {
+                        result.push(answer);
+                        setTimeout(() => {
+                            console.log("");
+                            getResult(index + 1);
+                        }, 50);
+                    });
+
+                }
+
+                // 列表选择
+                else if (item.type == "select") {
+                    let title = getTitle(item.label);
+
+                    let selectIndex = 0;
+                    logView(title, item.value, selectIndex);
+                    keyback = (keyname) => {
+                        if (keyname == "return") {
+                            result.push(selectIndex);
+                            keyback = () => { };
+                            linelog();
+                            setTimeout(() => {
+                                getResult(index + 1);
+                            }, 50);
+                        } else {
+                            if (keyname == "left" || keyname == "up") {
+                                if (selectIndex > 0) selectIndex -= 1;
+                                else selectIndex = item.value.length - 1;
+                            } else if (keyname == "right" || keyname == "down") {
+                                if (selectIndex < item.value.length - 1) selectIndex += 1;
+                                else selectIndex = 0;
+                            } else {
+                                return;
+                            }
+                            logView(title, item.value, selectIndex);
+                        }
+                    };
+
+                }
+
+                // 非法类型
+                else {
+                    throw new Error("Illegal type！");
+                }
+            }
+
+        };
+        getResult(0);
+    });
+};

package/nodejs/form/select.js

@@ -0,0 +1,10 @@
+const { linelog } = require("../core/log");
+
+exports.logView = (title, list, index) => {
+    let txtArray = [];
+    for (let i = 0; i < list.length; i++) {
+        txtArray.push("    " + (i == index ? "●" : "○") + " " + list[i]);
+    }
+
+    linelog(`${title}\n${txtArray.join("\n")}\n`);
+};

package/nodejs/index.js

@@ -10,6 +10,10 @@ const { toBase64 } = require('./core/image');
 const simpleScss = require('./loader/simpleScss');
 const xhtml = require('./loader/xhtml');
 
+const plain = require('./reader/plain');
+
+const form = require('./form/index');
+
 module.exports = {
 
     // 命令行相关
@@ -43,6 +47,12 @@ module.exports = {
     // 服务器
     server,
 
-    // 文件解析Loader
-    simpleScss, xhtml
+    // 文件解析
+    simpleScss, xhtml,
+
+    // 文件读取
+    plain,
+
+    // 表单录入
+    form
 };

package/nodejs/reader/plain.js

@@ -0,0 +1,20 @@
+module.exports = function (txt) {
+
+    let reader = {
+        index: -1,
+        currentChar: null
+    };
+
+    // 读取下一个字符
+    reader.readNext = function () {
+        reader.currentChar = reader.index++ < txt.length - 1 ? txt[reader.index] : null;
+        return reader.currentChar;
+    };
+
+    // 获取往后num个值
+    reader.getNextN = function (num) {
+        return txt.substring(reader.index, num + reader.index > txt.length ? txt.length : num + reader.index);
+    };
+
+    return reader;
+};

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "oipage",
-  "version": "0.1.0",
-  "description": "OI页面快速开发辅助库",
+  "version": "0.2.0-alpha.1",
+  "description": "OI页面快速开发辅助库，包括核心包、Nodejs、浏览器、样式文件等",
   "main": "./nodejs/index.js",
   "typings": "./types/index.d.ts",
   "sideEffects": false,
-  "scripts": {},
   "bin": {
     "oipage-cli": "bin/run"
   },
@@ -31,8 +30,5 @@
   "bugs": {
     "url": "https://github.com/oi-contrib/OIPage/issues"
   },
-  "homepage": "https://github.com/oi-contrib/OIPage",
-  "devDependencies": {
-    "vislite": "^1.2.0"
-  }
+  "homepage": "https://github.com/oi-contrib/OIPage"
 }