@pisell/materials 2.2.23 → 2.2.25

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

@@ -38,13 +38,11 @@ var import_react = __toESM(require("react"));
 var import_useEngineContext = __toESM(require("../../../../../../../hooks/useEngineContext"));
 var import_locales = require("../../../../../../../locales/index");
 var import_serve = require("../../../../../serve");
-var import_status = require("../../../../../status");
 var import_utils = require("../../../../../utils");
 var import_date = require("../../utils/date");
 var import_download = __toESM(require("../../utils/download"));
 var import_index = require("./index.less");
 var defaultData = {
-  type: import_status.defaultOptions.exportValue,
   skip: 1,
   num: 10
 };
@@ -56,25 +54,11 @@ var exportStatusOptions = {
 };
 var ExportFile = (props) => {
   const { exportImport } = props;
-  const { formId, formCode } = exportImport;
+  const { apiUrl, otherParams } = exportImport;
   const [list, setList] = (0, import_react.useState)([]);
-  const [defaultParams, setDefaultParams] = (0, import_react.useState)(defaultData);
   const context = (0, import_useEngineContext.default)();
   import_utils.request.setRequest(context.appHelper.utils.request);
-  (0, import_react.useEffect)(() => {
-    let params = {};
-    if (formId) {
-      params.form_id = formId;
-    }
-    if (formCode) {
-      params.code = formCode;
-    }
-    setDefaultParams({
-      ...defaultParams,
-      ...params
-    });
-  }, [formId, formCode]);
-  const _historyList = (0, import_ahooks.useRequest)(import_serve.historyData, {
+  const _historyList = (0, import_ahooks.useRequest)(import_serve.getExportFile, {
     manual: true,
     onSuccess: (res) => {
       var _a;
@@ -84,13 +68,16 @@ var ExportFile = (props) => {
     }
   });
   const init = () => {
-    if ((defaultParams == null ? void 0 : defaultParams.form_id) || (defaultParams == null ? void 0 : defaultParams.code)) {
-      _historyList.run(defaultParams);
-    }
+    const _defaultParams = {
+      ...defaultData,
+      ...otherParams,
+      url: apiUrl == null ? void 0 : apiUrl.export_file
+    };
+    _historyList.run(_defaultParams);
   };
   (0, import_react.useEffect)(() => {
     init();
-  }, [defaultParams]);
+  }, [exportImport]);
   const columns = [
     {
       title: (0, import_locales.getText)("table-action-export-import-file-name"),

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

@@ -40,15 +40,10 @@ var _batchExport = async (params) => {
   }
 };
 var batchExport = (exportParams, exportImport) => {
-  const { selectLists, formId, formCode } = exportImport;
+  const { selectLists, apiUrl, otherParams } = exportImport;
   let _name = (0, import_file.getFileDateName)();
-  let params = {};
-  if (formId) {
-    params.form_id = formId;
-  }
-  if (formCode) {
-    params.code = formCode;
-  }
+  let params = { ...otherParams };
+  params.url = apiUrl == null ? void 0 : apiUrl.export;
   console.log("exportParams", exportParams);
   const type = (exportParams == null ? void 0 : exportParams.type) || import_status.defaultOptions.exportType;
   if (type === import_status.defaultOptions.exportType) {

package/lib/components/table/Actions/component/ExportImport/components/ImportLog/index.d.ts

@@ -1,6 +1,6 @@
-import React from "react";
-import { ExportImportType } from "../../../../../types";
-import "./index.less";
+import React from 'react';
+import { ExportImportType } from '../../../../../types';
+import './index.less';
 declare const ImportLog: (props: {
     exportImport: ExportImportType;
 }) => React.JSX.Element;

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

@@ -38,38 +38,22 @@ var import_react = __toESM(require("react"));
 var import_useEngineContext = __toESM(require("../../../../../../../hooks/useEngineContext"));
 var import_locales = require("../../../../../../../locales/index");
 var import_serve = require("../../../../../serve");
-var import_status = require("../../../../../status");
 var import_utils = require("../../../../../utils");
 var import_date = require("../../utils/date");
 var import_Detail = __toESM(require("./Detail"));
 var import_index = require("./index.less");
 var defaultData = {
-  type: import_status.defaultOptions.importValue,
   skip: 1,
   num: 10
 };
 var ImportLog = (props) => {
   const { exportImport } = props;
-  const { formId, formCode } = exportImport;
+  const { apiUrl, otherParams } = exportImport;
   const detailRef = (0, import_react.useRef)(null);
   const [list, setList] = (0, import_react.useState)([]);
-  const [defaultParams, setDefaultParams] = (0, import_react.useState)(defaultData);
   const context = (0, import_useEngineContext.default)();
   import_utils.request.setRequest(context.appHelper.utils.request);
-  (0, import_react.useEffect)(() => {
-    let params = {};
-    if (formId) {
-      params.form_id = formId;
-    }
-    if (formCode) {
-      params.code = formCode;
-    }
-    setDefaultParams({
-      ...defaultParams,
-      ...params
-    });
-  }, [formId, formCode]);
-  const _historyList = (0, import_ahooks.useRequest)(import_serve.historyData, {
+  const _historyList = (0, import_ahooks.useRequest)(import_serve.getImportLog, {
     manual: true,
     onSuccess: (res) => {
       var _a;
@@ -79,13 +63,16 @@ var ImportLog = (props) => {
     }
   });
   const init = () => {
-    if ((defaultParams == null ? void 0 : defaultParams.form_id) || (defaultParams == null ? void 0 : defaultParams.code)) {
-      _historyList.run(defaultParams);
-    }
+    const _defaultParams = {
+      ...defaultData,
+      ...otherParams,
+      url: apiUrl == null ? void 0 : apiUrl.import_log
+    };
+    _historyList.run(_defaultParams);
   };
   (0, import_react.useEffect)(() => {
     init();
-  }, [defaultParams]);
+  }, [exportImport]);
   const columns = [
     {
       title: (0, import_locales.getText)("table-action-export-import-log-name"),

package/lib/components/table/Actions/component/ExportImport/components/ImportTable/index.d.ts

@@ -1,6 +1,6 @@
-import React from "react";
-import { ExportImportType } from "../../../../../types";
-import "./index.less";
+import React from 'react';
+import { ExportImportType } from '../../../../../types';
+import './index.less';
 declare type ImportTableProps = {
     onChange: any;
     exportImport: ExportImportType;

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

@@ -46,7 +46,7 @@ var import_index = require("./index.less");
 var loadingKey = import_status.defaultOptions.importValue;
 var ImportTable = (props) => {
   const { onChange, exportImport, errorStatus } = props;
-  const { formId, formCode, templateFileUrl } = exportImport;
+  const { templateFileUrl, apiUrl, otherParams } = exportImport;
   const [file, setFile] = (0, import_react.useState)(null);
   const context = (0, import_useEngineContext.default)();
   import_utils.request.setRequest(context.appHelper.utils.request);
@@ -55,13 +55,10 @@ var ImportTable = (props) => {
       (0, import_download.default)(templateFileUrl);
     } else {
       import_antd.message.loading({ content: "Loading...", key: loadingKey });
-      const params = {};
-      if (formId) {
-        params.form_id = formId;
-      }
-      if (formCode) {
-        params.code = formCode;
-      }
+      const params = {
+        url: apiUrl == null ? void 0 : apiUrl.template,
+        ...otherParams
+      };
       let { data } = await (0, import_serve.importTemplate)(params);
       (0, import_download.default)(data == null ? void 0 : data.url);
     }

package/lib/components/table/Actions/component/ExportImport/index.d.ts

@@ -1,6 +1,6 @@
-import React from "react";
-import { ExportImportType } from "../../../types";
-import "./index.less";
+import React from 'react';
+import { ExportImportType } from '../../../types';
+import './index.less';
 declare type ExportImportProps = {
     exportImport: ExportImportType;
 };

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

@@ -69,14 +69,19 @@ var ExportImport = ({ exportImport }) => {
   const context = (0, import_useEngineContext.default)();
   import_utils.request.setRequest((_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.request);
   const _items = (0, import_react.useMemo)(() => {
-    const result = Object.entries(import_status.exportImportOptions).map(([key, value2]) => {
+    var _a2;
+    const result = (_a2 = Object.entries(import_status.exportImportOptions).map(([key, value2]) => {
+      var _a3;
+      if (Array.isArray(exportImport == null ? void 0 : exportImport.hiddenKeys) && ((_a3 = exportImport == null ? void 0 : exportImport.hiddenKeys) == null ? void 0 : _a3.includes(key))) {
+        return;
+      }
       return {
         key,
         label: value2
       };
-    });
+    })) == null ? void 0 : _a2.filter(Boolean);
     return result;
-  }, []);
+  }, [exportImport == null ? void 0 : exportImport.hiddenKeys]);
   const Content = (0, import_react.useMemo)(() => {
     const _value = value || import_status.defaultOptions.importValue;
     return Com[_value];
@@ -138,7 +143,7 @@ var ExportImport = ({ exportImport }) => {
     }
   });
   const onOk = async () => {
-    const { formId, formCode } = exportImport;
+    const { apiUrl, otherParams } = exportImport;
     if (value === import_status.defaultOptions.exportValue) {
       const _params = {
         type,
@@ -152,12 +157,15 @@ var ExportImport = ({ exportImport }) => {
     } else if (value === import_status.defaultOptions.importValue) {
       const formData = new FormData();
       formData.append("file", file);
+      const formId = otherParams == null ? void 0 : otherParams.form_id;
+      const formCode = otherParams == null ? void 0 : otherParams.code;
       if (formId) {
         formData.append("form_id", formId);
       }
       if (formCode) {
         formData.append("code", formCode);
       }
+      formData.append("url", (apiUrl == null ? void 0 : apiUrl.export) || "");
       if (formData) {
         import_antd.message.loading({ content: "Loading...", key: value });
         _batchImport.run(formData);

package/lib/components/table/Actions/component/ExportImport/utils/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @title: 格式化导出导入接口地址
+ * @description:
+ * @param {string} url
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-09-05 11:39
+ */
+export declare const formatApiUrl: (url: string) => string;

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

@@ -0,0 +1,31 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/table/Actions/component/ExportImport/utils/index.ts
+var utils_exports = {};
+__export(utils_exports, {
+  formatApiUrl: () => formatApiUrl
+});
+module.exports = __toCommonJS(utils_exports);
+var formatApiUrl = (url) => {
+  return url || "/shop/form/data";
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  formatApiUrl
+});

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

@@ -3,9 +3,11 @@ declare type exportParams = {
     file_name?: string;
     form_id?: string | number;
     code?: string;
+    url?: string;
 };
 export declare const exportData: (params: exportParams) => Promise<any>;
 export declare const batchImport: (params: any) => Promise<any>;
 export declare const importTemplate: (params: exportParams) => Promise<any>;
-export declare const historyData: (params: any) => Promise<any>;
+export declare const getExportFile: (params: any) => Promise<any>;
+export declare const getImportLog: (params: any) => Promise<any>;
 export {};

package/lib/components/table/serve.js

@@ -21,21 +21,53 @@ var serve_exports = {};
 __export(serve_exports, {
   batchImport: () => batchImport,
   exportData: () => exportData,
-  historyData: () => historyData,
+  getExportFile: () => getExportFile,
+  getImportLog: () => getImportLog,
   importTemplate: () => importTemplate
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("./utils");
+var defaultUrl = {
+  export: "/shop/form/data/export",
+  import: "/shop/form/data/import",
+  export_file: "/shop/form/data/task?type=export",
+  import_log: "/shop/form/data/task?type=import",
+  template: "/shop/form/data/download-template"
+};
+var formatApiParams = (params, type) => {
+  const _url = (params == null ? void 0 : params.url) || (defaultUrl == null ? void 0 : defaultUrl[type]);
+  let _params = { ...params };
+  delete _params.url;
+  return {
+    url: _url,
+    params: { ..._params }
+  };
+};
 var exportData = (params) => {
-  return import_utils.request.getRequest().post(`/shop/form/data/export`, params);
+  const _params = formatApiParams(params, "export");
+  return import_utils.request.getRequest().post(_params == null ? void 0 : _params.url, _params == null ? void 0 : _params.params);
+};
+var batchImport = (params) => {
+  const _params = formatApiParams(params, "import");
+  return import_utils.request.getRequest().post(_params == null ? void 0 : _params.url, params);
+};
+var importTemplate = (params) => {
+  const _params = formatApiParams(params, "template");
+  return import_utils.request.getRequest().post(_params == null ? void 0 : _params.url, _params == null ? void 0 : _params.params);
+};
+var getExportFile = async (params) => {
+  const _params = formatApiParams(params, "export_file");
+  return await import_utils.request.getRequest().get(_params == null ? void 0 : _params.url, _params == null ? void 0 : _params.params);
+};
+var getImportLog = async (params) => {
+  const _params = formatApiParams(params, "import_log");
+  return await import_utils.request.getRequest().get(_params == null ? void 0 : _params.url, _params == null ? void 0 : _params.params);
 };
-var batchImport = (params) => import_utils.request.getRequest().post("/shop/form/data/import", params);
-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 = {
   batchImport,
   exportData,
-  historyData,
+  getExportFile,
+  getImportLog,
   importTemplate
 });

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

@@ -161,22 +161,35 @@ declare type SortDetail = {
 };
 /** 导入导出模式 */
 export declare type ExportImportModeType = "import" | "export" | "export_file" | "import_log";
+/**
+ * @title: 导出导入api
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-09-11 15:44
+ */
+export declare type ApiProps = {
+    export?: string;
+    import?: string;
+    export_file: string;
+    import_log?: string;
+    template?: string;
+};
 /**
  * 导入导出配置
  */
 export declare type ExportImportType = {
     /** 是否展示 */
     show: boolean;
-    /** 表id */
-    formId?: string;
-    /** 表key */
-    formCode?: string;
     /** 当前所选项 */
     selectLists: string[];
     /** 导入模版链接 */
     templateFileUrl: string;
     /** 标题 */
     title: string;
+    hiddenKeys?: string[];
+    apiUrl?: ApiProps;
+    otherParams?: any;
 };
 export declare type GridViewProps = {
     columns: any;

package/lowcode/table/meta.ts

@@ -2101,20 +2101,47 @@ export default {
           defaultValue: false,
         },
         {
-          name: "exportImport.formId",
-          title: { label: "表单ID", tip: "表单ID" },
-          propType: "string",
-          setter: "StringSetter",
+          name: "exportImport.hiddenKeys",
+          title: { label: "隐藏字段", tip: "比如：['import'] '导入(import)|导出(export)|导出文件(export_file)|导入日志(import_log)'" },
+          setter: "ObjectSetter",
           condition: {
             type: "JSFunction",
             value: 'target => !!target.getProps().getPropValue("exportImport.show")',
           },
         },
         {
-          name: "exportImport.formCode",
-          title: { label: "表单Code", tip: "表单Code｜表单的唯一标识" },
-          propType: "string",
-          setter: "StringSetter",
+          name: "exportImport.apiUrl",
+          title: { label: "接口地址", tip: "接口地址 | [{export: '/shop/order/task'}]" },
+          setter: "ObjectSetter",
+          condition: {
+            type: "JSFunction",
+            value: 'target => !!target.getProps().getPropValue("exportImport.show")',
+          },
+        },
+        // {
+        //   name: "exportImport.formId",
+        //   title: { label: "表单ID", tip: "表单ID" },
+        //   propType: "string",
+        //   setter: "StringSetter",
+        //   condition: {
+        //     type: "JSFunction",
+        //     value: 'target => !!target.getProps().getPropValue("exportImport.show")',
+        //   },
+        // },
+        // {
+        //   name: "exportImport.formCode",
+        //   title: { label: "表单Code", tip: "表单Code｜表单的唯一标识" },
+        //   propType: "string",
+        //   setter: "StringSetter",
+        //   condition: {
+        //     type: "JSFunction",
+        //     value: 'target => !!target.getProps().getPropValue("exportImport.show")',
+        //   },
+        // },
+        {
+          name: "exportImport.otherParams",
+          title: { label: "接口其他参数", tip: "接口其他参数" },
+          setter: "ObjectSetter",
           condition: {
             type: "JSFunction",
             value: 'target => !!target.getProps().getPropValue("exportImport.show")',

package/lowcode/table/snippets.ts

@@ -84,11 +84,11 @@ export default [
         },
         exportImport: {
           show: false,
-          formId: "",
-          formCode: "",
           selectLists: [],
           templateFileUrl: "",
           title: "",
+          hiddenKeys: [],
+          otherParams: {}
         },
       },
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "2.2.23",
+  "version": "2.2.25",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -65,7 +65,7 @@
     "@zxing/library": "0.21.2",
     "@pisell/utils": "2.0.1",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "1.0.100"
+    "@pisell/date-picker": "1.0.101"
   },
   "peerDependencies": {
     "react": "^18.0.0",