clickgo 3.11.12 → 3.11.13

package/README.md

@@ -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.1/dist/loader.min.js?path=index&npm={'clickgo':'3.11.12'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.5.1/dist/loader.min.js?path=index&npm={'clickgo':'3.11.13'}"></script>
 ```
 
 **index.js**

package/dist/app/demo/form/control/drawer/drawer.xml

@@ -6,6 +6,7 @@
     <drawer title="Drawer" gutter="10" v-model="drawer" direction="v" width="50%">
         <label>123</label>
         <button @click="drawer2 = true">456</button>
+        <tuieditor style="height: 200px;"></tuieditor>
     </drawer>
     <drawer title="Drawer2" gutter="10" v-model="drawer2" direction="v">
         <label>789</label>

package/dist/app/demo/form/solution/backpanel/backpanel.xml

@@ -6,7 +6,7 @@
             <button @click="formHash = fh">Change</button>
             <button @click="formHashBack">Back</button>
         </layout>
-        <nav v-model="name" default="list" hash style="flex: 1;">
+        <nav v-model="name" default="list" hash style="flex: 1; height: 0;">
             <nav-item label="User">
                 <nav-item label="All list" name="list"></nav-item>
                 <nav-item label="Available" name="list?avail=1"></nav-item>

package/dist/clickgo.js

@@ -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.11.12';
+const version = '3.11.13';
 function getVersion() {
     return version;
 }

package/dist/clickgo.ts

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

package/dist/lib/control.js

@@ -288,7 +288,7 @@ function read(blob) {
     });
 }
 exports.read = read;
-function init(taskId, invoke) {
+function init(taskId, invoke, cache) {
     return __awaiter(this, void 0, void 0, function* () {
         const t = task.list[taskId];
         if (!t) {
@@ -299,7 +299,9 @@ function init(taskId, invoke) {
                 path += '.cgc';
             }
             path = tool.urlResolve('/', path);
-            const file = yield fs.getContent(path, undefined, taskId);
+            const file = yield fs.getContent(path, {
+                'cache': cache
+            }, taskId);
             if (file && typeof file !== 'string') {
                 const c = yield read(file);
                 if (c) {

package/dist/lib/control.ts

@@ -415,7 +415,8 @@ export async function read(blob: Blob): Promise<false | types.TControlPackage> {
  */
 export async function init(
     taskId: number,
-    invoke: Record<string, any>
+    invoke: Record<string, any>,
+    cache?: string
 ): Promise<number> {
     const t = task.list[taskId];
     if (!t) {
@@ -426,7 +427,9 @@ export async function init(
             path += '.cgc';
         }
         path = tool.urlResolve('/', path);
-        const file = await fs.getContent(path, undefined, taskId);
+        const file = await fs.getContent(path, {
+            'cache': cache
+        }, taskId);
         if (file && typeof file !== 'string') {
             const c = await read(file);
             if (c) {

package/dist/lib/core.js

@@ -633,7 +633,8 @@ function fetchApp(url, opt = {}, taskId) {
                         if (opt.progress) {
                             opt.progress(loaded, total);
                         }
-                    }
+                    },
+                    'cache': opt.cache
                 }, taskId);
                 if ((blob === null) || typeof blob === 'string') {
                     return null;
@@ -650,7 +651,9 @@ function fetchApp(url, opt = {}, taskId) {
         let config;
         const files = {};
         try {
-            const blob = yield fs.getContent(url + 'config.json', undefined, taskId);
+            const blob = yield fs.getContent(url + 'config.json', {
+                'cache': opt.cache
+            }, taskId);
             if (blob === null || typeof blob === 'string') {
                 return null;
             }
@@ -665,7 +668,9 @@ function fetchApp(url, opt = {}, taskId) {
                     opt.progress(loaded + 1, total + 1);
                 }
                 for (const file of config.files) {
-                    fs.getContent(url + file.slice(1), undefined, taskId).then(function (blob) {
+                    fs.getContent(url + file.slice(1), {
+                        'cache': opt.cache
+                    }, taskId).then(function (blob) {
                         return __awaiter(this, void 0, void 0, function* () {
                             if (blob === null || typeof blob === 'string') {
                                 clickgo.form.notify({

package/dist/lib/core.ts

@@ -735,7 +735,8 @@ export async function fetchApp(
                     if (opt.progress) {
                         opt.progress(loaded, total) as unknown;
                     }
-                }
+                },
+                'cache': opt.cache
             }, taskId);
             if ((blob === null) || typeof blob === 'string') {
                 return null;
@@ -754,7 +755,9 @@ export async function fetchApp(
     /** --- 已加载的 files --- */
     const files: Record<string, Blob | string> = {};
     try {
-        const blob = await fs.getContent(url + 'config.json', undefined, taskId);
+        const blob = await fs.getContent(url + 'config.json', {
+            'cache': opt.cache
+        }, taskId);
         if (blob === null || typeof blob === 'string') {
             return null;
         }
@@ -769,7 +772,9 @@ export async function fetchApp(
                 opt.progress(loaded + 1, total + 1) as unknown;
             }
             for (const file of config.files) {
-                fs.getContent(url + file.slice(1), undefined, taskId).then(async function(blob) {
+                fs.getContent(url + file.slice(1), {
+                    'cache': opt.cache
+                }, taskId).then(async function(blob) {
                     if (blob === null || typeof blob === 'string') {
                         clickgo.form.notify({
                             'title': 'File not found',

package/dist/lib/fs.js

@@ -119,7 +119,7 @@ function unmount(name) {
 }
 exports.unmount = unmount;
 function getContent(path, options, taskId) {
-    var _a, _b;
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
         path = tool.urlResolve('/', path);
         const fpath = path.slice(8);
@@ -146,21 +146,21 @@ function getContent(path, options, taskId) {
                 ourl = path;
             }
             try {
-                const rand = Math.random().toString();
+                const rand = '?' + ((_a = options.cache) !== null && _a !== void 0 ? _a : Math.random().toString());
                 let blob = null;
                 const headers = {};
                 if (start || end) {
                     headers['range'] = `bytes=${start === undefined ? '0' : start}-${end === undefined ? '' : end}`;
                 }
                 if (options.progress) {
-                    blob = yield tool.request(ourl + (!ourl.startsWith(loader.cdn) ? ('?' + rand) : ''), {
+                    blob = yield tool.request(ourl + (!ourl.startsWith(loader.cdn) ? rand : ''), {
                         'headers': headers,
                         'progress': options.progress,
                         'responseType': 'blob'
                     });
                 }
                 else {
-                    blob = yield (yield fetch(ourl + (!ourl.startsWith(loader.cdn) ? ('?' + rand) : ''), {
+                    blob = yield (yield fetch(ourl + (!ourl.startsWith(loader.cdn) ? rand : ''), {
                         'headers': headers
                     })).blob();
                 }
@@ -178,7 +178,7 @@ function getContent(path, options, taskId) {
                     fr.readAsText(blob, encoding);
                 });
             }
-            catch (_c) {
+            catch (_d) {
                 return null;
             }
         }
@@ -193,7 +193,7 @@ function getContent(path, options, taskId) {
                 if (!hanlder) {
                     return null;
                 }
-                return (_b = (_a = hanlder.getContent) === null || _a === void 0 ? void 0 : _a.call(hanlder, path.slice(9 + name.length), options)) !== null && _b !== void 0 ? _b : null;
+                return (_c = (_b = hanlder.getContent) === null || _b === void 0 ? void 0 : _b.call(hanlder, path.slice(9 + name.length), options)) !== null && _c !== void 0 ? _c : null;
             }
             if (options.progress) {
                 delete options.progress;

package/dist/lib/fs.ts

@@ -113,12 +113,14 @@ export async function getContent(path: string, options?: {
     'start'?: number;
     'end'?: number;
     'progress'?: (loaded: number, total: number) => void | Promise<void>;
+    'cache'?: string;
 }, taskId?: number): Promise<string | Blob | null>;
 export async function getContent(path: string, options: BufferEncoding | {
     'encoding': BufferEncoding;
     'start'?: number;
     'end'?: number;
     'progress'?: (loaded: number, total: number) => void | Promise<void>;
+    'cache'?: string;
 }, taskId?: number): Promise<string | null>;
 /**
  * --- 读取完整文件或一段 ---
@@ -131,6 +133,7 @@ export async function getContent(path: string, options?: BufferEncoding | {
     'start'?: number;
     'end'?: number;
     'progress'?: (loaded: number, total: number) => void | Promise<void>;
+    'cache'?: string;
 }, taskId?: number): Promise<Blob | string | null> {
     path = tool.urlResolve('/', path);
     const fpath = path.slice(8);
@@ -157,21 +160,22 @@ export async function getContent(path: string, options?: BufferEncoding | {
             ourl = path;
         }
         try {
-            const rand = Math.random().toString();
+            /** --- 后缀 --- */
+            const rand = '?' + (options.cache ?? Math.random().toString());
             let blob: Blob | null = null;
             const headers: Record<string, string> = {};
             if (start || end) {
                 headers['range'] = `bytes=${start === undefined ? '0' : start}-${end === undefined ? '' : end}`;
             }
             if (options.progress) {
-                blob = await tool.request(ourl + (!ourl.startsWith(loader.cdn) ? ('?' + rand) : ''), {
+                blob = await tool.request(ourl + (!ourl.startsWith(loader.cdn) ? rand : ''), {
                     'headers': headers,
                     'progress': options.progress,
                     'responseType': 'blob'
                 });
             }
             else {
-                blob = await (await fetch(ourl + (!ourl.startsWith(loader.cdn) ? ('?' + rand) : ''), {
+                blob = await (await fetch(ourl + (!ourl.startsWith(loader.cdn) ? rand : ''), {
                     'headers': headers
                 })).blob();
             }

package/dist/lib/task.js

@@ -248,7 +248,8 @@ function run(url, opt = {}, ntid) {
             }
             app = yield core.fetchApp(url, {
                 'notifyId': notifyId,
-                'progress': opt.progress
+                'progress': opt.progress,
+                'cache': opt.cache
             }, ntid);
             if (notifyId) {
                 setTimeout(function () {
@@ -1159,7 +1160,7 @@ function run(url, opt = {}, ntid) {
         }
         dom.createToStyleList(taskId);
         yield ((_f = opt.initProgress) === null || _f === void 0 ? void 0 : _f.call(opt, 'Control initialization ...'));
-        const r = yield control.init(taskId, invoke);
+        const r = yield control.init(taskId, invoke, opt.cache);
         if (r < 0) {
             dom.removeFromStyleList(taskId);
             delete exports.list[taskId];

package/dist/lib/task.ts

@@ -290,7 +290,8 @@ export async function run(url: string | types.IApp, opt: types.ITaskRunOptions =
         // --- 获取并加载 app 对象 ---
         app = await core.fetchApp(url, {
             'notifyId': notifyId,
-            'progress': opt.progress
+            'progress': opt.progress,
+            'cache': opt.cache
         }, ntid);
         // --- 无论是否成功，都可以先隐藏 notify 了 ---
         if (notifyId) {
@@ -1305,7 +1306,7 @@ export async function run(url: string | types.IApp, opt: types.ITaskRunOptions =
     dom.createToStyleList(taskId);
     // --- 加载 control ---
     await opt.initProgress?.('Control initialization ...');
-    const r = await control.init(taskId, invoke);
+    const r = await control.init(taskId, invoke, opt.cache);
     if (r < 0) {
         dom.removeFromStyleList(taskId);
         delete list[taskId];

package/package.json

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

package/types/index.d.ts

@@ -92,6 +92,7 @@ export type TGlobalEvent = 'error' | 'screenResize' | 'configChanged' | 'formCre
 export interface ICoreFetchAppOptions {
     'notifyId'?: number;
     'progress'?: (loaded: number, total: number) => void | Promise<void>;
+    'cache'?: string;
 }
 
 /** --- 应用包解包后对象 --- */
@@ -329,6 +330,7 @@ export interface IMountHandler {
         'start'?: number;
         'end'?: number;
         'progress'?: (loaded: number, total: number) => void | Promise<void>;
+        'cache'?: string;
     }) => Blob | string | null | Promise<Blob | string | null>;
     putContent?: (path: string, data: string | Blob, options?: {
         'encoding'?: BufferEncoding | null;
@@ -439,6 +441,8 @@ export interface ITaskRunOptions {
     'data'?: Record<string, any>;
     /** --- 执行文件的基路径，一般在传入 APP 包时使用，以 .cga 结尾或以 / 结尾的路径 --- */
     'path'?: string;
+    /** --- 是否禁用缓存加载，默认禁用 --- */
+    'cache'?: string;
 }
 
 export interface ICreateTimerOptions {