@dt-frames/ui 2.0.14 → 2.0.15

package/es/components/upload/index.js

@@ -2,9 +2,9 @@ import { Button, Upload, Image } from "ant-design-vue/es";
 import "ant-design-vue/es/image/style";
 import "ant-design-vue/es/upload/style";
 import "ant-design-vue/es/button/style";
-import { defineComponent, openBlock, createBlock, unref as unref$1, withCtx, createVNode, createElementVNode, createElementBlock, mergeProps, isRef, createSlots, toDisplayString, Fragment, renderList, normalizeClass, createCommentVNode, renderSlot, normalizeProps, guardReactiveProps } from "vue";
+import { computed, unref, ref, watch, defineComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, toRefs, createElementBlock, mergeProps, isRef, createSlots, toDisplayString, Fragment, renderList, normalizeClass, createCommentVNode, renderSlot, normalizeProps, guardReactiveProps } from "vue";
 import { takeRight, omit } from "lodash-es";
-import { useAppStore, useMessage, dispatchResize, isFunction, isString, http, HttpContentTypeEnum } from "@dt-frames/core";
+import { useAppStore, useMessage, isString, dispatchResize, isFunction, http, HttpContentTypeEnum } from "@dt-frames/core";
 import { useModal, DtModal, useModalOut } from "../modal";
 import { DtIframe } from "../iframe";
 import { renderAsync } from "docx-preview";
@@ -27,9 +27,9 @@ const basicProps = {
     type: Object,
     default: {}
   },
-  filename: {
+  fileName: {
     type: String,
-    default: "filename"
+    default: "file"
   },
   accept: {
     type: Array,
@@ -134,13 +134,14 @@ function useFile({
     return helpTexts.join(", ");
   });
   const setFile = (file) => {
+    let _downloadUrl = getAppConf.pages?.downloadUrl;
     return {
       ...file,
-      name: file.filename ?? file.fileId,
-      fileType: file.filename ? takeRight(file.filename.split("."))[0] : null,
+      name: file.fileName ?? file.fileId,
+      fileType: file.fileName ? takeRight(file.fileName.split("."))[0] : null,
       status: "done",
       uid: file.id ?? file.fileId,
-      url: `${getAppConf.pages?.downloadUrl}?id=${file.fileId}`
+      url: `${getAppConf.http?.baseUrl}${isString(_downloadUrl) ? _downloadUrl : _downloadUrl.api}?id=${file.fileId}`
     };
   };
   const fileList = ref(unref(fileListRef).map((it) => setFile(it)));
@@ -213,7 +214,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     const pdfUrlRef = ref();
     const [register] = useModal({
       width: "70%",
-      title: (data) => `\u9644\u4EF6\u9884\u89C8 - ${data.filename}`,
+      title: (data) => `\u9644\u4EF6\u9884\u89C8 - ${data.fileName}`,
       useWrapper: false,
       wrapClassName: "dt-pdf",
       maskClosable: false,
@@ -225,14 +226,14 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       exeReduce.value = isFullscreen ? 55 : 233;
     }
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref$1(DtModal), {
-        onRegister: unref$1(register),
+      return openBlock(), createBlock(unref(DtModal), {
+        onRegister: unref(register),
         onToggleFullscreen: toggleFullscreen
       }, {
         default: withCtx(() => [
-          createVNode(unref$1(DtIframe), {
-            src: unref$1(pdfUrlRef),
-            exeReduce: unref$1(exeReduce)
+          createVNode(unref(DtIframe), {
+            src: pdfUrlRef.value,
+            exeReduce: exeReduce.value
           }, null, 8, ["src", "exeReduce"])
         ]),
         _: 1
@@ -240,27 +241,18 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _export_sfc = (sfc, props) => {
-  const target = sfc.__vccOpts || sfc;
-  for (const [key, val] of props) {
-    target[key] = val;
-  }
-  return target;
-};
-const PdfView = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/upload/src/components/PdfView.vue"]]);
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "WordView",
   setup(__props) {
     const ID = `word-view-${Math.ceil(Math.random() * 1e6)}`;
     const [register] = useModal({
       width: "900px",
-      title: (data) => `\u9644\u4EF6\u9884\u89C8 - ${data.filename}`,
+      title: (data) => `\u9644\u4EF6\u9884\u89C8 - ${data.fileName}`,
       useWrapper: false,
       wrapClassName: "dt-word",
       maskClosable: false,
       footer: null
     }, (data) => {
-      console.log(data);
       const fileReader = new FileReader();
       fileReader.addEventListener("load", (event) => {
         const arrayBuffer = event.target.result;
@@ -282,7 +274,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       fileReader.readAsArrayBuffer(data.data);
     });
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref$1(DtModal), { onRegister: unref$1(register) }, {
+      return openBlock(), createBlock(unref(DtModal), { onRegister: unref(register) }, {
         default: withCtx(() => [
           createElementVNode("div", {
             id: ID,
@@ -294,7 +286,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DocxView = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/upload/src/components/WordView.vue"]]);
 const _hoisted_1 = { class: "flex items-center" };
 const _hoisted_2 = { class: "pl-3" };
 const _hoisted_3 = { class: "flex justify-between border border-solid border-gray-300 p-1 mt-2" };
@@ -382,14 +373,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       };
     });
     const handlePreview = async (file) => {
-      console.log(file);
       imgSrcRef.value = file.url;
       imgVisable.value = true;
     };
     const uploadFile = async ({ file, onSuccess, onError, onProgress }) => {
-      console.log(file);
       const { getAppConf } = useAppStore();
-      const { uploadUrl = getAppConf.pages.uploadUrl, downloadUrl = getAppConf.pages.downloadUrl } = props;
+      const { uploadUrl = getAppConf.pages.uploadUrl, downloadUrl = getAppConf.pages.downloadUrl, fileName } = props;
       let _uploadUrl = isString(uploadUrl) ? uploadUrl : uploadUrl.api;
       let _downloadUrl = isString(downloadUrl) ? downloadUrl : downloadUrl.api;
       if (!_uploadUrl) {
@@ -410,13 +399,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           },
           {
             ...props.extraParams,
-            file
+            [fileName || "file"]: file
           }
         );
-        file.fileId = result?.data?.id;
-        file.url = `${_downloadUrl}?id=${result?.data?.id}`;
-        file.filename = result?.data?.filename;
-        file.fileType = takeRight(result?.data?.filename?.split("."))?.[0];
+        Object.assign(file, {
+          fileId: result?.data?.fileId,
+          url: `${getAppConf.http?.baseUrl}${_downloadUrl}?id=${result?.data?.fileId}`,
+          fileName: result?.data?.fileName,
+          fileType: takeRight(result?.data?.fileName?.split("."))?.[0]
+        });
         onSuccess(result);
       } catch (err) {
         onError(err);
@@ -426,12 +417,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       try {
         const { getAppConf } = useAppStore();
         const { downloadUrl = getAppConf.pages.downloadUrl } = props;
+        let _downloadUrl = isString(downloadUrl) ? downloadUrl : downloadUrl.api;
         if (["jpg", "jpeg", "png", "bmp", "gif"].includes(file.fileType)) {
-          imgSrcRef.value = `${downloadUrl}?id=${file.fileId}`;
+          imgSrcRef.value = `${_downloadUrl}?id=${file.fileId}`;
           imgVisable.value = true;
           return;
         }
-        let result = await http.get(downloadUrl, { id: file.fileId }, {
+        let result = await http.get(_downloadUrl, { id: file.fileId }, {
           onlyData: false,
           responseType: "blob",
           isTransformResponse: false,
@@ -442,13 +434,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         switch (file.fileType) {
           case "pdf":
             openPdfModal({
-              filename: file.filename,
+              fileName: file.fileName,
               url: URL.createObjectURL(result.data)
             });
             break;
           case "docx":
             openDocxModal({
-              filename: file.filename,
+              fileName: file.fileName,
               data: result.data
             });
             break;
@@ -460,12 +452,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function download(file) {
       const { getAppConf } = useAppStore();
       const { downloadUrl = getAppConf.pages.downloadUrl } = props;
-      http.exportFile(downloadUrl, { id: file.fileId }, file.filename);
+      http.exportFile(downloadUrl, { id: file.fileId }, file.fileName);
     }
     watch(
-      () => unref(fileList).length,
-      (v) => emits("change", unref(fileList).map((it) => it.fileId)),
+      () => unref(fileList),
+      async (v) => {
+        let ids = unref(fileList).map((it) => it.fileId);
+        if (ids.length === v.length)
+          emits("change", ids.join(","));
+      },
       {
+        deep: true,
         immediate: true
       }
     );
@@ -474,18 +471,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_AUpload = Upload;
       const _component_AImage = Image;
       return openBlock(), createElementBlock("div", null, [
-        unref$1(getBind).listType === "text" ? (openBlock(), createBlock(_component_AUpload, mergeProps({ key: 0 }, unref$1(getBind), {
-          fileList: unref$1(fileList),
+        unref(getBind).listType === "text" ? (openBlock(), createBlock(_component_AUpload, mergeProps({ key: 0 }, unref(getBind), {
+          fileList: unref(fileList),
           "onUpdate:fileList": _cache[0] || (_cache[0] = ($event) => isRef(fileList) ? fileList.value = $event : null)
         }), createSlots({
           itemRender: withCtx(({ file, actions }) => [
             createElementVNode("div", _hoisted_3, [
               createElementVNode("div", _hoisted_4, [
                 createElementVNode("img", {
-                  src: unref$1(getFileThumb)(file.fileType),
+                  src: unref(getFileThumb)(file.fileType),
                   class: "w-9 h-9 mr-2 p-1"
                 }, null, 8, _hoisted_5),
-                createElementVNode("span", null, toDisplayString(file.filename), 1)
+                createElementVNode("span", null, toDisplayString(file.fileName), 1)
               ]),
               createElementVNode("div", _hoisted_6, [
                 (openBlock(), createElementBlock(Fragment, null, renderList(btns, (btn) => {
@@ -496,7 +493,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       key: 0,
                       class: normalizeClass(["i w-7 h-7 !text-base text-center leading-7 text-gray-600 cursor-pointer hover:bg-gray-200 hover:bg-opacity-50 transition-all duration-300", btn.class]),
                       onClick: ($event) => btn.click(file)
-                    }, null, 10, _hoisted_7)) : createCommentVNode("v-if", true)
+                    }, null, 10, _hoisted_7)) : createCommentVNode("", true)
                   ], 64);
                 }), 64))
               ])
@@ -507,16 +504,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               createVNode(_component_AButton, null, {
                 default: withCtx(() => [
                   createElementVNode("i", {
-                    class: normalizeClass(["i mr-1", unref$1(getBind).preIcon])
+                    class: normalizeClass(["i mr-1", unref(getBind).preIcon])
                   }, null, 2),
-                  createElementVNode("span", null, toDisplayString(unref$1(getBind).buttonText), 1)
+                  createElementVNode("span", null, toDisplayString(unref(getBind).buttonText), 1)
                 ]),
                 _: 1
               }),
-              createElementVNode("p", _hoisted_2, toDisplayString(unref$1(getHelpText)), 1)
+              createElementVNode("p", _hoisted_2, toDisplayString(unref(getHelpText)), 1)
             ]),
-            createVNode(PdfView, { onRegister: unref$1(registerPdf) }, null, 8, ["onRegister"]),
-            createVNode(DocxView, { onRegister: unref$1(registerDocx) }, null, 8, ["onRegister"])
+            createVNode(_sfc_main$2, { onRegister: unref(registerPdf) }, null, 8, ["onRegister"]),
+            createVNode(_sfc_main$1, { onRegister: unref(registerDocx) }, null, 8, ["onRegister"])
           ]),
           _: 2
         }, [
@@ -528,23 +525,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ])
             };
           })
-        ]), 1040, ["fileList"])) : createCommentVNode("v-if", true),
-        unref$1(getBind).listType === "picture-card" ? (openBlock(), createBlock(_component_AUpload, mergeProps({ key: 1 }, unref$1(getBind), {
-          fileList: unref$1(fileList),
+        ]), 1040, ["fileList"])) : createCommentVNode("", true),
+        unref(getBind).listType === "picture-card" ? (openBlock(), createBlock(_component_AUpload, mergeProps({ key: 1 }, unref(getBind), {
+          fileList: unref(fileList),
           "onUpdate:fileList": _cache[1] || (_cache[1] = ($event) => isRef(fileList) ? fileList.value = $event : null),
           onPreview: handlePreview
         }), {
           default: withCtx(() => [
-            !_ctx.maxCount || unref$1(fileList).length < _ctx.maxCount ? (openBlock(), createElementBlock("div", _hoisted_8, _hoisted_11)) : createCommentVNode("v-if", true)
+            !_ctx.maxCount || !unref(fileList).length || unref(fileList).length < _ctx.maxCount ? (openBlock(), createElementBlock("div", _hoisted_8, _hoisted_11)) : createCommentVNode("", true)
           ]),
           _: 1
-        }, 16, ["fileList"])) : createCommentVNode("v-if", true),
-        unref$1(bindImg).src ? (openBlock(), createBlock(_component_AImage, mergeProps({ key: 2 }, unref$1(bindImg), { style: { display: "none" } }), null, 16)) : createCommentVNode("v-if", true)
+        }, 16, ["fileList"])) : createCommentVNode("", true),
+        unref(bindImg).src ? (openBlock(), createBlock(_component_AImage, mergeProps({ key: 2 }, unref(bindImg), { style: { display: "none" } }), null, 16)) : createCommentVNode("", true)
       ]);
     };
   }
 });
-const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/upload/src/index.vue"]]);
 export {
-  index as DtUpload
+  _sfc_main as DtUpload
 };

package/es/components/upload/index.less

@@ -5,7 +5,7 @@
     display: initial;
 }
 
-.dt-pdf{
+.dt-pdf, .dt-word{
     &.fullscreen-modal{
         min-height: calc(100% + 8px);
         &>.ant-modal{
@@ -27,12 +27,16 @@
                 }
             }
         }
+
+        .word-view{
+            width: 100%;
+        }
     }
 }
 
 .word-view{
     width: 900px;
-    height: 500px;
+    height: calc(100vh - 260px);
 }
 
 .dt-image-item{
@@ -49,9 +53,10 @@
 
 .dt-upload{
     .ant-upload-list-picture-card{
+        min-height: 112px;
         .ant-upload-list-item, .ant-upload {
-            height: 104px;
-            width: 104px;
+            height: 104px !important;
+            width: 104px !important;
         }
     }
     

package/es/components/upload/src/basicProps.d.ts

@@ -21,7 +21,7 @@ export declare const basicProps: {
         type: PropType<object | ((file: UploadFile) => object)>;
         default: {};
     };
-    filename: {
+    fileName: {
         type: StringConstructor;
         default: string;
     };

package/es/components/upload/src/index.d.ts

@@ -19,7 +19,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: import("vue").PropType<object | ((file: UploadFile) => object)>;
         default: {};
     };
-    filename: {
+    fileName: {
         type: StringConstructor;
         default: string;
     };
@@ -156,7 +156,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: import("vue").PropType<object | ((file: UploadFile) => object)>;
         default: {};
     };
-    filename: {
+    fileName: {
         type: StringConstructor;
         default: string;
     };
@@ -223,16 +223,16 @@ declare const _sfc_main: import("vue").DefineComponent<{
     onChange?: (...args: any[]) => any;
 }, {
     data: object | ((file: UploadFile) => object);
-    disabled: Boolean | import("vue").Ref<Boolean> | import("vue").ComputedRef<Boolean>;
-    multiple: boolean;
     buttonText: string;
     preIcon: string;
-    filename: string;
+    fileName: string;
     accept: string[];
+    disabled: Boolean | import("vue").Ref<Boolean> | import("vue").ComputedRef<Boolean>;
     defaultFiles: UploadFile[];
     listType: "text" | "picture-card";
     maxSize: number;
     helpText: string;
+    multiple: boolean;
     extraParams: {};
     showView: boolean;
     showDownload: boolean;