@vunk/form 1.1.70 → 1.1.72

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

@@ -0,0 +1,198 @@
+import { Status } from './const';
+declare const _default: import("vue").DefineComponent<{
+    fileId: {
+        type: StringConstructor;
+        default: string;
+    };
+    url: {
+        type: StringConstructor;
+        default: string;
+    };
+    chunkSize: {
+        type: NumberConstructor;
+        default: number;
+    };
+    fileServiceType: {
+        type: import("vue").PropType<import("../../upload-plus/src/types").FileServiceType>;
+        default: any;
+    };
+    fileStatus: {
+        type: import("vue").PropType<Status>;
+        default: any;
+    };
+    label: StringConstructor;
+    labelWidth: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "", boolean>;
+    prop: {
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | string[]) | (() => import("element-plus").FormItemProp) | ((new (...args: any[]) => string | string[]) | (() => import("element-plus").FormItemProp))[], unknown, unknown>>;
+        readonly required: false;
+        readonly validator: (val: unknown) => boolean;
+        __epPropKey: true;
+    };
+    required: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, undefined, boolean>;
+    rules: {
+        readonly type: import("vue").PropType<unknown>;
+        readonly required: false;
+        readonly validator: (val: unknown) => boolean;
+        __epPropKey: true;
+    };
+    error: StringConstructor;
+    validateStatus: {
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "error" | "success" | "validating", unknown>>;
+        readonly required: false;
+        readonly validator: (val: unknown) => boolean;
+        __epPropKey: true;
+    };
+    for: StringConstructor;
+    inlineMessage: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, BooleanConstructor], unknown, unknown, "", boolean>;
+    showMessage: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    formItemSize: {
+        type: import("vue").PropType<"default" | "small" | "large">;
+        default: "default" | "small" | "large";
+    };
+    formItemSlots: {
+        type: import("vue").PropType<import("../../form-item/src/types").FormItemSlots>;
+        default: any;
+    };
+    elRef: {
+        type: import("vue").PropType<any>;
+        required: boolean;
+    };
+    inline: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    readonly: {
+        type: BooleanConstructor;
+        default: any;
+    };
+    labelPosition: {
+        type: import("vue").PropType<"right">;
+        default: string;
+    };
+}, {
+    formItemBindProps: import("vue").ComputedRef<{}>;
+    fileInfo: import("vue").Ref<{
+        id: string;
+        name: string;
+        url: string;
+        response: {
+            fileName: string;
+            size: number;
+            memo: string;
+            realName: string;
+            fileId: string;
+            fileServiceType: string;
+            id: string;
+        };
+        fileName: string;
+        size: number;
+        memo: string;
+        realName: string;
+        fileId: string;
+        fileServiceType: string;
+    }>;
+    handleDownload: () => void;
+    handlePause: () => void;
+    Status: typeof Status;
+    chunks: import("vue").Ref<{
+        fileId: string;
+        start: number;
+        end: number;
+        status: Status;
+        index: number;
+        fileServiceType?: import("../../upload-plus/src/types").FileServiceType;
+        progress: number;
+        data?: Blob;
+    }[]>;
+    fileStatus: import("vue").WritableComputedRef<Status>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    'update:fileStatus': any;
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    fileId: {
+        type: StringConstructor;
+        default: string;
+    };
+    url: {
+        type: StringConstructor;
+        default: string;
+    };
+    chunkSize: {
+        type: NumberConstructor;
+        default: number;
+    };
+    fileServiceType: {
+        type: import("vue").PropType<import("../../upload-plus/src/types").FileServiceType>;
+        default: any;
+    };
+    fileStatus: {
+        type: import("vue").PropType<Status>;
+        default: any;
+    };
+    label: StringConstructor;
+    labelWidth: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "", boolean>;
+    prop: {
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | string[]) | (() => import("element-plus").FormItemProp) | ((new (...args: any[]) => string | string[]) | (() => import("element-plus").FormItemProp))[], unknown, unknown>>;
+        readonly required: false;
+        readonly validator: (val: unknown) => boolean;
+        __epPropKey: true;
+    };
+    required: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, undefined, boolean>;
+    rules: {
+        readonly type: import("vue").PropType<unknown>;
+        readonly required: false;
+        readonly validator: (val: unknown) => boolean;
+        __epPropKey: true;
+    };
+    error: StringConstructor;
+    validateStatus: {
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "error" | "success" | "validating", unknown>>;
+        readonly required: false;
+        readonly validator: (val: unknown) => boolean;
+        __epPropKey: true;
+    };
+    for: StringConstructor;
+    inlineMessage: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, BooleanConstructor], unknown, unknown, "", boolean>;
+    showMessage: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    formItemSize: {
+        type: import("vue").PropType<"default" | "small" | "large">;
+        default: "default" | "small" | "large";
+    };
+    formItemSlots: {
+        type: import("vue").PropType<import("../../form-item/src/types").FormItemSlots>;
+        default: any;
+    };
+    elRef: {
+        type: import("vue").PropType<any>;
+        required: boolean;
+    };
+    inline: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    readonly: {
+        type: BooleanConstructor;
+        default: any;
+    };
+    labelPosition: {
+        type: import("vue").PropType<"right">;
+        default: string;
+    };
+}>> & {
+    "onUpdate:fileStatus"?: (...args: any[] | unknown[]) => any;
+}, {
+    labelWidth: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
+    required: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+    inlineMessage: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, BooleanConstructor], unknown, unknown>;
+    showMessage: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+    formItemSize: "default" | "small" | "large";
+    formItemSlots: import("../../form-item/src/types").FormItemSlots;
+    inline: boolean;
+    readonly: boolean;
+    labelPosition: "right";
+    url: string;
+    chunkSize: number;
+    fileServiceType: import("../../upload-plus/src/types").FileServiceType;
+    fileStatus: Status;
+    fileId: string;
+}, {}>;
+export default _default;

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

@@ -0,0 +1,17 @@
+import { rFile } from '@skzz/platform/api/basic';
+import { ApiReturnType } from '@vunk/core';
+import { Status } from './const';
+import { __VkfUploadPlus } from '@vunk/form/components/upload-plus';
+export type FileInfo = ApiReturnType<typeof rFile>;
+export type FileServiceType = __VkfUploadPlus.FileServiceType;
+export interface DownloadChunk {
+    fileId: string;
+    start: number;
+    end: number;
+    status: Status;
+    index: number;
+    fileServiceType?: FileServiceType;
+    progress: number;
+    data?: Blob;
+}
+export {};

package/components/download-plus/src/types.js

@@ -0,0 +1 @@
+

package/components/upload-plus/index.css

@@ -73,6 +73,8 @@
 .vkf-upload-plus-label .el-input{
   pointer-events: none;
   --el-input-border-color: transparent;
+  --el-input-focus-border-color: transparent;
+  --el-input-hover-border-color: transparent;
 }
 .vkf-upload-plus-label .el-input.is-success .el-icon{
    color: var(--el-color-success);

package/components/upload-plus/index.js

@@ -1,15 +1,19 @@
 import { _VkfFormItemCtx, VkfFormItem } from '@vunk/form/components/form-item';
-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 { openBlock, createElementBlock, createElementVNode, defineComponent, watch, ref, computed, watchEffect, onBeforeUnmount, resolveComponent, resolveDirective, createBlock, mergeProps, withCtx, createVNode, normalizeClass, createCommentVNode, Fragment, renderList, normalizeStyle, withDirectives, createTextVNode } from 'vue';
+import { ElMessage, ElInput, ElButtonGroup, ElButton, ElIcon, vLoading } 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 { restFetch as restFetch$1 } from '@skzz/platform/shared/fetch/platform';
 import { useModelComputed } from '@vunk/core/composables';
 
 const props = {
   ..._VkfFormItemCtx.props,
-  size: {
+  /**
+   * @description 分片大小
+   */
+  chunkSize: {
     type: Number,
     default: 1024 / (16 * 16) * 1024 * 1024
   },
@@ -24,6 +28,9 @@ const props = {
     type: String,
     default: ""
   },
+  /**
+   * @description 上传文件类型
+   */
   accept: {
     type: String,
     default: ""
@@ -32,10 +39,17 @@ const props = {
     type: String,
     default: void 0
   },
+  /**
+   * @description v-model:file 文件对象
+   */
   file: {
     type: Object,
     default: void 0
   },
+  /**
+   * @description 
+   * v-model:fileStatus 当前文件状态: wait, doPause, pause, doUpload, uploading, error, done
+   */
   fileStatus: {
     type: String,
     default: void 0
@@ -9500,7 +9514,7 @@ lodash.prototype.at=seq.at;lodash.prototype.chain=seq.wrapperChain;lodash.protot
 lodash.prototype.first=lodash.prototype.head;if(symIterator){lodash.prototype[symIterator]=seq.toIterator;}throttle(err=>{let message="\u7CFB\u7EDF\u9519\u8BEF";if(err instanceof Error){const local={"Failed to fetch":"\u8BF7\u6C42\u5931\u8D25","The user aborted a request.":"\u8BF7\u6C42\u88AB\u7EC8\u6B62"};message=local[err.message]||err.message;if(err.name==="AbortError"&&err.message.includes("user")){return;}}if(typeof err==="string"){message=err;}if(isPlainObject$1(err)){const msg=err==null?void 0:err.msg;msg&&(message=msg);}ElMessage({type:"error",message});},500,{trailing:false});const setDefaultHeader=config=>{const headers=config.headers;headers.set("application","platform");headers.set("tenant","default");return config;};
 
 const restFetch = new RestFetch({
-  baseURL: "http://192.168.110.209:36800",
+  baseURL: restFetch$1.baseURL,
   presetRequestInit: (config) => {
     const header = config.headers;
     const token = getToken();
@@ -9673,6 +9687,9 @@ var script = defineComponent({
     ElIcon,
     SuccessFilled: success_filled_default
   },
+  directives: {
+    loading: vLoading
+  },
   props,
   emits,
   setup(props2, {
@@ -9729,7 +9746,7 @@ var script = defineComponent({
       if (!containerFile.value)
         return;
       fileStatus.value = Status.uploading;
-      const chunkFiles = createFileChunk(containerFile.value, props2.size);
+      const chunkFiles = createFileChunk(containerFile.value, props2.chunkSize);
       const hash = await calculateFileHashSample(containerFile.value);
       containerHash.value = hash;
       const {
@@ -9828,16 +9845,19 @@ var script = defineComponent({
         start();
       });
     }
+    const merging = ref(false);
     function cFile() {
       if (!containerFile.value)
         return;
       if (!containerHash.value)
         return;
+      merging.value = true;
       return merge({
         filename: containerFile.value.name,
         identifier: containerHash.value,
         fileServiceType: props2.fileServiceType,
-        dictId: props2.dictId
+        dictId: props2.dictId,
+        totalChunk: chunks.value.length
       }).then((res) => {
         emit("success", res);
       }).catch((err) => {
@@ -9847,6 +9867,8 @@ var script = defineComponent({
           message: "\u5408\u5E76\u5931\u8D25"
         });
         throw err;
+      }).finally(() => {
+        merging.value = false;
       });
     }
     onBeforeUnmount(() => {
@@ -9862,7 +9884,8 @@ var script = defineComponent({
       chunks,
       Status,
       filePrefixIcon,
-      handlePause
+      handlePause,
+      merging
     };
   }
 });
@@ -9897,6 +9920,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_button = resolveComponent("el-button");
   const _component_el_button_group = resolveComponent("el-button-group");
   const _component_VkfFormItem = resolveComponent("VkfFormItem");
+  const _directive_loading = resolveDirective("loading");
   return openBlock(), createBlock(
     _component_VkfFormItem,
     mergeProps(_ctx.formItemBindProps, {
@@ -9963,8 +9987,15 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
       }, null, 40, _hoisted_6), createVNode(_component_el_button_group, {
         class: "vkf-upload-plus-btng"
       }, {
-        default: withCtx(() => [_ctx.fileStatus === _ctx.Status.uploading ? (openBlock(), createBlock(_component_ElButton, {
+        default: withCtx(() => [_ctx.merging ? withDirectives((openBlock(), createBlock(_component_ElButton, {
           key: 0,
+          type: "success"
+        }, {
+          default: withCtx(() => [createTextVNode(" \u5408\u5E76 ")]),
+          _: 1
+          /* STABLE */
+        })), [[_directive_loading, _ctx.merging]]) : _ctx.fileStatus === _ctx.Status.uploading ? (openBlock(), createBlock(_component_ElButton, {
+          key: 1,
           type: "danger",
           onClick: _ctx.handlePause
         }, {
@@ -9972,7 +10003,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
           _: 1
           /* STABLE */
         }, 8, ["onClick"])) : _ctx.fileStatus === _ctx.Status.done ? (openBlock(), createBlock(_component_ElButton, {
-          key: 1,
+          key: 2,
           type: "success",
           disabled: ""
         }, {
@@ -9980,7 +10011,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
           _: 1
           /* STABLE */
         })) : (openBlock(), createBlock(_component_el_button, {
-          key: 2,
+          key: 3,
           type: "primary",
           disabled: !_ctx.containerFile,
           onClick: _ctx.handleUpload

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

@@ -34,4 +34,5 @@ export declare const merge: (data: {
     filename: string;
     dictId?: string;
     fileServiceType?: string;
+    totalChunk: number;
 }) => Promise<FileInfo>;