fast-vue-multi-pages 1.0.8 → 1.0.10

package/dist/cjs/other/FastVueMultiDate.js

@@ -27,7 +27,7 @@ class FastVueMultiDate {
         if (lodash_1.default.isEmpty(pattern)) {
             return source.toLocaleString();
         }
-        if (lodash_1.default.isEmpty(source)) {
+        if (!source) {
             return null;
         }
         return (0, moment_1.default)(source).format(pattern);

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

@@ -6,13 +6,13 @@ export declare class FastVueMultiFile {
     static showUploadImage(multi: boolean): Promise<any>;
     /**
      * 将base64转为file对象
-     * @param content base64内容
+     * @param base64Content base64内容
      * @param fileName 文件名
      */
-    static base64ToFile(content: string, fileName: string): File;
+    static base64ToFile(base64Content: string, fileName: string): Promise<File>;
     /**
      * 将file对象转为base64
      * @param file
      */
-    static fileToBase64(file: File): Promise<unknown>;
+    static fileToBase64(file: File): Promise<string>;
 }

package/dist/cjs/other/FastVueMultiFile.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FastVueMultiFile = void 0;
+const file64_1 = require("file64");
 class FastVueMultiFile {
     /**
      * 弹出上传文件的选择框
@@ -43,32 +44,18 @@ class FastVueMultiFile {
     }
     /**
      * 将base64转为file对象
-     * @param content base64内容
+     * @param base64Content base64内容
      * @param fileName 文件名
      */
-    static base64ToFile(content, fileName) {
-        let arr = content.split(','), mime = arr[0].match(/:(.*?);/)[1], bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
-        while (n--) {
-            u8arr[n] = bstr.charCodeAt(n);
-        }
-        const blob = new Blob([u8arr], { type: mime });
-        blob.lastModifiedDate = new Date();
-        blob.name = fileName;
-        return blob;
+    static async base64ToFile(base64Content, fileName) {
+        return await (0, file64_1.base64ToFile)(base64Content, fileName);
     }
     /**
      * 将file对象转为base64
      * @param file
      */
     static async fileToBase64(file) {
-        return new Promise(function (resolved, rejected) {
-            const fileReader = new FileReader();
-            fileReader.onload = function (readEvent) {
-                let base64 = readEvent.target.result;
-                resolved(base64);
-            };
-            fileReader.readAsDataURL(file);
-        });
+        return await (0, file64_1.fileToBase64)(file);
     }
 }
 exports.FastVueMultiFile = FastVueMultiFile;

package/dist/esm/other/FastVueMultiDate.js

@@ -29,7 +29,7 @@ define(["require", "exports", "tslib", "moment", "lodash"], function (require, e
             if (lodash_1.default.isEmpty(pattern)) {
                 return source.toLocaleString();
             }
-            if (lodash_1.default.isEmpty(source)) {
+            if (!source) {
                 return null;
             }
             return (0, moment_1.default)(source).format(pattern);

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

@@ -6,13 +6,13 @@ export declare class FastVueMultiFile {
     static showUploadImage(multi: boolean): Promise<any>;
     /**
      * 将base64转为file对象
-     * @param content base64内容
+     * @param base64Content base64内容
      * @param fileName 文件名
      */
-    static base64ToFile(content: string, fileName: string): File;
+    static base64ToFile(base64Content: string, fileName: string): Promise<File>;
     /**
      * 将file对象转为base64
      * @param file
      */
-    static fileToBase64(file: File): Promise<unknown>;
+    static fileToBase64(file: File): Promise<string>;
 }

package/dist/esm/other/FastVueMultiFile.js

@@ -1,4 +1,4 @@
-define(["require", "exports", "tslib"], function (require, exports, tslib_1) {
+define(["require", "exports", "tslib", "file64"], function (require, exports, tslib_1, file64_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.FastVueMultiFile = void 0;
@@ -53,18 +53,18 @@ define(["require", "exports", "tslib"], function (require, exports, tslib_1) {
         };
         /**
          * 将base64转为file对象
-         * @param content base64内容
+         * @param base64Content base64内容
          * @param fileName 文件名
          */
-        FastVueMultiFile.base64ToFile = function (content, fileName) {
-            var arr = content.split(','), mime = arr[0].match(/:(.*?);/)[1], bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
-            while (n--) {
-                u8arr[n] = bstr.charCodeAt(n);
-            }
-            var blob = new Blob([u8arr], { type: mime });
-            blob.lastModifiedDate = new Date();
-            blob.name = fileName;
-            return blob;
+        FastVueMultiFile.base64ToFile = function (base64Content, fileName) {
+            return tslib_1.__awaiter(this, void 0, void 0, function () {
+                return tslib_1.__generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, (0, file64_1.base64ToFile)(base64Content, fileName)];
+                        case 1: return [2 /*return*/, _a.sent()];
+                    }
+                });
+            });
         };
         /**
          * 将file对象转为base64
@@ -73,14 +73,10 @@ define(["require", "exports", "tslib"], function (require, exports, tslib_1) {
         FastVueMultiFile.fileToBase64 = function (file) {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
                 return tslib_1.__generator(this, function (_a) {
-                    return [2 /*return*/, new Promise(function (resolved, rejected) {
-                            var fileReader = new FileReader();
-                            fileReader.onload = function (readEvent) {
-                                var base64 = readEvent.target.result;
-                                resolved(base64);
-                            };
-                            fileReader.readAsDataURL(file);
-                        })];
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, (0, file64_1.fileToBase64)(file)];
+                        case 1: return [2 /*return*/, _a.sent()];
+                    }
                 });
             });
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-vue-multi-pages",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "author": "janesen",
   "description": "快速搭建VUE项目工具类的基本库，主要用于每个功能页面独立生成html",
   "main": "./dist/cjs/index.js",
@@ -31,7 +31,8 @@
     "@types/js-cookie": "^3.0.6",
     "@types/lodash": "^4.17.6",
     "copy-to-clipboard": "^3.3.3",
-    "ip": "^2.0.1"
+    "ip": "^2.0.1",
+    "file64": "^1.0.3"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^7.16.0",

package/vue/FastBuildOption.d.ts

@@ -1,6 +1,8 @@
 /**
  * 获取编译配置的选项配置，配置选项如下：
  * <br/>
+ * {@link devServer } 本地运行服务器配置参考文档：https://webpack.js.org/configuration/dev-server/#devserver
+ * <br/>
  * {@link projectTitle } 项目名称
  * <br/>
  * {@link projectPagesDir } 项目存储页面的目录地址 默认：src/pages
@@ -230,6 +232,10 @@ export declare class FastBuildOption {
      * 编译级别的标签名，默认 build-level
      */
     buildLevelTagName: string;
+    /**
+     * 本地运行服务器配置 https://webpack.js.org/configuration/dev-server/#devserver
+     */
+    devServer: any;
     /**
      * 插入Webpack函数function (config){};
      */

package/vue/FastBuildOption.js

@@ -4,6 +4,8 @@ exports.FastBuildOption = void 0;
 /**
  * 获取编译配置的选项配置，配置选项如下：
  * <br/>
+ * {@link devServer } 本地运行服务器配置参考文档：https://webpack.js.org/configuration/dev-server/#devserver
+ * <br/>
  * {@link projectTitle } 项目名称
  * <br/>
  * {@link projectPagesDir } 项目存储页面的目录地址 默认：src/pages
@@ -235,6 +237,10 @@ class FastBuildOption {
      * 编译级别的标签名，默认 build-level
      */
     buildLevelTagName = "build-level";
+    /**
+     * 本地运行服务器配置 https://webpack.js.org/configuration/dev-server/#devserver
+     */
+    devServer;
     /**
      * 插入Webpack函数function (config){};
      */

package/vue/FastVueMultiPages.js

@@ -76,7 +76,7 @@ class FastVueMultiPages {
             this.removeFile(cacheDir);
         }
         const { defineConfig } = require('@vue/cli-service');
-        return defineConfig({
+        let newConfig = {
             outputDir: options.projectOutDir,
             assetsDir: options.projectAssetsDir,
             productionSourceMap: false,
@@ -172,7 +172,11 @@ class FastVueMultiPages {
                     options.configureWebpack(config);
                 }
             }
-        });
+        };
+        if (options.devServer) {
+            newConfig["devServer"] = options.devServer;
+        }
+        return defineConfig(newConfig);
     }
     /**
      * 设置全局变量值