@pisell/materials 1.0.407 → 1.0.409

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

@@ -10,47 +10,31 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useRequest } from "ahooks";
-import { Spin, Table } from "antd";
-import React, { useEffect, useRef, useState } from "react";
+import { useRequest } from 'ahooks';
+import { Spin, Table } from 'antd';
+import React, { useEffect, useRef, useState } from 'react';
 import useEngineContext from "../../../../../../../hooks/useEngineContext";
 import { getText } from "../../../../../../../locales/index";
-import { historyData } from "../../../../../serve";
-import { defaultOptions } from "../../../../../status";
+import { getImportLog } from "../../../../../serve";
 import { request } from "../../../../../utils";
 import { formatDate } from "../../utils/date";
 import Detail from "./Detail";
 import "./index.less";
 var defaultData = {
-  type: defaultOptions.importValue,
   skip: 1,
   num: 10
 };
 var ImportLog = function ImportLog(props) {
   var exportImport = props.exportImport;
-  var formId = exportImport.formId,
-    formCode = exportImport.formCode;
+  var apiUrl = exportImport.apiUrl,
+    otherParams = exportImport.otherParams;
   var detailRef = useRef(null);
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     list = _useState2[0],
     setList = _useState2[1];
-  var _useState3 = useState(defaultData),
-    _useState4 = _slicedToArray(_useState3, 2),
-    defaultParams = _useState4[0],
-    setDefaultParams = _useState4[1];
   var context = useEngineContext();
   request.setRequest(context.appHelper.utils.request);
-  useEffect(function () {
-    var params = {};
-    if (formId) {
-      params.form_id = formId;
-    }
-    if (formCode) {
-      params.code = formCode;
-    }
-    setDefaultParams(_objectSpread(_objectSpread({}, defaultParams), params));
-  }, [formId, formCode]);
 
   /**
    * @title: 导入日志
@@ -59,7 +43,7 @@ var ImportLog = function ImportLog(props) {
    * @Author: WangHan
    * @Date: 2024-06-29 15:14
    */
-  var _historyList = useRequest(historyData, {
+  var _historyList = useRequest(getImportLog, {
     manual: true,
     onSuccess: function onSuccess(res) {
       if (res.code == 200) {
@@ -69,24 +53,25 @@ var ImportLog = function ImportLog(props) {
     }
   });
   var init = function init() {
-    if (defaultParams !== null && defaultParams !== void 0 && defaultParams.form_id || defaultParams !== null && defaultParams !== void 0 && defaultParams.code) {
-      _historyList.run(defaultParams);
-    }
+    var _defaultParams = _objectSpread(_objectSpread(_objectSpread({}, defaultData), otherParams), {}, {
+      url: apiUrl === null || apiUrl === void 0 ? void 0 : apiUrl.import_log
+    });
+    _historyList.run(_defaultParams);
   };
   useEffect(function () {
     init();
-  }, [defaultParams]);
+  }, [exportImport]);
   var columns = [{
-    title: getText("table-action-export-import-log-name"),
-    dataIndex: "file_name"
+    title: getText('table-action-export-import-log-name'),
+    dataIndex: 'file_name'
   }, {
-    title: getText("table-action-export-import-log-result"),
-    dataIndex: "result",
+    title: getText('table-action-export-import-log-result'),
+    dataIndex: 'result',
     render: function render(text, record) {
       var _record$result;
-      return /*#__PURE__*/React.createElement("div", null, getText("table-action-export-import-log-ok")((text === null || text === void 0 ? void 0 : text.success) || 0), record !== null && record !== void 0 && (_record$result = record.result) !== null && _record$result !== void 0 && _record$result.fail ? getText("table-action-export-import-log-err")((text === null || text === void 0 ? void 0 : text.fail) || 0) : null, text !== null && text !== void 0 && text.fail ? /*#__PURE__*/React.createElement("a", {
+      return /*#__PURE__*/React.createElement("div", null, getText('table-action-export-import-log-ok')((text === null || text === void 0 ? void 0 : text.success) || 0), record !== null && record !== void 0 && (_record$result = record.result) !== null && _record$result !== void 0 && _record$result.fail ? getText('table-action-export-import-log-err')((text === null || text === void 0 ? void 0 : text.fail) || 0) : null, text !== null && text !== void 0 && text.fail ? /*#__PURE__*/React.createElement("a", {
         style: {
-          marginLeft: "10px"
+          marginLeft: '10px'
         },
         onClick: function onClick() {
           var _detailRef$current, _detailRef$current$op;
@@ -94,32 +79,32 @@ var ImportLog = function ImportLog(props) {
             list: [record]
           });
         }
-      }, getText("table-action-export-import-log-check")) : null);
+      }, getText('table-action-export-import-log-check')) : null);
     }
   }, {
-    title: getText("table-action-export-import-file-account"),
-    dataIndex: "account",
+    title: getText('table-action-export-import-file-account'),
+    dataIndex: 'account',
     render: function render(text) {
-      return text ? /*#__PURE__*/React.createElement("div", null, "".concat((text === null || text === void 0 ? void 0 : text.first_name) || "", " ").concat((text === null || text === void 0 ? void 0 : text.last_name) || "")) : null;
+      return text ? /*#__PURE__*/React.createElement("div", null, "".concat((text === null || text === void 0 ? void 0 : text.first_name) || '', " ").concat((text === null || text === void 0 ? void 0 : text.last_name) || '')) : null;
     }
   }, {
-    title: getText("table-action-export-import-file-created"),
-    dataIndex: "created_at",
+    title: getText('table-action-export-import-file-created'),
+    dataIndex: 'created_at',
     render: function render(text) {
       return formatDate(text);
     }
   }];
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "export-history-content"
+    className: 'export-history-content'
   }, /*#__PURE__*/React.createElement(Spin, {
     spinning: _historyList === null || _historyList === void 0 ? void 0 : _historyList.loading
   }, /*#__PURE__*/React.createElement("div", {
-    className: "content-hint"
-  }, getText("table-action-export-import-log-hint"), /*#__PURE__*/React.createElement("a", {
+    className: 'content-hint'
+  }, getText('table-action-export-import-log-hint'), /*#__PURE__*/React.createElement("a", {
     onClick: function onClick() {
       return init();
     }
-  }, getText("table-action-export-import-file-refresh"))), /*#__PURE__*/React.createElement(Table, {
+  }, getText('table-action-export-import-file-refresh'))), /*#__PURE__*/React.createElement(Table, {
     rowClassName: "antd-table-row",
     columns: columns,
     dataSource: list,

package/es/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/es/components/table/Actions/component/ExportImport/components/ImportTable/index.js

@@ -1,5 +1,10 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 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); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -8,9 +13,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { InboxOutlined } from "@ant-design/icons";
-import { Button, message } from "antd";
-import React, { useMemo, useState } from "react";
+import { InboxOutlined } from '@ant-design/icons';
+import { Button, message } from 'antd';
+import React, { useMemo, useState } from 'react';
 import useEngineContext from "../../../../../../../hooks/useEngineContext";
 import { getText } from "../../../../../../../locales/index";
 import IconFont from "../../../../../../iconfont";
@@ -24,9 +29,9 @@ var ImportTable = function ImportTable(props) {
   var onChange = props.onChange,
     exportImport = props.exportImport,
     errorStatus = props.errorStatus;
-  var formId = exportImport.formId,
-    formCode = exportImport.formCode,
-    templateFileUrl = exportImport.templateFileUrl;
+  var templateFileUrl = exportImport.templateFileUrl,
+    apiUrl = exportImport.apiUrl,
+    otherParams = exportImport.otherParams;
 
   // 当前上传列表
   var _useState = useState(null),
@@ -48,32 +53,28 @@ var ImportTable = function ImportTable(props) {
               break;
             }
             download(templateFileUrl);
-            _context.next = 13;
+            _context.next = 11;
             break;
           case 4:
             message.loading({
-              content: "Loading...",
+              content: 'Loading...',
               key: loadingKey
             });
-            params = {};
-            if (formId) {
-              params.form_id = formId;
-            }
-            if (formCode) {
-              params.code = formCode;
-            }
-            _context.next = 10;
+            params = _objectSpread({
+              url: apiUrl === null || apiUrl === void 0 ? void 0 : apiUrl.template
+            }, otherParams);
+            _context.next = 8;
             return importTemplate(params);
-          case 10:
+          case 8:
             _yield$importTemplate = _context.sent;
             data = _yield$importTemplate.data;
             download(data === null || data === void 0 ? void 0 : data.url);
-          case 13:
+          case 11:
             message.success({
-              content: getText("table-action-export-import-table-success-download"),
+              content: getText('table-action-export-import-table-success-download'),
               key: loadingKey
             });
-          case 14:
+          case 12:
           case "end":
             return _context.stop();
         }
@@ -85,62 +86,62 @@ var ImportTable = function ImportTable(props) {
   }();
   var fileType = useMemo(function () {
     if (file) {
-      return file.type.indexOf("/csv") !== -1 ? "csv" : "excel";
+      return file.type.indexOf('/csv') !== -1 ? 'csv' : 'excel';
     }
-    return "";
+    return '';
   }, [file]);
   var fileName = useMemo(function () {
     if (file) {
       return file.name;
     }
-    return "";
+    return '';
   }, [file]);
   var _handleSelectFile = function _handleSelectFile(e) {
     var _e$target;
     var _file = e !== null && e !== void 0 && (_e$target = e.target) !== null && _e$target !== void 0 && _e$target.files ? e.target.files[0] : null;
     if (_file) {
-      if (_file.name.indexOf(".csv") === -1 && _file.name.indexOf(".xls") === -1 && _file.name.indexOf(".xlsx") === -1) {
-        return message.error(getText("table-action-export-import-table-error-file"));
+      if (_file.name.indexOf('.csv') === -1 && _file.name.indexOf('.xls') === -1 && _file.name.indexOf('.xlsx') === -1) {
+        return message.error(getText('table-action-export-import-table-error-file'));
       }
       onChange(_file);
       setFile(_file);
     }
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, errorStatus ? /*#__PURE__*/React.createElement("div", {
-    className: "error-hint"
+    className: 'error-hint'
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "icontixingshixin",
-    className: "error-icon"
+    className: 'error-icon'
   }), /*#__PURE__*/React.createElement("div", {
-    className: "text"
+    className: 'text'
   }, errorStatus)) : null, /*#__PURE__*/React.createElement("div", {
-    className: "import-title"
-  }, getText("table-action-export-import-table-text-click-download"), /*#__PURE__*/React.createElement("a", {
+    className: 'import-title'
+  }, getText('table-action-export-import-table-text-click-download'), /*#__PURE__*/React.createElement("a", {
     onClick: handleDownload
-  }, getText("table-action-export-import-table-text-product-template"))), file ? /*#__PURE__*/React.createElement("div", {
-    className: "file-list"
+  }, getText('table-action-export-import-table-text-product-template'))), file ? /*#__PURE__*/React.createElement("div", {
+    className: 'file-list'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    type: fileType === "csv" ? "icon-csv" : "icon-excel",
-    className: "file-icon"
+    type: fileType === 'csv' ? 'icon-csv' : 'icon-excel',
+    className: 'file-icon'
   }), /*#__PURE__*/React.createElement("div", {
-    className: "file-name"
-  }, fileName), /*#__PURE__*/React.createElement(Button, null, getText("table-action-export-import-table-text-edit-file"), /*#__PURE__*/React.createElement("input", {
+    className: 'file-name'
+  }, fileName), /*#__PURE__*/React.createElement(Button, null, getText('table-action-export-import-table-text-edit-file'), /*#__PURE__*/React.createElement("input", {
     accept: ".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel",
-    className: "upload-input",
+    className: 'upload-input',
     type: "file",
     onChange: _handleSelectFile,
     value: ""
   }))) : /*#__PURE__*/React.createElement("div", {
-    className: "default-view"
+    className: 'default-view'
   }, /*#__PURE__*/React.createElement("div", {
-    className: "icon-wrap"
+    className: 'icon-wrap'
   }, /*#__PURE__*/React.createElement(InboxOutlined, null)), /*#__PURE__*/React.createElement("p", {
-    className: "text"
-  }, getText("table-action-export-import-table-text-input-title")), /*#__PURE__*/React.createElement("p", {
-    className: "hint"
-  }, getText("table-action-export-import-table-text-input-describe")), /*#__PURE__*/React.createElement("input", {
+    className: 'text'
+  }, getText('table-action-export-import-table-text-input-title')), /*#__PURE__*/React.createElement("p", {
+    className: 'hint'
+  }, getText('table-action-export-import-table-text-input-describe')), /*#__PURE__*/React.createElement("input", {
     accept: ".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel",
-    className: "upload-input",
+    className: 'upload-input',
     type: "file",
     onChange: _handleSelectFile,
     value: ""

package/es/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/es/components/table/Actions/component/ExportImport/index.js

@@ -8,10 +8,10 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import ImportExport from "@pisell/icon/es/ImportExport";
-import { useRequest } from "ahooks";
-import { Dropdown, Modal, message } from "antd";
-import React, { useMemo, useState } from "react";
+import ImportExport from '@pisell/icon/es/ImportExport';
+import { useRequest } from 'ahooks';
+import { Dropdown, Modal, message } from 'antd';
+import React, { useMemo, useState } from 'react';
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import { getText } from "../../../../../locales/index";
 import { batchImport } from "../../../serve";
@@ -47,7 +47,7 @@ var ExportImport = function ExportImport(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     type = _useState6[0],
     setType = _useState6[1];
-  var _useState7 = useState(""),
+  var _useState7 = useState(''),
     _useState8 = _slicedToArray(_useState7, 2),
     value = _useState8[0],
     setValue = _useState8[1];
@@ -62,22 +62,28 @@ var ExportImport = function ExportImport(_ref) {
   var context = useEngineContext();
   request.setRequest(context.appHelper.utils.request);
   var _items = useMemo(function () {
+    var _Object$entries$map;
     // 将对象转成数组
-    var result = Object.entries(exportImportOptions).map(function (_ref2) {
+    var result = (_Object$entries$map = Object.entries(exportImportOptions).map(function (_ref2) {
+      var _exportImport$hiddenK;
       var _ref3 = _slicedToArray(_ref2, 2),
         key = _ref3[0],
         value = _ref3[1];
+      // 如果开启了隐藏字段则不显示该字段
+      if (Array.isArray(exportImport === null || exportImport === void 0 ? void 0 : exportImport.hiddenKeys) && exportImport !== null && exportImport !== void 0 && (_exportImport$hiddenK = exportImport.hiddenKeys) !== null && _exportImport$hiddenK !== void 0 && _exportImport$hiddenK.includes(key)) {
+        return;
+      }
       return {
         key: key,
         label: value
       };
-    });
+    })) === null || _Object$entries$map === void 0 ? void 0 : _Object$entries$map.filter(Boolean);
     return result;
-  }, []);
+  }, [exportImport === null || exportImport === void 0 ? void 0 : exportImport.hiddenKeys]);
   var Content = useMemo(function () {
-    if (!value) return null;
-    return Com[value];
-  }, [value]);
+    var _value = value || defaultOptions.importValue;
+    return Com[_value];
+  }, [value, defaultOptions.importValue]);
   var _footer = useMemo(function () {
     var types = defaultOptions.footerHintTypes;
     if (types.includes(value)) {
@@ -92,18 +98,18 @@ var ExportImport = function ExportImport(_ref) {
     if (!value) return null;
     var types = defaultOptions.okShowButtonTypes;
     var lang = getCurrentLocale();
-    var isEn = lang === "en-US" || lang === "en";
+    var isEn = lang === 'en-US' || lang === 'en';
 
     // 导出导入标题
     if (types.includes(value) && exportImport !== null && exportImport !== void 0 && exportImport.title) {
-      return "".concat(exportImportOptions[value]).concat(isEn ? " " : "").concat(exportImport.title);
+      return "".concat(exportImportOptions[value]).concat(isEn ? ' ' : '').concat(exportImport.title);
     }
     return exportImportOptions[value];
   }, [value, exportImport === null || exportImport === void 0 ? void 0 : exportImport.title]);
   var _okText = useMemo(function () {
     var types = defaultOptions.okShowButtonTypes;
     if (types.includes(value)) {
-      return value === defaultOptions.exportValue ? getText("table-action-export-import-button") : getText("table-action-export-import-button-import");
+      return value === defaultOptions.exportValue ? getText('table-action-export-import-button') : getText('table-action-export-import-button-import');
     }
   }, [value]);
   var handleClick = function handleClick(e) {
@@ -113,7 +119,7 @@ var ExportImport = function ExportImport(_ref) {
   };
   var onCancel = function onCancel() {
     setOpen(false);
-    setValue("");
+    setValue('');
     setFile(null);
     setErrorStatus(null);
     setType(defaultOptions.exportType);
@@ -125,7 +131,7 @@ var ExportImport = function ExportImport(_ref) {
       setErrorStatus(null);
       message.destroy();
       message.success({
-        content: getText("table-action-export-import-import-success"),
+        content: getText('table-action-export-import-import-success'),
         key: value
       });
       onCancel();
@@ -137,11 +143,11 @@ var ExportImport = function ExportImport(_ref) {
   });
   var onOk = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var formId, formCode, _params, result, formData;
+      var apiUrl, otherParams, _params, result, formData, formId, formCode;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            formId = exportImport.formId, formCode = exportImport.formCode; // 导出
+            apiUrl = exportImport.apiUrl, otherParams = exportImport.otherParams; // 导出
             if (!(value === defaultOptions.exportValue)) {
               _context.next = 9;
               break;
@@ -163,16 +169,19 @@ var ExportImport = function ExportImport(_ref) {
           case 9:
             if (value === defaultOptions.importValue) {
               formData = new FormData();
-              formData.append("file", file);
+              formData.append('file', file);
+              formId = otherParams === null || otherParams === void 0 ? void 0 : otherParams.form_id;
+              formCode = otherParams === null || otherParams === void 0 ? void 0 : otherParams.code;
               if (formId) {
-                formData.append("form_id", formId);
+                formData.append('form_id', formId);
               }
               if (formCode) {
-                formData.append("code", formCode);
+                formData.append('code', formCode);
               }
+              formData.append('url', (apiUrl === null || apiUrl === void 0 ? void 0 : apiUrl.export) || '');
               if (formData) {
                 message.loading({
-                  content: "Loading...",
+                  content: 'Loading...',
                   key: value
                 });
                 _batchImport.run(formData);
@@ -199,7 +208,7 @@ var ExportImport = function ExportImport(_ref) {
     isActive: false
   }, /*#__PURE__*/React.createElement(ImportExport, {
     style: {
-      cursor: "pointer",
+      cursor: 'pointer',
       fontSize: 20
     }
   }))), /*#__PURE__*/React.createElement(Modal, {
@@ -211,11 +220,11 @@ var ExportImport = function ExportImport(_ref) {
     className: "export-import-modal",
     onCancel: onCancel,
     bodyStyle: {
-      padding: "0px"
+      padding: '0px'
     },
     destroyOnClose: true,
     onOk: onOk,
-    cancelText: getText("table-action-export-import-cancel"),
+    cancelText: getText('table-action-export-import-cancel'),
     okButtonProps: {
       disabled: value === defaultOptions.importValue && (!file || !!errorStatus)
     }

package/es/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/es/components/table/Actions/component/ExportImport/utils/index.js

@@ -0,0 +1,11 @@
+/**
+ * @title: 格式化导出导入接口地址
+ * @description: 
+ * @param {string} url
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-09-05 11:39
+ */
+export var formatApiUrl = function formatApiUrl(url) {
+  return url || '/shop/form/data';
+};

package/es/components/table/BasicTable/index.js

@@ -84,7 +84,6 @@ var BasicTable = function BasicTable(props) {
       total: _total
     };
   }, [localPagination, dataSource, formPagination === null || formPagination === void 0 ? void 0 : formPagination.page, formPagination === null || formPagination === void 0 ? void 0 : formPagination.size, filter, sort, other.columns]);
-  console.log(pagination, 'wh8888');
 
   // 总数
   var total = useMemo(function () {
@@ -110,7 +109,7 @@ var BasicTable = function BasicTable(props) {
       type: 'setCurrentDataSource',
       payload: (_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list) || []
     });
-  }, [_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list]);
+  }, [JSON.stringify(_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list)]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, _extends({
     key: defaultExpandedRowKeys.join('-')
   }, other, {
@@ -140,7 +139,10 @@ var BasicTable = function BasicTable(props) {
       defaultExpandAllRows: true
     }
   })), total > ((pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || (pagination === null || pagination === void 0 ? void 0 : (_pagination$pageSizeO = pagination.pageSizeOptions) === null || _pagination$pageSizeO === void 0 ? void 0 : _pagination$pageSizeO[0]) || 10) || pagination !== null && pagination !== void 0 && pagination.showPagination && total > 10 ? /*#__PURE__*/React.createElement(Form.Item, {
-    name: "pagination"
+    name: "pagination",
+    style: {
+      margin: 0
+    }
   }, /*#__PURE__*/React.createElement(FormPagination, _extends({}, pagination, {
     showTotal: _showTotal,
     total: total

package/es/components/table/Gallery/index.js

@@ -46,7 +46,8 @@ var Gallery = function Gallery(props) {
     form: form,
     localPagination: !!(pagination !== null && pagination !== void 0 && pagination.localPagination),
     rowKey: rowKey,
-    filter: filter
+    filter: filter,
+    currentView: 'gallery'
   });
   useEffect(function () {
     onDataSourceChange === null || onDataSourceChange === void 0 ? void 0 : onDataSourceChange(dataSource);