ddan-js 2.0.7 → 2.0.9

package/bin/lib/class/store.js

@@ -40,7 +40,7 @@ class DStore extends event_1.default {
             result = obj_1.default.copy(val);
         }
         else {
-            const [, data] = await hook_1.default.exec(() => this.dispatch(key), `${this.__eventId__}_${key}`);
+            const [, data] = await hook_1.default.exec(() => this.dispatch(key), `${this.__eventId}_${key}`);
             result = data;
         }
         return result;

package/bin/lib/class/task.js

@@ -2,19 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const is_1 = require("../util/is");
 class DTask {
-    __source__;
+    __source;
     constructor(source) {
-        this.__source__ = source;
+        this.__source = source;
     }
     run() {
         let promise;
         try {
             let temp;
-            if (is_1.default.isFunction(this.__source__)) {
-                temp = this.__source__();
+            if (is_1.default.isFunction(this.__source)) {
+                temp = this.__source();
             }
             else {
-                temp = this.__source__;
+                temp = this.__source;
             }
             promise = is_1.default.isPromise(temp) ? temp : Promise.resolve(temp);
             return promise.then(data => [null, data]).catch(err => [err, undefined]);

package/bin/lib/class/tracker.js

@@ -48,12 +48,12 @@ class DTrack {
 }
 exports.DTrack = DTrack;
 class DTracker {
-    __map__ = new Map();
-    __trackList__ = [];
+    __map = new Map();
+    __trackList = [];
     can = true;
     clear() {
-        this.__map__.clear();
-        this.__trackList__ = [];
+        this.__map.clear();
+        this.__trackList = [];
         return this;
     }
     add(name, { desc = "", type = "" } = {}) {
@@ -63,13 +63,13 @@ class DTracker {
         _track.name = name;
         _track.type = type;
         _track.desc = desc;
-        this.__trackList__.push(_track);
+        this.__trackList.push(_track);
         return _track.id;
     }
     done(id) {
         if (!id || !this.can)
             return;
-        const _track = this.__trackList__.find(e => e.id === id);
+        const _track = this.__trackList.find(e => e.id === id);
         if (!_track || _track.isDone)
             return;
         _track.done();
@@ -77,38 +77,38 @@ class DTracker {
         endTrack.id = this._endId(id);
         endTrack.flag = 1;
         endTrack.desc = `${_track.desc} | end`;
-        this.__trackList__.push(endTrack);
+        this.__trackList.push(endTrack);
     }
     getTrack(id) {
-        return this.__trackList__.find(e => e.id === id);
+        return this.__trackList.find(e => e.id === id);
     }
     getLine(id) {
         if (!id || id.endsWith("-end"))
             return [];
-        const idx_s = this.__trackList__.findIndex(e => e.id === id);
+        const idx_s = this.__trackList.findIndex(e => e.id === id);
         if (idx_s < 0)
             return [];
         const endid = this._endId(id);
-        const idx_e = this.__trackList__.findIndex(e => e.id === endid);
-        const count = idx_e < 0 ? this.__trackList__.length - idx_s : idx_e - idx_s + 1;
-        return list_1.default.take(this.__trackList__, count, idx_s);
+        const idx_e = this.__trackList.findIndex(e => e.id === endid);
+        const count = idx_e < 0 ? this.__trackList.length - idx_s : idx_e - idx_s + 1;
+        return list_1.default.take(this.__trackList, count, idx_s);
     }
     getListByName(name, id = "") {
         if (!name)
             return [];
-        const _nameList = this.__trackList__.filter(e => e.name === name);
+        const _nameList = this.__trackList.filter(e => e.name === name);
         if (_nameList.length <= 0)
             return [];
         if (!id)
             return _nameList;
         const endid = this._endId(id);
-        return this.__trackList__.filter(e => e.id === id || e.id === endid);
+        return this.__trackList.filter(e => e.id === id || e.id === endid);
     }
     getList() {
-        return this.__trackList__;
+        return this.__trackList;
     }
     size() {
-        return this.__trackList__.length;
+        return this.__trackList.length;
     }
     _endId = (id) => `${id}-end`;
 }

package/bin/lib/modules/css.js

@@ -17,7 +17,7 @@ const stringify = (styleObj) => {
     });
     return result;
 };
-const parse = (styleStr, camel = false) => {
+const parse = (styleStr, { camel = false, pure = true } = {}) => {
     if (!styleStr.trim())
         return undefined;
     const ret = qs_1.default.parse(styleStr, { sep: ';', eq: ':', uri: false });
@@ -25,7 +25,7 @@ const parse = (styleStr, camel = false) => {
     util_1.default.forof(ret, (k, v) => {
         if (!v)
             return;
-        const _k = camel ? string_1.default.camelCase(k) : k;
+        const _k = camel ? ((pure && k.startsWith("_")) ? k : string_1.default.camelCase(k)) : k;
         if (rule_1.default.isFloat(v)) {
             result[_k] = +v;
         }
@@ -68,6 +68,10 @@ const commonFields = [
     "borderColor",
     "borderRadius",
     "background",
+    "backgroundImage",
+    "backgroundRepeat",
+    "backgroundSize",
+    "backgroundPosition",
     "color",
     "overflow",
     "opacity",
@@ -80,7 +84,8 @@ const commonFields = [
     "flex",
     "flexBasis",
     "flexFlow",
-    "flexShrink"
+    "flexShrink",
+    "pointerEvents",
 ];
 const fixFields = [
     "top",

package/bin/lib/modules/hook/mutex.js

@@ -4,9 +4,9 @@ function mutex(func) {
     var lastThis = null;
     async function mutexed(...args) {
         lastThis = this || lastThis || {};
-        if (lastThis.__ddMutex__)
+        if (lastThis.__ddMutex)
             return false;
-        lastThis.__ddMutex__ = true;
+        lastThis.__ddMutex = true;
         try {
             func && (await Promise.resolve(func.apply(this, args)));
         }
@@ -14,7 +14,7 @@ function mutex(func) {
             console.log(err);
         }
         finally {
-            lastThis.__ddMutex__ = false;
+            lastThis.__ddMutex = false;
         }
     }
     return mutexed;

package/bin/lib/modules/html.js

@@ -36,11 +36,29 @@ const readAsDataURL = (file, cb) => {
         cb && cb(e.target?.result);
     };
 };
-const downloadFile = (fileName, dataUrl) => {
-    const a = document.createElement("a");
-    a.href = dataUrl;
-    a.download = fileName;
-    a.click();
+const downloadUrl = (filename, url) => {
+    try {
+        const a = document.createElement("a");
+        a.href = url;
+        a.download = filename;
+        a.click();
+    }
+    catch (err) {
+        console.warn(`[ddan] downloadUrl`, err);
+    }
+};
+const download = (filename, obj) => {
+    if (!obj)
+        return;
+    if (typeof obj === "string") {
+        downloadUrl(filename, obj);
+        return;
+    }
+    const href = URL?.createObjectURL(obj);
+    if (!href)
+        return;
+    downloadUrl(filename, href);
+    URL?.revokeObjectURL(href);
 };
 const downloadImage = (url) => {
     try {
@@ -56,14 +74,37 @@ const downloadImage = (url) => {
             let context = canvas.getContext("2d");
             context && context.drawImage(img, 0, 0, img.width, img.height);
             let base64 = canvas.toDataURL(); //得到图片的base64编码数据
-            downloadFile(name, base64);
+            downloadUrl(name, base64);
         };
         img.src = url; // 将canvas对象转换为图片的data url
         img.setAttribute("crossOrigin", "Anonymous");
     }
     catch (err) {
-        console.log(`[ddan] downloadImageUrl`, err);
+        console.warn(`[ddan] downloadImage`, err);
     }
     return Promise.resolve();
 };
-exports.default = { dataURLtoFile, dataURLtoBlob, blobToFile, readAsDataURL, downloadFile, downloadImage };
+const watermark = (text, { width = 400, height = 300, angle = 0, fillStyle = "rgba(0, 0, 0, 0.2)", font = "16px Arial", textAlign = "left", textBaseline = "middle" } = {}) => {
+    try {
+        if (!text)
+            return "";
+        const canvas = document.createElement("canvas");
+        canvas.width = width;
+        canvas.height = height;
+        const ctx = canvas.getContext("2d");
+        if (!ctx)
+            return "";
+        angle && ctx.rotate((angle * Math.PI) / 180);
+        fillStyle && (ctx.fillStyle = fillStyle);
+        font && (ctx.font = font);
+        textAlign && (ctx.textAlign = textAlign);
+        textBaseline && (ctx.textBaseline = textBaseline);
+        ctx.fillText(text, canvas.width / 10, canvas.height / 2);
+        return `url(${canvas.toDataURL()})`; // "image/png" 默认
+    }
+    catch (err) {
+        console.warn(`[ddan] watermark`, err);
+        return "";
+    }
+};
+exports.default = { dataURLtoFile, dataURLtoBlob, blobToFile, readAsDataURL, downloadUrl, download, downloadImage, watermark };

package/bin/lib/modules/obj/index.js

@@ -9,7 +9,7 @@ const copy = (source, options = {}) => {
         return newData;
     if (Array.isArray(newData))
         return newData;
-    const { fields = [], camel = false, pure = false } = options;
+    const { fields = [], camel = false, pure = true } = options;
     if ((!fields || fields.length <= 0) && !camel)
         return newData;
     const result = {};

package/bin/types/class/event.d.ts

@@ -4,9 +4,9 @@ export interface IDEvent {
     tag: string;
 }
 export default class DEvent {
-    __map__: Map<string, Set<Function | any>>;
-    __tagList__: IDEvent[];
-    __eventId__: string;
+    __map: Map<string, Set<Function | any>>;
+    __tagList: IDEvent[];
+    __eventId: string;
     constructor();
     clear(): this;
     /**

package/bin/types/class/icon.d.ts

@@ -1,7 +1,7 @@
 export type TSVG = "back" | "right" | "home" | "close" | "close_circle" | "close_circle_fill" | "warning" | "play" | "lock" | "lock_fill" | "plus" | "plus_circle" | "plus_circle_fill" | "star" | "star_fill" | "share" | "love" | "love_fill";
 export declare class DIcon {
-    __defStyle__: string;
-    __map__: Record<TSVG, string>;
+    __defStyle: string;
+    __map: Record<TSVG, string>;
     getBase64: (svgType: TSVG) => string;
     getSVG: (svgType: TSVG) => {
         url: string;

package/bin/types/class/pipeTask.d.ts

@@ -1,5 +1,5 @@
 export default class DPipeTask {
-    __list__: any[];
+    __list: any[];
     constructor(_task?: any);
     push(_task?: any): this;
     clear(): this;

package/bin/types/class/pipeline.d.ts

@@ -1,7 +1,7 @@
 export default class DPipeline {
-    __list__: any[];
-    __running__: boolean;
-    __waitting__: boolean;
+    __list: any[];
+    __running: boolean;
+    __waitting: boolean;
     constructor();
     pipe(_task?: any): this;
     delay(t?: number): this;

package/bin/types/class/pipeparallel.d.ts

@@ -1,5 +1,5 @@
 export default class DPipeparallel {
-    __list__: any[];
+    __list: any[];
     constructor();
     add(_task?: any): this;
     clear(): this;

package/bin/types/class/task.d.ts

@@ -1,5 +1,5 @@
 export default class DTask {
-    __source__: any;
+    __source: any;
     constructor(source?: any);
     run(): Promise<any[]>;
     static _lockedMap: Map<string, Promise<any[]>>;

package/bin/types/class/tracker.d.ts

@@ -25,8 +25,8 @@ export declare class DTrack {
     done: (t?: number) => void;
 }
 export declare class DTracker {
-    __map__: Map<string, DTrack>;
-    __trackList__: DTrack[];
+    __map: Map<string, DTrack>;
+    __trackList: DTrack[];
     can: boolean;
     clear(): this;
     add(name: string, { desc, type }?: {

package/bin/types/index.d.ts

@@ -195,7 +195,10 @@ declare const _default: {
     };
     css: {
         stringify: (styleObj: Record<string, string | number>) => string;
-        parse: (styleStr: string, camel?: boolean) => {} | undefined;
+        parse: (styleStr: string, { camel, pure }?: {
+            camel?: boolean | undefined;
+            pure?: boolean | undefined;
+        }) => {} | undefined;
         fixValue: (value: string | number, unit?: string) => string | number;
         style: (cssKV: Record<string, any>, unit?: string) => string;
         commonFields: string[];
@@ -221,8 +224,18 @@ declare const _default: {
         dataURLtoBlob: (dataurl: any) => Blob;
         blobToFile: (theBlob: any, fileName: any) => any;
         readAsDataURL: (file: any, cb: any) => void;
-        downloadFile: (fileName: any, dataUrl: any) => void;
+        downloadUrl: (filename: string, url: string) => void;
+        download: (filename: string, obj: string | Blob | MediaSource) => void;
         downloadImage: (url: string) => Promise<void> | undefined;
+        watermark: (text: string, { width, height, angle, fillStyle, font, textAlign, textBaseline }?: {
+            width?: number | undefined;
+            height?: number | undefined;
+            angle?: number | undefined;
+            fillStyle?: string | undefined;
+            font?: string | undefined;
+            textAlign?: "center" | "end" | "left" | "right" | "start" | undefined;
+            textBaseline?: "alphabetic" | "bottom" | "hanging" | "ideographic" | "middle" | "top" | undefined;
+        }) => string;
     };
     icon: import("./class/icon").DIcon;
     rule: {

package/bin/types/modules/css.d.ts

@@ -1,6 +1,9 @@
 declare const _default: {
     stringify: (styleObj: Record<string, string | number>) => string;
-    parse: (styleStr: string, camel?: boolean) => {} | undefined;
+    parse: (styleStr: string, { camel, pure }?: {
+        camel?: boolean | undefined;
+        pure?: boolean | undefined;
+    }) => {} | undefined;
     fixValue: (value: string | number, unit?: string) => string | number;
     style: (cssKV: Record<string, any>, unit?: string) => string;
     commonFields: string[];

package/bin/types/modules/html.d.ts

@@ -3,7 +3,17 @@ declare const _default: {
     dataURLtoBlob: (dataurl: any) => Blob;
     blobToFile: (theBlob: any, fileName: any) => any;
     readAsDataURL: (file: any, cb: any) => void;
-    downloadFile: (fileName: any, dataUrl: any) => void;
+    downloadUrl: (filename: string, url: string) => void;
+    download: (filename: string, obj: string | Blob | MediaSource) => void;
     downloadImage: (url: string) => Promise<void> | undefined;
+    watermark: (text: string, { width, height, angle, fillStyle, font, textAlign, textBaseline }?: {
+        width?: number | undefined;
+        height?: number | undefined;
+        angle?: number | undefined;
+        fillStyle?: string | undefined;
+        font?: string | undefined;
+        textAlign?: "center" | "end" | "left" | "right" | "start" | undefined;
+        textBaseline?: "alphabetic" | "bottom" | "hanging" | "ideographic" | "middle" | "top" | undefined;
+    }) => string;
 };
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddan-js",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "",
   "keywords": [],
   "main": "bin/ddan-js.js",