@bit-sun/business-component 3.1.3 → 3.1.5

package/dist/components/Business/DetailPageWrapper/utils.d.ts

@@ -7,5 +7,7 @@ export declare const judgeIsEmpty: (value: any) => boolean;
 export declare const getMainCrumbNameMap: (menuData: any) => {};
 export declare const getModeTypeText: (path: any) => "编辑" | "查看" | "新增" | "--";
 export declare function matchRoute(path: any, routeObj: any, hideRouteObj: any): any;
-export declare const getDetailMatchRoute: (path: any, routeObj: any, hideRouteArray: any) => any;
+export declare const getDetailMatchRoute: (path: any, routeObj: any, hideRouteArray: any, { pathToRegexp }: {
+    pathToRegexp: any;
+}) => any;
 export {};

package/dist/components/Functional/DataImport/index.d.ts

@@ -139,6 +139,8 @@ declare class DataImport extends React.Component {
     errorChange: (e: any) => void;
     menuList: React.JSX.Element;
     leftMenu: React.JSX.Element;
+    getSheetMap: () => {};
+    importExcelToLuckySheet: (resultData: any) => void;
     render(): React.JSX.Element;
 }
 export default DataImport;

package/dist/components/Functional/DataValidation/index.d.ts

@@ -139,6 +139,8 @@ declare class DataValidation extends React.Component {
     errorChange: (e: any) => void;
     menuList: React.JSX.Element;
     leftMenu: React.JSX.Element;
+    getSheetMap: () => {};
+    importExcelToLuckySheet: (resultData: any) => void;
     render(): React.JSX.Element;
 }
 export default DataValidation;

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import request$1 from 'umi-request';
 import cookie from 'js-cookie';
-import { message as message$1, Tooltip, Image, Popover, Card, Avatar, Badge, Menu, Input, InputNumber, Space, Button, Dropdown, Checkbox, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, Typography, Alert, Breadcrumb, Drawer as Drawer$1, List, Radio, Tree, Row, Col, Result, Tabs, Affix, Cascader, DatePicker, TimePicker, Switch } from 'antd';
+import { message as message$1, Tooltip, Image, Popover, Card, Avatar, Badge, Menu, Input, InputNumber, Space, Button, Dropdown, Upload, Checkbox, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, Typography, Alert, Breadcrumb, Drawer as Drawer$1, List, Radio, Tree, Row, Col, Result, Tabs, Affix, Cascader, DatePicker, TimePicker, Switch } from 'antd';
 import _, { isNil, escapeRegExp, omit, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
 import memoizeOne from 'memoize-one';
 import { formatMessage, history, useLocation, Link, useModel, setLocale, useIntl } from 'umi';
@@ -11,6 +11,7 @@ import moment$1 from 'moment';
 import { EyeOutlined, DeleteOutlined, EditOutlined, CopyOutlined, CloseSquareOutlined, WarningOutlined, SendOutlined, ProfileTwoTone, ExclamationCircleOutlined, DownOutlined, UnorderedListOutlined, SearchOutlined, CaretLeftOutlined, CloseCircleOutlined, ArrowLeftOutlined, FolderOutlined, EllipsisOutlined, CaretDownOutlined, HomeOutlined, DoubleLeftOutlined, DoubleRightOutlined, MenuUnfoldOutlined, DashOutlined, SettingOutlined, BulbOutlined, PlayCircleOutlined, SaveOutlined, FullscreenExitOutlined, MinusCircleOutlined, PlusCircleOutlined } from '@ant-design/icons';
 import { request as request$2, Table as Table$1, QueryTable, Form as Form$1 } from 'bssula';
 import 'qs';
+import { utils, writeFile, read } from 'xlsx';
 import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd';
 import { useDebounceFn, useSize, useMount } from 'ahooks';
 import { stringify } from 'querystring';
@@ -186,8 +187,8 @@ function _objectWithoutProperties(e, t) {
     r,
     i = _objectWithoutPropertiesLoose(e, t);
   if (Object.getOwnPropertySymbols) {
-    var n = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    var s = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
   return i;
 }
@@ -195,7 +196,7 @@ function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.indexOf(n) >= 0) continue;
+    if (e.includes(n)) continue;
     t[n] = r[n];
   }
   return t;
@@ -560,7 +561,8 @@ var ENUM = {
     USER_INFO: 'userInfo',
     DICT_CODES: 'dicData',
     CHILD_APP_BACK: 'child_app_back',
-    SEARCH_FIELDS_CONDITION: 'searchFieldsCondition' //表格搜索项信息缓存
+    SEARCH_FIELDS_CONDITION: 'searchFieldsCondition',
+    COMMONINFO: 'commonInfo' //通用信息
   },
   MAIN_AUTH_MAPPING: {
     '/config-project-front/': 'CONFIG_PC',
@@ -687,6 +689,10 @@ var getMenuAuthDataKey = function getMenuAuthDataKey(channel) {
 var getLimitMenuDataKey = function getLimitMenuDataKey(channel) {
   return getLocalStorageSaveKey(ENUM.BROWSER_CACHE.LIMIT_MENU_DATA, channel);
 };
+// 公用数据存储/获取key
+var getCommonInfoKey = function getCommonInfoKey(channel) {
+  return getLocalStorageSaveKey(ENUM.BROWSER_CACHE.COMMONINFO, channel);
+};
 /*******      公用localstorage结束      *****/
 
 var resposne$1 = JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}');
@@ -1449,6 +1455,185 @@ var shouldUseAuth = function shouldUseAuth() {
   return window.__POWERED_BY_WUJIE__ ? true : false;
 };
 
+/**---------------------excel专程数据-------开始------------------------*/
+var fieldMappingReverse = function fieldMappingReverse(sheetMap) {
+  var obj = {};
+  Object.entries(sheetMap).forEach(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+      key = _ref2[0],
+      val = _ref2[1];
+    // @ts-ignore
+    obj[val] = key;
+  });
+  return obj;
+};
+// 把文件以二进制的方式读出来
+var analyseExcelToByte = function analyseExcelToByte(file) {
+  return new Promise(function (resolve) {
+    var reader = new FileReader();
+    reader.readAsBinaryString(file);
+    reader.onload = function (ev) {
+      var _ev$target;
+      resolve(ev === null || ev === void 0 ? void 0 : (_ev$target = ev.target) === null || _ev$target === void 0 ? void 0 : _ev$target.result);
+    };
+  });
+};
+// 把excel数据【数组对象：中文表头key,value即表格内容】转换成服务端需要的数据【数组对象：英文表头key---中文表头对应的英文,value即表格内容】
+var parseToServe = function parseToServe(outdata, revertChart) {
+  var arrs = [];
+  outdata.forEach(function (item, i) {
+    var arr = [];
+    item.forEach(function (ite) {
+      var obj = {};
+      for (var key in revertChart) {
+        var target = revertChart;
+        if (!Object.prototype.hasOwnProperty.call(target, key)) break;
+        var v = target[key];
+        // if (key === ''||!item[key]) break; //表头字段映射为空,不进行导出
+        if (key && (ite[key] || ite[key] === 0)) {
+          obj[v] = ite[key];
+        }
+      }
+      arr.push(obj);
+    });
+    arrs.push(arr);
+  });
+  return arrs;
+};
+//读取excel表
+// sheepMap是表头字段中英文映射
+// sheetCount:表的数量，默认一张
+var resolveFile = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
+    var config,
+      data,
+      _args = arguments;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          config = _args.length > 1 && _args[1] !== undefined ? _args[1] : {
+            sheetMap: [],
+            sheetCount: 1
+          };
+          _context.next = 3;
+          return analyseExcelToByte(file);
+        case 3:
+          data = _context.sent;
+          return _context.abrupt("return", new Promise(function (resolve, reject) {
+            var workbook = read(data, {
+              type: 'binary'
+            });
+            //根据sheet数量取出
+            var sheetMapJsonList = _toConsumableArray(Array(config.sheetCount || 1)).map(function (ite, i) {
+              var worksheets = workbook.Sheets[workbook.SheetNames[i]];
+              return utils.sheet_to_json(worksheets);
+            });
+            var outdata = parseToServe(sheetMapJsonList, config.sheetMap);
+            resolve(outdata);
+          }));
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function resolveFile(_x) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+//读取文件 
+var readerXlsxToList = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(file, fileList, uploadRef, done, otherInfo) {
+    var _ref5, callback, sheetMap, data2, data;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _ref5 = otherInfo || {}, callback = _ref5.callback, sheetMap = _ref5.sheetMap;
+          if (!(Array.isArray(fileList) && fileList.length > 0)) {
+            _context2.next = 14;
+            break;
+          }
+          _context2.next = 4;
+          return resolveFile(file.originFileObj, {
+            sheetMap: fieldMappingReverse(sheetMap),
+            sheetCount: 1
+          });
+        case 4:
+          data2 = _context2.sent;
+          data = data2[0];
+          if (data.length) {
+            _context2.next = 9;
+            break;
+          }
+          message$1.error("\u8BF7\u5148\u5F55\u5165\u6570\u636E\u518D\u5BFC\u5165");
+          return _context2.abrupt("return");
+        case 9:
+          if (callback) callback(data);
+          !callback && message$1.success("\u5BFC\u5165\u6210\u529F");
+          return _context2.abrupt("return", data);
+        case 14:
+          message$1.error("\u8BF7\u9009\u62E9\u6587\u4EF6");
+          return _context2.abrupt("return");
+        case 16:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function readerXlsxToList(_x2, _x3, _x4, _x5, _x6) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+/**---------------------excel专程数据-------结束------------------------*/
+/**---------------------数据写入excel-------开始------------------------*/
+//数据写入excel
+var writeListToXlsx = function writeListToXlsx(list) {
+  var fileName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '导出';
+  // 创建工作薄
+  var workbook = utils.book_new();
+  // 利用XLSX的json_to_sheet工具将json数据转化为表
+  var workSheet = utils.json_to_sheet(list);
+  // 设置表格范围
+  workSheet['!ref'] = "A1:AI".concat(list.length + 1);
+  // 利用XLSX的book_append_sheet工具将表添加到excel文档中
+  utils.book_append_sheet(workbook, workSheet, 'sheet0');
+  // 执行数据转换文件写入
+  writeFile(workbook, "".concat(fileName, ".xlsx"), {
+    bookType: 'xlsx',
+    bookSST: true,
+    type: 'array'
+  });
+};
+//字段转中文映射  alwaysTrans 为true就是如果在映射中找不到就按原样返回
+var keyToWord = function keyToWord(data, fieldMapping) {
+  var alwaysTrans = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var keyMap = new Map([]);
+  for (var _i = 0, _Object$entries = Object.entries(fieldMapping); _i < _Object$entries.length; _i++) {
+    var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+      key = _Object$entries$_i[0],
+      value = _Object$entries$_i[1];
+    keyMap.set(key, value);
+  }
+  return data.map(function (item) {
+    var obj = {};
+    for (var _i2 = 0, _Object$entries2 = Object.entries(item); _i2 < _Object$entries2.length; _i2++) {
+      var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
+        _key = _Object$entries2$_i[0],
+        _value = _Object$entries2$_i[1];
+      if (keyMap.has(_key)) {
+        //@ts-ignore
+        obj[keyMap.get(_key)] = _value;
+      } else {
+        if (alwaysTrans) {
+          obj[_key] = _value;
+        }
+      }
+    }
+    return obj;
+  });
+};
+/**---------------------数据写入excel-------结束------------------------*/
+
 var FORMAT_TIME_STR = 'YYYY-MM-DD HH:mm:ss';
 var FORMAT_DAY_STR = 'YYYY-MM-DD';
 var FUNCTION_GET = 'GET';
@@ -2440,8 +2625,12 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
           columnTitleCellRenderBefore: function columnTitleCellRenderBefore(columnAbc, postion, ctx) {
             if (columnAbc.name) {
               var charCode = columnAbc.name.charCodeAt();
-              if (charCode - 65 <= items.length) {
-                columnAbc.name = itemsTemp[charCode - 65] ? itemsTemp[charCode - 65].content : !notValid ? '校验结果' : '';
+              var codeLen = 65 + 23 * (columnAbc.name.length - 1);
+              if (charCode - codeLen <= items.length) {
+                columnAbc.name = itemsTemp[charCode - codeLen] ? itemsTemp[charCode - codeLen].content : '';
+                if (charCode - 65 === itemsTemp.length) {
+                  columnAbc.name = '校验结果';
+                }
               } else {
                 columnAbc.name = '';
               }
@@ -2491,13 +2680,6 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
           defaultRowHeight: 20,
           defaultColWidth: 120,
           config: {},
-          // celldata:
-          //   data && data.length !== 0 ? data : _.flattenDeep(Array.from({ length: 100 }).map((a, b) => Array.from({ length: 100 }).map((c, d) => ({
-          //     "r": b,
-          //     "c": d,
-          //     "v": { "ct": { "fa": "@", "t": "s" }, }
-          //   }))))
-          // ,
           celldata: data && data.length !== 0 ? data : _.flattenDeep(Array.from({
             length: 100
           }).map(function (a, b) {
@@ -2659,7 +2841,10 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         });
         return obj;
       });
-      return data;
+      // 解决 没有输入的行不要录入进去
+      return data.filter(function (d) {
+        return _.compact(Object.values(d)).length;
+      });
     };
     _this.resetData = function () {
       var _customerColumnsMappi;
@@ -2843,6 +3028,43 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         });
       }), provided.placeholder);
     }))));
+    _this.getSheetMap = function () {
+      var _this$props2 = _this.props,
+        customerColumnsMapping = _this$props2.customerColumnsMapping,
+        columns = _this$props2.columns;
+      var sheetData = customerColumnsMapping || columns.map(function (s) {
+        return {
+          title: mapping.get(s),
+          name: s
+        };
+      }) || [];
+      var sheetMap = {};
+      sheetData.forEach(function (item, index) {
+        sheetMap[item.name] = item === null || item === void 0 ? void 0 : item.title;
+      });
+      return sheetMap;
+    };
+    _this.importExcelToLuckySheet = function (resultData) {
+      var res = resultData || [];
+      var sheetData = luckysheet.getSheetData();
+      sheetData.map(function (item, index) {
+        if (!(res === null || res === void 0 ? void 0 : res[index])) return item;
+        var rowItem = res[index];
+        item === null || item === void 0 ? void 0 : item.forEach(function (element, colIndex) {
+          var _ref4;
+          var colKey = (_ref4 = Object.keys(rowItem) || []) === null || _ref4 === void 0 ? void 0 : _ref4[colIndex];
+          if (!(rowItem === null || rowItem === void 0 ? void 0 : rowItem[colKey])) return element;
+          element.m = rowItem[colKey];
+          element.v = rowItem[colKey];
+        });
+      });
+      luckysheet.create(_this.setConfig(luckysheet.transToCellData(sheetData)));
+      _this.setState({
+        data: luckysheet.transToCellData(sheetData),
+        errorListCheck: false,
+        resultData: resultData
+      });
+    };
     _this.props.onRef(_this);
     var format = {
       fa: FORMAT_NAME_GENERAL,
@@ -2900,10 +3122,58 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var errorListCheck = this.state.errorListCheck;
-      var _this$props2 = this.props,
-        title = _this$props2.title,
-        notValid = _this$props2.notValid;
+      var _this$props3 = this.props,
+        title = _this$props3.title,
+        notValid = _this$props3.notValid,
+        notExcelImport = _this$props3.notExcelImport,
+        excelImportConfig = _this$props3.excelImportConfig;
+      var _ref5 = excelImportConfig || {},
+        size = _ref5.size,
+        accept = _ref5.accept,
+        suffixRule = _ref5.suffixRule;
       var totalSummary = this.getCount();
+      var sheetMap = this.getSheetMap();
+      var callBackFun = this.importExcelToLuckySheet;
+      var uploadProps = {
+        name: 'file',
+        action: '',
+        headers: {},
+        accept: accept || ['.xlsx', '.xls'],
+        showUploadList: false,
+        beforeUpload: function beforeUpload(file) {
+          // 文件校验
+          var extName = file.name.substring(file.name.lastIndexOf('.')).toLowerCase();
+          if (size && file.size > size * 1024 * 1024) {
+            message$1.error("\u4E0A\u4F20\u6587\u4EF6\u4E0D\u80FD\u8D85\u8FC7".concat(size, "M!"));
+            return Upload.LIST_IGNORE;
+          }
+          if (suffixRule && suffixRule.length > 0 && !suffixRule.includes(extName)) {
+            message$1.error("\u8BF7\u4E0A\u4F20".concat(suffixRule.toString(), "\u7B49\u683C\u5F0F\u7684\u6587\u4EF6!"));
+            return Upload.LIST_IGNORE;
+          }
+          return true;
+        },
+        onChange: function onChange(info) {
+          var _Object$keys;
+          if (!(sheetMap && ((_Object$keys = Object.keys(sheetMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length))) return;
+          if (info.file.status !== 'uploading') {
+            var _ref6 = info || {},
+              file = _ref6.file,
+              fileList = _ref6.fileList;
+            readerXlsxToList(file, fileList, null, null, {
+              callback: function callback(excelData) {
+                callBackFun(excelData);
+              },
+              sheetMap: sheetMap
+            });
+          }
+          if (info.file.status === 'done') {
+            message$1.success("".concat(info.file.name, " \u5DF2\u4E0A\u4F20\uFF0C\u8BF7\u68C0\u9A8C\u6570\u636E\u65E0\u8BEF\u540E\u4FDD\u5B58"));
+          } else if (info.file.status === 'error') {
+            message$1.error("".concat(info.file.name, " \u4E0A\u4F20\u5931\u8D25.\u8BF7\u91CD\u65B0\u4E0A\u4F20"));
+          }
+        }
+      };
       var luckyCss = {
         margin: '0px',
         padding: '0px',
@@ -2921,7 +3191,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         placement: "bottomLeft"
       }, /*#__PURE__*/React$1.createElement("a", null, /*#__PURE__*/React$1.createElement(ProfileTwoTone, null))), /*#__PURE__*/React$1.createElement(Tooltip, {
         title: /*#__PURE__*/React$1.createElement(React$1.Fragment, null, /*#__PURE__*/React$1.createElement("span", null, "\u4F7F\u7528\u6307\u5357\uFF1A"), /*#__PURE__*/React$1.createElement("br", null), /*#__PURE__*/React$1.createElement("span", null, "1\u3001\u62D6\u52A8\u6570\u636E\u9879\uFF0C\u4EE5\u9002\u914D\u6E90\u6570\u636E\u7684\u987A\u5E8F\uFF0C\u5982\u60A8Excel\u4E2D\u6570\u636E\u6392\u5E8F\u4F9D\u6B21\u4E3A\u7F16\u7801\u3001\u4EF7\u683C\u548C\u6570\u91CF\uFF0C\u5219\u60A8\u4E5F\u53EF\u4EE5\u5C06\u6570\u636E\u9879\u7684\u987A\u5E8F\u8C03\u6574\u4E3A\u4E00\u81F4"), /*#__PURE__*/React$1.createElement("br", null), /*#__PURE__*/React$1.createElement("span", null, "2\u3001\u590D\u5236\u6587\u4EF6\u6570\u636E\uFF08\u591A\u5217\u4E00\u8D77\uFF09\uFF0C\u5728\u6587\u672C\u6846\u5185\u8FDB\u884C\u7C98\u8D34"), /*#__PURE__*/React$1.createElement("br", null), /*#__PURE__*/React$1.createElement("span", null, "3\u3001\u70B9\u51FB\u8BC6\u522B\u6309\u94AE\u8FDB\u884C\u6570\u636E\u6821\u9A8C\uFF0C\u5982\u5168\u90E8\u6B63\u786E\uFF0C\u5219\u70B9\u51FB\u5F55\u5165\u6309\u94AE\u53EF\u5F55\u5165\u6570\u636E\uFF0C\u5982\u5B58\u5728\u9519\u8BEF\u6570\u636E\uFF0C\u5219\u9700\u4FEE\u6539\u540E\u518D\u8FDB\u884C\u5F55\u5165"))
-      }, /*#__PURE__*/React$1.createElement(ExclamationCircleOutlined, null))), /*#__PURE__*/React$1.createElement(Space, null, /*#__PURE__*/React$1.createElement(Dropdown, {
+      }, /*#__PURE__*/React$1.createElement(ExclamationCircleOutlined, null))), /*#__PURE__*/React$1.createElement(Space, null, !notExcelImport && ( /*#__PURE__*/React$1.createElement(Upload, _objectSpread2({}, uploadProps), /*#__PURE__*/React$1.createElement(Button, null, "\u5BFC\u5165"))), /*#__PURE__*/React$1.createElement(Dropdown, {
         trigger: ['click'],
         overlay: this.menuList,
         placement: "bottomRight"
@@ -3034,8 +3304,9 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
           columnTitleCellRenderBefore: function columnTitleCellRenderBefore(columnAbc, postion, ctx) {
             if (columnAbc.name) {
               var charCode = columnAbc.name.charCodeAt();
-              if (charCode - 65 <= items.length) {
-                columnAbc.name = itemsTemp$1[charCode - 65] ? itemsTemp$1[charCode - 65].content : !notValid ? '校验结果' : '';
+              var codeLen = 65 + 23 * (columnAbc.name.length - 1);
+              if (charCode - codeLen <= items.length) {
+                columnAbc.name = itemsTemp$1[charCode - codeLen] ? itemsTemp$1[charCode - codeLen].content : !notValid ? '校验结果' : '';
               } else {
                 columnAbc.name = '';
               }
@@ -3085,13 +3356,6 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
           defaultRowHeight: 20,
           defaultColWidth: 120,
           config: {},
-          // celldata:
-          //   data && data.length !== 0 ? data : _.flattenDeep(Array.from({ length: 100 }).map((a, b) => Array.from({ length: 100 }).map((c, d) => ({
-          //     "r": b,
-          //     "c": d,
-          //     "v": { "ct": { "fa": "@", "t": "s" }, }
-          //   }))))
-          // ,
           celldata: data && data.length !== 0 ? data : _.flattenDeep(Array.from({
             length: 100
           }).map(function (a, b) {
@@ -3253,7 +3517,10 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
         });
         return obj;
       });
-      return data;
+      // 解决 没有输入的行不要录入进去
+      return data.filter(function (d) {
+        return _.compact(Object.values(d)).length;
+      });
     };
     _this.resetData = function () {
       var _customerColumnsMappi;
@@ -3437,6 +3704,43 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
         });
       }), provided.placeholder);
     }))));
+    _this.getSheetMap = function () {
+      var _this$props2 = _this.props,
+        customerColumnsMapping = _this$props2.customerColumnsMapping,
+        columns = _this$props2.columns;
+      var sheetData = customerColumnsMapping || columns.map(function (s) {
+        return {
+          title: mapping$1.get(s),
+          name: s
+        };
+      }) || [];
+      var sheetMap = {};
+      sheetData.forEach(function (item, index) {
+        sheetMap[item.name] = item === null || item === void 0 ? void 0 : item.title;
+      });
+      return sheetMap;
+    };
+    _this.importExcelToLuckySheet = function (resultData) {
+      var res = resultData || [];
+      var sheetData = luckysheet$1.getSheetData();
+      sheetData.map(function (item, index) {
+        if (!(res === null || res === void 0 ? void 0 : res[index])) return item;
+        var rowItem = res[index];
+        item === null || item === void 0 ? void 0 : item.forEach(function (element, colIndex) {
+          var _ref4;
+          var colKey = (_ref4 = Object.keys(rowItem) || []) === null || _ref4 === void 0 ? void 0 : _ref4[colIndex];
+          if (!(rowItem === null || rowItem === void 0 ? void 0 : rowItem[colKey])) return element;
+          element.m = rowItem[colKey];
+          element.v = rowItem[colKey];
+        });
+      });
+      luckysheet$1.create(_this.setConfig(luckysheet$1.transToCellData(sheetData)));
+      _this.setState({
+        data: luckysheet$1.transToCellData(sheetData),
+        errorListCheck: false,
+        resultData: resultData
+      });
+    };
     _this.props.onRef(_this);
     var format = {
       fa: FORMAT_NAME_GENERAL$1,
@@ -3494,10 +3798,58 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var errorListCheck = this.state.errorListCheck;
-      var _this$props2 = this.props,
-        title = _this$props2.title,
-        notValid = _this$props2.notValid;
+      var _this$props3 = this.props,
+        title = _this$props3.title,
+        notValid = _this$props3.notValid,
+        notExcelImport = _this$props3.notExcelImport,
+        excelImportConfig = _this$props3.excelImportConfig;
+      var _ref5 = excelImportConfig || {},
+        size = _ref5.size,
+        accept = _ref5.accept,
+        suffixRule = _ref5.suffixRule;
       var totalSummary = this.getCount();
+      var sheetMap = this.getSheetMap();
+      var callBackFun = this.importExcelToLuckySheet;
+      var uploadProps = {
+        name: 'file',
+        action: '',
+        headers: {},
+        accept: accept || ['.xlsx', '.xls'],
+        showUploadList: false,
+        beforeUpload: function beforeUpload(file) {
+          // 文件校验
+          var extName = file.name.substring(file.name.lastIndexOf('.')).toLowerCase();
+          if (size && file.size > size * 1024 * 1024) {
+            message$1.error("\u4E0A\u4F20\u6587\u4EF6\u4E0D\u80FD\u8D85\u8FC7".concat(size, "M!"));
+            return Upload.LIST_IGNORE;
+          }
+          if (suffixRule && suffixRule.length > 0 && !suffixRule.includes(extName)) {
+            message$1.error("\u8BF7\u4E0A\u4F20".concat(suffixRule.toString(), "\u7B49\u683C\u5F0F\u7684\u6587\u4EF6!"));
+            return Upload.LIST_IGNORE;
+          }
+          return true;
+        },
+        onChange: function onChange(info) {
+          var _Object$keys;
+          if (!(sheetMap && ((_Object$keys = Object.keys(sheetMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length))) return;
+          if (info.file.status !== 'uploading') {
+            var _ref6 = info || {},
+              file = _ref6.file,
+              fileList = _ref6.fileList;
+            readerXlsxToList(file, fileList, null, null, {
+              callback: function callback(excelData) {
+                callBackFun(excelData);
+              },
+              sheetMap: sheetMap
+            });
+          }
+          if (info.file.status === 'done') {
+            message$1.success("".concat(info.file.name, " \u5DF2\u4E0A\u4F20\uFF0C\u8BF7\u68C0\u9A8C\u6570\u636E\u65E0\u8BEF\u540E\u4FDD\u5B58"));
+          } else if (info.file.status === 'error') {
+            message$1.error("".concat(info.file.name, " \u4E0A\u4F20\u5931\u8D25.\u8BF7\u91CD\u65B0\u4E0A\u4F20"));
+          }
+        }
+      };
       var luckyCss = {
         margin: '0px',
         padding: '0px',
@@ -3515,7 +3867,7 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
         placement: "bottomLeft"
       }, /*#__PURE__*/React$1.createElement("a", null, /*#__PURE__*/React$1.createElement(ProfileTwoTone, null))), /*#__PURE__*/React$1.createElement(Tooltip, {
         title: /*#__PURE__*/React$1.createElement(React$1.Fragment, null, /*#__PURE__*/React$1.createElement("span", null, "\u4F7F\u7528\u6307\u5357\uFF1A"), /*#__PURE__*/React$1.createElement("br", null), /*#__PURE__*/React$1.createElement("span", null, "1\u3001\u62D6\u52A8\u6570\u636E\u9879\uFF0C\u4EE5\u9002\u914D\u6E90\u6570\u636E\u7684\u987A\u5E8F\uFF0C\u5982\u60A8Excel\u4E2D\u6570\u636E\u6392\u5E8F\u4F9D\u6B21\u4E3A\u7F16\u7801\u3001\u4EF7\u683C\u548C\u6570\u91CF\uFF0C\u5219\u60A8\u4E5F\u53EF\u4EE5\u5C06\u6570\u636E\u9879\u7684\u987A\u5E8F\u8C03\u6574\u4E3A\u4E00\u81F4"), /*#__PURE__*/React$1.createElement("br", null), /*#__PURE__*/React$1.createElement("span", null, "2\u3001\u590D\u5236\u6587\u4EF6\u6570\u636E\uFF08\u591A\u5217\u4E00\u8D77\uFF09\uFF0C\u5728\u6587\u672C\u6846\u5185\u8FDB\u884C\u7C98\u8D34"), /*#__PURE__*/React$1.createElement("br", null), /*#__PURE__*/React$1.createElement("span", null, "3\u3001\u70B9\u51FB\u8BC6\u522B\u6309\u94AE\u8FDB\u884C\u6570\u636E\u6821\u9A8C\uFF0C\u5982\u5168\u90E8\u6B63\u786E\uFF0C\u5219\u70B9\u51FB\u5F55\u5165\u6309\u94AE\u53EF\u5F55\u5165\u6570\u636E\uFF0C\u5982\u5B58\u5728\u9519\u8BEF\u6570\u636E\uFF0C\u5219\u9700\u4FEE\u6539\u540E\u518D\u8FDB\u884C\u5F55\u5165"))
-      }, /*#__PURE__*/React$1.createElement(ExclamationCircleOutlined, null))), /*#__PURE__*/React$1.createElement(Space, null, /*#__PURE__*/React$1.createElement(Dropdown, {
+      }, /*#__PURE__*/React$1.createElement(ExclamationCircleOutlined, null))), /*#__PURE__*/React$1.createElement(Space, null, !notExcelImport && ( /*#__PURE__*/React$1.createElement(Upload, _objectSpread2({}, uploadProps), /*#__PURE__*/React$1.createElement(Button, null, "\u5BFC\u5165"))), /*#__PURE__*/React$1.createElement(Dropdown, {
         trigger: ['click'],
         overlay: this.menuList,
         placement: "bottomRight"
@@ -8129,9 +8481,11 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps, hidde
         }
       }
     }];
-    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
-      formatSource(x, 0, 2, tableSearchForm);
-      formatSource(x, 1, 3, tableSearchForm);
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
+      var firstElement = x === null || x === void 0 ? void 0 : x[0];
+      var allList = firstElement && [firstElement, firstElement];
+      formatSource(allList, 0, 2, tableSearchForm);
+      formatSource(allList, 1, 3, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择供应商',
@@ -9179,9 +9533,11 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps, hidde
         }
       }
     }];
-    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
-      formatSource(x, 0, 2, tableSearchForm);
-      formatSource(x, 1, 3, tableSearchForm);
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
+      var firstElement = x === null || x === void 0 ? void 0 : x[0];
+      var allList = firstElement && [firstElement, firstElement];
+      formatSource(allList, 0, 2, tableSearchForm);
+      formatSource(allList, 1, 3, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择客户',
@@ -13425,9 +13781,14 @@ function matchRoute(path, routeObj, hideRouteObj) {
   // 检查是否为action路由
   var actionMatch = path.match(/.*\/action\/.*/);
   if (actionMatch) {
+    var _routeObj$path$match$, _path$match;
     // 从hideRouteObj中进行全量匹配
     var matchedRoute = hideRouteObj[path];
-    return matchedRoute ? matchedRoute : null; // 如果找到匹配的路由则返回，否则返回null
+    var regex = new RegExp("^(.*?)/action");
+    var nameMap = (routeObj === null || routeObj === void 0 ? void 0 : (_routeObj$path$match$ = routeObj[path === null || path === void 0 ? void 0 : (_path$match = path.match(regex)) === null || _path$match === void 0 ? void 0 : _path$match[1]]) === null || _routeObj$path$match$ === void 0 ? void 0 : _routeObj$path$match$.nameMap) || []; // 去拿对应列表的nameMap
+    return matchedRoute ? _objectSpread2(_objectSpread2({}, matchedRoute), {}, {
+      nameMap: nameMap
+    }) : null; // 如果找到匹配的路由则返回，否则返回null
   }
   // 检查是否为特殊路由（add/view/edit）
   var specialMatch = path.match(/(.*)(\/add(\/[^\/](.*))*|\/create(\/[^\/](.*))*|\/view\/([^\/](.*))+|\/edit\/([^\/](.*))+)$/);
@@ -13440,7 +13801,8 @@ function matchRoute(path, routeObj, hideRouteObj) {
   // 如果都不匹配，返回null
   return null;
 }
-var getDetailMatchRoute = function getDetailMatchRoute(path, routeObj, hideRouteArray) {
+var getDetailMatchRoute = function getDetailMatchRoute(path, routeObj, hideRouteArray, _ref) {
+  var pathToRegexp = _ref.pathToRegexp;
   var newPath = path.split('?')[0];
   var hideRouteObj = _defineProperty({}, newPath, hideRouteArray.find(function (itemRoute) {
     return pathToRegexp(itemRoute.path).test(newPath);
@@ -13572,7 +13934,12 @@ var DetailWrapper = /*#__PURE__*/React$1.memo(function (_ref) {
     return pathKey ? breadcrumbNameMap[pathKey] : undefined;
   };
   var getPageTitle = function getPageTitle(pathname) {
-    var currRouterData = matchParamsPath("".concat(basePath).concat(pathname), breadcrumbNameMap) || getDetailMatchRoute("".concat(basePath).concat(pathname), breadcrumbNameMap, []);
+    var _ref3 = localStorage.getItem(getCommonInfoKey()) && JSON.parse(localStorage.getItem('commonInfo')) || {},
+      _ref3$hideRouteArray = _ref3.hideRouteArray,
+      hideRouteArray = _ref3$hideRouteArray === void 0 ? [] : _ref3$hideRouteArray;
+    var currRouterData = matchParamsPath("".concat(basePath).concat(pathname), breadcrumbNameMap) || getDetailMatchRoute("".concat(basePath).concat(pathname), breadcrumbNameMap, hideRouteArray, {
+      pathToRegexp: pathToRegexp
+    });
     if (!currRouterData) {
       return '';
     }
@@ -34736,4 +35103,4 @@ var index$7 = /*#__PURE__*/forwardRef(function (props, ref) {
   })));
 });
 
-export { AddSelect, AddSkcSelect, AddSkuSelect, AddSpuSelect, AuthButton, BillEntry, BsCascader, index$5 as BsLayout, BsSulaQueryTable, BusinessSearchSelect$1 as BusinessSearchSelect, BusinessTreeSearchSelect$1 as BusinessTreeSearchSelect, index$1 as CheckOneUser, ColumnSettingTable, ColumnsEdit, CommodityEntry, DataImport, DataValidation, index$3 as DetailPageWrapper, EllipsisTooltip, ExportIcon, GuideWrapper, HandleTotalCount, index$4 as HomePageWrapper, JsonQueryTable, index$6 as MoreTreeTable, QueryMutipleInput, RuleObjectComponent as RuleComponent, index$7 as RuleSetter, SearchSelect, index$2 as StateFlow, ColumnSettingSulaTable as SulaColumnSettingTable, TableColumnSetting, TreeSearchSelect, authFunc, calculateValidPeriod, checkQuantityAccuracy, createUniqID, downloadExcel, ergodicMenuRoutes, formatter, getAccountID, getAccountId, getBreadcrumbNameMap, getConfigTableColumns, getCurrentTargetBgId, getCurrentTenantId, getDictionarySource, getDictionaryTextByValue, getEmployeeCode, getEmployeeId, getItemDefaultWidth$1 as getItemDefaultWidth, getJoinDictionaryText, getLastKey, getLimitMenuDataKey, getLocalStorageSaveKey, getMenuAuthDataKey, getSessionId, getSkuImg, getTenantList, getUserId, getUserName, go2BackAndClose, handleAntdColumnsSpecialParams, handleBaseUrlPre, handleBeforeUpload, handleBssulaColumnsSpecialParams, handleCommonTimeRender$1 as handleCommonTimeRender, handleError, handleExport, handleExportBarCode, handleJudgeAuthButtons, handleOssUrl, handleRequestAuthHeader, handleRequestUrl, handleStatusBadge, handleTextBreakSpaces, handleTextDouble$1 as handleTextDouble, handleTextDoubleOrId, handleTextLineFeed$1 as handleTextLineFeed, handleTextOverflow$1 as handleTextOverflow, handleTextTooltip, handleTextWarp, handleTextWarpCustom, handleTooltip$1 as handleTooltip, handleTooltipHours$1 as handleTooltipHours, handleUserPhone, judgeIsEmpty, judgeIsRequestError, judgeIsRequestSuccess, memoizeOneFormatter, noEmptyArr, paramsControl, precisionQuantity, randomString, removeCurrentTenantId, removeTenantList, renderFixed2, renderNumberText, saveCurrentTenantId, saveTenantList, setConfigTableColumns, shouldUseAuth, socketFunctions, sulaTableRenderTooltip, tableColumnsImage$1 as tableColumnsImage, textIcon, updateGuanDate, userColumns$1 as userColumns, userInfoCard$1 as userInfoCard, uuid };
+export { AddSelect, AddSkcSelect, AddSkuSelect, AddSpuSelect, AuthButton, BillEntry, BsCascader, index$5 as BsLayout, BsSulaQueryTable, BusinessSearchSelect$1 as BusinessSearchSelect, BusinessTreeSearchSelect$1 as BusinessTreeSearchSelect, index$1 as CheckOneUser, ColumnSettingTable, ColumnsEdit, CommodityEntry, DataImport, DataValidation, index$3 as DetailPageWrapper, EllipsisTooltip, ExportIcon, GuideWrapper, HandleTotalCount, index$4 as HomePageWrapper, JsonQueryTable, index$6 as MoreTreeTable, QueryMutipleInput, RuleObjectComponent as RuleComponent, index$7 as RuleSetter, SearchSelect, index$2 as StateFlow, ColumnSettingSulaTable as SulaColumnSettingTable, TableColumnSetting, TreeSearchSelect, authFunc, calculateValidPeriod, checkQuantityAccuracy, createUniqID, downloadExcel, ergodicMenuRoutes, formatter, getAccountID, getAccountId, getBreadcrumbNameMap, getCommonInfoKey, getConfigTableColumns, getCurrentTargetBgId, getCurrentTenantId, getDictionarySource, getDictionaryTextByValue, getEmployeeCode, getEmployeeId, getItemDefaultWidth$1 as getItemDefaultWidth, getJoinDictionaryText, getLastKey, getLimitMenuDataKey, getLocalStorageSaveKey, getMenuAuthDataKey, getSessionId, getSkuImg, getTenantList, getUserId, getUserName, go2BackAndClose, handleAntdColumnsSpecialParams, handleBaseUrlPre, handleBeforeUpload, handleBssulaColumnsSpecialParams, handleCommonTimeRender$1 as handleCommonTimeRender, handleError, handleExport, handleExportBarCode, handleJudgeAuthButtons, handleOssUrl, handleRequestAuthHeader, handleRequestUrl, handleStatusBadge, handleTextBreakSpaces, handleTextDouble$1 as handleTextDouble, handleTextDoubleOrId, handleTextLineFeed$1 as handleTextLineFeed, handleTextOverflow$1 as handleTextOverflow, handleTextTooltip, handleTextWarp, handleTextWarpCustom, handleTooltip$1 as handleTooltip, handleTooltipHours$1 as handleTooltipHours, handleUserPhone, judgeIsEmpty, judgeIsRequestError, judgeIsRequestSuccess, keyToWord, memoizeOneFormatter, noEmptyArr, paramsControl, precisionQuantity, randomString, readerXlsxToList, removeCurrentTenantId, removeTenantList, renderFixed2, renderNumberText, saveCurrentTenantId, saveTenantList, setConfigTableColumns, shouldUseAuth, socketFunctions, sulaTableRenderTooltip, tableColumnsImage$1 as tableColumnsImage, textIcon, updateGuanDate, userColumns$1 as userColumns, userInfoCard$1 as userInfoCard, uuid, writeListToXlsx };