@ibiz-template/runtime 0.7.41-alpha.139 → 0.7.41-alpha.140

package/out/utils/file-util/file-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-util.d.ts","sourceRoot":"","sources":["../../../src/utils/file-util/file-util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file-util.d.ts","sourceRoot":"","sources":["../../../src/utils/file-util/file-util.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,WAAW,EACX,aAAa,EAId,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,kBAAkB,EAClB,yBAAyB,EACzB,YAAY,EACb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAG5E;;;;;GAKG;AACH,qBAAa,QAAS,YAAW,YAAY;IAC3C;;;;OAIG;IACH,SAAS,CAAC,kBAAkB,qBAA4B;IAExD;;;;;OAKG;IACH,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAE3D;;;;OAIG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAIpD;;;;;;OAMG;IACH,SAAS,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,EAAE,OAAO,GAAG,OAAO;IAQ1E;;;;OAIG;IACH,gBAAgB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAqB1C;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CACrB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,UAAU,CAAC,EAAE,MAAM,EACnB,cAAc,GAAE,OAAe,EAC/B,oBAAoB,GAAE,OAAe,GACpC,MAAM;IAmBT;;;;;;;;;;;OAWG;IACH,iBAAiB,CACf,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,EAChB,WAAW,GAAE,yBAA8B,GAC1C;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB;IAoCD;;;;;;;;;OASG;IACG,iBAAiB,CACrB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,EACX,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,KAAK,EAChC,oBAAoB,GAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAO,GAC1E,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAU1C;;;;;OAKG;IACI,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,KAAK,GAAG,IAAI;IAOrE;;;;;;;;;;;;;;;OAeG;IACG,YAAY,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,MAAM,EACb,cAAc,CAAC,EAAE;QACf,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE;YAAE,MAAM,EAAE,MAAM,CAAA;SAAE,GAAG,KAAK,CAAC;QACjC,WAAW,CAAC,EAAE,yBAAyB,CAAC;QACxC,oBAAoB,CAAC,EAAE;YAAE,YAAY,CAAC,EAAE,MAAM,CAAC;YAAC,YAAY,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KACzE,EACD,oBAAoB,CAAC,EAAE,OAAO,EAC9B,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,IAAI,CAAC;IAkDhB;;;;;;;OAOG;IACG,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,GACb,OAAO,CAAC,KAAK,CAAC;IAsBjB;;;;;OAKG;IACH,WAAW,CAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,MAAM;IAmBnD;;;;;;;;OAQG;IACG,mBAAmB,CACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,KAAU,GACjB,OAAO,CAAC,KAAK,EAAE,GAAG,SAAS,CAAC;IA+B/B;;;;;;OAMG;IACH,UAAU,CACR,MAAM,GAAE,MAAW,EACnB,QAAQ,GAAE,OAAe,GACxB,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IA6ChC;;;;;;;;;;;;;;;OAeG;IACG,WAAW,CACf,GAAG,EAAE,MAAM,EACX,YAAY,CAAC,EAAE,0BAA0B,EACzC,cAAc,CAAC,EAAE;QACf,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE;YAAE,MAAM,EAAE,MAAM,CAAA;SAAE,GAAG,KAAK,CAAC;QACjC,WAAW,CAAC,EAAE,yBAAyB,CAAC;QACxC,oBAAoB,CAAC,EAAE;YAAE,YAAY,CAAC,EAAE,MAAM,CAAC;YAAC,YAAY,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KACzE,EACD,oBAAoB,CAAC,EAAE,OAAO,EAC9B,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,KAAK,CAAC;IAgDjB;;;;;;OAMG;IACH,WAAW,SACH,IAAI,SACJ,MAAM,YACH,MAAM,KACd,QAAQ,IAAI,CAAC,CAkCd;IAEF;;;;;OAKG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CASnC"}

package/out/utils/file-util/file-util.js

@@ -323,36 +323,45 @@ export class FileUtil {
      */
     chooseFile(accept = '', multiple = false) {
         return new Promise(resolve => {
-            // 创建 input 元素
-            let inputElement = document.createElement('input');
-            inputElement.type = 'file';
-            inputElement.accept = accept;
-            inputElement.multiple = multiple;
-            inputElement.webkitdirectory = false;
-            // 添加事件监听器，处理文件上传逻辑
-            inputElement.addEventListener('change', (e) => {
-                if (inputElement) {
-                    document.body.removeChild(inputElement);
-                    inputElement = null;
-                }
-                resolve(e.target.files);
-            }, { once: true });
-            // 将 input 元素添加到页面中
-            document.body.appendChild(inputElement);
-            // 执行文件上传操作
-            inputElement.click();
-            // 监听取消操作
-            window.addEventListener('focus', () => {
-                // 确保执行在 change 之后
+            const input = document.createElement('input');
+            input.type = 'file';
+            input.accept = accept;
+            input.multiple = multiple;
+            input.webkitdirectory = false;
+            let settled = false;
+            const settle = (result) => {
+                if (settled)
+                    return;
+                settled = true;
+                input.remove();
+                resolve(result);
+            };
+            // 1. 选中文件
+            input.onchange = (e) => {
+                var _a;
+                const files = (_a = e.target.files) !== null && _a !== void 0 ? _a : undefined;
+                settle(files);
+            };
+            // 2. 现代浏览器：用户取消会触发 cancel 事件
+            input.oncancel = () => {
+                settle(undefined);
+            };
+            // 3. 挂载元素触发文件上传
+            document.body.appendChild(input);
+            input.click();
+            // 4. 兜底：focus 回来之后 change 迟迟没来
+            const onFocus = () => {
+                window.removeEventListener('focus', onFocus);
                 setTimeout(() => {
-                    // 方法结束后销毁 input 元素
-                    if (inputElement) {
-                        document.body.removeChild(inputElement);
-                        inputElement = null;
-                    }
-                    resolve(undefined);
+                    if (settled)
+                        return;
+                    // 关键：如果 input 里已经有文件，说明 change 一定会来，绝不当成取消
+                    if (input.files && input.files.length > 0)
+                        return;
+                    settle(undefined);
                 }, 1000);
-            }, { once: true });
+            };
+            window.addEventListener('focus', onFocus);
         });
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.41-alpha.139",
+  "version": "0.7.41-alpha.140",
   "description": "运行时逻辑库",
   "type": "module",
   "main": "out/index.js",
@@ -39,7 +39,7 @@
     "jsencrypt": "^3.3.2"
   },
   "devDependencies": {
-    "@ibiz-template/core": "^0.7.41-alpha.138",
+    "@ibiz-template/core": "^0.7.41-alpha.140",
     "@ibiz/model-core": "^0.1.89",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
@@ -70,5 +70,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "b875543c236f00a5838e22a3ebe97ac773bee9f8"
+  "gitHead": "29a5a4315ab5fc1780030f02bc6ceaa8af60738c"
 }

package/src/utils/file-util/file-util.ts

@@ -413,48 +413,46 @@ export class FileUtil implements IApiFileUtil {
     multiple: boolean = false,
   ): Promise<FileList | undefined> {
     return new Promise(resolve => {
-      // 创建 input 元素
-      let inputElement: HTMLInputElement | null =
-        document.createElement('input');
-      inputElement.type = 'file';
-      inputElement.accept = accept;
-      inputElement.multiple = multiple;
-      inputElement.webkitdirectory = false;
-      // 添加事件监听器，处理文件上传逻辑
-      inputElement.addEventListener(
-        'change',
-        (e: IData) => {
-          if (inputElement) {
-            document.body.removeChild(inputElement);
-            inputElement = null;
-          }
-          resolve(e.target.files);
-        },
-        { once: true },
-      );
+      const input = document.createElement('input');
+      input.type = 'file';
+      input.accept = accept;
+      input.multiple = multiple;
+      input.webkitdirectory = false;
 
-      // 将 input 元素添加到页面中
-      document.body.appendChild(inputElement);
+      let settled = false;
+      const settle = (result: FileList | undefined): void => {
+        if (settled) return;
+        settled = true;
+        input.remove();
+        resolve(result);
+      };
 
-      // 执行文件上传操作
-      inputElement.click();
+      // 1. 选中文件
+      input.onchange = (e: Event): void => {
+        const files = (e.target as HTMLInputElement).files ?? undefined;
+        settle(files);
+      };
 
-      // 监听取消操作
-      window.addEventListener(
-        'focus',
-        () => {
-          // 确保执行在 change 之后
-          setTimeout(() => {
-            // 方法结束后销毁 input 元素
-            if (inputElement) {
-              document.body.removeChild(inputElement);
-              inputElement = null;
-            }
-            resolve(undefined);
-          }, 1000);
-        },
-        { once: true },
-      );
+      // 2. 现代浏览器：用户取消会触发 cancel 事件
+      input.oncancel = (): void => {
+        settle(undefined);
+      };
+
+      // 3. 挂载元素触发文件上传
+      document.body.appendChild(input);
+      input.click();
+
+      // 4. 兜底：focus 回来之后 change 迟迟没来
+      const onFocus = (): void => {
+        window.removeEventListener('focus', onFocus);
+        setTimeout(() => {
+          if (settled) return;
+          // 关键：如果 input 里已经有文件，说明 change 一定会来，绝不当成取消
+          if (input.files && input.files.length > 0) return;
+          settle(undefined);
+        }, 1000);
+      };
+      window.addEventListener('focus', onFocus);
     });
   }