clickgo 3.1.2-dev11 → 3.1.4-dev13

package/dist/lib/tool.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.execCommand = exports.blob2DataUrl = exports.blob2Text = exports.urlResolve = exports.parseUrl = exports.request = exports.escapeHTML = exports.getNumber = exports.getBoolean = exports.random = exports.RANDOM_LUNS = exports.RANDOM_V = exports.RANDOM_LUN = exports.RANDOM_LU = exports.RANDOM_LN = exports.RANDOM_UN = exports.RANDOM_L = exports.RANDOM_U = exports.RANDOM_N = exports.rand = exports.getMimeByPath = exports.stylePrepend = exports.eventsAttrWrap = exports.layoutClassPrepend = exports.layoutInsertAttr = exports.layoutAddTagClassAndReTagName = exports.styleUrl2DataUrl = exports.purify = exports.sleep = exports.clone = exports.blob2ArrayBuffer = exports.getClassPrototype = void 0;
+exports.execCommand = exports.blob2DataUrl = exports.blob2Text = exports.urlResolve = exports.parseUrl = exports.request = exports.escapeHTML = exports.getArray = exports.getNumber = exports.getBoolean = exports.random = exports.RANDOM_LUNS = exports.RANDOM_V = exports.RANDOM_LUN = exports.RANDOM_LU = exports.RANDOM_LN = exports.RANDOM_UN = exports.RANDOM_L = exports.RANDOM_U = exports.RANDOM_N = exports.rand = exports.getMimeByPath = exports.stylePrepend = exports.teleportGlue = exports.eventsAttrWrap = exports.layoutClassPrepend = exports.layoutInsertAttr = exports.layoutAddTagClassAndReTagName = exports.styleUrl2DataUrl = exports.purify = exports.sleepFrame = exports.nextFrame = exports.sleep = exports.clone = exports.blob2ArrayBuffer = exports.getClassPrototype = void 0;
 function getClassPrototype(obj, over = [], level = 0) {
     if (level === 0) {
         return getClassPrototype(Object.getPrototypeOf(obj), over, level + 1);
@@ -93,6 +93,25 @@ function sleep(ms = 0) {
     });
 }
 exports.sleep = sleep;
+function nextFrame() {
+    return new Promise(function (resolve) {
+        requestAnimationFrame(() => {
+            resolve();
+        });
+    });
+}
+exports.nextFrame = nextFrame;
+function sleepFrame(count) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (count > 10) {
+            count = 10;
+        }
+        for (let i = 0; i < count; ++i) {
+            yield nextFrame();
+        }
+    });
+}
+exports.sleepFrame = sleepFrame;
 function purify(text) {
     text = '>' + text + '<';
     text = text.replace(/<!--([\s\S]*?)-->/g, '').replace(/>([\s\S]*?)</g, function (t, t1) {
@@ -255,6 +274,19 @@ function eventsAttrWrap(layout) {
     });
 }
 exports.eventsAttrWrap = eventsAttrWrap;
+function teleportGlue(layout, formId) {
+    if (typeof formId !== 'string') {
+        formId = formId.toString();
+    }
+    const fid = formId;
+    return layout.replace(/<teleport([\s\S]+?)to="(.+?)"([\s\S]+?<[\w-]+)/g, (v, v1, v2, v3) => {
+        if (v2 !== 'system') {
+            return v;
+        }
+        return '<teleport' + v1 + 'to="#cg-pop-list > [data-form-id=\'' + fid + '\']"' + v3 + ' data-cg-pop';
+    });
+}
+exports.teleportGlue = teleportGlue;
 function stylePrepend(style, prep = '') {
     if (prep === '') {
         prep = 'cg-scope' + Math.round(Math.random() * 1000000000000000).toString() + '_';
@@ -379,6 +411,21 @@ function getNumber(param) {
     return parseFloat(param);
 }
 exports.getNumber = getNumber;
+function getArray(param) {
+    if (typeof param !== 'string') {
+        return param;
+    }
+    let rtn = [];
+    if (param.startsWith('[')) {
+        rtn = JSON.parse(param);
+    }
+    else {
+        param = param.replace(/ /g, '');
+        rtn = param.split(',');
+    }
+    return rtn;
+}
+exports.getArray = getArray;
 function escapeHTML(html) {
     return html.replace(/</g, '&lt;').replace(/>/g, '&gt;');
 }

package/dist/lib/tool.ts

@@ -126,6 +126,30 @@ export function sleep(ms: number = 0): Promise<boolean> {
     });
 }
 
+/**
+ * --- 等待浏览器帧 ---
+ */
+export function nextFrame(): Promise<void> {
+    return new Promise(function(resolve) {
+        requestAnimationFrame(() => {
+            resolve();
+        });
+    });
+}
+
+/**
+ * --- 等待浏览器帧 ---
+ * @param count 等待帧数最高 10 帧
+ */
+export async function sleepFrame(count: number): Promise<void> {
+    if (count > 10) {
+        count = 10;
+    }
+    for (let i = 0; i < count; ++i) {
+        await nextFrame();
+    }
+}
+
 /**
  * --- 去除 html 的空白符、换行以及注释 ---
  * @param text 要纯净的字符串
@@ -338,6 +362,24 @@ export function eventsAttrWrap(layout: string): string {
     });
 }
 
+/**
+ * --- 对 layout 的 teleport 做转义处理为 vue 识别的内容 ---
+ * @param layout 要处理的窗体或控件的 layout
+ * @param formId 要加入的 formId
+ */
+export function teleportGlue(layout: string, formId: number | string): string {
+    if (typeof formId !== 'string') {
+        formId = formId.toString();
+    }
+    const fid = formId;
+    return layout.replace(/<teleport([\s\S]+?)to="(.+?)"([\s\S]+?<[\w-]+)/g, (v, v1, v2, v3): string => {
+        if (v2 !== 'system') {
+            return v;
+        }
+        return '<teleport' + v1 + 'to="#cg-pop-list > [data-form-id=\'' + fid + '\']"' + v3 + ' data-cg-pop';
+    });
+}
+
 /**
  * --- 给 class 前部增加唯一标识符 ---
  * @param style 样式内容
@@ -504,6 +546,25 @@ export function getNumber(param: string | number): number {
     return parseFloat(param);
 }
 
+/**
+ * --- 根据参数获取最终的数组型 ---
+ * @param param 参数
+ */
+export function getArray(param: string | any[]): any[] {
+    if (typeof param !== 'string') {
+        return param;
+    }
+    let rtn: any[] = [];
+    if (param.startsWith('[')) {
+        rtn = JSON.parse(param);
+    }
+    else {
+        param = param.replace(/ /g, '');
+        rtn = param.split(',');
+    }
+    return rtn;
+}
+
 /**
  * --- 转义 HTML ---
  * @param html HTML 字符

package/dist/lib/zip.ts

@@ -142,6 +142,7 @@ export class Zip {
         return pstats;
     }
 
+    /** --- 读取目录，hasChildren: false, hasDir: true, pathAsKey: false --- */
     public readDir(path?: string, opt?: { 'hasChildren'?: boolean; 'hasDir'?: boolean; 'pathAsKey'?: false; }): types.IZipItem[];
     public readDir(path?: string, opt?: { 'hasChildren'?: boolean; 'hasDir'?: boolean; 'pathAsKey': true; }): Record<string, types.IZipItem>;
     /**
@@ -278,6 +279,7 @@ export class Zip {
      */
     private _refreshList(): void {
         const list: Record<string, Record<string, types.IZipItem>> = {};
+        // eslint-disable-next-line @litert/rules/disable-for-each-method
         this._zip.forEach(function(relativePath: string, item: jszip.JSZipObject) {
             if (relativePath.startsWith('/')) {
                 relativePath = relativePath.slice(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo",
-  "version": "3.1.2-dev11",
+  "version": "3.1.4-dev13",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",
@@ -20,7 +20,7 @@
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.1.0",
     "@litert/loader": "^3.4.3",
-    "@types/node": "^17.0.21",
+    "@types/node": "^18.11.14",
     "electron": "^19.1.3",
     "typescript": "^4.8.4"
   },

package/types/index.d.ts

@@ -35,9 +35,6 @@ export interface IControlConfig {
     'layout': string;
     /** --- 不带扩展名，系统会在末尾添加 .css --- */
     'style': string;
-
-    /** --- 将要加载的文件 --- */
-    'files': string[];
 }
 
 /** --- 控件对象 --- */
@@ -86,7 +83,7 @@ export interface IAvailArea {
 }
 
 /** --- 全局事件类型 --- */
-export type TGlobalEvent = 'error' | 'screenResize' | 'configChanged' | 'formCreated' | 'formRemoved' | 'formTitleChanged' | 'formIconChanged' | 'formStateMinChanged' | 'formStateMaxChanged' | 'formShowChanged' | 'formFocused' | 'formBlurred' | 'formFlash' | 'taskStarted' | 'taskEnded' | 'launcherFolderNameChanged';
+export type TGlobalEvent = 'error' | 'screenResize' | 'configChanged' | 'formCreated' | 'formRemoved' | 'formTitleChanged' | 'formIconChanged' | 'formStateMinChanged' | 'formStateMaxChanged' | 'formShowChanged' | 'formFocused' | 'formBlurred' | 'formFlash' | 'taskStarted' | 'taskEnded' | 'launcherFolderNameChanged' | 'hashChanged';
 
 /** --- 现场下载 app 的参数 --- */
 export interface ICoreFetchAppOptions {
@@ -97,17 +94,13 @@ export interface ICoreFetchAppOptions {
 
 /** --- 应用包解包后对象 --- */
 export interface IApp {
-    /** --- net 模式将包含 net 属性，否则是 app 解包模式 --- */
-    'net'?: {
-        'current': string;
-        'url': string;
-        'notify'?: number;
-        'progress'?: (loaded: number, total: number) => void | Promise<void>;
-    };
-    /** --- 应用图标，net 模式下可能为空 --- */
-    'icon': string;
+    'type': 'app';
+    /** --- 控件对象配置文件 --- */
+    'config': IAppConfig;
     /** --- 所有已加载的文件内容 --- */
     'files': Record<string, Blob | string>;
+    /** --- 应用图标 --- */
+    'icon': string;
 }
 
 /** --- 应用文件包 config --- */
@@ -126,7 +119,7 @@ export interface IAppConfig {
     /** --- 将自动加载的主题 --- */
     'themes'?: string[];
     /** --- 将自动申请的权限 --- */
-    'permissions'?: Record<string, any>;
+    'permissions'?: string[];
     /** --- 将自动加载的语言包，path: lang --- */
     'locales'?: Record<string, string>;
     /** --- 全局样式，不带扩展名，系统会在末尾添加 .css --- */
@@ -134,7 +127,7 @@ export interface IAppConfig {
     /** --- 图标路径，需包含扩展名 --- */
     'icon'?: string;
 
-    /** --- 将要加载的非 js 文件列表，仅 net 模式有用 --- */
+    /** --- 将要加载的非 js 文件列表，打包为 cga 模式下此配置可省略 --- */
     'files'?: string[];
 }
 
@@ -187,12 +180,20 @@ export interface IBindDownOptions {
     'end'?: (e: MouseEvent | TouchEvent) => void;
 }
 
-/** --- 绑定上下左右拉选项 --- */
-export interface IBindGestureOptions {
-    'el'?: HTMLElement;
-    'rect'?: DOMRect;
-    'dirs'?: Array<('top' | 'right' | 'bottom' | 'left')>;
-    handler: (dir: 'top' | 'right' | 'bottom' | 'left') => void;
+/** --- 绑定拖动选项 move 回调的回调参数 --- */
+export interface IBindMoveMoveOptions {
+    'ox': number;
+    'oy': number;
+    'x': number;
+    'y': number;
+    'border': TDomBorder;
+    'inBorder': {
+        'top': boolean;
+        'right': boolean;
+        'bottom': boolean;
+        'left': boolean;
+    };
+    'dir': 'top' | 'right' | 'bottom' | 'left';
 }
 
 /** --- 绑定拖动选项 --- */
@@ -213,7 +214,7 @@ export interface IBindMoveOptions {
     'object'?: HTMLElement | IVue;
     'showRect'?: boolean;
     'start'?: (x: number, y: number) => any;
-    'move'?: (ox: number, oy: number, x: number, y: number, border: TDomBorder, dir: 'top' | 'right' | 'bottom' | 'left', e: MouseEvent | TouchEvent) => void;
+    'move'?: (e: MouseEvent | TouchEvent, opt: IBindMoveMoveOptions) => void;
     'up'?: (moveTimes: Array<{ 'time': number; 'ox': number; 'oy': number; }>, e: MouseEvent | TouchEvent) => void;
     'end'?: (moveTimes: Array<{ 'time': number; 'ox': number; 'oy': number; }>, e: MouseEvent | TouchEvent) => void;
     'borderIn'?: (x: number, y: number, border: TDomBorder, e: MouseEvent | TouchEvent) => void;
@@ -248,7 +249,7 @@ export interface IBindResizeOptions {
 /** --- 监视大小中的元素 --- */
 export interface IWatchSizeItem {
     'el': HTMLElement;
-    'ro': any;
+    'handler': () => void | Promise<void>;
     'taskId'?: number;
 }
 
@@ -300,6 +301,7 @@ export interface IFormCreateOptions {
 /** --- 窗体的 code 参数 --- */
 export interface IFormCreateCode {
     'data'?: Record<string, any>;
+    'access'?: Record<string, any>;
     'methods'?: Record<string, any>;
     'computed'?: Record<string, {
         'get'?: any;
@@ -319,21 +321,64 @@ export interface IFormCreateCode {
 // --------- fs lib ---------
 // --------------------------
 
+export interface IMountHandler {
+    'taskId'?: number;
+    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>;
+    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>;
+}
+
 /** --- 文件/文件夹信息对象 --- */
 export interface IStats {
     isFile(): boolean;
     isDirectory(): boolean;
     isSymbolicLink(): boolean;
-    size: number;
-    blksize: number;
-    atimeMs: number;
-    mtimeMs: number;
-    ctimeMs: number;
-    birthtimeMs: number;
-    atime: Date;
-    mtime: Date;
-    ctime: Date;
-    birthtime: Date;
+    'size': number;
+    'blksize': number;
+    'atimeMs': number;
+    'mtimeMs': number;
+    'ctimeMs': number;
+    'birthtimeMs': number;
+    'atime': Date;
+    'mtime': Date;
+    'ctime': Date;
+    'birthtime': Date;
 }
 
 /** --- 目录下项目 ---  */
@@ -341,7 +386,7 @@ export interface IDirent {
     isFile(): boolean;
     isDirectory(): boolean;
     isSymbolicLink(): boolean;
-    name: string;
+    'name': string;
 }
 
 // --------------------------
@@ -353,7 +398,6 @@ export interface ITask {
     'id': number;
     'app': IApp;
     'class': import('../dist/lib/core').AbstractApp;
-    'config': IAppConfig;
     'customTheme': boolean;
     'locale': {
         'lang': string;
@@ -369,7 +413,7 @@ export interface ITask {
         /** --- 独占窗体序列 --- */
         'dialogFormIds': number[];
         /** --- 已申请的权限列表 --- */
-        'permissions': Record<string, any>;
+        'permissions': string[];
     };
     /** --- 窗体对象列表 --- */
     'forms': Record<string, IForm>;
@@ -385,8 +429,6 @@ export interface ITask {
     }>;
     /** --- 任务中的 timer 列表 --- */
     'timers': Record<string, number>;
-    /** --- 用于初始化 control 时 invoke 用 --- */
-    'invoke'?: Record<string, any>;
 }
 
 /** --- 系统任务信息 --- */
@@ -404,8 +446,10 @@ export interface ITaskRunOptions {
     'notify'?: boolean;
     /** --- 所属任务，App 模式无法设置 --- */
     'taskId'?: number;
-    /** --- 不禁止某些浏览器对象，App 模式下无法设置 --- */
+    /** --- 不禁止某些浏览器对象，App 模式下仅能设置基任务中已经 unblock 的值 --- */
     'unblock'?: string[];
+    /** --- 直接赋予此任务相应权限，App 模式下有 "root" 权限的应用才能设置 --- */
+    'permissions'?: string[];
 }
 
 export interface ICreateTimerOptions {

package/dist/app/demo/form/control/greatview/greatview.js

@@ -1,92 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.methods = exports.mounted = exports.computed = exports.data = void 0;
-const clickgo = require("clickgo");
-exports.data = {
-    'ntab': '',
-    'lineValue': 100,
-    'lineCount': 2,
-    'sLeft1': 0,
-    'sTop1': 0,
-    'l1': 0,
-    'c1': 0,
-    'sLeft2': 0,
-    'sTop2': 0,
-    'l2': 0,
-    'c2': 0,
-    'sLeft3': 0,
-    'sTop3': 0,
-    'l3': 0,
-    'c3': 0,
-    'sLeft4': 0,
-    'sTop4': 0,
-    'l4': 0,
-    'c4': 0,
-    'direction': false,
-    'dir5': 'v',
-    'sLeft5': 0,
-    'sTop5': 0,
-    'l5': 0,
-    'c5': 0,
-    'line5': 10,
-    'c6': 0,
-    'is6': [],
-    'gesture': false,
-    'style': false,
-    'selection': false,
-    'content': false,
-    'area': {}
-};
-exports.computed = {
-    'is': function () {
-        const is = [];
-        for (let i = 0; i < this.lineCount; ++i) {
-            if (i > 0 && i % 10 === 0) {
-                is[i] = 30;
-                continue;
-            }
-        }
-        return is;
-    }
-};
-const mounted = function () {
-    this.is6[29] = 50;
-    this.is6[39] = 50;
-};
-exports.mounted = mounted;
-exports.methods = {
-    scrollborder: function (e, dir) {
-        if (!this.gesture) {
-            return;
-        }
-        let dirs = [];
-        switch (dir) {
-            case 'h': {
-                dirs = ['left', 'right'];
-                break;
-            }
-            default: {
-                dirs = ['top', 'bottom'];
-                break;
-            }
-        }
-        clickgo.dom.bindGesture(e, {
-            'dirs': dirs,
-            'handler': (dir) => {
-                switch (dir) {
-                    case 'left':
-                    case 'top': {
-                        this.lineCount -= 10;
-                        if (this.lineCount < 0) {
-                            this.lineCount = 0;
-                        }
-                        break;
-                    }
-                    default: {
-                        this.lineCount += this.lineValue;
-                    }
-                }
-            }
-        });
-    }
-};

package/dist/app/demo/form/control/overflow/overflow.js

@@ -1,70 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.methods = exports.data = void 0;
-const clickgo = require("clickgo");
-exports.data = {
-    'ntab': '',
-    'lineValue': 10,
-    'lineCount': 2,
-    'sLeft1': 0,
-    'sTop1': 0,
-    'l1': 0,
-    'c1': 0,
-    'sLeft2': 0,
-    'sTop2': 0,
-    'l2': 0,
-    'c2': 0,
-    'sLeft3': 0,
-    'sTop3': 0,
-    'l3': 0,
-    'c3': 0,
-    'sLeft4': 0,
-    'sTop4': 0,
-    'l4': 0,
-    'c4': 0,
-    'direction': false,
-    'dir5': 'v',
-    'sLeft5': 0,
-    'sTop5': 0,
-    'l5': 0,
-    'c5': 0,
-    'line5': 10,
-    'gesture': false,
-    'style': false
-};
-exports.methods = {
-    scrollborder: function (e, dir) {
-        if (!this.gesture) {
-            return;
-        }
-        let dirs = [];
-        switch (dir) {
-            case 'h': {
-                dirs = ['left', 'right'];
-                break;
-            }
-            default: {
-                dirs = ['top', 'bottom'];
-                break;
-            }
-        }
-        clickgo.dom.bindGesture(e, {
-            'dirs': dirs,
-            'handler': (dir) => {
-                switch (dir) {
-                    case 'left':
-                    case 'top': {
-                        this.lineCount -= 10;
-                        if (this.lineCount < 0) {
-                            this.lineCount = 0;
-                        }
-                        break;
-                    }
-                    default: {
-                        this.lineCount += this.lineValue;
-                    }
-                }
-            }
-        });
-    }
-};