@pisell/materials 1.0.313 → 1.0.315

package/lib/components/table/Actions/component/ExportImport/index.js

@@ -47,6 +47,8 @@ var import_ExportTable = __toESM(require("./components/ExportTable"));
 var import_function = require("./components/ExportTable/function");
 var import_ImportLog = __toESM(require("./components/ImportLog"));
 var import_ImportTable = __toESM(require("./components/ImportTable"));
+var import_hooks = require("../../../../../hooks");
+var import_model = require("../../../model");
 var import_index = require("./index.less");
 var Com = {
   import: import_ImportTable.default,
@@ -55,14 +57,16 @@ var Com = {
   import_log: import_ImportLog.default
 };
 var ExportImport = ({ exportImport }) => {
-  const { selectLists, formId, formCode } = exportImport;
   const [open, setOpen] = (0, import_react.useState)(false);
   const [file, setFile] = (0, import_react.useState)(null);
   const [type, setType] = (0, import_react.useState)(import_status.defaultOptions.exportType);
   const [value, setValue] = (0, import_react.useState)("");
   const [errorStatus, setErrorStatus] = (0, import_react.useState)();
+  const { state } = (0, import_hooks.useSharedState)(import_model.Context);
+  const { dataSource: defaultDataSource, originDataSource } = state;
   const context = (0, import_useEngineContext.default)();
   import_utils.request.setRequest(context.appHelper.utils.request);
+  console.log(defaultDataSource, originDataSource, "wh77");
   const _items = (0, import_react.useMemo)(() => {
     const result = Object.entries(import_status.exportImportOptions).map(([key, value2]) => {
       return {
@@ -88,16 +92,18 @@ var ExportImport = ({ exportImport }) => {
     return types.includes(value) ? 900 : import_status.defaultOptions.importValue ? 600 : 400;
   }, [value]);
   const _title = (0, import_react.useMemo)(() => {
-    if (exportImport == null ? void 0 : exportImport.title)
-      return exportImport.title;
     if (!value)
       return null;
+    const types = import_status.defaultOptions.okShowButtonTypes;
+    if (types.includes(value) && (exportImport == null ? void 0 : exportImport.title)) {
+      return `${import_status.exportImportOptions[value]}${exportImport.title}`;
+    }
     return import_status.exportImportOptions[value];
   }, [value, exportImport == null ? void 0 : exportImport.title]);
   const _okText = (0, import_react.useMemo)(() => {
     const types = import_status.defaultOptions.okShowButtonTypes;
     if (types.includes(value)) {
-      return import_status.defaultOptions.exportValue ? (0, import_locales.getText)("table-action-export-import-button") : (0, import_locales.getText)("table-action-export-import-button-import");
+      return value === import_status.defaultOptions.exportValue ? (0, import_locales.getText)("table-action-export-import-button") : (0, import_locales.getText)("table-action-export-import-button-import");
     }
   }, [value]);
   const handleClick = (e) => {
@@ -122,6 +128,7 @@ var ExportImport = ({ exportImport }) => {
         content: (0, import_locales.getText)("table-action-export-import-import-success"),
         key: value
       });
+      localStorage.setItem("dot", "true");
       onCancel();
     },
     onError: (err) => {
@@ -130,15 +137,25 @@ var ExportImport = ({ exportImport }) => {
     }
   });
   const onOk = async () => {
+    const { formId, formCode } = exportImport;
     if (value === import_status.defaultOptions.exportValue) {
-      const result = await (0, import_function.batchExport)(type, exportImport);
+      const _params = {
+        type,
+        dataSource: defaultDataSource
+      };
+      const result = await (0, import_function.batchExport)(_params, exportImport);
       if (result) {
         onCancel();
       }
     } else if (value === import_status.defaultOptions.importValue) {
       const formData = new FormData();
       formData.append("file", file);
-      formData.append("form_id", form_id);
+      if (formId) {
+        formData.append("form_id", formId);
+      }
+      if (formCode) {
+        formData.append("code", formCode);
+      }
       if (formData) {
         import_antd.message.loading({ content: "Loading...", key: value });
         _batchImport.run(formData);

package/lib/components/table/serve.d.ts

@@ -1,13 +1,11 @@
 declare type exportParams = {
     ids?: Array<string | number>;
     file_name?: string;
+    form_id?: string | number;
+    code?: string;
 };
 export declare const exportData: (params: exportParams) => Promise<any>;
-export declare const batchExport: (params: any) => Promise<any>;
-export declare const formIdExport: (form_id: string | number, params: exportParams) => Promise<any>;
-export declare const formCodeExport: (code: string, params: exportParams) => Promise<any>;
 export declare const batchImport: (params: any) => Promise<any>;
-export declare const importCodeTemplate: (code: string) => Promise<any>;
-export declare const importFormIdTemplate: (form_id: string | number) => Promise<any>;
+export declare const importTemplate: (params: exportParams) => Promise<any>;
 export declare const historyData: (params: any) => Promise<any>;
 export {};

package/lib/components/table/serve.js

@@ -19,37 +19,23 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/table/serve.ts
 var serve_exports = {};
 __export(serve_exports, {
-  batchExport: () => batchExport,
   batchImport: () => batchImport,
   exportData: () => exportData,
-  formCodeExport: () => formCodeExport,
-  formIdExport: () => formIdExport,
   historyData: () => historyData,
-  importCodeTemplate: () => importCodeTemplate,
-  importFormIdTemplate: () => importFormIdTemplate
+  importTemplate: () => importTemplate
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("./utils");
 var exportData = (params) => {
-  return import_utils.request.getRequest().get(`/shop/form/data/export`, params);
+  return import_utils.request.getRequest().post(`/shop/form/data/export`, params);
 };
-var batchExport = (params) => {
-  return import_utils.request.getRequest().get(`/shop/form/data/export`, params);
-};
-var formIdExport = (form_id, params) => import_utils.request.getRequest().post(`/shop/form/data/export/${form_id}`, params);
-var formCodeExport = (code, params) => import_utils.request.getRequest().get(`/shop/form/data/export/code/${code}`, params);
 var batchImport = (params) => import_utils.request.getRequest().post("/shop/form/data/import", params);
-var importCodeTemplate = (code) => import_utils.request.getRequest().get(`/shop/form/data/download-template/code/${code}`);
-var importFormIdTemplate = (form_id) => import_utils.request.getRequest().get(`/shop/form/data/download-template/id/${form_id}`);
+var importTemplate = (params) => import_utils.request.getRequest().post("/shop/form/data/download-template", params);
 var historyData = async (params) => await import_utils.request.getRequest().get("/shop/form/data/task", params);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  batchExport,
   batchImport,
   exportData,
-  formCodeExport,
-  formIdExport,
   historyData,
-  importCodeTemplate,
-  importFormIdTemplate
+  importTemplate
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.313",
+  "version": "1.0.315",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -63,8 +63,8 @@
     "react-virtualized-auto-sizer": "^1.0.20",
     "crypto-js": "^4.2.0",
     "@pisell/utils": "1.0.27",
-    "@pisell/icon": "0.0.10",
-    "@pisell/date-picker": "1.0.75"
+    "@pisell/date-picker": "1.0.75",
+    "@pisell/icon": "0.0.10"
   },
   "peerDependencies": {
     "react": "^18.0.0",