@newview/file-ui 1.1.38 → 1.1.39

package/dist/file-ui.js

@@ -633,10 +633,14 @@ let UploadFileInstance$1 = class UploadFileInstance extends BaseInstance {
     let fileMark = this.utilities.getCurrentDate("YYYYMMDDHHmmss") + "." + ext;
     let ossClient = await new OSSFileApi().getOSSClient();
     const userInfo = this.storageInfo.getUser();
+    const business = this.storageInfo.getCurrentBusiness();
     const module = this.storageInfo.getCurrentModule();
     const platform = this.storageInfo.getCurrentPlatform();
-    let moduleName = module ? module == null ? void 0 : module.ModuleAlias : "无模块";
-    let newFileName = `${(platform == null ? void 0 : platform.OssRootPath) + "/" + moduleName + "/"}${this.props.catalog}/${this.currentToken}/${fileMark}`;
+    let businessName = business ? business == null ? void 0 : business.ModuleAlias : "非业务";
+    let moduleName = module ? module == null ? void 0 : module.ModuleAlias : "非业务";
+    let moduleName2 = businessName + "/" + moduleName;
+    let FileCabinePath = (platform == null ? void 0 : platform.OssRootPath) + "/" + moduleName2 + "/";
+    let newFileName = `${FileCabinePath}${this.props.catalog}/${this.currentToken}/${fileMark}`;
     const result = await ossClient.multipartUpload(newFileName, file, {
       async progress(p) {
         _this.uploadingPercent.value = (p * 100).toFixed(0);
@@ -646,7 +650,7 @@ let UploadFileInstance$1 = class UploadFileInstance extends BaseInstance {
     if (result.res.statusCode === 200) {
       let fileInfo = {
         "FileCabinetId": (module == null ? void 0 : module.Id) ? module == null ? void 0 : module.Id : 0,
-        "FileCabinePath": (platform == null ? void 0 : platform.OssRootPath) + "/" + moduleName + "/",
+        "FileCabinePath": FileCabinePath,
         "Catalog": this.props.catalog,
         "Token": this.currentToken,
         "GroupName": this.activeGroupName.value,
@@ -660,10 +664,16 @@ let UploadFileInstance$1 = class UploadFileInstance extends BaseInstance {
         "CreateTime": this.utilities.getCurrentDate(),
         "Id": 0
       };
-      await this.fileInfoApi.save(fileInfo);
-      this.message.success("上传成功！");
-      this.uploadingPercent.value = 100;
-      this.loadFileList(true);
+      let infoSaveRes = this.utilities.parseApiResult(await this.fileInfoApi.save(fileInfo));
+      if (infoSaveRes) {
+        this.message.success("上传成功！");
+        this.ctx.emit("success", { token: this.currentToken, fileId: infoSaveRes });
+        this.loadFileList(true);
+        this.uploadingPercent.value = 100;
+      } else {
+        this.message.error("网络出现异常，再次上传");
+        this.uploadingPercent.value = 0;
+      }
     } else {
       this.message.error("网络出现异常，再次上传");
       this.uploadingPercent.value = 0;