@dt-frames/ui 1.0.45 → 1.0.47

package/es/components/curd/src/types/curd.type.d.ts

@@ -3,7 +3,7 @@ import { ComputedRef, VNodeChild } from "vue";
 import { FormSchema, FormProps } from "../../../forms/src/types/form.type";
 export declare type CrudOptType = {
     t?: string;
-    title?: string | ComputedRef;
+    title?: string | ComputedRef | Function;
     width?: string | number;
     schemas: FormSchema[];
     footer?: VNodeChild | JSX.Element | ButtonProps[];

package/es/components/source/src/hooks/useDownload.d.ts

@@ -4,5 +4,5 @@ import { ComputedRef } from 'vue';
 export declare function useDownload(exportUrl: string, exportName: string | ComputedRef): {
     download: (excelData: DownloadType & {
         params: Recordable;
-    }) => void;
+    }, extraData?: any[]) => void;
 };

package/es/components/source/src/hooks/useSource.d.ts

@@ -21,7 +21,7 @@ export declare function useSource(opt: SourceType): {
             total: number;
         }>;
         onTableChange: (params: TableParamsType, needSearch?: boolean) => void;
-        onDownload: (excelData: DownloadType) => void;
+        onDownload: (excelData: DownloadType, extraData?: any[]) => void;
         loading: Ref<boolean>;
     };
     curd: {
@@ -38,6 +38,6 @@ export declare function useSource(opt: SourceType): {
     onDeletes: (ids: any) => void;
     onUpdate: (model: Recordable) => Promise<unknown>;
     onTableChange: (params: TableParamsType, needSearch?: boolean) => void;
-    onDownload: (excelData: DownloadType) => void;
+    onDownload: (excelData: DownloadType, extraData?: any[]) => void;
     onSearch: (model?: Recordable) => void;
 };

package/es/index.js

@@ -6841,7 +6841,7 @@ function useFetch(api, baseUrl = "") {
   };
 }
 function useDownload(exportUrl, exportName) {
-  function download(excelData) {
+  function download(excelData, extraData = []) {
     const { params: searchDTO, type, columns } = excelData;
     switch (type) {
       case "all":
@@ -6854,7 +6854,7 @@ function useDownload(exportUrl, exportName) {
         break;
       case "current":
       case "select":
-        handleDownloadPage(excelData, unref(exportName));
+        handleDownloadPage(excelData, unref(exportName), extraData);
         break;
     }
   }
@@ -6880,7 +6880,7 @@ function useDownload(exportUrl, exportName) {
       return column;
     });
   }
-  function handleDownloadPage({ columns = [], rows = [] }, exportName2 = "") {
+  function handleDownloadPage({ columns = [], rows = [] }, exportName2 = "", extraData = []) {
     const titles = columns.map((it) => it.title);
     const content = rows.reduce((total, it) => {
       const rowData = columns.map((column) => {
@@ -6910,7 +6910,11 @@ function useDownload(exportUrl, exportName) {
       total.push(rowData);
       return total;
     }, []);
-    export2Excel([titles].concat(content), exportName2);
+    let excelHeader = [titles];
+    if (extraData && extraData.length > 0) {
+      excelHeader = [...extraData, titles];
+    }
+    export2Excel(excelHeader.concat(content), exportName2);
   }
   function export2Excel(data = [], exportName2 = "") {
     const worksheet = xlsx.utils.aoa_to_sheet(data);
@@ -7074,11 +7078,11 @@ function useSource(opt) {
     });
   }
   const { download } = useDownload(apiFul.export, exportName);
-  function onDownload(excelData) {
+  function onDownload(excelData, extraData = []) {
     download({
       ...excelData,
       params: baseData
-    });
+    }, extraData);
   }
   const form = {
     onSearch,
@@ -7224,7 +7228,7 @@ function useCurd(curdOpt) {
     t
   } = useI18n("UI");
   const actType = ref(null);
-  const title = computed(() => unref(actType) + unref(curdOpt.title));
+  const title = computed(() => isFunction(curdOpt.title) ? curdOpt.title() : unref(actType) + unref(curdOpt.title));
   const DtCurdModal = () => {
     return h(createVNode("div", {
       "class": "curdModal"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dt-frames/ui",
-	"version": "1.0.45",
+	"version": "1.0.47",
 	"keywords": [
 		"ui",
 		"dt-ui"