clickgo 3.1.4-dev13 → 3.1.6-dev15

package/dist/lib/tool.ts

@@ -156,12 +156,34 @@ export async function sleepFrame(count: number): Promise<void> {
  */
 export function purify(text: string): string {
     text = '>' + text + '<';
-    text = text.replace(/<!--([\s\S]*?)-->/g, '').replace(/>([\s\S]*?)</g, function(t: string, t1: string) {
+    const scripts: string[] = [];
+    let num: number = -1;
+    text = text.replace(/<!--([\s\S]*?)-->/g, '').replace(/<script[\s\S]+?<\/script>/g, function(t: string): string {
+        scripts.push(t);
+        return '[SCRIPT]';
+    }).replace(/>([\s\S]*?)</g, function(t: string, t1: string): string {
         return '>' + t1.replace(/\t|\r\n| {2}/g, '').replace(/\n|\r/g, '') + '<';
+    }).replace(/\[SCRIPT\]/g, function(): string {
+        ++num;
+        return scripts[num];
     });
     return text.slice(1, -1);
 }
 
+/**
+ * --- 传入正则进行匹配 str 是否有一项满足 ---
+ * @param str 要检测的字符串
+ * @param regs 正则列表
+ */
+export function match(str: string, regs: RegExp[]): boolean {
+    for (const reg of regs) {
+        if (reg.test(str)) {
+            return true;
+        }
+    }
+    return false;
+}
+
 /**
  * --- 将 style 中的 url 转换成 base64 data url ---
  * @param path 路径基准或以文件的路径为基准，以 / 结尾
@@ -573,6 +595,47 @@ export function escapeHTML(html: string): string {
     return html.replace(/</g, '&lt;').replace(/>/g, '&gt;');
 }
 
+/**
+ * --- rgb 字符串转 hsl 数组 ---
+ * @param rgb rgb(x, x, x) 或直接 x,x,x
+ */
+export function rgb2hsl(rgb: string): number[] {
+    if (rgb.includes('(')) {
+        const match = /[0-9., ]+/.exec(rgb);
+        if (!match) {
+            return [0, 0, 0];
+        }
+        rgb = match[0];
+    }
+    const arr = rgb.split(',');
+    const [r, g, b] = arr.map(v => parseInt(v) / 255);
+
+    const max = Math.max(r, g, b);
+    const min = Math.min(r, g, b);
+    const diff = max - min;
+
+    let h = 0 ;
+    const l = (max + min) / 2;
+    const s2 = 1 - Math.abs(max + min - 1);
+    const s = s2 ? (diff / s2) : 0;
+
+    switch (min) {
+        case max:
+            h = 0 ;
+            break;
+        case r:
+            h = (60 * ((b - g) / diff)) + 180;
+            break;
+        case g:
+            h = (60 * ((r - b) / diff)) + 300;
+            break;
+        case b:
+            h = (60 * ((g - r) / diff)) + 60;
+            break;
+    }
+    return [h, s, l] ;
+}
+
 /**
  * --- 发起一个网络请求 ---
  * @param url 网址
@@ -680,6 +743,10 @@ export function urlResolve(from: string, to: string): string {
     return loader.urlResolve(from, to);
 }
 
+export function urlAtom(url: string): string {
+    return loader.urlAtom(url);
+}
+
 export function blob2Text(blob: Blob): Promise<string> {
     return loader.blob2Text(blob);
 }

package/dist/lib/zip.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,10 +31,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.get = exports.Zip = void 0;
-const jszip = require("jszip");
-const tool = require("./tool");
+const jszip_1 = __importDefault(require("jszip"));
+const tool = __importStar(require("./tool"));
 class Zip {
     constructor(zip) {
         this._path = '/';
@@ -337,7 +363,7 @@ class Zip {
 exports.Zip = Zip;
 function get(data) {
     return __awaiter(this, void 0, void 0, function* () {
-        const z = jszip();
+        const z = (0, jszip_1.default)();
         try {
             if (data) {
                 yield z.loadAsync(data);

package/dist/lib/zip.ts

@@ -1,4 +1,4 @@
-import * as jszip from 'jszip';
+import jszip from 'jszip';
 import * as types from '../../types';
 import * as tool from './tool';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo",
-  "version": "3.1.4-dev13",
+  "version": "3.1.6-dev15",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",
@@ -19,12 +19,10 @@
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.1.0",
-    "@litert/loader": "^3.4.3",
+    "@litert/loader": "^3.4.4",
     "@types/node": "^18.11.14",
-    "electron": "^19.1.3",
-    "typescript": "^4.8.4"
-  },
-  "dependencies": {
-    "jszip": "^3.10.0"
+    "electron": "^22.0.2",
+    "jszip": "^3.10.1",
+    "typescript": "^4.9.4"
   }
 }

package/types/index.d.ts

@@ -88,7 +88,6 @@ export type TGlobalEvent = 'error' | 'screenResize' | 'configChanged' | 'formCre
 /** --- 现场下载 app 的参数 --- */
 export interface ICoreFetchAppOptions {
     'notifyId'?: number;
-    'current'?: string;
     'progress'?: (loaded: number, total: number) => void | Promise<void>;
 }
 
@@ -129,6 +128,8 @@ export interface IAppConfig {
 
     /** --- 将要加载的非 js 文件列表，打包为 cga 模式下此配置可省略 --- */
     'files'?: string[];
+    /** --- import 的目录映射关系 --- */
+    'map'?: Record<string, string>;
 }
 
 // -------------------------
@@ -213,6 +214,7 @@ export interface IBindMoveOptions {
     'objectHeight'?: number;
     'object'?: HTMLElement | IVue;
     'showRect'?: boolean;
+    'cursor'?: string;
     'start'?: (x: number, y: number) => any;
     'move'?: (e: MouseEvent | TouchEvent, opt: IBindMoveMoveOptions) => void;
     'up'?: (moveTimes: Array<{ 'time': number; 'ox': number; 'oy': number; }>, e: MouseEvent | TouchEvent) => void;
@@ -260,6 +262,33 @@ export interface IWatchItem {
     'taskId'?: number;
 }
 
+/** --- 获取当前正在监视中的 property 和 style 的元素信息 --- */
+export interface IGetWatchInfoResult {
+    'formId': number;
+    'default': Record<string, {
+        'style': {
+            'list': string[];
+            'count': number;
+        };
+        'property': {
+            'list': string[];
+            'count': number;
+        };
+    }>;
+    'panels': Record<string,
+        Record<string, {
+            'style': {
+                'list': string[];
+                'count': number;
+            };
+            'property': {
+                'list': string[];
+                'count': number;
+            };
+        }>
+    >;
+}
+
 // --------------------------
 // -------- form lib --------
 // --------------------------
@@ -284,84 +313,34 @@ export interface IFormInfo {
     'focus': boolean;
 }
 
-/** --- 窗体创建选项 --- */
-export interface IFormCreateOptions {
-    'code'?: IFormCreateCode;
-    'layout': string;
-    'style'?: string;
-
-    /** --- 当前窗体的基准路径，不以 / 结尾，仅用作传值，App 内无法填写 --- */
-    'path'?: string;
-    /** --- 传递到 onMounted 的数据 --- */
-    'data'?: Record<string, any>;
-    /** --- APP 内无法填写 --- */
-    'taskId'?: number;
-}
-
-/** --- 窗体的 code 参数 --- */
-export interface IFormCreateCode {
-    'data'?: Record<string, any>;
-    'access'?: Record<string, any>;
-    'methods'?: Record<string, any>;
-    'computed'?: Record<string, {
-        'get'?: any;
-        'set'?: any;
-    }>;
-    'beforeCreate'?: any;
-    'created'?: any;
-    'beforeMount'?: any;
-    'mounted'?: any;
-    'beforeUpdate'?: any;
-    'updated'?: any;
-    'beforeUnmount'?: any;
-    'unmounted'?: any;
-}
-
 // --------------------------
 // --------- fs lib ---------
 // --------------------------
 
 export interface IMountHandler {
-    'taskId'?: number;
+    /** --- 挂载时间，无需设置 --- */
+    'date'?: Date;
     getContent?: (path: string, options?: BufferEncoding | {
         'encoding'?: BufferEncoding;
         'start'?: number;
         'end'?: number;
-        'files'?: Record<string, Blob | string>;
-        'current'?: string;
         'progress'?: (loaded: number, total: number) => void | Promise<void>;
-    }) => Promise<Blob | string | null>;
+    }) => Blob | string | null | Promise<Blob | string | null>;
     putContent?: (path: string, data: string | Blob, options?: {
         'encoding'?: BufferEncoding | null;
         'mode'?: string | number;
         'flag'?: string | number;
-        'current'?: string;
-    }) => Promise<boolean>;
-    readLink?: (path: string, options?: BufferEncoding | {
-        'encoding'?: BufferEncoding;
-        /** --- 不以 / 结尾的路径 --- */
-        'current'?: string;
-    }) => Promise<string | null>;
-    symlink?: (filePath: string, linkPath: string, options?: {
-        'type'?: 'dir' | 'file' | 'junction';
-        'current'?: string;
-    }) => Promise<boolean>;
-    unlink?: (path: string, options?: {
-        'current'?: string;
-    }) => Promise<boolean>;
-    stats: (path: string, options?: {
-        'files'?: Record<string, Blob | string>;
-        'current'?: string;
-    }) => Promise<IStats | null>;
-    mkdir: (path: string, mode?: number, options?: {
-        'current'?: string;
-    }) => Promise<boolean>;
-    rmdir: (path: string, options?: {
-        'current'?: string;
-    }) => Promise<boolean>;
-    chmod: (path: string, mod: string | number, options?: {
-        'current'?: string;
-    }) => Promise<boolean>;
+    }) => boolean | Promise<boolean>;
+    readLink?: (path: string, encoding?: BufferEncoding) => string | null | Promise<string | null>;
+    symlink?: (filePath: string, linkPath: string, type?: 'dir' | 'file' | 'junction') => boolean | Promise<boolean>;
+    unlink?: (path: string) => boolean | Promise<boolean>;
+    stats?: (path: string) => IStats | null | Promise<IStats | null>;
+    mkdir?: (path: string, mode?: number) => boolean | Promise<boolean>;
+    rmdir?: (path: string) => boolean | Promise<boolean>;
+    chmod?: (path: string, mod: string | number) => boolean | Promise<boolean>;
+    rename?: (oldPath: string, newPath: string) => boolean | Promise<boolean>;
+    readDir?: (path: string, encoding?: BufferEncoding) => IDirent[] | Promise<IDirent[]>;
+    copyFile?: (src: string, dest: string) => boolean | Promise<boolean>;
 }
 
 /** --- 文件/文件夹信息对象 --- */
@@ -444,8 +423,6 @@ export interface ITaskRunOptions {
     'progress'?: (loaded: number, total: number) => void | Promise<void>;
     /** --- 显示 notify 窗口 --- */
     'notify'?: boolean;
-    /** --- 所属任务，App 模式无法设置 --- */
-    'taskId'?: number;
     /** --- 不禁止某些浏览器对象，App 模式下仅能设置基任务中已经 unblock 的值 --- */
     'unblock'?: string[];
     /** --- 直接赋予此任务相应权限，App 模式下有 "root" 权限的应用才能设置 --- */
@@ -572,15 +549,19 @@ export interface IZipMetadata {
 
 /** --- Dialog 选项 --- */
 export interface IFormDialogOptions {
-    /** --- 当前的 taskId，App 模式下无效 --- */
-    'taskId'?: number;
-
     'title'?: string;
     'content': string;
     'buttons'?: string[];
     'direction'?: 'h' | 'v';
 
+    'style'?: string;
+    /** --- 路径基，以 / 结束或文件路径则以文件的基路径为准，可留空 --- */
+    'path'?: string;
+
     'select'?: (e: Event, button: string) => void;
+
+    /** --- 当前的 taskId，App 模式下无效 --- */
+    'taskId'?: number;
 }
 
 /** --- Confirm 选项 --- */