fast-vue-multi-pages 1.0.1 → 1.0.3

package/dist/cjs/FastVueMultiTool.d.ts

@@ -17,10 +17,14 @@ export declare class FastVueMultiTool {
      * 页面配置工具类
      */
     static Config: typeof FastVueMultiConfig;
+    /**
+     * 常规的网络接口请求类，返回格式要求为JSON：{success:true,message:"消息",data:{}}
+     */
+    static SimpleHttp: typeof FastVueMultiHttp.Simple;
     /**
      * 网络请求工具类
      */
-    static Http: typeof FastVueMultiHttp.Simple;
+    static Http: typeof FastVueMultiHttp.Base;
     /**
      * 页面数据缓存工具类
      */

package/dist/cjs/FastVueMultiTool.js

@@ -21,10 +21,14 @@ class FastVueMultiTool {
      * 页面配置工具类
      */
     static Config = FastVueMultiConfig_1.FastVueMultiConfig;
+    /**
+     * 常规的网络接口请求类，返回格式要求为JSON：{success:true,message:"消息",data:{}}
+     */
+    static SimpleHttp = FastVueMultiHttp_1.FastVueMultiHttp.Simple;
     /**
      * 网络请求工具类
      */
-    static Http = FastVueMultiHttp_1.FastVueMultiHttp.Simple;
+    static Http = FastVueMultiHttp_1.FastVueMultiHttp.Base;
     /**
      * 页面数据缓存工具类
      */

package/dist/cjs/other/FastVueMultiClipboard.d.ts

@@ -3,18 +3,5 @@ export declare class FastVueMultiClipboard {
      * 将内容复制到剪贴板中
      * @param content
      */
-    static copy(content: string): Promise<void>;
-    /**
-     * 将blob复制到剪贴板中
-     * @param blob
-     */
-    static copyBlob(blob: Blob): Promise<void>;
-    /**
-     * 获取剪贴板的文本内容
-     */
-    static getText(): Promise<string | undefined>;
-    /**
-     * 获取剪贴板的ClipboardItem内容
-     */
-    static getItems(): Promise<ClipboardItems | undefined>;
+    static copy(content: string): void;
 }

package/dist/cjs/other/FastVueMultiClipboard.js

@@ -1,40 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FastVueMultiClipboard = void 0;
+const tslib_1 = require("tslib");
+const copy_to_clipboard_1 = tslib_1.__importDefault(require("copy-to-clipboard"));
 class FastVueMultiClipboard {
     /**
      * 将内容复制到剪贴板中
      * @param content
      */
     static copy(content) {
-        const clipboard = require("clipboard-polyfill");
-        return clipboard.writeText(content);
-    }
-    /**
-     * 将blob复制到剪贴板中
-     * @param blob
-     */
-    static copyBlob(blob) {
-        const clipboard = require("clipboard-polyfill");
-        let contentType = blob.type;
-        let items = {};
-        items[contentType] = blob;
-        const item = new clipboard.ClipboardItem(items);
-        return clipboard.write([item]);
-    }
-    /**
-     * 获取剪贴板的文本内容
-     */
-    static async getText() {
-        const clipboard = require("clipboard-polyfill");
-        return await clipboard.readText();
-    }
-    /**
-     * 获取剪贴板的ClipboardItem内容
-     */
-    static async getItems() {
-        const clipboard = require("clipboard-polyfill");
-        return await clipboard.read();
+        (0, copy_to_clipboard_1.default)(content);
     }
 }
 exports.FastVueMultiClipboard = FastVueMultiClipboard;

package/dist/cjs/other/FastVueMultiWindow.d.ts

@@ -18,4 +18,13 @@ export declare class FastVueMultiWindow {
      * 安全的获取窗口高度，有的手机渲染后document.body.clientHeight 莫明会返回0
      */
     static safeGetClientHeight(): number;
+    /**
+     * 获取地址栏携带的参数
+     * @param paramName 参数名
+     */
+    static getWindowUrlParam(paramName: string): string | null;
+    /**
+     * 获取地址栏携带的参数对象信息
+     */
+    static getWindowUrlInfo(): any;
 }

package/dist/cjs/other/FastVueMultiWindow.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FastVueMultiWindow = void 0;
 const tslib_1 = require("tslib");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const FastVueMultiHttp_1 = require("../http/FastVueMultiHttp");
 class FastVueMultiWindow {
     /**
      * 添加window的onLoad事件，如果存在onLoad函数名则进行合并
@@ -49,5 +50,18 @@ class FastVueMultiWindow {
     static safeGetClientHeight() {
         return Math.max(document.documentElement.clientHeight, document.body.clientHeight);
     }
+    /**
+     * 获取地址栏携带的参数
+     * @param paramName 参数名
+     */
+    static getWindowUrlParam(paramName) {
+        return FastVueMultiHttp_1.FastVueMultiHttp.Base.getUrlParam(window.location.href, paramName);
+    }
+    /**
+     * 获取地址栏携带的参数对象信息
+     */
+    static getWindowUrlInfo() {
+        return FastVueMultiHttp_1.FastVueMultiHttp.Base.getUrlParamInfo(window.location.href);
+    }
 }
 exports.FastVueMultiWindow = FastVueMultiWindow;

package/dist/esm/FastVueMultiTool.d.ts

@@ -17,10 +17,14 @@ export declare class FastVueMultiTool {
      * 页面配置工具类
      */
     static Config: typeof FastVueMultiConfig;
+    /**
+     * 常规的网络接口请求类，返回格式要求为JSON：{success:true,message:"消息",data:{}}
+     */
+    static SimpleHttp: typeof FastVueMultiHttp.Simple;
     /**
      * 网络请求工具类
      */
-    static Http: typeof FastVueMultiHttp.Simple;
+    static Http: typeof FastVueMultiHttp.Base;
     /**
      * 页面数据缓存工具类
      */

package/dist/esm/FastVueMultiTool.js

@@ -13,10 +13,14 @@ define(["require", "exports", "tslib", "lodash", "./http/FastVueMultiHttp", "./o
          * 页面配置工具类
          */
         FastVueMultiTool.Config = FastVueMultiConfig_1.FastVueMultiConfig;
+        /**
+         * 常规的网络接口请求类，返回格式要求为JSON：{success:true,message:"消息",data:{}}
+         */
+        FastVueMultiTool.SimpleHttp = FastVueMultiHttp_1.FastVueMultiHttp.Simple;
         /**
          * 网络请求工具类
          */
-        FastVueMultiTool.Http = FastVueMultiHttp_1.FastVueMultiHttp.Simple;
+        FastVueMultiTool.Http = FastVueMultiHttp_1.FastVueMultiHttp.Base;
         /**
          * 页面数据缓存工具类
          */

package/dist/esm/other/FastVueMultiClipboard.d.ts

@@ -3,18 +3,5 @@ export declare class FastVueMultiClipboard {
      * 将内容复制到剪贴板中
      * @param content
      */
-    static copy(content: string): Promise<void>;
-    /**
-     * 将blob复制到剪贴板中
-     * @param blob
-     */
-    static copyBlob(blob: Blob): Promise<void>;
-    /**
-     * 获取剪贴板的文本内容
-     */
-    static getText(): Promise<string | undefined>;
-    /**
-     * 获取剪贴板的ClipboardItem内容
-     */
-    static getItems(): Promise<ClipboardItems | undefined>;
+    static copy(content: string): void;
 }

package/dist/esm/other/FastVueMultiClipboard.js

@@ -1,7 +1,8 @@
-define(["require", "exports", "tslib"], function (require, exports, tslib_1) {
+define(["require", "exports", "tslib", "copy-to-clipboard"], function (require, exports, tslib_1, copy_to_clipboard_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.FastVueMultiClipboard = void 0;
+    copy_to_clipboard_1 = tslib_1.__importDefault(copy_to_clipboard_1);
     var FastVueMultiClipboard = /** @class */ (function () {
         function FastVueMultiClipboard() {
         }
@@ -10,52 +11,7 @@ define(["require", "exports", "tslib"], function (require, exports, tslib_1) {
          * @param content
          */
         FastVueMultiClipboard.copy = function (content) {
-            var clipboard = require("clipboard-polyfill");
-            return clipboard.writeText(content);
-        };
-        /**
-         * 将blob复制到剪贴板中
-         * @param blob
-         */
-        FastVueMultiClipboard.copyBlob = function (blob) {
-            var clipboard = require("clipboard-polyfill");
-            var contentType = blob.type;
-            var items = {};
-            items[contentType] = blob;
-            var item = new clipboard.ClipboardItem(items);
-            return clipboard.write([item]);
-        };
-        /**
-         * 获取剪贴板的文本内容
-         */
-        FastVueMultiClipboard.getText = function () {
-            return tslib_1.__awaiter(this, void 0, void 0, function () {
-                var clipboard;
-                return tslib_1.__generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            clipboard = require("clipboard-polyfill");
-                            return [4 /*yield*/, clipboard.readText()];
-                        case 1: return [2 /*return*/, _a.sent()];
-                    }
-                });
-            });
-        };
-        /**
-         * 获取剪贴板的ClipboardItem内容
-         */
-        FastVueMultiClipboard.getItems = function () {
-            return tslib_1.__awaiter(this, void 0, void 0, function () {
-                var clipboard;
-                return tslib_1.__generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            clipboard = require("clipboard-polyfill");
-                            return [4 /*yield*/, clipboard.read()];
-                        case 1: return [2 /*return*/, _a.sent()];
-                    }
-                });
-            });
+            (0, copy_to_clipboard_1.default)(content);
         };
         return FastVueMultiClipboard;
     }());

package/dist/esm/other/FastVueMultiWindow.d.ts

@@ -18,4 +18,13 @@ export declare class FastVueMultiWindow {
      * 安全的获取窗口高度，有的手机渲染后document.body.clientHeight 莫明会返回0
      */
     static safeGetClientHeight(): number;
+    /**
+     * 获取地址栏携带的参数
+     * @param paramName 参数名
+     */
+    static getWindowUrlParam(paramName: string): string | null;
+    /**
+     * 获取地址栏携带的参数对象信息
+     */
+    static getWindowUrlInfo(): any;
 }

package/dist/esm/other/FastVueMultiWindow.js

@@ -1,4 +1,4 @@
-define(["require", "exports", "tslib", "lodash"], function (require, exports, tslib_1, lodash_1) {
+define(["require", "exports", "tslib", "lodash", "../http/FastVueMultiHttp"], function (require, exports, tslib_1, lodash_1, FastVueMultiHttp_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.FastVueMultiWindow = void 0;
@@ -51,6 +51,19 @@ define(["require", "exports", "tslib", "lodash"], function (require, exports, ts
         FastVueMultiWindow.safeGetClientHeight = function () {
             return Math.max(document.documentElement.clientHeight, document.body.clientHeight);
         };
+        /**
+         * 获取地址栏携带的参数
+         * @param paramName 参数名
+         */
+        FastVueMultiWindow.getWindowUrlParam = function (paramName) {
+            return FastVueMultiHttp_1.FastVueMultiHttp.Base.getUrlParam(window.location.href, paramName);
+        };
+        /**
+         * 获取地址栏携带的参数对象信息
+         */
+        FastVueMultiWindow.getWindowUrlInfo = function () {
+            return FastVueMultiHttp_1.FastVueMultiHttp.Base.getUrlParamInfo(window.location.href);
+        };
         return FastVueMultiWindow;
     }());
     exports.FastVueMultiWindow = FastVueMultiWindow;

package/loader/index.d.ts

@@ -0,0 +1,2 @@
+declare const htmlparser2: any;
+declare const singleTag: string[];

package/loader/index.js

@@ -0,0 +1,89 @@
+"use strict";
+const htmlparser2 = require("htmlparser2");
+const singleTag = ["br", "hr", "img", "input", "param", "meta", "link", "slot"];
+/**
+ * 标签builder插件，用来处理是否排除标签内的代码
+ * @author Janesen
+ * @param source
+ */
+module.exports = function (source) {
+    //对应配置的options
+    // @ts-ignore
+    let legacyLoaderConfig = this.query;
+    let parseNewHtml = "";
+    let isBreak = false, hasResolve = false;
+    const tagName = legacyLoaderConfig.buildLevelTagName;
+    const parser = new htmlparser2.Parser({
+        onopentag(name, attributes) {
+            if (isBreak) {
+                return;
+            }
+            let attr = "";
+            let buildConfig = {
+                level: 1,
+            };
+            for (let attributesKey in attributes) {
+                let attributesValue = attributes[attributesKey];
+                if (attributesValue.length === 0) {
+                    attr += " " + attributesKey;
+                    continue;
+                }
+                if (attributesKey === "level") {
+                    buildConfig.level = parseInt(attributesValue);
+                }
+                attr += " " + attributesKey + "=\"" + attributesValue + "\"";
+            }
+            if (name === tagName) {
+                hasResolve = true;
+                if (legacyLoaderConfig.buildLevel < buildConfig.level) {
+                    isBreak = true;
+                }
+            }
+            else {
+                if (attr.length > 0) {
+                    parseNewHtml += "<" + name + " " + attr + " ";
+                }
+                else {
+                    parseNewHtml += "<" + name;
+                }
+                if (singleTag.indexOf(name) >= 0) {
+                    parseNewHtml += "/>";
+                }
+                else {
+                    parseNewHtml += ">";
+                }
+            }
+        },
+        ontext(text) {
+            if (isBreak) {
+                return;
+            }
+            parseNewHtml += text;
+        },
+        onclosetag(name) {
+            if (name === tagName) {
+                isBreak = false;
+            }
+            if (isBreak) {
+                return;
+            }
+            if (singleTag.indexOf(name) >= 0) {
+                return;
+            }
+            if (name === tagName) {
+                return;
+            }
+            parseNewHtml += "</" + name + ">";
+        },
+    }, {
+        recognizeSelfClosing: true,
+        lowerCaseTags: false,
+        lowerCaseAttributeNames: false
+    });
+    parser.write(source);
+    parser.end();
+    if (hasResolve) {
+        return parseNewHtml;
+    }
+    return source;
+};

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "fast-vue-multi-pages",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "author": "janesen",
   "description": "快速搭建VUE项目工具类的基本库，主要用于每个功能页面独立生成html",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
   "scripts": {
-    "tsc": "tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && tsc -p ./src/vue/tsconfig-cjs.json",
+    "tsc": "tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && tsc -p ./src/vue/tsconfig-cjs.json && tsc -p ./src/loader/tsconfig-cjs.json",
     "login": "npm login",
     "buildLocal": "npm run tsc",
     "push-fastchar-appjs": "npm run buildLocal && npm publish"
@@ -29,8 +29,8 @@
     "store2": "^2.14.3",
     "moment": "^2.30.1",
     "@types/js-cookie": "^3.0.6",
-    "clipboard-polyfill": "^4.1.0",
-    "@types/lodash": "^4.17.6"
+    "@types/lodash": "^4.17.6",
+    "copy-to-clipboard": "^3.3.3"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^7.16.0",
@@ -43,7 +43,8 @@
   "files": [
     "dist/cjs",
     "dist/esm",
-    "vue"
+    "vue",
+    "loader"
   ],
   "eslintConfig": {
     "root": true,

package/vue/FastVueMultiPages.d.ts

@@ -10,7 +10,7 @@ export declare class FastVueMultiPages {
      * @param dirName 项目根目录，建议取值 {@link __dirname}
      * @param options 更多选项配置 {@link FastBuildOption}
      */
-    static getDefaultVueConfig(dirName: string, options: FastBuildOption): any;
+    static getVueConfig(dirName: string, options: FastBuildOption): any;
     /**
      * 设置全局变量值
      * @param key 变量名
@@ -42,14 +42,6 @@ export declare class FastVueMultiPages {
      * @param argument
      */
     static getScriptArgumentValue(argument: string): string | null;
-    /**
-     * 获取命令参数 --src
-     */
-    static getSrcPageDir(): string | null;
-    /**
-     * 获取命令参数 --out
-     */
-    static getOutPageDir(): string | null;
     /**
      * 获取命令参数 --debug 的值
      */

package/vue/FastVueMultiPages.js

@@ -15,7 +15,7 @@ class FastVueMultiPages {
      * @param dirName 项目根目录，建议取值 {@link __dirname}
      * @param options 更多选项配置 {@link FastBuildOption}
      */
-    static getDefaultVueConfig(dirName, options) {
+    static getVueConfig(dirName, options) {
         if (options) {
             options = FastBuildOption_1.FastBuildOption.merge(options, new FastBuildOption_1.FastBuildOption());
         }
@@ -74,13 +74,9 @@ class FastVueMultiPages {
             const cacheDir = path.join(dirName, options.nodeModulesDir, ".cache", "vue-loader");
             this.removeFile(cacheDir);
         }
-        let outPageDir = this.getOutPageDir();
-        if (!outPageDir) {
-            outPageDir = options.projectOutDir;
-        }
         const { defineConfig } = require('@vue/cli-service');
         return defineConfig({
-            outputDir: outPageDir,
+            outputDir: options.projectOutDir,
             assetsDir: options.projectAssetsDir,
             productionSourceMap: false,
             publicPath: this.isVueCliServerBuild() ? "./" : '/',
@@ -90,7 +86,7 @@ class FastVueMultiPages {
                 extract: false, //取消css单独生成文件
             },
             chainWebpack: (config) => {
-                let tagLoaderPath = "fast-vue-multi-pages/dist/cjs/loader/FastTagBuilderLoader";
+                let tagLoaderPath = "fast-vue-multi-pages/loader";
                 //版本标签加载器
                 config.module
                     .rule('vue')
@@ -244,18 +240,6 @@ class FastVueMultiPages {
         }
         return null;
     }
-    /**
-     * 获取命令参数 --src
-     */
-    static getSrcPageDir() {
-        return this.getScriptArgumentValue("--src");
-    }
-    /**
-     * 获取命令参数 --out
-     */
-    static getOutPageDir() {
-        return this.getScriptArgumentValue("--out");
-    }
     /**
      * 获取命令参数 --debug 的值
      */