@pisell/materials 1.0.313 → 1.0.314

package/es/components/table/Actions/component/ExportImport/components/ExportTable/function.d.ts

@@ -1 +1 @@
-export declare const batchExport: (type: string, exportImport: any) => Promise<true | undefined> | undefined;
+export declare const batchExport: (type: string, exportImport: any) => Promise<true | undefined>;

package/es/components/table/Actions/component/ExportImport/components/ExportTable/function.js

@@ -4,37 +4,23 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { message } from "antd";
 import { getText } from "../../../../../../../locales/index";
-import { formIdExport, formCodeExport } from "../../../../../serve";
+import { exportData } from "../../../../../serve";
 import { defaultOptions } from "../../../../../status";
 import { getFileDateName } from "../../utils/file";
 // 导出接口
 var _batchExport = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(idCode, params) {
-    var _res;
-    var formId, formCode, res;
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+    var _yield$exportData, status;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          formId = idCode.formId, formCode = idCode.formCode;
-          res = null;
-          console.log(formCode, formId, 'wh77');
-          if (!formId) {
-            _context.next = 9;
-            break;
-          }
-          _context.next = 6;
-          return formIdExport(formId, params);
-        case 6:
-          res = _context.sent;
-          _context.next = 10;
-          break;
-        case 9:
-          if (formCode) {
-            res = formCodeExport(formCode, params);
-          }
-        case 10:
-          if (!((_res = res) !== null && _res !== void 0 && _res.status)) {
-            _context.next = 16;
+          _context.next = 2;
+          return exportData(params);
+        case 2:
+          _yield$exportData = _context.sent;
+          status = _yield$exportData.status;
+          if (!status) {
+            _context.next = 10;
             break;
           }
           message.success({
@@ -43,44 +29,49 @@ var _batchExport = /*#__PURE__*/function () {
           });
           localStorage.setItem("dot", "true");
           return _context.abrupt("return", true);
-        case 16:
+        case 10:
           message.destroy();
-        case 17:
+        case 11:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return function _batchExport(_x, _x2) {
+  return function _batchExport(_x) {
     return _ref.apply(this, arguments);
   };
 }();
 
 // 导出格式化
 export var batchExport = function batchExport(type, exportImport) {
-  var selectLists = exportImport.selectLists;
+  var selectLists = exportImport.selectLists,
+    formId = exportImport.formId,
+    formCode = exportImport.formCode;
   var _name = getFileDateName();
+  var params = {};
+  if (formId) {
+    params.form_id = formId;
+  }
+  if (formCode) {
+    params.code = formCode;
+  }
+  if (type === defaultOptions.exportType || type === "selected-records") {
+    params.ids = selectLists || [];
+  }
   // 当前页面
   if (type === defaultOptions.exportType) {
     _name = "".concat(getText("table-action-export-import-current-page")).concat(_name);
-    return _batchExport(exportImport, {
-      ids: selectLists,
-      file_name: _name
-    });
+    params.file_name = _name;
   }
   // 所有记录
   if (type === "all-records") {
     _name = "".concat(getText("table-action-export-import-all-records")).concat(_name);
-    return _batchExport(exportImport, {
-      file_name: _name
-    });
+    params.file_name = _name;
   }
   // 所选记录
   if (type === "selected-records") {
     _name = "".concat(getText("table-action-export-import-selected-records"), "(").concat(getText("table-action-export-import-selected"), " ").concat(getText("table-action-export-import-item")(selectLists === null || selectLists === void 0 ? void 0 : selectLists.length), ") ").concat(_name);
-    return _batchExport(exportImport, {
-      ids: selectLists,
-      file_name: _name
-    });
+    params.file_name = _name;
   }
+  return _batchExport(params);
 };

package/es/components/table/Actions/component/ExportImport/components/ImportTable/index.js

@@ -14,7 +14,7 @@ import React, { useMemo, useState } from "react";
 import useEngineContext from "../../../../../../../hooks/useEngineContext";
 import { getText } from "../../../../../../../locales/index";
 import IconFont from "../../../../../../iconfont";
-import { importCodeTemplate, importFormIdTemplate } from "../../../../../serve";
+import { importTemplate } from "../../../../../serve";
 import { defaultOptions } from "../../../../../status";
 import { request } from "../../../../../utils";
 import download from "../../utils/download";
@@ -36,42 +36,33 @@ var ImportTable = function ImportTable(props) {
   request.setRequest(context.appHelper.utils.request);
   var handleDownload = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _res, _res$data;
-      var res;
+      var _res$data;
+      var params, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            console.log("wh_export", exportImport);
             message.loading({
               content: "Loading...",
               key: loadingKey
             });
-            res = null;
-            if (!formId) {
-              _context.next = 8;
-              break;
+            params = {};
+            if (formId) {
+              params.form_id = formId;
             }
-            _context.next = 5;
-            return importFormIdTemplate(formId);
-          case 5:
-            res = _context.sent;
-            _context.next = 12;
-            break;
-          case 8:
-            if (!formCode) {
-              _context.next = 12;
-              break;
+            if (formCode) {
+              params.code = formCode;
             }
-            _context.next = 11;
-            return importCodeTemplate(formCode);
-          case 11:
+            _context.next = 7;
+            return importTemplate(params);
+          case 7:
             res = _context.sent;
-          case 12:
-            download((_res = res) === null || _res === void 0 ? void 0 : (_res$data = _res.data) === null || _res$data === void 0 ? void 0 : _res$data.url);
+            download(res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.url);
             message.success({
               content: getText("table-action-export-import-table-success-download"),
               key: loadingKey
             });
-          case 14:
+          case 10:
           case "end":
             return _context.stop();
         }

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

@@ -32,9 +32,6 @@ var Com = {
 };
 var ExportImport = function ExportImport(_ref) {
   var exportImport = _ref.exportImport;
-  var selectLists = exportImport.selectLists,
-    formId = exportImport.formId,
-    formCode = exportImport.formCode;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -117,10 +114,9 @@ var ExportImport = function ExportImport(_ref) {
         content: getText("table-action-export-import-import-success"),
         key: value
       });
+      localStorage.setItem("dot", "true");
       onCancel();
-      // localStorage.setItem("dot", "true");
     },
-
     onError: function onError(err) {
       message.destroy();
       setErrorStatus((err === null || err === void 0 ? void 0 : err.message) || null);
@@ -128,29 +124,34 @@ var ExportImport = function ExportImport(_ref) {
   });
   var onOk = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var result, formData;
+      var formId, formCode, result, formData;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            formId = exportImport.formId, formCode = exportImport.formCode; // 导出
             if (!(value === defaultOptions.exportValue)) {
-              _context.next = 7;
+              _context.next = 8;
               break;
             }
-            _context.next = 3;
+            _context.next = 4;
             return batchExport(type, exportImport);
-          case 3:
+          case 4:
             result = _context.sent;
             if (result) {
               onCancel();
             }
-            _context.next = 8;
+            _context.next = 9;
             break;
-          case 7:
+          case 8:
             if (value === defaultOptions.importValue) {
               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) {
                 message.loading({
                   content: "Loading...",
@@ -159,7 +160,7 @@ var ExportImport = function ExportImport(_ref) {
                 _batchImport.run(formData);
               }
             }
-          case 8:
+          case 9:
           case "end":
             return _context.stop();
         }

package/es/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/es/components/table/serve.js

@@ -5,34 +5,17 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { request } from "./utils";
 // 导出
 export var exportData = function exportData(params) {
-  return request.getRequest().get("/shop/form/data/export", params);
-};
-
-// 导出
-export var batchExport = function batchExport(params) {
-  return request.getRequest().get("/shop/form/data/export", params);
-};
-
-// 根据表单id导出
-export var formIdExport = function formIdExport(form_id, params) {
-  return request.getRequest().post("/shop/form/data/export/".concat(form_id), params);
-};
-// 根据表单code导出
-export var formCodeExport = function formCodeExport(code, params) {
-  return request.getRequest().get("/shop/form/data/export/code/".concat(code), params);
+  return request.getRequest().post("/shop/form/data/export", params);
 };
 
 // 导入
 export var batchImport = function batchImport(params) {
   return request.getRequest().post('/shop/form/data/import', params);
 };
-// 根据code导入模版
-export var importCodeTemplate = function importCodeTemplate(code) {
-  return request.getRequest().get("/shop/form/data/download-template/code/".concat(code));
-};
-// 根据form_id导入模版
-export var importFormIdTemplate = function importFormIdTemplate(form_id) {
-  return request.getRequest().get("/shop/form/data/download-template/id/".concat(form_id));
+
+// 导入模版
+export var importTemplate = function importTemplate(params) {
+  return request.getRequest().post('/shop/form/data/download-template', params);
 };
 export var historyData = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {

package/lib/components/table/Actions/component/ExportImport/components/ExportTable/function.d.ts

@@ -1 +1 @@
-export declare const batchExport: (type: string, exportImport: any) => Promise<true | undefined> | undefined;
+export declare const batchExport: (type: string, exportImport: any) => Promise<true | undefined>;

package/lib/components/table/Actions/component/ExportImport/components/ExportTable/function.js

@@ -27,16 +27,9 @@ var import_locales = require("../../../../../../../locales/index");
 var import_serve = require("../../../../../serve");
 var import_status = require("../../../../../status");
 var import_file = require("../../utils/file");
-var _batchExport = async (idCode, params) => {
-  const { formId, formCode } = idCode;
-  let res = null;
-  console.log(formCode, formId, "wh77");
-  if (formId) {
-    res = await (0, import_serve.formIdExport)(formId, params);
-  } else if (formCode) {
-    res = (0, import_serve.formCodeExport)(formCode, params);
-  }
-  if (res == null ? void 0 : res.status) {
+var _batchExport = async (params) => {
+  let { status } = await (0, import_serve.exportData)(params);
+  if (status) {
     import_antd.message.success({
       content: (0, import_locales.getText)("table-action-export-import-export-success"),
       key: import_status.defaultOptions.exportValue
@@ -48,30 +41,33 @@ var _batchExport = async (idCode, params) => {
   }
 };
 var batchExport = (type, exportImport) => {
-  const { selectLists } = exportImport;
+  const { selectLists, formId, formCode } = exportImport;
   let _name = (0, import_file.getFileDateName)();
+  let params = {};
+  if (formId) {
+    params.form_id = formId;
+  }
+  if (formCode) {
+    params.code = formCode;
+  }
+  if (type === import_status.defaultOptions.exportType || type === "selected-records") {
+    params.ids = selectLists || [];
+  }
   if (type === import_status.defaultOptions.exportType) {
     _name = `${(0, import_locales.getText)("table-action-export-import-current-page")}${_name}`;
-    return _batchExport(exportImport, {
-      ids: selectLists,
-      file_name: _name
-    });
+    params.file_name = _name;
   }
   if (type === "all-records") {
     _name = `${(0, import_locales.getText)("table-action-export-import-all-records")}${_name}`;
-    return _batchExport(exportImport, {
-      file_name: _name
-    });
+    params.file_name = _name;
   }
   if (type === "selected-records") {
     _name = `${(0, import_locales.getText)(
       "table-action-export-import-selected-records"
     )}(${(0, import_locales.getText)("table-action-export-import-selected")} ${(0, import_locales.getText)("table-action-export-import-item")(selectLists == null ? void 0 : selectLists.length)}) ${_name}`;
-    return _batchExport(exportImport, {
-      ids: selectLists,
-      file_name: _name
-    });
+    params.file_name = _name;
   }
+  return _batchExport(params);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -52,13 +52,16 @@ var ImportTable = (props) => {
   import_utils.request.setRequest(context.appHelper.utils.request);
   const handleDownload = async () => {
     var _a;
+    console.log("wh_export", exportImport);
     import_antd.message.loading({ content: "Loading...", key: loadingKey });
-    let res = null;
+    const params = {};
     if (formId) {
-      res = await (0, import_serve.importFormIdTemplate)(formId);
-    } else if (formCode) {
-      res = await (0, import_serve.importCodeTemplate)(formCode);
+      params.form_id = formId;
     }
+    if (formCode) {
+      params.code = formCode;
+    }
+    let res = await (0, import_serve.importTemplate)(params);
     (0, import_download.default)((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.url);
     import_antd.message.success({
       content: (0, import_locales.getText)("table-action-export-import-table-success-download"),

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

@@ -55,7 +55,6 @@ 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);
@@ -122,6 +121,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,6 +130,7 @@ 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);
       if (result) {
@@ -138,7 +139,12 @@ var ExportImport = ({ exportImport }) => {
     } 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.314",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",