@vunk/form 1.1.63 → 1.1.64

package/components/upload-plus/index.js

@@ -1,10 +1,11 @@
 import { _VkfFormItemCtx, VkfFormItem } from '@vunk/form/components/form-item';
-import { openBlock, createElementBlock, createElementVNode, defineComponent, reactive, ref, computed, watchEffect, resolveComponent, createBlock, mergeProps, withCtx, createVNode, normalizeClass, createCommentVNode, Fragment, renderList, normalizeStyle, createTextVNode } from 'vue';
+import { openBlock, createElementBlock, createElementVNode, defineComponent, watch, ref, computed, watchEffect, onBeforeUnmount, resolveComponent, createBlock, mergeProps, withCtx, createVNode, normalizeClass, createCommentVNode, Fragment, renderList, normalizeStyle, createTextVNode } from 'vue';
 import { ElMessage, ElInput, ElButtonGroup, ElButton, ElIcon } from 'element-plus';
 import { createFileChunk, calculateFileHashSample } from '@vunk/form/shared/upload';
 import { RestFetch } from '@vunk/core/shared/utils-fetch';
 import '@vunk/core/shared/utils-promise';
 import { isPlainObject as isPlainObject$1 } from '@vunk/core/shared/utils-object';
+import { useModelComputed } from '@vunk/core/composables';
 
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
@@ -45,15 +46,27 @@ const props = __spreadProps(__spreadValues({}, _VkfFormItemCtx.props), {
   fileServiceType: {
     type: String,
     default: void 0
+  },
+  file: {
+    type: Object,
+    default: void 0
+  },
+  fileStatus: {
+    type: String,
+    default: void 0
   }
 });
 const emits = {
+  "update:file": null,
+  "update:fileStatus": null,
   success: (file) => file
 };
 
 var Status = /* @__PURE__ */ ((Status2) => {
   Status2["wait"] = "wait";
+  Status2["doPause"] = "doPause";
   Status2["pause"] = "pause";
+  Status2["doUpload"] = "doUpload";
   Status2["uploading"] = "uploading";
   Status2["error"] = "error";
   Status2["done"] = "done";
@@ -18173,6 +18186,9 @@ const merge = async (data) => {
     data,
     setRequestInit: setDefaultHeader
   }).then((res) => {
+    if (res.code !== 200) {
+      throw new Error(res.message);
+    }
     return res.datas;
   });
 };
@@ -18290,8 +18306,27 @@ const _sfc_main = defineComponent({
   setup(props2, { emit }) {
     const formItemBindProps = _VkfFormItemCtx.createBindProps(props2);
     const uuid = Math.random().toString(36).slice(-8);
-    const container = reactive({});
-    const fileStatus = ref(Status.wait);
+    const containerFile = useModelComputed({
+      default: null,
+      key: "file"
+    }, props2, emit);
+    const fileStatus = useModelComputed({
+      default: Status.wait,
+      key: "fileStatus"
+    }, props2, emit);
+    watch(() => fileStatus.value, (v, ov) => {
+      if (v === Status.doUpload) {
+        handleUpload();
+      }
+      if (v === Status.doPause) {
+        if (ov === Status.uploading) {
+          handlePause();
+        } else {
+          fileStatus.value = ov;
+        }
+      }
+    });
+    const containerHash = ref("");
     const chunks = ref([]);
     const uploadingXhrs = ref([]);
     const filePrefixIcon = computed(() => {
@@ -18312,17 +18347,17 @@ const _sfc_main = defineComponent({
       const target = e.target;
       const file = target.files?.[0];
       if (file) {
-        container.file = file;
+        containerFile.value = file;
         fileStatus.value = Status.wait;
       }
     };
     const handleUpload = async () => {
-      if (!container.file)
+      if (!containerFile.value)
         return;
       fileStatus.value = Status.uploading;
-      const chunkFiles = createFileChunk(container.file, props2.size);
-      const hash = await calculateFileHashSample(container.file);
-      container.hash = hash;
+      const chunkFiles = createFileChunk(containerFile.value, props2.size);
+      const hash = await calculateFileHashSample(containerFile.value);
+      containerHash.value = hash;
       const { uploadedList, uploaded } = await verify({
         identifier: hash
       });
@@ -18335,12 +18370,11 @@ const _sfc_main = defineComponent({
       }
       const sliceSize = chunkFiles[0].size;
       chunks.value = chunkFiles.map((chunk, index) => {
-        const _container = container;
-        const chunkHash = _container.hash + "-" + index;
+        const chunkHash = containerHash.value + "-" + index;
         return {
-          fileName: _container.file.name,
-          fileHash: _container.hash,
-          fileSize: _container.file.size,
+          fileName: containerFile.value.name,
+          fileHash: containerHash.value,
+          fileSize: containerFile.value.size,
           chunk,
           hash: chunkHash,
           index,
@@ -18422,13 +18456,13 @@ const _sfc_main = defineComponent({
       });
     }
     function cFile() {
-      if (!container.file)
+      if (!containerFile.value)
         return;
-      if (!container.hash)
+      if (!containerHash.value)
         return;
       return merge({
-        filename: container.file.name,
-        identifier: container.hash,
+        filename: containerFile.value.name,
+        identifier: containerHash.value,
         fileServiceType: props2.fileServiceType,
         dictId: props2.dictId
       }).then((res) => {
@@ -18439,13 +18473,17 @@ const _sfc_main = defineComponent({
           type: "error",
           message: "\u5408\u5E76\u5931\u8D25"
         });
+        throw err;
       });
     }
+    onBeforeUnmount(() => {
+      handlePause();
+    });
     return {
       formItemBindProps,
       handleFileChange,
       uuid,
-      container,
+      containerFile,
       handleUpload,
       fileStatus,
       chunks,
@@ -18487,7 +18525,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               "is-success": _ctx.fileStatus === _ctx.Status.done,
               "is-error": _ctx.fileStatus === _ctx.Status.error
             }),
-            modelValue: _ctx.container.file?.name,
+            modelValue: _ctx.containerFile?.name,
             prefixIcon: _ctx.filePrefixIcon,
             placeholder: "\u8BF7\u9009\u62E9\u6587\u4EF6"
           }, null, 8, ["class", "modelValue", "prefixIcon"]),
@@ -18542,10 +18580,19 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 createTextVNode(" \u6682\u505C ")
               ]),
               _: 1
-            }, 8, ["onClick"])) : (openBlock(), createBlock(_component_el_button, {
+            }, 8, ["onClick"])) : _ctx.fileStatus === _ctx.Status.done ? (openBlock(), createBlock(_component_ElButton, {
               key: 1,
+              type: "success",
+              disabled: ""
+            }, {
+              default: withCtx(() => [
+                createTextVNode(" \u5DF2\u4F20 ")
+              ]),
+              _: 1
+            })) : (openBlock(), createBlock(_component_el_button, {
+              key: 2,
               type: "primary",
-              disabled: !_ctx.container.file,
+              disabled: !_ctx.containerFile,
               onClick: _ctx.handleUpload
             }, {
               default: withCtx(() => [

package/components/upload-plus/src/api.js

@@ -18111,6 +18111,9 @@ const merge = async (data) => {
     data,
     setRequestInit: setDefaultHeader
   }).then((res) => {
+    if (res.code !== 200) {
+      throw new Error(res.message);
+    }
     return res.datas;
   });
 };

package/components/upload-plus/src/const.d.ts

@@ -1,6 +1,8 @@
 export declare enum Status {
     wait = "wait",
+    doPause = "doPause",
     pause = "pause",
+    doUpload = "doUpload",
     uploading = "uploading",
     error = "error",
     done = "done"

package/components/upload-plus/src/const.js

@@ -1,6 +1,8 @@
 var Status = /* @__PURE__ */ ((Status2) => {
   Status2["wait"] = "wait";
+  Status2["doPause"] = "doPause";
   Status2["pause"] = "pause";
+  Status2["doUpload"] = "doUpload";
   Status2["uploading"] = "uploading";
   Status2["error"] = "error";
   Status2["done"] = "done";

package/components/upload-plus/src/ctx.d.ts

@@ -1,5 +1,6 @@
 import { FileInfo, FileServiceType } from './types';
 import { PropType } from 'vue';
+import { Status } from './const';
 export declare const props: {
     size: {
         type: NumberConstructor;
@@ -24,6 +25,14 @@ export declare const props: {
         type: PropType<FileServiceType>;
         default: undefined;
     };
+    file: {
+        type: PropType<File>;
+        default: undefined;
+    };
+    fileStatus: {
+        type: PropType<Status>;
+        default: undefined;
+    };
     required: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, undefined, boolean>;
     label: StringConstructor;
     labelWidth: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "", boolean>;
@@ -75,5 +84,7 @@ export declare const props: {
     };
 };
 export declare const emits: {
+    'update:file': null;
+    'update:fileStatus': null;
     success: (file: FileInfo) => FileInfo;
 };

package/components/upload-plus/src/ctx.js

@@ -39,9 +39,19 @@ const props = __spreadProps(__spreadValues({}, _VkfFormItemCtx.props), {
   fileServiceType: {
     type: String,
     default: void 0
+  },
+  file: {
+    type: Object,
+    default: void 0
+  },
+  fileStatus: {
+    type: String,
+    default: void 0
   }
 });
 const emits = {
+  "update:file": null,
+  "update:fileStatus": null,
   success: (file) => file
 };
 

package/components/upload-plus/src/index.vue.d.ts

@@ -20,6 +20,14 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<import("./types").FileServiceType>;
         default: undefined;
     };
+    file: {
+        type: import("vue").PropType<File>;
+        default: undefined;
+    };
+    fileStatus: {
+        type: import("vue").PropType<Status>;
+        default: undefined;
+    };
     required: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, undefined, boolean>;
     label: StringConstructor;
     labelWidth: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "", boolean>;
@@ -90,12 +98,9 @@ declare const _default: import("vue").DefineComponent<{
     }>;
     handleFileChange: (e: Event) => void;
     uuid: string;
-    container: {
-        file?: File | undefined;
-        hash?: string | undefined;
-    };
+    containerFile: import("vue").WritableComputedRef<File>;
     handleUpload: () => Promise<void>;
-    fileStatus: import("vue").Ref<Status>;
+    fileStatus: import("vue").WritableComputedRef<Status>;
     chunks: import("vue").Ref<{
         fileName: string;
         fileHash: string;
@@ -112,6 +117,8 @@ declare const _default: import("vue").DefineComponent<{
     filePrefixIcon: import("vue").ComputedRef<import("vue").DefineComponent<{}, {}, {}, import("vue").ComputedOptions, import("vue").MethodOptions, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
     handlePause: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    'update:file': null;
+    'update:fileStatus': null;
     success: (file: import("./types").FileInfo) => import("./types").FileInfo;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     size: {
@@ -134,6 +141,14 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<import("./types").FileServiceType>;
         default: undefined;
     };
+    file: {
+        type: import("vue").PropType<File>;
+        default: undefined;
+    };
+    fileStatus: {
+        type: import("vue").PropType<Status>;
+        default: undefined;
+    };
     required: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, undefined, boolean>;
     label: StringConstructor;
     labelWidth: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "", boolean>;
@@ -185,6 +200,8 @@ declare const _default: import("vue").DefineComponent<{
     };
 }>> & {
     onSuccess?: ((file: import("./types").FileInfo) => any) | undefined;
+    "onUpdate:file"?: ((...args: any[]) => any) | undefined;
+    "onUpdate:fileStatus"?: ((...args: any[]) => any) | undefined;
 }, {
     required: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     labelWidth: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
@@ -197,8 +214,10 @@ declare const _default: import("vue").DefineComponent<{
     readonly: boolean;
     labelPosition: "right";
     accept: string;
+    file: File;
     url: string;
     fileServiceType: import("./types").FileServiceType;
     dictId: string;
+    fileStatus: Status;
 }>;
 export default _default;

package/components/upload-plus/src/types.d.ts

@@ -1,9 +1,5 @@
 import { Status } from './const';
 export declare type FileServiceType = 'mongodb' | 'local' | 'obs' | 'oss';
-export interface FileContainer {
-    file?: File;
-    hash?: string;
-}
 export interface Chunk {
     fileName: string;
     fileHash: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vunk/form",
-  "version": "1.1.63",
+  "version": "1.1.64",
   "description": "",
   "main": "index.esm.js",
   "scripts": {