npm - clickgo - Versions diffs - 3.8.4 → 3.8.6 - Mend

clickgo 3.8.4 → 3.8.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

package/README.md +1 -1
package/dist/app/demo/form/control/html/html.js +7 -2
package/dist/app/demo/form/control/html/html.xml +3 -2
package/dist/app/demo/form/control/list/list.xml +1 -1
package/dist/app/demo/form/control/select/select.js +31 -4
package/dist/app/demo/form/control/select/select.xml +18 -8
package/dist/app/demo/form/control/tab/tab.js +6 -2
package/dist/app/demo/form/method/system/system.js +5 -0
package/dist/app/demo/form/method/system/system.xml +10 -7
package/dist/clickgo.js +1 -1
package/dist/clickgo.ts +1 -1
package/dist/control/common.cgc +0 -0
package/dist/lib/form.js +13 -13
package/dist/lib/form.ts +17 -18
package/dist/lib/task.js +9 -2
package/dist/lib/task.ts +16 -2
package/dist/lib/tool.js +29 -1
package/dist/lib/tool.ts +47 -0
package/dist/theme/light.cgt +0 -0
package/package.json +1 -1

package/README.md CHANGED Viewed

@@ -28,7 +28,7 @@ Load the module loader first, and then load it using the module loader.
 **index.html**
 ```html
-<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.5.0/dist/loader.min.js?path=index&npm={'clickgo':'3.8.4'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.5.0/dist/loader.min.js?path=index&npm={'clickgo':'3.8.6'}"></script>
 ```
 **index.js**

package/dist/app/demo/form/control/html/html.js CHANGED Viewed

@@ -27,7 +27,9 @@ const clickgo = __importStar(require("clickgo"));
 class default_1 extends clickgo.form.AbstractForm {
     constructor() {
         super(...arguments);
-        this.html = `<h1>Hello world!</h1>
+        this.htmlIndex = 0;
+        this.html = [
+            `<h1>Hello world!</h1>
 <button>Button</button> <button disabled>Button2</button>
 <h2>H2 title</h2>
 <div>div</div>
@@ -45,7 +47,10 @@ class default_1 extends clickgo.form.AbstractForm {
     <li id="li">li</li>
 </ol>
 <script>alert('b');</script>
-<style>li{background:red;}div{background:blue;}#li{background:yellow;}</style>`;
+<style>li{background:red;}div{background:blue;}#li{background:yellow;}</style>`,
+            `<h2>123</h2>
+<button>Test</button>`
+        ];
         this.css = `div{background:blue;}.test{background:red;}#li{background:yellow;}`;
         this.lcss = '';
         this.rcss = '';

package/dist/app/demo/form/control/html/html.xml CHANGED Viewed

@@ -1,11 +1,12 @@
 <form title="Html" width="450" height="500" padding="10">
     <layout gutter="10" direction="v" style="flex: 1; width: 0;">
         <layout gutter="10" style="flex: 1; height: 0;">
-            <html :html="html" :css="lcss" style="background: var(--g-plain-background); border: solid 1px var(--g-plain-border-color); padding: 10px; flex: 1; width: 0;"></html>
-            <html :html="html" :css="rcss" style="background: var(--g-plain-background); border: solid 1px var(--g-plain-border-color); padding: 10px; flex: 1; width: 0;"></html>
+            <html :html="html[htmlIndex]" :css="lcss" style="background: var(--g-plain-background); border: solid 1px var(--g-plain-border-color); padding: 10px; flex: 1; width: 0;"></html>
+            <html :html="html[htmlIndex]" :css="rcss" style="background: var(--g-plain-background); border: solid 1px var(--g-plain-border-color); padding: 10px; flex: 1; width: 0;"></html>
         </layout>
         <layout gutter="10">
             <button style="height: 30px; flex: 1;" @click="lcss = lcss ? '' : css">Left {{lcss ? 'remove' : 'add'}} css</button>
+            <button style="height: 30px; flex: 1;" @click="htmlIndex = htmlIndex ? 0 : 1">Toogle html</button>
             <button style="height: 30px; flex: 1;" @click="rcss = rcss ? '' : css">Right {{rcss ? 'remove' : 'add'}} css</button>
         </layout>
     </layout>

package/dist/app/demo/form/control/list/list.xml CHANGED Viewed

@@ -1,4 +1,4 @@
-<form title="List" width="400" height="450" min-width="300" min-height="400" padding="10" direction="v">
+<form title="List" width="450" height="450" min-width="300" min-height="400" padding="10" direction="v">
     <label>Greatlist: {{select}}, list: {{select2}}, label: {{label2}}</label>
     <tab v-model="ntab" :tabs="['greatlist', 'adaptation', 'beyond', 'list', 'object', 'async']" style="flex: 1; height: 0;">
         <!-- 默认 -->

package/dist/app/demo/form/control/select/select.js CHANGED Viewed

@@ -93,9 +93,12 @@ class default_1 extends clickgo.form.AbstractForm {
             }
         ];
         this.slist2r = [];
+        this.addRemoveList = [];
         this.select2 = ['haha2'];
         this.aemodel = [];
         this.label2 = [];
+        this.asyncModel = ['1'];
+        this.asyncData = [];
         this.select3 = [];
         this.label3 = [];
         this.s3other = false;
@@ -105,6 +108,7 @@ class default_1 extends clickgo.form.AbstractForm {
         this.background = false;
         this.disabled = false;
         this.multi = false;
+        this.search = false;
         this.editable = false;
         this.tree = false;
         this.async = false;
@@ -150,21 +154,44 @@ class default_1 extends clickgo.form.AbstractForm {
     onRemote(value, resolve) {
         return __awaiter(this, void 0, void 0, function* () {
             yield clickgo.tool.sleep(300);
+            if (value === '') {
+                resolve(['1', '3', '5']);
+                return;
+            }
             if (value === '8') {
-                this.slist2r = [];
                 resolve();
                 return;
             }
-            this.slist2r = ['test', value, 'remote', {
+            resolve(['test', value, 'remote', {
                     'label': 'label',
                     'value': 'ok'
                 }, {
                     'label': 'label2',
                     'value': 2
-                }];
-            resolve();
+                }]);
         });
     }
+    onAdd(index, value) {
+        this.addRemoveList.unshift('@add, index: ' + index.toString() + ', value: ' + value);
+    }
+    onRemove(index, value) {
+        this.addRemoveList.unshift('@remove, index: ' + index.toString() + ', value: ' + value);
+    }
+    changeArea() {
+        switch (this.area) {
+            case 'all': {
+                this.area = 'arrow';
+                break;
+            }
+            case 'arrow': {
+                this.area = 'text';
+                break;
+            }
+            default: {
+                this.area = 'all';
+            }
+        }
+    }
     onMounted() {
         this.watch(() => this.select.join(','), (n, o) => {
             let select = [];

package/dist/app/demo/form/control/select/select.xml CHANGED Viewed

@@ -1,4 +1,4 @@
-<form title="Select" width="400" height="450" min-width="300" min-height="400" padding="10">
+<form title="Select" width="400" height="550" min-width="300" min-height="400" padding="10">
     <layout gutter="10" direction="v" style="flex: 1; width: 0;">
         <tab v-model="ntab" :tabs="['greatselect', 'select', 'levelselect']" style="flex: 1; height: 0;">
             <!-- greatselect -->
@@ -45,23 +45,33 @@
                 <layout gutter="10" direction="v" style="padding: 10px;">
                     <label>Now select value is {{select2}}</label>
                     <label>Label: {{label2}}</label>
-                    <select v-model="select2" @label="label2 = $event" :data="remote ? slist2r : slist2" :disabled="disabled" :editable="editable" :multi="multi" :tree="tree" :async="async" :remote="remote" :remote-delay="remoteDelay[0]" :icon="icon" icon-default="../../../res/txt.svg" @load="onLoad" @remote="onRemote" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>
+                    <select v-model="select2" @label="label2 = $event" :data="remote ? slist2r : slist2" :disabled="disabled" :editable="editable" :multi="multi" :tree="tree" :async="async" :search="search" :remote="remote" :remote-delay="remoteDelay[0]" :icon="icon" icon-default="../../../res/txt.svg" @load="onLoad" @remote="onRemote" @add="onAdd" @remove="onRemove" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>
+                    <list :data="addRemoveList" style="height: 100px;"></list>
                     <label>Custom height:</label>
-                    <select :data="remote ? slist2r : ['1','2','3','4','5']" :disabled="disabled" :editable="editable" :multi="multi" :tree="tree" :async="async" :remote="remote" :remote-delay="remoteDelay[0]" :icon="icon" icon-default="../../../res/txt.svg" style="height: 60px;" @load="onLoad" @remote="onRemote" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>
+                    <select :data="remote ? slist2r : ['1','2','3','4','5']" :disabled="disabled" :editable="editable" :multi="multi" :tree="tree" :async="async" :search="search" :remote="remote" :remote-delay="remoteDelay[0]" :icon="icon" icon-default="../../../res/txt.svg" style="height: 60px;" @load="onLoad" @remote="onRemote" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>
                     <label>Always editable: {{aemodel}}</label>
                     <layout gutter="10">
-                        <select v-model="aemodel" :data="remote ? slist2r : ['1','2','3','4','5']" :disabled="disabled" editable :multi="multi" :tree="tree" :async="async" :remote="remote" :remote-delay="remoteDelay[0]" :icon="icon" icon-default="../../../res/txt.svg" placeholder="Please enter" @load="onLoad" @remote="onRemote" style="flex: 1;" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>
+                        <select v-model="aemodel" :data="remote ? slist2r : ['1','2','3','4','5']" :disabled="disabled" editable :multi="multi" :tree="tree" :async="async" :search="search" :remote="remote" :remote-delay="remoteDelay[0]" :icon="icon" icon-default="../../../res/txt.svg" placeholder="Please enter" @load="onLoad" @remote="onRemote" style="flex: 1;" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>
                         <button @click="aemodel.length=0">clear</button>
                         <button @click="aemodel[0] = '4'">4</button>
                     </layout>
                     <layout gutter="10">
                         <button @click="icon = !icon" style="flex: 1;">{{icon ? '' : '!'}}icon</button>
-                        <button @click="async = !async" style="flex: 1;">{{async ? '' : '!'}}async</button>
                         <button @click="tree = !tree" style="flex: 1;">{{tree ? '' : '!'}}tree</button>
+                        <button v-if="tree" @click="async = !async" style="flex: 1;">{{async ? '' : '!'}}async</button>
                     </layout>
                     <layout gutter="10">
-                        <button @click="remote = !remote" style="flex: 1;">{{remote ? '' : '!'}}remote</button>
-                        <select :data="[0, 100, 500, 1000, 2000]" v-model="remoteDelay" style="flex: 1;"></select>
+                        <button @click="search = !search" style="flex: 1;">{{search ? '' : '!'}}search</button>
+                        <template v-if="search">
+                            <button @click="remote = !remote" style="flex: 1;">{{remote ? '' : '!'}}remote</button>
+                            <select :data="[0, 100, 500, 1000, 2000]" v-model="remoteDelay" style="flex: 1;"></select>
+                        </template>
+                    </layout>
+                    <!-- async 延迟加载 data -->
+                    <label>Async value: {{asyncModel}}</label>
+                    <layout gutter="10">
+                        <select v-model="asyncModel" :data="asyncData" style="flex: 1;"></select>
+                        <button v-if="!asyncData.length" @click="asyncData=['0', {'label':'ok','value':'1'},'2','3']">Load</button>
                     </layout>
                 </layout>
             </flow>
@@ -81,7 +91,7 @@
         </tab>
         <layout gutter="10">
             <button @click="disabled = !disabled" style="flex: 1;">{{disabled ? '' : '!'}}disabled</button>
-            <button v-if="ntab === 'greatselect'" @click="area = area === 'all' ? 'arrow' : 'all'" style="flex: 1;">Area: {{area}}</button>
+            <button v-if="ntab === 'greatselect'" @click="changeArea" style="flex: 1;">Area: {{area}}</button>
             <button v-else @click="editable = !editable" style="flex: 1;">{{editable ? '' : '!'}}editable</button>
         </layout>
         <layout gutter="10">

package/dist/app/demo/form/control/tab/tab.js CHANGED Viewed

@@ -37,7 +37,10 @@ class default_1 extends clickgo.form.AbstractForm {
     constructor() {
         super(...arguments);
         this.ntab = '';
-        this.tabs = ['tab1'];
+        this.tabs = ['tab1', {
+                'label': 'haha',
+                'value': 'ok'
+            }];
         this.tindex = 1;
         this.tabPosition = 'top';
         this.color = undefined;
@@ -45,9 +48,10 @@ class default_1 extends clickgo.form.AbstractForm {
         this.drag = false;
         this.cclose = false;
     }
-    onClose(e, i) {
+    onClose(e, i, v) {
         return __awaiter(this, void 0, void 0, function* () {
             if (i !== 10) {
+                yield clickgo.form.dialog('Closed, index: ' + i.toString() + ', value: ' + v);
                 return;
             }
             e.preventDefault();

package/dist/app/demo/form/method/system/system.js CHANGED Viewed

@@ -69,5 +69,10 @@ class default_1 extends clickgo.form.AbstractForm {
             yield clickgo.form.dialog('typeof localStorage: ' + typeof localStorage);
         });
     }
+    map() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield clickgo.form.dialog('typeof Map: ' + typeof Map);
+        });
+    }
 }
 exports.default = default_1;

package/dist/app/demo/form/method/system/system.xml CHANGED Viewed

@@ -1,11 +1,14 @@
 <form width="350" height="400" title="System">
     <layout direction="v" gutter="10" style="flex: 1; padding: 10px;">
-        <button @click="getVersion" style="height: 30px;">clickgo.getVersion()</button>
-        <button @click="isNative" style="height: 30px;">clickgo.isNative()</button>
-        <button @click="getPlatform" style="height: 30px;">clickgo.getPlatform()</button>
-        <button @click="isImmersion" style="height: 30px;">clickgo.isImmersion()</button>
-        <button @click="hasFrame" style="height: 30px;">clickgo.hasFrame()</button>
-        <button @click="unblock" style="height: 30px;">unblock: ['sessionStorage']</button>
-        <button @click="ls" style="height: 30px;">typeof localStorage</button>
+        <button @click="getVersion">clickgo.getVersion()</button>
+        <button @click="isNative">clickgo.isNative()</button>
+        <button @click="getPlatform">clickgo.getPlatform()</button>
+        <button @click="isImmersion">clickgo.isImmersion()</button>
+        <button @click="hasFrame">clickgo.hasFrame()</button>
+        <button @click="unblock">unblock: ['sessionStorage']</button>
+        <layout gutter="10">
+            <button @click="ls" style="flex: 1;">typeof localStorage</button>
+            <button @click="map" style="flex: 1;">Map</button>
+        </layout>
     </layout>
 </form>

package/dist/clickgo.js CHANGED Viewed

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zip = exports.tool = exports.theme = exports.task = exports.storage = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.vue = exports.hasFrame = exports.isImmersion = exports.getPlatform = exports.isNative = exports.getVersion = void 0;
-const version = '3.8.4';
+const version = '3.8.6';
 function getVersion() {
     return version;
 }

package/dist/clickgo.ts CHANGED Viewed

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const version = '3.8.4';
+const version = '3.8.6';
 export function getVersion(): string {
     return version;
 }

package/dist/control/common.cgc CHANGED Viewed

Binary file

package/dist/lib/form.js CHANGED Viewed

@@ -1571,23 +1571,26 @@ function doFocusAndPopEvent(e) {
     if (!target) {
         return;
     }
-    const element = target;
-    if (element.dataset.cgPopOpen !== undefined) {
-        return;
-    }
     const paths = (_a = e.path) !== null && _a !== void 0 ? _a : (e.composedPath ? e.composedPath() : []);
+    let isCgPopOpen = false;
     for (const item of paths) {
         if (!item.tagName) {
             continue;
         }
-        if (item.tagName.toLowerCase() === 'body') {
-            break;
+        if (item.dataset.cgPopOpen !== undefined) {
+            isCgPopOpen = true;
+            continue;
         }
-        if (item.id === 'cg-pop-list') {
+        if (item.classList.contains('cg-form-wrap')) {
+            const formId = parseInt((_b = item.getAttribute('data-form-id')) !== null && _b !== void 0 ? _b : '0');
+            changeFocus(formId);
+            if (!isCgPopOpen) {
+                hidePop();
+            }
             return;
         }
-        if (item.dataset.cgPopOpen !== undefined) {
-            return;
+        if (item.tagName.toLowerCase() === 'body') {
+            break;
         }
     }
     for (const item of paths) {
@@ -1597,10 +1600,7 @@ function doFocusAndPopEvent(e) {
         if (item.tagName.toLowerCase() === 'body') {
             break;
         }
-        if (item.classList.contains('cg-form-wrap')) {
-            const formId = parseInt((_b = item.getAttribute('data-form-id')) !== null && _b !== void 0 ? _b : '0');
-            changeFocus(formId);
-            hidePop();
+        if (item.id === 'cg-pop-list') {
             return;
         }
     }

package/dist/lib/form.ts CHANGED Viewed

@@ -2053,29 +2053,31 @@ export function doFocusAndPopEvent(e: MouseEvent | TouchEvent): void {
     if (!target) {
         return;
     }
-    const element: HTMLElement | null = target as HTMLElement;
-    if (element.dataset.cgPopOpen !== undefined) {
-        // --- 此对象为已打开 pop 的组件，不做处理，组件自行处理 ---
-        return;
-    }
     const paths: HTMLElement[] = (e as any).path ?? (e.composedPath ? e.composedPath() : []);
-    // --- 检测是不是弹出层 ---
+    // --- 检测是不是窗体内部点击 ---
+    let isCgPopOpen = false;
     for (const item of paths) {
         if (!item.tagName) {
             continue;
         }
-        if (item.tagName.toLowerCase() === 'body') {
-            break;
+        if (item.dataset.cgPopOpen !== undefined) {
+            isCgPopOpen = true;
+            continue;
         }
-        if (item.id === 'cg-pop-list') {
-            // --- 弹出层点击，不触发丢失焦点，也不触发隐藏 pop，是否隐藏请自行处理 ---
+        if (item.classList.contains('cg-form-wrap')) {
+            // --- 窗体内部点击，转换焦点到当前窗体，但触发隐藏 pop ---
+            const formId = parseInt(item.getAttribute('data-form-id') ?? '0');
+            changeFocus(formId);
+            if (!isCgPopOpen) {
+                hidePop();
+            }
             return;
         }
-        if (item.dataset.cgPopOpen !== undefined) {
-            return;
+        if (item.tagName.toLowerCase() === 'body') {
+            break;
         }
     }
-    // --- 检测是不是窗体内部点击 ---
+    // --- 检测是不是弹出层 ---
     for (const item of paths) {
         if (!item.tagName) {
             continue;
@@ -2083,11 +2085,8 @@ export function doFocusAndPopEvent(e: MouseEvent | TouchEvent): void {
         if (item.tagName.toLowerCase() === 'body') {
             break;
         }
-        if (item.classList.contains('cg-form-wrap')) {
-            // --- 窗体内部点击，转换焦点到当前窗体，但触发隐藏 pop ---
-            const formId = parseInt(item.getAttribute('data-form-id') ?? '0');
-            changeFocus(formId);
-            hidePop();
+        if (item.id === 'cg-pop-list') {
+            // --- 弹出层点击，不触发丢失焦点，也不触发隐藏 pop，是否隐藏请自行处理 ---
             return;
         }
     }

package/dist/lib/task.js CHANGED Viewed

@@ -253,7 +253,7 @@ function run(url, opt = {}, ntid) {
             if (notifyId) {
                 setTimeout(function () {
                     form.hideNotify(notifyId);
-                }, 2000);
+                }, 3000);
             }
         }
         else if (url.type !== 'app') {
@@ -269,7 +269,8 @@ function run(url, opt = {}, ntid) {
         const unblock = opt.unblock ? tool.clone(opt.unblock) : [];
         const unblockSys = [
             'require',
-            '__awaiter', 'eval', 'Math', 'Array', 'Blob', 'Error', 'Infinity', 'getComputedStyle', 'parseInt', 'parseFloat', 'Promise', 'Date', 'JSON', 'fetch', 'Number', 'String', 'Object', 'encodeURIComponent', 'decodeURIComponent', 'FormData', 'WebSocket'
+            '__awaiter', 'eval', 'Math', 'Array', 'Blob', 'Error', 'Infinity', 'getComputedStyle', 'parseInt', 'parseFloat', 'Promise', 'Date', 'JSON', 'fetch', 'Number', 'String', 'Object', 'encodeURIComponent', 'decodeURIComponent', 'FormData', 'WebSocket',
+            'Map', 'Set', 'WeakMap', 'WeakSet', 'RegExp', 'Function', 'Boolean', 'Symbol', 'Proxy', 'Reflect', 'Intl', 'NaN', 'navigator', 'Image', 'Audio', 'CanvasRenderingContext2D', 'WebGLRenderingContext', 'NodeList', 'HTMLCollection', 'Event', 'MouseEvent', 'KeyboardEvent', 'TouchEvent', 'File', 'FileList', 'URL', 'Navigator', 'Performance', 'Crypto', 'Worker', 'SharedWorker', 'ServiceWorker', 'WebAssembly', 'IntersectionObserver', 'MutationObserver', 'AudioContext', 'WebGL2RenderingContext', 'WebGLVertexArrayObject', 'WebGLBuffer', 'WebGLShader', 'WebGLProgram', 'WebGLTexture', 'WebGLRenderbuffer', 'WebGLFramebuffer', 'WebGLUniformLocation', 'WebGLActiveInfo', 'WebGLShaderPrecisionFormat', 'PerformanceObserver', 'PerformanceEntry', 'performance', 'ResizeObserver', 'requestIdleCallback', 'cancelIdleCallback', 'AbortController', 'AbortSignal', 'TextDecoder', 'TextEncoder', 'StorageEvent', 'BeforeUnloadEvent', 'PointerEvent', 'CompositionEvent', 'WheelEvent', 'InputEvent', 'HashChangeEvent', 'PopStateEvent', 'MessageEvent', 'Notification', 'BatteryManager', 'DeviceOrientationEvent', 'DeviceMotionEvent', 'ScreenOrientation', 'MediaQueryList', 'SpeechSynthesisUtterance', 'BroadcastChannel', 'Worklet', 'CustomEvent', 'TransitionEvent', 'AnimationEvent', 'Response', 'Request', 'Headers', 'ReadableStream', 'WritableStream', 'TransformStream', 'URLSearchParams', 'History', 'location', 'crypto', 'indexedDB', 'IDBFactory', 'IDBDatabase', 'IDBTransaction', 'IDBObjectStore', 'IDBIndex', 'IDBCursor', 'IDBKeyRange', 'IDBRequest', 'FileReader', 'Atomics', 'CanvasGradient', 'CanvasPattern', 'TextMetrics', 'ImageData', 'Path2D', 'TextTrack', 'VTTCue', 'TrackEvent', 'OfflineAudioContext', 'AnalyserNode', 'AudioBuffer', 'AudioBufferSourceNode', 'AudioDestinationNode', 'AudioListener', 'AudioNode', 'AudioParam', 'AudioScheduledSourceNode', 'AudioWorklet', 'BaseAudioContext', 'BiquadFilterNode', 'ChannelMergerNode', 'ChannelSplitterNode', 'ConstantSourceNode', 'ConvolverNode', 'DelayNode', 'DynamicsCompressorNode', 'GainNode', 'IIRFilterNode', 'MediaElementAudioSourceNode', 'MediaStreamAudioSourceNode', 'MediaStreamAudioDestinationNode', 'OscillatorNode', 'PannerNode', 'PeriodicWave', 'ScriptProcessorNode', 'StereoPannerNode', 'WaveShaperNode', 'UIEvent', 'FocusEvent', 'ClipboardEvent', 'GamepadEvent', 'MediaKeyMessageEvent', 'PageTransitionEvent', 'ProgressEvent', 'Touch', 'ErrorEvent', 'MediaStreamEvent', 'IDBVersionChangeEvent', 'SpeechSynthesisEvent', 'AudioProcessingEvent', 'OfflineAudioCompletionEvent', 'ClipboardItem', 'PresentationConnection', 'PresentationConnectionAvailableEvent', 'PresentationConnectionCloseEvent', 'PresentationConnectionList', 'PresentationReceiver', 'PresentationRequest', 'PushManager', 'PushSubscription', 'PushSubscriptionOptions', 'ServiceWorkerContainer', 'PaymentRequest', 'PaymentAddress', 'PaymentRequestUpdateEvent', 'PaymentResponse', 'PresentationAvailability', 'Bluetooth', 'BluetoothDevice', 'BluetoothRemoteGATTServer', 'BluetoothRemoteGATTService', 'BluetoothRemoteGATTCharacteristic', 'BluetoothRemoteGATTDescriptor', 'MediaRecorder', 'MessageChannel', 'MessagePort', 'atob', 'btoa'
         ];
         for (const name of unblockSys) {
             if (unblock.includes(name)) {
@@ -665,6 +666,9 @@ function run(url, opt = {}, ntid) {
                 hidePop: function (pop) {
                     form.hidePop(pop);
                 },
+                doFocusAndPopEvent: function (e) {
+                    form.doFocusAndPopEvent(e);
+                },
                 removePanel(id, vapp, el) {
                     return form.removePanel(id, vapp, el);
                 },
@@ -1043,6 +1047,9 @@ function run(url, opt = {}, ntid) {
                 },
                 execCommand: function (ac) {
                     tool.execCommand(ac);
+                },
+                compar(before, after) {
+                    return tool.compar(before, after);
                 }
             },
             'zip': {

package/dist/lib/task.ts CHANGED Viewed

@@ -296,7 +296,7 @@ export async function run(url: string | types.IApp, opt: types.ITaskRunOptions =
         if (notifyId) {
             setTimeout(function(): void {
                 form.hideNotify(notifyId);
-            }, 2000);
+            }, 3000);
         }
     }
     else if (url.type !== 'app') {
@@ -315,7 +315,8 @@ export async function run(url: string | types.IApp, opt: types.ITaskRunOptions =
     const unblock = opt.unblock ? tool.clone(opt.unblock) : [];
     const unblockSys = [
         'require',
-        '__awaiter', 'eval', 'Math', 'Array', 'Blob', 'Error', 'Infinity', 'getComputedStyle', 'parseInt', 'parseFloat', 'Promise', 'Date', 'JSON', 'fetch', 'Number', 'String', 'Object', 'encodeURIComponent', 'decodeURIComponent', 'FormData', 'WebSocket'
+        '__awaiter', 'eval', 'Math', 'Array', 'Blob', 'Error', 'Infinity', 'getComputedStyle', 'parseInt', 'parseFloat', 'Promise', 'Date', 'JSON', 'fetch', 'Number', 'String', 'Object', 'encodeURIComponent', 'decodeURIComponent', 'FormData', 'WebSocket',
+        'Map', 'Set', 'WeakMap', 'WeakSet', 'RegExp', 'Function', 'Boolean', 'Symbol', 'Proxy', 'Reflect', 'Intl', 'NaN', 'navigator', 'Image', 'Audio', 'CanvasRenderingContext2D', 'WebGLRenderingContext', 'NodeList', 'HTMLCollection', 'Event', 'MouseEvent', 'KeyboardEvent', 'TouchEvent', 'File', 'FileList', 'URL', 'Navigator', 'Performance', 'Crypto', 'Worker', 'SharedWorker', 'ServiceWorker', 'WebAssembly', 'IntersectionObserver', 'MutationObserver', 'AudioContext', 'WebGL2RenderingContext', 'WebGLVertexArrayObject', 'WebGLBuffer', 'WebGLShader', 'WebGLProgram', 'WebGLTexture', 'WebGLRenderbuffer', 'WebGLFramebuffer', 'WebGLUniformLocation', 'WebGLActiveInfo', 'WebGLShaderPrecisionFormat', 'PerformanceObserver', 'PerformanceEntry', 'performance', 'ResizeObserver', 'requestIdleCallback', 'cancelIdleCallback', 'AbortController', 'AbortSignal', 'TextDecoder', 'TextEncoder', 'StorageEvent', 'BeforeUnloadEvent', 'PointerEvent', 'CompositionEvent', 'WheelEvent', 'InputEvent', 'HashChangeEvent', 'PopStateEvent', 'MessageEvent', 'Notification', 'BatteryManager', 'DeviceOrientationEvent', 'DeviceMotionEvent', 'ScreenOrientation', 'MediaQueryList', 'SpeechSynthesisUtterance', 'BroadcastChannel', 'Worklet', 'CustomEvent', 'TransitionEvent', 'AnimationEvent', 'Response', 'Request', 'Headers', 'ReadableStream', 'WritableStream', 'TransformStream', 'URLSearchParams', 'History', 'location', 'crypto', 'indexedDB', 'IDBFactory', 'IDBDatabase', 'IDBTransaction', 'IDBObjectStore', 'IDBIndex', 'IDBCursor', 'IDBKeyRange', 'IDBRequest', 'FileReader', 'Atomics', 'CanvasGradient', 'CanvasPattern', 'TextMetrics', 'ImageData', 'Path2D', 'TextTrack', 'VTTCue', 'TrackEvent', 'OfflineAudioContext', 'AnalyserNode', 'AudioBuffer', 'AudioBufferSourceNode', 'AudioDestinationNode', 'AudioListener', 'AudioNode', 'AudioParam', 'AudioScheduledSourceNode', 'AudioWorklet', 'BaseAudioContext', 'BiquadFilterNode', 'ChannelMergerNode', 'ChannelSplitterNode', 'ConstantSourceNode', 'ConvolverNode', 'DelayNode', 'DynamicsCompressorNode', 'GainNode', 'IIRFilterNode', 'MediaElementAudioSourceNode', 'MediaStreamAudioSourceNode', 'MediaStreamAudioDestinationNode', 'OscillatorNode', 'PannerNode', 'PeriodicWave', 'ScriptProcessorNode', 'StereoPannerNode', 'WaveShaperNode', 'UIEvent', 'FocusEvent', 'ClipboardEvent', 'GamepadEvent', 'MediaKeyMessageEvent', 'PageTransitionEvent', 'ProgressEvent', 'Touch', 'ErrorEvent', 'MediaStreamEvent', 'IDBVersionChangeEvent', 'SpeechSynthesisEvent', 'AudioProcessingEvent', 'OfflineAudioCompletionEvent', 'ClipboardItem', 'PresentationConnection', 'PresentationConnectionAvailableEvent', 'PresentationConnectionCloseEvent', 'PresentationConnectionList', 'PresentationReceiver', 'PresentationRequest', 'PushManager', 'PushSubscription', 'PushSubscriptionOptions', 'ServiceWorkerContainer', 'PaymentRequest', 'PaymentAddress', 'PaymentRequestUpdateEvent', 'PaymentResponse', 'PresentationAvailability', 'Bluetooth', 'BluetoothDevice', 'BluetoothRemoteGATTServer', 'BluetoothRemoteGATTService', 'BluetoothRemoteGATTCharacteristic', 'BluetoothRemoteGATTDescriptor', 'MediaRecorder', 'MessageChannel', 'MessagePort', 'atob', 'btoa'
     ];
     for (const name of unblockSys) {
         if (unblock.includes(name)) {
@@ -756,6 +757,9 @@ export async function run(url: string | types.IApp, opt: types.ITaskRunOptions =
             hidePop: function(pop?: HTMLElement): void {
                 form.hidePop(pop);
             },
+            doFocusAndPopEvent: function(e: MouseEvent | TouchEvent): void {
+                form.doFocusAndPopEvent(e);
+            },
             removePanel(id: number, vapp: types.IVApp, el: HTMLElement): boolean {
                 return form.removePanel(id, vapp, el);
             },
@@ -1162,6 +1166,16 @@ export async function run(url: string | types.IApp, opt: types.ITaskRunOptions =
             },
             execCommand: function(ac: string): void {
                 tool.execCommand(ac);
+            },
+            compar(before: string[], after: string[]): {
+                'remove': Record<string, number>;
+                'add': Record<string, number>;
+                'length': {
+                    'remove': number;
+                    'add': number;
+                };
+            } {
+                return tool.compar(before, after);
             }
         },
         'zip': {

package/dist/lib/tool.js CHANGED Viewed

@@ -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.urlAtom = exports.urlResolve = exports.parseUrl = exports.post = exports.fetch = exports.request = exports.rgb2hsl = 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.match = exports.purify = exports.sleepFrame = exports.nextFrame = exports.sleep = exports.clone = exports.blob2ArrayBuffer = exports.getClassPrototype = void 0;
+exports.compar = exports.execCommand = exports.blob2DataUrl = exports.blob2Text = exports.urlAtom = exports.urlResolve = exports.parseUrl = exports.post = exports.fetch = exports.request = exports.rgb2hsl = 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.match = 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);
@@ -636,3 +636,31 @@ function execCommand(ac) {
     document.execCommand(ac);
 }
 exports.execCommand = execCommand;
+function compar(before, after) {
+    const rtn = {
+        'remove': {},
+        'add': {},
+        'length': {
+            'remove': 0,
+            'add': 0
+        }
+    };
+    for (let i = 0; i < before.length; ++i) {
+        const item = before[i];
+        if (after.includes(item)) {
+            continue;
+        }
+        rtn.remove[item] = i;
+        ++rtn.length.remove;
+    }
+    for (let i = 0; i < after.length; ++i) {
+        const item = after[i];
+        if (before.includes(item)) {
+            continue;
+        }
+        rtn.add[item] = i;
+        ++rtn.length.add;
+    }
+    return rtn;
+}
+exports.compar = compar;

package/dist/lib/tool.ts CHANGED Viewed

@@ -790,3 +790,50 @@ export function execCommand(ac: string): void {
     // eslint-disable-next-line deprecation/deprecation
     document.execCommand(ac);
 }
+/**
+ * ---- 对比老值和新值，看看新值中哪些移除了，哪些新增了 ---
+ * @param before 老值
+ * @param after 新值
+ */
+export function compar(before: string[], after: string[]): {
+    'remove': Record<string, number>;
+    'add': Record<string, number>;
+    'length': {
+        'remove': number;
+        'add': number;
+    };
+} {
+    const rtn: {
+        'remove': Record<string, number>;
+        'add': Record<string, number>;
+        'length': {
+            'remove': number;
+            'add': number;
+        };
+    } = {
+        'remove': {},
+        'add': {},
+        'length': {
+            'remove': 0,
+            'add': 0
+        }
+    };
+    for (let i = 0; i < before.length; ++i) {
+        const item = before[i];
+        if (after.includes(item)) {
+            continue;
+        }
+        rtn.remove[item] = i;
+        ++rtn.length.remove;
+    }
+    for (let i = 0; i < after.length; ++i) {
+        const item = after[i];
+        if (before.includes(item)) {
+            continue;
+        }
+        rtn.add[item] = i;
+        ++rtn.length.add;
+    }
+    return rtn;
+}

package/dist/theme/light.cgt CHANGED Viewed

Binary file

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "clickgo",
-  "version": "3.8.4",
+  "version": "3.8.6",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",