clickgo 3.1.4-dev13 → 3.1.6-dev15

package/dist/lib/core.ts

@@ -73,13 +73,7 @@ export abstract class AbstractApp {
      * --- 以某个窗体进行正式启动这个 app（入口 form），不启动则任务也启动失败 ---
      * @param form 窗体对象
      */
-    public run(form: form.AbstractForm | number): void {
-        if (typeof form === 'number') {
-            // --- 报错 ---
-            const msg = 'Application run error, Form creation failed (' + form.toString() + ').';
-            trigger('error', this.taskId, 0, new Error(msg), msg);
-            return;
-        }
+    public run(form: form.AbstractForm): void {
         form.show();
     }
 
@@ -397,7 +391,7 @@ export function trigger(name: types.TGlobalEvent, taskId: number | string | bool
             if (typeof taskId !== 'number' || typeof formId !== 'number') {
                 break;
             }
-            (boot as any)[eventName](taskId, formId, param1, param2);
+            (boot as any)?.[eventName](taskId, formId, param1, param2);
             for (const tid in task.list) {
                 const t = task.list[tid];
                 (t.class as any)?.[eventName](taskId, formId, param1, param2);
@@ -409,7 +403,7 @@ export function trigger(name: types.TGlobalEvent, taskId: number | string | bool
         }
         case 'screenResize': {
             globalEvents.screenResize();
-            (boot as any)[eventName]();
+            (boot as any)?.[eventName]();
             for (const tid in task.list) {
                 const t = task.list[tid];
                 (t.class as any)?.[eventName]();
@@ -423,7 +417,7 @@ export function trigger(name: types.TGlobalEvent, taskId: number | string | bool
             if ((typeof taskId !== 'string') || (typeof formId === 'number')) {
                 break;
             }
-            (boot as any)[eventName]();
+            (boot as any)?.[eventName]();
             for (const tid in task.list) {
                 const t = task.list[tid];
                 (t.class as any)?.[eventName](taskId, formId);
@@ -436,7 +430,7 @@ export function trigger(name: types.TGlobalEvent, taskId: number | string | bool
         case 'formCreated':
         case 'formRemoved': {
             (globalEvents as any)[name]?.(taskId, formId, param1, param2);
-            (boot as any)[eventName](taskId, formId, param1, param2);
+            (boot as any)?.[eventName](taskId, formId, param1, param2);
             for (const tid in task.list) {
                 const t = task.list[tid];
                 (t.class as any)?.[eventName](taskId, formId, param1, param2);
@@ -449,7 +443,7 @@ export function trigger(name: types.TGlobalEvent, taskId: number | string | bool
         case 'formTitleChanged':
         case 'formIconChanged': {
             (globalEvents as any)[name]?.(taskId, formId, param1);
-            (boot as any)[eventName](taskId, formId, param1);
+            (boot as any)?.[eventName](taskId, formId, param1);
             for (const tid in task.list) {
                 const t = task.list[tid];
                 (t.class as any)?.[eventName](taskId, formId, param1);
@@ -463,7 +457,7 @@ export function trigger(name: types.TGlobalEvent, taskId: number | string | bool
         case 'formStateMaxChanged':
         case 'formShowChanged': {
             (globalEvents as any)[name]?.(taskId, formId, param1);
-            (boot as any)[eventName](taskId, formId, param1);
+            (boot as any)?.[eventName](taskId, formId, param1);
             for (const tid in task.list) {
                 const t = task.list[tid];
                 (t.class as any)?.[eventName](taskId, formId, param1);
@@ -477,7 +471,7 @@ export function trigger(name: types.TGlobalEvent, taskId: number | string | bool
         case 'formBlurred':
         case 'formFlash': {
             (globalEvents as any)[name]?.(taskId, formId);
-            (boot as any)[eventName](taskId, formId);
+            (boot as any)?.[eventName](taskId, formId);
             for (const tid in task.list) {
                 const t = task.list[tid];
                 (t.class as any)?.[eventName](taskId, formId);
@@ -490,7 +484,7 @@ export function trigger(name: types.TGlobalEvent, taskId: number | string | bool
         case 'taskStarted':
         case 'taskEnded': {
             (globalEvents as any)[name]?.(taskId, formId);
-            (boot as any)[eventName](taskId, formId);
+            (boot as any)?.[eventName](taskId, formId);
             for (const tid in task.list) {
                 const t = task.list[tid];
                 (t.class as any)?.[eventName](taskId);
@@ -507,7 +501,7 @@ export function trigger(name: types.TGlobalEvent, taskId: number | string | bool
             if (typeof taskId !== 'string') {
                 taskId = taskId.toString();
             }
-            (boot as any)[eventName](taskId, formId);
+            (boot as any)?.[eventName](taskId, formId);
             for (const tid in task.list) {
                 const t = task.list[tid];
                 (t.class as any)?.[eventName](taskId, formId);
@@ -521,7 +515,7 @@ export function trigger(name: types.TGlobalEvent, taskId: number | string | bool
             if (typeof taskId !== 'string') {
                 break;
             }
-            (boot as any)[eventName](taskId);
+            (boot as any)?.[eventName](taskId);
             for (const tid in task.list) {
                 const t = task.list[tid];
                 (t.class as any)?.[eventName](taskId);
@@ -588,10 +582,12 @@ export async function readApp(blob: Blob): Promise<false | types.IApp> {
  * --- 从网址下载应用，App 模式下本方法不可用 ---
  * @param url 对于当前网页的相对、绝对路径，以 / 结尾的目录或 .cga 结尾的文件 ---
  * @param opt,notifyId:显示进度条的 notify id,current:设置则以设置的为准，不以 / 结尾，否则以 location 为准 ---
+ * @param taskId 所属任务 ID
  */
 export async function fetchApp(
     url: string,
-    opt: types.ICoreFetchAppOptions = {}
+    opt: types.ICoreFetchAppOptions = {},
+    taskId?: number
 ): Promise<null | types.IApp> {
     /** --- 若是 cga 文件，则是 cga 的文件名，含 .cga --- */
     let cga: string = '';
@@ -602,30 +598,10 @@ export async function fetchApp(
             return null;
         }
     }
-
-    let current = '';
-    if (opt.current) {
-        current = opt.current.endsWith('/') ? opt.current.slice(0, -1) : opt.current;
-        url = tool.urlResolve('/current/', url);
-    }
-    else {
-        if (!url.startsWith('/clickgo/') && !url.startsWith('/storage/') && !url.startsWith('/mounted/')) {
-            current = tool.urlResolve(window.location.href, url);
-            if (cga) {
-                current = current.slice(0, -cga.length - 1);
-                url = '/current/' + cga;
-            }
-            else {
-                url = '/current/';
-            }
-        }
-    }
-
     // --- 如果是 cga 文件，直接读取并交给 readApp 函数处理 ---
     if (cga) {
         try {
             const blob = await fs.getContent(url, {
-                'current': current,
                 'progress': (loaded: number, total: number): void => {
                     if (opt.notifyId) {
                         form.notifyProgress(opt.notifyId, loaded / total);
@@ -634,7 +610,7 @@ export async function fetchApp(
                         opt.progress(loaded, total) as unknown;
                     }
                 }
-            });
+            }, taskId);
             if ((blob === null) || typeof blob === 'string') {
                 return null;
             }
@@ -652,9 +628,7 @@ export async function fetchApp(
     /** --- 已加载的 files --- */
     const files: Record<string, Blob | string> = {};
     try {
-        const blob = await fs.getContent(url + 'config.json', {
-            'current': current
-        });
+        const blob = await fs.getContent(url + 'config.json', undefined, taskId);
         if (blob === null || typeof blob === 'string') {
             return null;
         }
@@ -669,9 +643,7 @@ export async function fetchApp(
                 opt.progress(loaded + 1, total + 1) as unknown;
             }
             for (const file of config.files) {
-                fs.getContent(url + file.slice(1), {
-                    'current': current
-                }).then(async function(blob) {
+                fs.getContent(url + file.slice(1), undefined, taskId).then(async function(blob) {
                     if (blob === null || typeof blob === 'string') {
                         clickgo.form.notify({
                             'title': 'File not found',
@@ -725,9 +697,7 @@ export async function fetchApp(
         icon = await tool.blob2DataUrl(files[config.icon] as Blob);
     }
     if (icon === '') {
-        const iconBlob = await fs.getContent('/clickgo/icon.png', {
-            'current': current
-        });
+        const iconBlob = await fs.getContent('/clickgo/icon.png', undefined, taskId);
         if (iconBlob instanceof Blob) {
             icon = await tool.blob2DataUrl(iconBlob);
         }