cnhis-design-vue 3.3.3-release.9 → 3.4.0-beta.0

package/es/components/vod-chunk-upload/src/chunk-upload-new.vue2.js

@@ -1,4 +1,4 @@
-import { createElementVNode, defineComponent, ref, reactive, computed, onMounted, nextTick, onUnmounted, resolveComponent, openBlock, createElementBlock, createCommentVNode, createVNode, unref, withCtx, Fragment, renderList, withDirectives, normalizeClass, toDisplayString, vShow, createTextVNode } from 'vue';
+import { defineComponent, ref, reactive, computed, onMounted, nextTick, onUnmounted, resolveComponent, openBlock, createElementBlock, createCommentVNode, createVNode, unref, withCtx, createElementVNode, Fragment, renderList, withDirectives, normalizeClass, toDisplayString, vShow, createTextVNode } from 'vue';
 import SparkMD5 from 'spark-md5';
 import axios from 'axios';
 import { useMessage, NIcon, NProgress, NButton } from 'naive-ui';
@@ -9,56 +9,40 @@ import { FolderOutline, DocumentAttachOutline, Close } from '@vicons/ionicons5';
 const _hoisted_1 = {
   class: "c-chunk-upload-container"
 };
-const _hoisted_2 = /* @__PURE__ */ createElementVNode("p", null, function() {
-  var _a, _b, _c;
-  try {
-    return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.649")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.649")) || "\u70B9\u51FB\u6216\u5C06\u6587\u4EF6\u62D6\u62FD\u5230\u8FD9\u91CC\u4E0A\u4F20";
-  } catch (e) {
-    return "\u70B9\u51FB\u6216\u5C06\u6587\u4EF6\u62D6\u62FD\u5230\u8FD9\u91CC\u4E0A\u4F20";
-  }
-}(), -1);
-const _hoisted_3 = {
+const _hoisted_2 = {
   class: "c-file-list-conatiner"
 };
-const _hoisted_4 = {
+const _hoisted_3 = {
   key: 0,
   class: "file-list"
 };
-const _hoisted_5 = {
+const _hoisted_4 = {
   class: "c-f-item"
 };
-const _hoisted_6 = {
+const _hoisted_5 = {
   class: "c-f-item-icon"
 };
-const _hoisted_7 = {
+const _hoisted_6 = {
   class: "c-f-item-info"
 };
-const _hoisted_8 = {
+const _hoisted_7 = {
   class: "c-f-item-info-title"
 };
-const _hoisted_9 = {
+const _hoisted_8 = {
   class: "title"
 };
-const _hoisted_10 = {
+const _hoisted_9 = {
   class: "size"
 };
-const _hoisted_11 = {
+const _hoisted_10 = {
   class: "c-f-item-info-time"
 };
-const _hoisted_12 = {
+const _hoisted_11 = {
   class: "c-f-item-btn"
 };
-const _hoisted_13 = {
+const _hoisted_12 = {
   class: "upload-btn"
 };
-const _hoisted_14 = /* @__PURE__ */ createElementVNode("span", null, function() {
-  var _a, _b, _c;
-  try {
-    return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.648")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.648")) || "\u4E0A\u4F20\u65B0\u6587\u4EF6";
-  } catch (e) {
-    return "\u4E0A\u4F20\u65B0\u6587\u4EF6";
-  }
-}(), -1);
 var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "chunk-upload-new",
   props: {
@@ -66,10 +50,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
   },
   emits: ["getSumbitList", "closeUpload"],
   setup(__props, {
-    expose,
-    emit
+    expose: __expose,
+    emit: __emit
   }) {
-    const props = __props;
     const {
       UploadState
     } = getUploadData();
@@ -77,9 +60,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const uploaderDom = ref(null);
     const uploadBtnDom = ref(null);
     const state = reactive(UploadState);
+    const props = __props;
+    const emit = __emit;
     const message = useMessage();
     const {
       initState,
+      isChunkNew,
       uploadArguments,
       autoStart,
       btnAttrs
@@ -94,9 +80,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const init = () => {
       try {
-        console.log(props.getChunkUploadConfig);
+        if (isChunkNew.value)
+          return;
         props.getChunkUploadConfig().then((res) => {
-          console.log(res);
           state.uploadConfig = {
             ...res
           };
@@ -268,41 +254,58 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         computeMD5(file);
       }
     };
-    const verifyUpload = (fileName, fileHash, file) => {
+    const checkFileMd5ExistOld = (obj, file) => {
       let url = state.uploadConfig.checkFileMd5Exist;
-      return new Promise((resolve, reject) => {
+      return instance.get(url, {
+        params: obj
+      }).then((res) => {
+        let verifyData = res.data || {};
+        if (verifyData.code == "00000")
+          return verifyData.data || {};
+      }).catch((err) => {
+        statusSet(file, "failed");
+        console.log("verifyUpload-old -> err", err);
+      });
+    };
+    const verifyUpload = async (fileName, fileHash, file) => {
+      var _a;
+      try {
         const obj = {
           md5: fileHash,
           fileName,
           ...uploadArguments.value
         };
-        instance.get(url, {
-          params: obj
-        }).then((res) => {
-          resolve(res.data);
-        }).catch((err) => {
-          statusSet(file, "failed");
-          console.log("verifyUpload -> err", err);
-        });
-      });
+        if (isChunkNew.value) {
+          Object.assign(obj, {
+            up2saas: (_a = props.chunkUploadApiConfig) == null ? void 0 : _a.up2saas
+          });
+        }
+        return isChunkNew.value ? await props.chunkUploadApiConfig.checkFileMd5Exist(obj) : checkFileMd5ExistOld(obj, file);
+      } catch (err) {
+        console.log("verifyUpload -> err", err);
+      }
     };
     const computeMD5Success = async (md5, file) => {
       try {
-        const verifyData = await verifyUpload(file.name, md5, file);
-        if (verifyData.code == "00000") {
-          const {
-            data
-          } = verifyData || {};
-          if (data.presence) {
-            statusSet(file, "complete");
-            file.crm_chkuns_complete_status = "complete";
-            file.crm_uploade_resInfo = {
-              url: data.path,
-              name: file.name,
-              size: file.size
-            };
-            return;
-          }
+        const data = await verifyUpload(file.name, md5, file);
+        if (data == null ? void 0 : data.path) {
+          statusSet(file, "complete");
+          file.crm_chkuns_complete_status = "complete";
+          file.crm_uploade_resInfo = {
+            url: data.path,
+            name: file.name,
+            size: file.size
+          };
+          return;
+        }
+        if (file.completed) {
+          const successObj = isChunkNew.value ? {
+            result: "SUCCESS"
+          } : {
+            success: true
+          };
+          onFileSuccess({}, file, JSON.stringify(successObj));
+          return;
         }
         file.uniqueIdentifier = md5;
         statusSet(file, "uploading");
@@ -313,56 +316,69 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const onFileProgress = () => {
     };
-    const mergeRequest = (data, file) => {
-      return new Promise((resolve, reject) => {
-        const obj = {
-          ...data,
-          ...uploadArguments.value,
-          size: file.size
-        };
-        instance.post(state.uploadConfig.partFileMerge, obj, {
-          timeout: 0
-        }).then(({
-          data: data2
-        }) => {
-          if (data2.code === "00000") {
-            statusSet(file, "complete");
-            if (uploaderDom.value) {
-              let resData = (data2 == null ? void 0 : data2.data) || {};
-              let fileList = uploaderDom.value.fileList;
-              fileList.forEach((v) => {
-                if (v.uniqueIdentifier == file.uniqueIdentifier) {
-                  v.crm_chkuns_complete_status = "complete";
-                  v.crm_uploade_resInfo = {
-                    url: resData.path || resData.url,
-                    name: file.name,
-                    size: file.size,
-                    ...resData
-                  };
-                }
-              });
-            }
-            resolve();
-          } else {
-            message.error(function() {
-              var _a, _b, _c;
-              try {
-                return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.641")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.641")) || "\u4E0A\u4F20\u5931\u8D25";
-              } catch (e) {
-                return "\u4E0A\u4F20\u5931\u8D25";
-              }
-            }());
-            resolve();
+    const handleMergeFile = (data, file) => {
+      statusSet(file, "complete");
+      if (uploaderDom.value) {
+        let resData = (data == null ? void 0 : data.data) || (data == null ? void 0 : data.obj) || {};
+        let fileList = uploaderDom.value.fileList;
+        fileList.forEach((v) => {
+          if (v.uniqueIdentifier == file.uniqueIdentifier) {
+            v.crm_chkuns_complete_status = "complete";
+            v.crm_uploade_resInfo = {
+              url: resData.path || resData.url,
+              name: file.name,
+              size: file.size,
+              ...resData
+            };
           }
-        }).catch((err) => {
-          console.log("mergeRequest -> err", err);
-          reject();
         });
-      });
+      }
+    };
+    const partFileMergeOld = (obj) => {
+      return instance.post(state.uploadConfig.partFileMerge, obj, {
+        timeout: 0
+      }).then(({
+        data
+      }) => data);
+    };
+    const mergeRequest = async (data, file) => {
+      var _a, _b;
+      const obj = {
+        ...data,
+        ...uploadArguments.value,
+        size: file.size
+      };
+      if (isChunkNew.value) {
+        Object.assign(obj, {
+          up2saas: (_b = (_a = props.chunkUploadApiConfig) == null ? void 0 : _a.up2saas) != null ? _b : false
+        });
+      }
+      try {
+        let resData = isChunkNew.value ? await props.chunkUploadApiConfig.partFileMerge(obj) : await partFileMergeOld(obj);
+        let isFailure = isChunkNew.value ? resData.result !== "SUCCESS" : resData.code !== "00000";
+        if (isFailure) {
+          message.error(function() {
+            var _a2, _b2, _c;
+            try {
+              return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.641")) || ((_c = (_b2 = window.top) == null ? void 0 : _b2.getLanguageByCode) == null ? void 0 : _c.call(_b2, "10010.1.641")) || "\u4E0A\u4F20\u5931\u8D25";
+            } catch (e) {
+              return "\u4E0A\u4F20\u5931\u8D25";
+            }
+          }());
+          statusSet(file, "failed");
+          return;
+        }
+        handleMergeFile(resData, file);
+      } catch (err) {
+        console.log("mergeRequest -> err", err);
+        statusSet(file, "failed");
+        throw err;
+      }
     };
     const onFileSuccess = (rootFile, file, response) => {
       let res = JSON.parse(response);
-      if (!res.success) {
+      let isFailure = isChunkNew.value ? res.result !== "SUCCESS" : !res.success;
+      if (isFailure) {
         statusSet(file, "failed");
         return;
       }
@@ -446,7 +462,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       emit("getSumbitList", list);
     };
     const confirm = () => {
-      console.log("ininini");
       const {
         configList
       } = state;
@@ -478,7 +493,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       cancel();
     };
     const cancel = () => {
-      console.log("cancelcancelcancel");
       close();
       state.configList = [];
       emit("closeUpload", false);
@@ -490,7 +504,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     });
     onUnmounted(() => {
     });
-    expose({
+    __expose({
       cancel,
       confirm
     });
@@ -518,10 +532,17 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             onClick: hanldeDraggerBtnClick
           }, [createVNode(unref(NIcon), {
             component: unref(FolderOutline)
-          }, null, 8, ["component"]), _hoisted_2])]),
+          }, null, 8, ["component"]), _cache[0] || (_cache[0] = createElementVNode("p", null, function() {
+            var _a, _b, _c;
+            try {
+              return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.649")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.649")) || "\u70B9\u51FB\u6216\u5C06\u6587\u4EF6\u62D6\u62FD\u5230\u8FD9\u91CC\u4E0A\u4F20";
+            } catch (e) {
+              return "\u70B9\u51FB\u6216\u5C06\u6587\u4EF6\u62D6\u62FD\u5230\u8FD9\u91CC\u4E0A\u4F20";
+            }
+          }(), -1))])]),
           _: 1
         }), createVNode(_component_uploader_list, null, {
-          default: withCtx((scope) => [createElementVNode("div", _hoisted_3, [scope ? (openBlock(), createElementBlock("ul", _hoisted_4, [(openBlock(true), createElementBlock(Fragment, null, renderList(scope.fileList, (file) => {
+          default: withCtx((scope) => [createElementVNode("div", _hoisted_2, [scope ? (openBlock(), createElementBlock("ul", _hoisted_3, [(openBlock(true), createElementBlock(Fragment, null, renderList(scope.fileList, (file) => {
             return openBlock(), createElementBlock("li", {
               key: file.id
             }, [withDirectives(createVNode(_component_uploader_file, {
@@ -535,12 +556,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                 class: normalizeClass(["c-file-container", {
                   "c-file-boder-bottom": fileClass(file)
                 }])
-              }, [createElementVNode("div", _hoisted_5, [createElementVNode("div", _hoisted_6, [createVNode(unref(NIcon), {
+              }, [createElementVNode("div", _hoisted_4, [createElementVNode("div", _hoisted_5, [createVNode(unref(NIcon), {
                 component: unref(DocumentAttachOutline),
                 style: {
                   "color": "#5585f5"
                 }
-              }, null, 8, ["component"])]), createElementVNode("div", _hoisted_7, [createElementVNode("div", _hoisted_8, [createElementVNode("span", _hoisted_9, toDisplayString(file.name), 1), createElementVNode("span", _hoisted_10, "(" + toDisplayString(scope2.formatedSize) + ")", 1)]), createElementVNode("div", _hoisted_11, [createElementVNode("span", null, toDisplayString(scope2.formatedTimeRemaining), 1), createElementVNode("span", null, toDisplayString(getUploadShowStatus(file, "text")), 1)])]), createElementVNode("div", _hoisted_12, [createVNode(unref(NIcon), {
+              }, null, 8, ["component"])]), createElementVNode("div", _hoisted_6, [createElementVNode("div", _hoisted_7, [createElementVNode("span", _hoisted_8, toDisplayString(file.name), 1), createElementVNode("span", _hoisted_9, "(" + toDisplayString(scope2.formatedSize) + ")", 1)]), createElementVNode("div", _hoisted_10, [createElementVNode("span", null, toDisplayString(scope2.formatedTimeRemaining), 1), createElementVNode("span", null, toDisplayString(getUploadShowStatus(file, "text")), 1)])]), createElementVNode("div", _hoisted_11, [createVNode(unref(NIcon), {
                 component: unref(Close),
                 onClick: ($event) => handleRemove(file)
               }, null, 8, ["component", "onClick"])])]), createVNode(unref(NProgress), {
@@ -552,26 +573,33 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             }, 1032, ["class", "file"]), [[vShow, !file.ignored]])]);
           }), 128))])) : createCommentVNode("v-if", true)])]),
           _: 1
-        }), createElementVNode("div", _hoisted_13, [withDirectives(createVNode(_component_uploader_btn, {
+        }), createElementVNode("div", _hoisted_12, [withDirectives(createVNode(_component_uploader_btn, {
           attrs: unref(btnAttrs),
           ref_key: "uploadBtnDom",
           ref: uploadBtnDom
         }, {
-          default: withCtx(() => [_hoisted_14]),
+          default: withCtx(() => [..._cache[1] || (_cache[1] = [createElementVNode("span", null, function() {
+            var _a, _b, _c;
+            try {
+              return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.648")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.648")) || "\u4E0A\u4F20\u65B0\u6587\u4EF6";
+            } catch (e) {
+              return "\u4E0A\u4F20\u65B0\u6587\u4EF6";
+            }
+          }(), -1)])]),
           _: 1
         }, 8, ["attrs"]), [[vShow, false]]), createVNode(unref(NButton), {
           type: "primary",
           class: "mgl-10",
           onClick: handleStartUpload
         }, {
-          default: withCtx(() => [createTextVNode(function() {
+          default: withCtx(() => [..._cache[2] || (_cache[2] = [createTextVNode(function() {
             var _a, _b, _c;
             try {
               return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.653")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.653")) || "\u5F00\u59CB\u4E0A\u4F20";
             } catch (e) {
               return "\u5F00\u59CB\u4E0A\u4F20";
             }
-          }())]),
+          }(), -1)])]),
           _: 1
         })])]),
         _: 1

package/es/components/vod-chunk-upload/src/hooks/upload-computed.d.ts

@@ -1,5 +1,6 @@
 export declare const UploadComputed: (props: any, state: any, config: any) => {
     initState: () => void;
+    isChunkNew: import("vue").ComputedRef<any>;
     uploadArguments: import("vue").ComputedRef<{
         type: any;
         channel: any;

package/es/components/vod-chunk-upload/src/hooks/upload-computed.js

@@ -1,16 +1,26 @@
 import { computed } from 'vue';
 
 const UploadComputed = (props, state, config) => {
+  const isChunkNew = computed(() => {
+    return props.chunkUploadApiConfig && !!Object.keys(props.chunkUploadApiConfig).length && "checkFileMd5Exist" in props.chunkUploadApiConfig && typeof props.chunkUploadApiConfig.checkFileMd5Exist === "function";
+  });
+  const useToken = computed(() => {
+    var _a;
+    return isChunkNew.value ? (_a = props.chunkUploadApiConfig) == null ? void 0 : _a.authorization : state.uploadConfig.token;
+  });
   const handleProcessHeaders = () => {
+    if (!useToken.value)
+      return "";
     return {
-      Authorization: "bearer " + state.uploadConfig.token
+      Authorization: "bearer " + useToken.value
     };
   };
   const handleGetTargetUrl = (file) => {
-    var _a;
-    return ((_a = state == null ? void 0 : state.uploadConfig) == null ? void 0 : _a.partFileUpload) || "";
+    var _a, _b;
+    return isChunkNew.value ? (_a = props.chunkUploadApiConfig) == null ? void 0 : _a.partFileUpload : ((_b = state == null ? void 0 : state.uploadConfig) == null ? void 0 : _b.partFileUpload) || "";
   };
   const handleProcessParams = (params, file) => {
+    var _a, _b;
     const res = {
       channel: channel.value,
       md5: file.uniqueIdentifier,
@@ -19,6 +29,12 @@ const UploadComputed = (props, state, config) => {
       chunks: params.totalChunks,
       chunkSize: params.currentChunkSize
     };
+    if (isChunkNew.value) {
+      Object.assign(res, {
+        size: file.size,
+        up2saas: (_b = (_a = props.chunkUploadApiConfig) == null ? void 0 : _a.up2saas) != null ? _b : false
+      });
+    }
     return res || params;
   };
   const processResponse = (response, cb, file, Chunk) => {
@@ -99,6 +115,7 @@ const UploadComputed = (props, state, config) => {
   });
   return {
     initState,
+    isChunkNew,
     uploadArguments,
     autoStart,
     btnAttrs

package/es/components/vod-chunk-upload/src/hooks/upload-data.d.ts

@@ -58,6 +58,10 @@ export declare const UploadProps: {
         type: StringConstructor;
         default: string;
     };
+    chunkUploadApiConfig: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
 };
 /**
  * 自定义的状态

package/es/components/vod-chunk-upload/src/hooks/upload-data.js

@@ -5,10 +5,10 @@ const getUploadData = () => {
     progress: 0,
     options: {
       target: {},
-      chunkSize: 3 * 1024 * 1024,
+      chunkSize: 5 * 1024 * 1024,
       fileParameterName: "file",
       maxChunkRetries: 3,
-      simultaneousUploads: 3,
+      simultaneousUploads: 1,
       prioritizeFirstAndLastChunk: true,
       forceChunkSize: true,
       testChunks: false,
@@ -61,6 +61,10 @@ const UploadProps = {
   source: {
     type: String,
     default: ""
+  },
+  chunkUploadApiConfig: {
+    type: Object,
+    default: () => ({})
   }
 };
 const statusSet = (file, status) => {