@dt-frames/ui 1.0.44 → 1.0.46

package/es/assets/locales/en.json

@@ -28,8 +28,8 @@
         "MULTIFY": "Batch",
         "DELETE_SUCCESS": "Successfully Deleted！",
         "COLUMN_CONTROL": "Column Control",
-        "COLUMN_SHOW": "Column Display",
-        "INDEX": "Serial Number",
+        "COLUMN_SHOW": "All",
+        "INDEX": "Index",
         "CHECKBOX": "Checkbox",
         "FIXED_TO_LEFT": "Fixed to the Left",
         "FIXED_TO_RIGHT": "Fixed to the Right",

package/es/components/curd/src/hooks/useCurd.d.ts

@@ -6,7 +6,7 @@ export declare function useCurd(curdOpt: CrudOptType): {
     }>;
     add: () => void;
     del: ({ row }: Recordable) => void;
-    dels: (ids: string[], cb: Function) => void;
+    dels: (ids?: string[]) => void;
     update: ({ row }: Recordable) => void;
     closeModal: () => void;
     openModal: (data?: {

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/components/source/src/types/source.type.d.ts

@@ -21,6 +21,7 @@ export declare type ApiObjType = {
 export declare type SourceType = {
     baseUrl?: string;
     exportName?: string | ComputedRef;
+    clearKeys?: Function;
     api: ApiObjType;
 };
 export declare type BaseDataType = {

package/es/index.js

@@ -5136,7 +5136,6 @@ function useDataSource(propsRef, {
   }, false);
   function updateTableDataRecord(rowKey, record) {
     const row = findTableDataRecord(rowKey);
-    console.log(row, record);
     if (row) {
       for (const field in record) {
         row[field] = record[field];
@@ -5270,7 +5269,7 @@ var _sfc_main$I = defineComponent({
   },
   setup(props) {
     let renderText = ref();
-    watch(() => props.record, (v) => {
+    watch(() => [props.record, props.column], (v) => {
       if (v)
         renderCell();
     }, {
@@ -5545,7 +5544,7 @@ function handleIndexColumn(propsRef, getPaginationRef, columns) {
   const isFixedLeft = columns.some((item) => item.fixed === "left");
   columns.unshift({
     flag: INDEX_FLAG,
-    width: unref(getIsZH) ? 50 : 60,
+    width: unref(getIsZH) ? 50 : 70,
     title: t("NUMBER"),
     align: "center",
     customRender: ({ index: index2 }) => {
@@ -5683,7 +5682,6 @@ function useColumns(propsRef, getPaginationRef, tableElRef) {
     return columns;
   }
   function setColumns(columnList = []) {
-    console.log(columnList);
     const columns = cloneDeep(columnList);
     if (!isArray$1(columns))
       return;
@@ -5887,7 +5885,6 @@ const _sfc_main$G = /* @__PURE__ */ defineComponent({
       setColumns(columns);
     }
     function setColumns(columns) {
-      console.log(columns, "===");
       table.setColumns(columns);
       const data = unref(plainSortOptions).map((col) => {
         const visable = columns.findIndex((c) => c === col.value || typeof c !== "string" && c.dataIndex === col.value) !== -1;
@@ -6844,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":
@@ -6857,7 +6854,7 @@ function useDownload(exportUrl, exportName) {
         break;
       case "current":
       case "select":
-        handleDownloadPage(excelData, unref(exportName));
+        handleDownloadPage(excelData, unref(exportName), extraData);
         break;
     }
   }
@@ -6883,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) => {
@@ -6913,7 +6910,7 @@ function useDownload(exportUrl, exportName) {
       total.push(rowData);
       return total;
     }, []);
-    export2Excel([titles].concat(content), exportName2);
+    export2Excel([extraData, titles].concat(content), exportName2);
   }
   function export2Excel(data = [], exportName2 = "") {
     const worksheet = xlsx.utils.aoa_to_sheet(data);
@@ -6937,7 +6934,8 @@ function useSource(opt) {
     onSearch: ref(false),
     onReset: ref(false)
   };
-  const { baseUrl = "", api = {}, exportName = "" } = opt;
+  const { baseUrl = "", api = {}, exportName = "", clearKeys = () => {
+  } } = opt;
   const { add, deletes, update, queryById, queryPage } = api;
   const { message } = useMessage();
   const apiFul = {};
@@ -6973,12 +6971,14 @@ function useSource(opt) {
     baseData.entityDTO = { ...model };
     baseData.pageDTO.pageNo = 0;
     loading.onSearch.value = true;
+    clearKeys();
     search();
   }
   function onReset(model) {
     baseData.entityDTO = { ...model };
     baseData.pageDTO.pageNo = 0;
     loading.onReset.value = true;
+    clearKeys();
     search();
   }
   function onTableChange(params, needSearch = true) {
@@ -7023,15 +7023,17 @@ function useSource(opt) {
     });
   }
   function onAdd(model) {
-    if (!add)
+    if (!add || loading.onAdd.value)
       return;
     const { fetch } = useFetch(add, baseUrl);
+    loading.onAdd.value = true;
     let httpFetch = fetch(model, false);
     httpFetch.then((rsp) => {
       if ((rsp == null ? void 0 : rsp.code) === 0) {
         message.success(t("ADD_SUCCESS"));
         search();
       }
+      loading.onAdd.value = false;
     });
     return httpFetch;
   }
@@ -7042,8 +7044,9 @@ function useSource(opt) {
     return await fetch({ id });
   }
   function onUpdate(model) {
-    if (!update)
+    if (!update || loading.onUpdate.value)
       return;
+    loading.onUpdate.value = true;
     const { fetch } = useFetch(update, baseUrl);
     let httpFetch = fetch(model, false);
     httpFetch.then((rsp) => {
@@ -7051,26 +7054,31 @@ function useSource(opt) {
         message.success(t("UPDATE_SUCCESS"));
         search();
       }
+      loading.onUpdate.value = false;
     });
     return httpFetch;
   }
   function onDeletes(ids) {
-    if (!deletes)
+    if (!deletes || loading.onDeletes.value)
       return;
+    loading.onDeletes.value = true;
     const { fetch } = useFetch(deletes, baseUrl);
     fetch(toRaw(ids), false).then((rsp) => {
       if ((rsp == null ? void 0 : rsp.code) === 0) {
         message.success(`${ids.length > 1 ? t("MULTIFY") : ""} ${t("DELETE_SUCCESS")}`);
+        if (ids.length > 1)
+          clearKeys();
         search();
       }
+      loading.onDeletes.value = false;
     });
   }
   const { download } = useDownload(apiFul.export, exportName);
-  function onDownload(excelData) {
+  function onDownload(excelData, extraData = []) {
     download({
       ...excelData,
       params: baseData
-    });
+    }, extraData);
   }
   const form = {
     onSearch,
@@ -7216,7 +7224,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"
@@ -7267,7 +7275,7 @@ function useCurd(curdOpt) {
       nextTick(() => dispatchResize());
     });
   }
-  function dels(ids = [], cb) {
+  function dels(ids = []) {
     if (!ids.length) {
       message.error(t("EMPTY"));
       return;
@@ -7282,7 +7290,6 @@ function useCurd(curdOpt) {
         iconType: "warning",
         onOk() {
           curd.onDeletes(ids);
-          cb();
         }
       });
     } else {

package/package.json

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