@bit-sun/business-component 3.1.0-alpha.8 → 3.1.0-alpha.9

package/dist/index.esm.js

@@ -30,9 +30,88 @@ import { parse as parse$1 } from '@babel/parser';
 import { visit } from 'ast-types';
 import isArray$1 from 'lodash/isArray';
 
+function _arrayLikeToArray(r, a) {
+  (null == a || a > r.length) && (a = r.length);
+  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+  return n;
+}
+function _arrayWithHoles(r) {
+  if (Array.isArray(r)) return r;
+}
+function _arrayWithoutHoles(r) {
+  if (Array.isArray(r)) return _arrayLikeToArray(r);
+}
+function _assertThisInitialized(e) {
+  if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  return e;
+}
+function asyncGeneratorStep(n, t, e, r, o, a, c) {
+  try {
+    var i = n[a](c),
+      u = i.value;
+  } catch (n) {
+    return void e(n);
+  }
+  i.done ? t(u) : Promise.resolve(u).then(r, o);
+}
+function _asyncToGenerator(n) {
+  return function () {
+    var t = this,
+      e = arguments;
+    return new Promise(function (r, o) {
+      var a = n.apply(t, e);
+      function _next(n) {
+        asyncGeneratorStep(a, r, o, _next, _throw, "next", n);
+      }
+      function _throw(n) {
+        asyncGeneratorStep(a, r, o, _next, _throw, "throw", n);
+      }
+      _next(void 0);
+    });
+  };
+}
 function _callSuper(t, o, e) {
   return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
 }
+function _classCallCheck(a, n) {
+  if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
+}
+function _defineProperties(e, r) {
+  for (var t = 0; t < r.length; t++) {
+    var o = r[t];
+    o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
+  }
+}
+function _createClass(e, r, t) {
+  return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", {
+    writable: !1
+  }), e;
+}
+function _defineProperty(e, r, t) {
+  return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+    value: t,
+    enumerable: !0,
+    configurable: !0,
+    writable: !0
+  }) : e[r] = t, e;
+}
+function _getPrototypeOf(t) {
+  return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
+    return t.__proto__ || Object.getPrototypeOf(t);
+  }, _getPrototypeOf(t);
+}
+function _inherits(t, e) {
+  if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function");
+  t.prototype = Object.create(e && e.prototype, {
+    constructor: {
+      value: t,
+      writable: !0,
+      configurable: !0
+    }
+  }), Object.defineProperty(t, "prototype", {
+    writable: !1
+  }), e && _setPrototypeOf(t, e);
+}
 function _isNativeReflectConstruct() {
   try {
     var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
@@ -41,6 +120,9 @@ function _isNativeReflectConstruct() {
     return !!t;
   })();
 }
+function _iterableToArray(r) {
+  if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
+}
 function _iterableToArrayLimit(r, l) {
   var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
   if (null != t) {
@@ -68,6 +150,15 @@ function _iterableToArrayLimit(r, l) {
     return a;
   }
 }
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _nonIterableSpread() {
+  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _objectDestructuringEmpty(t) {
+  if (null == t) throw new TypeError("Cannot destructure " + t);
+}
 function ownKeys(e, r) {
   var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
@@ -89,6 +180,31 @@ function _objectSpread2(e) {
   }
   return e;
 }
+function _objectWithoutProperties(e, t) {
+  if (null == e) return {};
+  var o,
+    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]);
+  }
+  return i;
+}
+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;
+    t[n] = r[n];
+  }
+  return t;
+}
+function _possibleConstructorReturn(t, e) {
+  if (e && ("object" == typeof e || "function" == typeof e)) return e;
+  if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
+  return _assertThisInitialized(t);
+}
 function _regeneratorRuntime() {
   _regeneratorRuntime = function () {
     return e;
@@ -390,6 +506,20 @@ function _regeneratorRuntime() {
     }
   }, e;
 }
+function _setPrototypeOf(t, e) {
+  return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
+    return t.__proto__ = e, t;
+  }, _setPrototypeOf(t, e);
+}
+function _slicedToArray(r, e) {
+  return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
+}
+function _toArray(r) {
+  return _arrayWithHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableRest();
+}
+function _toConsumableArray(r) {
+  return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
+}
 function _toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
   var e = t[Symbol.toPrimitive];
@@ -413,181 +543,13 @@ function _typeof(o) {
     return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
   }, _typeof(o);
 }
-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 _unsupportedIterableToArray(r, a) {
+  if (r) {
+    if ("string" == typeof r) return _arrayLikeToArray(r, a);
+    var t = {}.toString.call(r).slice(8, -1);
+    return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
   }
 }
-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 _classCallCheck(instance, Constructor) {
-  if (!(instance instanceof Constructor)) {
-    throw new TypeError("Cannot call a class as a function");
-  }
-}
-function _defineProperties(target, props) {
-  for (var i = 0; i < props.length; i++) {
-    var descriptor = props[i];
-    descriptor.enumerable = descriptor.enumerable || false;
-    descriptor.configurable = true;
-    if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
-  }
-}
-function _createClass(Constructor, protoProps, staticProps) {
-  if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-  if (staticProps) _defineProperties(Constructor, staticProps);
-  Object.defineProperty(Constructor, "prototype", {
-    writable: false
-  });
-  return Constructor;
-}
-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 _inherits(subClass, superClass) {
-  if (typeof superClass !== "function" && superClass !== null) {
-    throw new TypeError("Super expression must either be null or a function");
-  }
-  subClass.prototype = Object.create(superClass && superClass.prototype, {
-    constructor: {
-      value: subClass,
-      writable: true,
-      configurable: true
-    }
-  });
-  Object.defineProperty(subClass, "prototype", {
-    writable: false
-  });
-  if (superClass) _setPrototypeOf(subClass, superClass);
-}
-function _getPrototypeOf(o) {
-  _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
-    return o.__proto__ || Object.getPrototypeOf(o);
-  };
-  return _getPrototypeOf(o);
-}
-function _setPrototypeOf(o, p) {
-  _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
-    o.__proto__ = p;
-    return o;
-  };
-  return _setPrototypeOf(o, p);
-}
-function _objectDestructuringEmpty(obj) {
-  if (obj == null) throw new TypeError("Cannot destructure " + obj);
-}
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  for (var key in source) {
-    if (Object.prototype.hasOwnProperty.call(source, key)) {
-      if (excluded.indexOf(key) >= 0) continue;
-      target[key] = source[key];
-    }
-  }
-  return target;
-}
-function _objectWithoutProperties(source, excluded) {
-  if (source == null) return {};
-  var target = _objectWithoutPropertiesLoose(source, excluded);
-  var key, i;
-  if (Object.getOwnPropertySymbols) {
-    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-    for (i = 0; i < sourceSymbolKeys.length; i++) {
-      key = sourceSymbolKeys[i];
-      if (excluded.indexOf(key) >= 0) continue;
-      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-      target[key] = source[key];
-    }
-  }
-  return target;
-}
-function _assertThisInitialized(self) {
-  if (self === void 0) {
-    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-  }
-  return self;
-}
-function _possibleConstructorReturn(self, call) {
-  if (call && (typeof call === "object" || typeof call === "function")) {
-    return call;
-  } else if (call !== void 0) {
-    throw new TypeError("Derived constructors may only return object or undefined");
-  }
-  return _assertThisInitialized(self);
-}
-function _slicedToArray(arr, i) {
-  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
-}
-function _toArray(arr) {
-  return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest();
-}
-function _toConsumableArray(arr) {
-  return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
-}
-function _arrayWithoutHoles(arr) {
-  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
-}
-function _arrayWithHoles(arr) {
-  if (Array.isArray(arr)) return arr;
-}
-function _iterableToArray(iter) {
-  if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
-function _unsupportedIterableToArray(o, minLen) {
-  if (!o) return;
-  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === "Object" && o.constructor) n = o.constructor.name;
-  if (n === "Map" || n === "Set") return Array.from(o);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-}
-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 _nonIterableSpread() {
-  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _nonIterableRest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 
 var ENUM = {
   // 浏览器缓存信息
@@ -2478,8 +2440,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 = '';
               }
@@ -2697,7 +2663,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;
@@ -3072,8 +3041,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 = '';
               }
@@ -3291,7 +3261,9 @@ 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;
@@ -3480,6 +3452,7 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
       fa: FORMAT_NAME_GENERAL$1,
       t: FORMAT_TYPE_STRING$1
     };
+    debugger;
     if (props === null || props === void 0 ? void 0 : (_props$customerColumn = props.customerColumnsMapping) === null || _props$customerColumn === void 0 ? void 0 : _props$customerColumn.length) {
       var _props$customerColumn2;
       itemsTemp$1 = (props === null || props === void 0 ? void 0 : (_props$customerColumn2 = props.customerColumnsMapping) === null || _props$customerColumn2 === void 0 ? void 0 : _props$customerColumn2.map(function (item, index) {
@@ -3492,6 +3465,7 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
         return createItem$1('item-0', index, mapping$1.get(item), item, format);
       })) || [];
     }
+    console.log(itemsTemp$1, 'itemsTemp');
     luckysheet$1 = window.luckysheet || window.top.luckysheet;
     _this.state = {
       showErrorData: false,
@@ -4559,13 +4533,13 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     if (noNeedSplit) {
       return item.text;
     } else {
-      return specialBracket ? "\u3010".concat(item.textShowKey, "\u3011").concat(showText) : "".concat(item.textShowKey, "       ").concat(showText);
+      return specialBracket ? "\u3010".concat(item.textShowKey || '', "\u3011").concat(showText) : "".concat(item.textShowKey || '', "       ").concat(showText);
     }
   };
   var getShowLabelTextStr = function getShowLabelTextStr(kongValue) {
     if (selectMode) {
       var _value$map;
-      return (value === null || value === void 0 ? void 0 : (_value$map = value.map(function (item) {
+      return Array.isArray(value) && (value === null || value === void 0 ? void 0 : (_value$map = value.map(function (item) {
         return item.label || item.text || '';
       })) === null || _value$map === void 0 ? void 0 : _value$map.join(',')) || kongValue;
     }
@@ -4580,7 +4554,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var getShowValueStr = function getShowValueStr(kongValue) {
     if (selectMode) {
       var _value$map2;
-      return (value === null || value === void 0 ? void 0 : (_value$map2 = value.map(function (item) {
+      return Array.isArray(value) && (value === null || value === void 0 ? void 0 : (_value$map2 = value.map(function (item) {
         return getSelectValueText(item);
       })) === null || _value$map2 === void 0 ? void 0 : _value$map2.join(',')) || kongValue;
     }
@@ -9699,7 +9673,10 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps, hidde
       tableSearchForm: tableSearchForm,
       tableColumns: [{
         title: '账户名称',
-        dataIndex: 'username'
+        dataIndex: 'username',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
       }, {
         title: '显示名称',
         dataIndex: 'name'
@@ -9723,16 +9700,19 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps, hidde
         dataIndex: 'employmentType',
         render: function render(text) {
           var _employeeType$find;
-          return (_employeeType$find = employeeType.find(function (i) {
+          return ((_employeeType$find = employeeType.find(function (i) {
             return i.value === text;
-          })) === null || _employeeType$find === void 0 ? void 0 : _employeeType$find.text;
+          })) === null || _employeeType$find === void 0 ? void 0 : _employeeType$find.text) || '- -';
         }
       }] : []), [{
         title: '邮箱',
         dataIndex: 'email'
       }, {
         title: '手机号',
-        dataIndex: 'officeTelephone'
+        dataIndex: 'officeTelephone',
+        render: function render(text, record) {
+          return handleTextOverflow(text || (record === null || record === void 0 ? void 0 : record.phone));
+        }
       }])
     }, modalTableBusProps);
   }
@@ -15490,7 +15470,7 @@ var BsSulaQueryTable = (function (props) {
       expandable: props.expandable,
       scroll: {
         x: props.overScrollX || 'max-content',
-        y: height
+        y: (props === null || props === void 0 ? void 0 : props.overScrollY) || height
       },
       bordered: value.bordered || false,
       sticky: true,
@@ -15534,7 +15514,7 @@ var BsSulaQueryTable = (function (props) {
     }
   };
   var handleTimeValue = function handleTimeValue() {
-    var _value$actionsRender, _value$exportConfig, _sortTableRef$current, _value$exportConfig6, _exportTableRef$curre;
+    var _value$actionsRender, _value$exportConfig, _sortTableRef$current, _value$searchConfig, _value$exportConfig6, _exportTableRef$curre;
     var actionsRender = ((_value$actionsRender = value.actionsRender) !== null && _value$actionsRender !== void 0 ? _value$actionsRender : []).map(function (x) {
       var _x$position;
       return _objectSpread2(_objectSpread2({}, x), {}, {
@@ -15593,13 +15573,13 @@ var BsSulaQueryTable = (function (props) {
               fontSize: 14,
               textAlign: 'center'
             }
-          }, "\u5217\u8BBE\u7F6E")), /*#__PURE__*/React$1.createElement(Menu.Item, null, /*#__PURE__*/React$1.createElement(SearchItemTable, {
+          }, "\u5217\u8BBE\u7F6E")), !(value === null || value === void 0 ? void 0 : (_value$searchConfig = value.searchConfig) === null || _value$searchConfig === void 0 ? void 0 : _value$searchConfig.isHidden) && ( /*#__PURE__*/React$1.createElement(Menu.Item, null, /*#__PURE__*/React$1.createElement(SearchItemTable, {
             ref: searchTableRef,
             setShowSearchFields: setShowSearchFields,
             showSearchFields: showSearchFields,
             datasource: (value === null || value === void 0 ? void 0 : value.fields) || [],
             bsTableCode: bsTableCode
-          })), (value === null || value === void 0 ? void 0 : (_value$exportConfig6 = value.exportConfig) === null || _value$exportConfig6 === void 0 ? void 0 : _value$exportConfig6.settingColumns) && ( /*#__PURE__*/React$1.createElement(Menu.Item, null, /*#__PURE__*/React$1.createElement("div", {
+          }))), (value === null || value === void 0 ? void 0 : (_value$exportConfig6 = value.exportConfig) === null || _value$exportConfig6 === void 0 ? void 0 : _value$exportConfig6.settingColumns) && ( /*#__PURE__*/React$1.createElement(Menu.Item, null, /*#__PURE__*/React$1.createElement("div", {
             onClick: exportTableRef === null || exportTableRef === void 0 ? void 0 : (_exportTableRef$curre = exportTableRef.current) === null || _exportTableRef$curre === void 0 ? void 0 : _exportTableRef$curre.showModal,
             style: {
               fontSize: 14,

package/dist/index.js

@@ -53,9 +53,88 @@ var serialize__default = /*#__PURE__*/_interopDefaultLegacy(serialize);
 var castArray__default = /*#__PURE__*/_interopDefaultLegacy(castArray);
 var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray$1);
 
+function _arrayLikeToArray(r, a) {
+  (null == a || a > r.length) && (a = r.length);
+  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+  return n;
+}
+function _arrayWithHoles(r) {
+  if (Array.isArray(r)) return r;
+}
+function _arrayWithoutHoles(r) {
+  if (Array.isArray(r)) return _arrayLikeToArray(r);
+}
+function _assertThisInitialized(e) {
+  if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+  return e;
+}
+function asyncGeneratorStep(n, t, e, r, o, a, c) {
+  try {
+    var i = n[a](c),
+      u = i.value;
+  } catch (n) {
+    return void e(n);
+  }
+  i.done ? t(u) : Promise.resolve(u).then(r, o);
+}
+function _asyncToGenerator(n) {
+  return function () {
+    var t = this,
+      e = arguments;
+    return new Promise(function (r, o) {
+      var a = n.apply(t, e);
+      function _next(n) {
+        asyncGeneratorStep(a, r, o, _next, _throw, "next", n);
+      }
+      function _throw(n) {
+        asyncGeneratorStep(a, r, o, _next, _throw, "throw", n);
+      }
+      _next(void 0);
+    });
+  };
+}
 function _callSuper(t, o, e) {
   return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
 }
+function _classCallCheck(a, n) {
+  if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
+}
+function _defineProperties(e, r) {
+  for (var t = 0; t < r.length; t++) {
+    var o = r[t];
+    o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
+  }
+}
+function _createClass(e, r, t) {
+  return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", {
+    writable: !1
+  }), e;
+}
+function _defineProperty(e, r, t) {
+  return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+    value: t,
+    enumerable: !0,
+    configurable: !0,
+    writable: !0
+  }) : e[r] = t, e;
+}
+function _getPrototypeOf(t) {
+  return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
+    return t.__proto__ || Object.getPrototypeOf(t);
+  }, _getPrototypeOf(t);
+}
+function _inherits(t, e) {
+  if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function");
+  t.prototype = Object.create(e && e.prototype, {
+    constructor: {
+      value: t,
+      writable: !0,
+      configurable: !0
+    }
+  }), Object.defineProperty(t, "prototype", {
+    writable: !1
+  }), e && _setPrototypeOf(t, e);
+}
 function _isNativeReflectConstruct() {
   try {
     var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
@@ -64,6 +143,9 @@ function _isNativeReflectConstruct() {
     return !!t;
   })();
 }
+function _iterableToArray(r) {
+  if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
+}
 function _iterableToArrayLimit(r, l) {
   var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
   if (null != t) {
@@ -91,6 +173,15 @@ function _iterableToArrayLimit(r, l) {
     return a;
   }
 }
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _nonIterableSpread() {
+  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _objectDestructuringEmpty(t) {
+  if (null == t) throw new TypeError("Cannot destructure " + t);
+}
 function ownKeys(e, r) {
   var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
@@ -112,6 +203,31 @@ function _objectSpread2(e) {
   }
   return e;
 }
+function _objectWithoutProperties(e, t) {
+  if (null == e) return {};
+  var o,
+    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]);
+  }
+  return i;
+}
+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;
+    t[n] = r[n];
+  }
+  return t;
+}
+function _possibleConstructorReturn(t, e) {
+  if (e && ("object" == typeof e || "function" == typeof e)) return e;
+  if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
+  return _assertThisInitialized(t);
+}
 function _regeneratorRuntime() {
   _regeneratorRuntime = function () {
     return e;
@@ -413,6 +529,20 @@ function _regeneratorRuntime() {
     }
   }, e;
 }
+function _setPrototypeOf(t, e) {
+  return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
+    return t.__proto__ = e, t;
+  }, _setPrototypeOf(t, e);
+}
+function _slicedToArray(r, e) {
+  return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
+}
+function _toArray(r) {
+  return _arrayWithHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableRest();
+}
+function _toConsumableArray(r) {
+  return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
+}
 function _toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
   var e = t[Symbol.toPrimitive];
@@ -436,181 +566,13 @@ function _typeof(o) {
     return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
   }, _typeof(o);
 }
-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 _unsupportedIterableToArray(r, a) {
+  if (r) {
+    if ("string" == typeof r) return _arrayLikeToArray(r, a);
+    var t = {}.toString.call(r).slice(8, -1);
+    return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
   }
 }
-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 _classCallCheck(instance, Constructor) {
-  if (!(instance instanceof Constructor)) {
-    throw new TypeError("Cannot call a class as a function");
-  }
-}
-function _defineProperties(target, props) {
-  for (var i = 0; i < props.length; i++) {
-    var descriptor = props[i];
-    descriptor.enumerable = descriptor.enumerable || false;
-    descriptor.configurable = true;
-    if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
-  }
-}
-function _createClass(Constructor, protoProps, staticProps) {
-  if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-  if (staticProps) _defineProperties(Constructor, staticProps);
-  Object.defineProperty(Constructor, "prototype", {
-    writable: false
-  });
-  return Constructor;
-}
-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 _inherits(subClass, superClass) {
-  if (typeof superClass !== "function" && superClass !== null) {
-    throw new TypeError("Super expression must either be null or a function");
-  }
-  subClass.prototype = Object.create(superClass && superClass.prototype, {
-    constructor: {
-      value: subClass,
-      writable: true,
-      configurable: true
-    }
-  });
-  Object.defineProperty(subClass, "prototype", {
-    writable: false
-  });
-  if (superClass) _setPrototypeOf(subClass, superClass);
-}
-function _getPrototypeOf(o) {
-  _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
-    return o.__proto__ || Object.getPrototypeOf(o);
-  };
-  return _getPrototypeOf(o);
-}
-function _setPrototypeOf(o, p) {
-  _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
-    o.__proto__ = p;
-    return o;
-  };
-  return _setPrototypeOf(o, p);
-}
-function _objectDestructuringEmpty(obj) {
-  if (obj == null) throw new TypeError("Cannot destructure " + obj);
-}
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  for (var key in source) {
-    if (Object.prototype.hasOwnProperty.call(source, key)) {
-      if (excluded.indexOf(key) >= 0) continue;
-      target[key] = source[key];
-    }
-  }
-  return target;
-}
-function _objectWithoutProperties(source, excluded) {
-  if (source == null) return {};
-  var target = _objectWithoutPropertiesLoose(source, excluded);
-  var key, i;
-  if (Object.getOwnPropertySymbols) {
-    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-    for (i = 0; i < sourceSymbolKeys.length; i++) {
-      key = sourceSymbolKeys[i];
-      if (excluded.indexOf(key) >= 0) continue;
-      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-      target[key] = source[key];
-    }
-  }
-  return target;
-}
-function _assertThisInitialized(self) {
-  if (self === void 0) {
-    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-  }
-  return self;
-}
-function _possibleConstructorReturn(self, call) {
-  if (call && (typeof call === "object" || typeof call === "function")) {
-    return call;
-  } else if (call !== void 0) {
-    throw new TypeError("Derived constructors may only return object or undefined");
-  }
-  return _assertThisInitialized(self);
-}
-function _slicedToArray(arr, i) {
-  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
-}
-function _toArray(arr) {
-  return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest();
-}
-function _toConsumableArray(arr) {
-  return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
-}
-function _arrayWithoutHoles(arr) {
-  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
-}
-function _arrayWithHoles(arr) {
-  if (Array.isArray(arr)) return arr;
-}
-function _iterableToArray(iter) {
-  if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
-function _unsupportedIterableToArray(o, minLen) {
-  if (!o) return;
-  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === "Object" && o.constructor) n = o.constructor.name;
-  if (n === "Map" || n === "Set") return Array.from(o);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-}
-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 _nonIterableSpread() {
-  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _nonIterableRest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 
 var ENUM = {
   // 浏览器缓存信息
@@ -2501,8 +2463,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 = '';
               }
@@ -2720,7 +2686,10 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         });
         return obj;
       });
-      return data;
+      // 解决 没有输入的行不要录入进去
+      return data.filter(function (d) {
+        return ___default['default'].compact(Object.values(d)).length;
+      });
     };
     _this.resetData = function () {
       var _customerColumnsMappi;
@@ -3095,8 +3064,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 = '';
               }
@@ -3314,7 +3284,9 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
         });
         return obj;
       });
-      return data;
+      return data.filter(function (d) {
+        return ___default['default'].compact(Object.values(d)).length;
+      });
     };
     _this.resetData = function () {
       var _customerColumnsMappi;
@@ -3503,6 +3475,7 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
       fa: FORMAT_NAME_GENERAL$1,
       t: FORMAT_TYPE_STRING$1
     };
+    debugger;
     if (props === null || props === void 0 ? void 0 : (_props$customerColumn = props.customerColumnsMapping) === null || _props$customerColumn === void 0 ? void 0 : _props$customerColumn.length) {
       var _props$customerColumn2;
       itemsTemp$1 = (props === null || props === void 0 ? void 0 : (_props$customerColumn2 = props.customerColumnsMapping) === null || _props$customerColumn2 === void 0 ? void 0 : _props$customerColumn2.map(function (item, index) {
@@ -3515,6 +3488,7 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
         return createItem$1('item-0', index, mapping$1.get(item), item, format);
       })) || [];
     }
+    console.log(itemsTemp$1, 'itemsTemp');
     luckysheet$1 = window.luckysheet || window.top.luckysheet;
     _this.state = {
       showErrorData: false,
@@ -4582,13 +4556,13 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     if (noNeedSplit) {
       return item.text;
     } else {
-      return specialBracket ? "\u3010".concat(item.textShowKey, "\u3011").concat(showText) : "".concat(item.textShowKey, "       ").concat(showText);
+      return specialBracket ? "\u3010".concat(item.textShowKey || '', "\u3011").concat(showText) : "".concat(item.textShowKey || '', "       ").concat(showText);
     }
   };
   var getShowLabelTextStr = function getShowLabelTextStr(kongValue) {
     if (selectMode) {
       var _value$map;
-      return (value === null || value === void 0 ? void 0 : (_value$map = value.map(function (item) {
+      return Array.isArray(value) && (value === null || value === void 0 ? void 0 : (_value$map = value.map(function (item) {
         return item.label || item.text || '';
       })) === null || _value$map === void 0 ? void 0 : _value$map.join(',')) || kongValue;
     }
@@ -4603,7 +4577,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   var getShowValueStr = function getShowValueStr(kongValue) {
     if (selectMode) {
       var _value$map2;
-      return (value === null || value === void 0 ? void 0 : (_value$map2 = value.map(function (item) {
+      return Array.isArray(value) && (value === null || value === void 0 ? void 0 : (_value$map2 = value.map(function (item) {
         return getSelectValueText(item);
       })) === null || _value$map2 === void 0 ? void 0 : _value$map2.join(',')) || kongValue;
     }
@@ -9722,7 +9696,10 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps, hidde
       tableSearchForm: tableSearchForm,
       tableColumns: [{
         title: '账户名称',
-        dataIndex: 'username'
+        dataIndex: 'username',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
       }, {
         title: '显示名称',
         dataIndex: 'name'
@@ -9746,16 +9723,19 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps, hidde
         dataIndex: 'employmentType',
         render: function render(text) {
           var _employeeType$find;
-          return (_employeeType$find = employeeType.find(function (i) {
+          return ((_employeeType$find = employeeType.find(function (i) {
             return i.value === text;
-          })) === null || _employeeType$find === void 0 ? void 0 : _employeeType$find.text;
+          })) === null || _employeeType$find === void 0 ? void 0 : _employeeType$find.text) || '- -';
         }
       }] : []), [{
         title: '邮箱',
         dataIndex: 'email'
       }, {
         title: '手机号',
-        dataIndex: 'officeTelephone'
+        dataIndex: 'officeTelephone',
+        render: function render(text, record) {
+          return handleTextOverflow(text || (record === null || record === void 0 ? void 0 : record.phone));
+        }
       }])
     }, modalTableBusProps);
   }
@@ -15513,7 +15493,7 @@ var BsSulaQueryTable = (function (props) {
       expandable: props.expandable,
       scroll: {
         x: props.overScrollX || 'max-content',
-        y: height
+        y: (props === null || props === void 0 ? void 0 : props.overScrollY) || height
       },
       bordered: value.bordered || false,
       sticky: true,
@@ -15557,7 +15537,7 @@ var BsSulaQueryTable = (function (props) {
     }
   };
   var handleTimeValue = function handleTimeValue() {
-    var _value$actionsRender, _value$exportConfig, _sortTableRef$current, _value$exportConfig6, _exportTableRef$curre;
+    var _value$actionsRender, _value$exportConfig, _sortTableRef$current, _value$searchConfig, _value$exportConfig6, _exportTableRef$curre;
     var actionsRender = ((_value$actionsRender = value.actionsRender) !== null && _value$actionsRender !== void 0 ? _value$actionsRender : []).map(function (x) {
       var _x$position;
       return _objectSpread2(_objectSpread2({}, x), {}, {
@@ -15616,13 +15596,13 @@ var BsSulaQueryTable = (function (props) {
               fontSize: 14,
               textAlign: 'center'
             }
-          }, "\u5217\u8BBE\u7F6E")), /*#__PURE__*/React__default['default'].createElement(antd.Menu.Item, null, /*#__PURE__*/React__default['default'].createElement(SearchItemTable, {
+          }, "\u5217\u8BBE\u7F6E")), !(value === null || value === void 0 ? void 0 : (_value$searchConfig = value.searchConfig) === null || _value$searchConfig === void 0 ? void 0 : _value$searchConfig.isHidden) && ( /*#__PURE__*/React__default['default'].createElement(antd.Menu.Item, null, /*#__PURE__*/React__default['default'].createElement(SearchItemTable, {
             ref: searchTableRef,
             setShowSearchFields: setShowSearchFields,
             showSearchFields: showSearchFields,
             datasource: (value === null || value === void 0 ? void 0 : value.fields) || [],
             bsTableCode: bsTableCode
-          })), (value === null || value === void 0 ? void 0 : (_value$exportConfig6 = value.exportConfig) === null || _value$exportConfig6 === void 0 ? void 0 : _value$exportConfig6.settingColumns) && ( /*#__PURE__*/React__default['default'].createElement(antd.Menu.Item, null, /*#__PURE__*/React__default['default'].createElement("div", {
+          }))), (value === null || value === void 0 ? void 0 : (_value$exportConfig6 = value.exportConfig) === null || _value$exportConfig6 === void 0 ? void 0 : _value$exportConfig6.settingColumns) && ( /*#__PURE__*/React__default['default'].createElement(antd.Menu.Item, null, /*#__PURE__*/React__default['default'].createElement("div", {
             onClick: exportTableRef === null || exportTableRef === void 0 ? void 0 : (_exportTableRef$curre = exportTableRef.current) === null || _exportTableRef$curre === void 0 ? void 0 : _exportTableRef$curre.showModal,
             style: {
               fontSize: 14,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "3.1.0-alpha.8",
+  "version": "3.1.0-alpha.9",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/BsSulaQueryTable/index.tsx

@@ -409,7 +409,7 @@ const getSettingFieldOrColumn = (savedConfig, originConfig, type: string) => {
       },
       initialSelectedRowKeys: value.initialSelectedRowKeys || [],
       expandable: props.expandable,
-      scroll: { x: props.overScrollX || 'max-content', y: height },
+      scroll: { x: props.overScrollX || 'max-content', y: props?.overScrollY || height },
       bordered: value.bordered || false,
       sticky: true,
       rowClassName: (record: object | null | undefined, index: number) =>
@@ -542,15 +542,17 @@ const getSettingFieldOrColumn = (savedConfig, originConfig, type: string) => {
                         列设置
                       </div>
                     </Menu.Item>
-                    <Menu.Item>
-                      <SearchItemTable
-                        ref={searchTableRef}
-                        setShowSearchFields={setShowSearchFields}
-                        showSearchFields={showSearchFields}
-                        datasource={value?.fields || []}
-                        bsTableCode={bsTableCode}
-                      />
+                    {!value?.searchConfig?.isHidden && (
+                     <Menu.Item>
+                        <SearchItemTable
+                          ref={searchTableRef}
+                          setShowSearchFields={setShowSearchFields}
+                          showSearchFields={showSearchFields}
+                          datasource={value?.fields || []}
+                          bsTableCode={bsTableCode}
+                        />
                     </Menu.Item>
+                    )}
                     {value?.exportConfig?.settingColumns && (
                       <Menu.Item>
                         <div

package/src/components/Business/SearchSelect/BusinessUtils.tsx

@@ -1605,6 +1605,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '账户名称',
           dataIndex: 'username',
+          render: (text: any) => handleTextOverflow(text),
         },
         {
           title: '显示名称',
@@ -1626,7 +1627,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         ...(modalTableBusProps?.needTypeSearch?[{
           title: '员工类型',
           dataIndex: 'employmentType',
-          render: (text: number) => employeeType.find((i: any) => i.value === text)?.text,
+          render: (text: number) => employeeType.find((i: any) => i.value === text)?.text || '- -',
         }]:[]),
         {
           title: '邮箱',
@@ -1635,6 +1636,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         {
           title: '手机号',
           dataIndex: 'officeTelephone',
+          render: (text: any, record: any) => handleTextOverflow(text||record?.phone),
         },
       ],
       ...modalTableBusProps

package/src/components/Functional/DataImport/index.tsx

@@ -2,8 +2,8 @@
  * @Description:
  * @Author: rodchen
  * @Date: 2021-12-01 10:52:08
- * @LastEditTime: 2021-12-29 17:11:56
- * @LastEditors: rodchen
+ * @LastEditTime: 2024-07-11 19:20:39
+ * @LastEditors: rodchen rodchen_king@outlook.com
  */
 // @ts-nocheck
 import React from 'react';
@@ -132,6 +132,7 @@ class DataImport extends React.Component {
     this.props.onRef(this);
 
     const format = { fa: FORMAT_NAME_GENERAL, t: FORMAT_TYPE_STRING };
+    debugger
     if (props?.customerColumnsMapping?.length) {
       itemsTemp = props?.customerColumnsMapping?.map((item, index) => {
         return createItem('item-0', index, item.title, item.name, format);
@@ -145,6 +146,7 @@ class DataImport extends React.Component {
         return createItem('item-0', index, mapping.get(item), item, format);
       })||[];
     }
+    console.log(itemsTemp, 'itemsTemp')
     luckysheet = window.luckysheet || window.top.luckysheet;
     this.state = {
       showErrorData: false,
@@ -194,9 +196,10 @@ class DataImport extends React.Component {
         columnTitleCellRenderBefore: function (columnAbc, postion, ctx) {
           if (columnAbc.name) {
             let charCode = columnAbc.name.charCodeAt();
-            if (charCode - 65 <= items.length) {
-              columnAbc.name = itemsTemp[charCode - 65]
-                ? itemsTemp[charCode - 65].content
+            let codeLen = (65+23 * (columnAbc.name.length-1))
+            if (charCode - codeLen <= items.length) {
+              columnAbc.name = itemsTemp[charCode - codeLen]
+                ? itemsTemp[charCode - codeLen].content
                 :  (!notValid ? '校验结果' : '');
             } else {
               columnAbc.name = '';
@@ -417,7 +420,7 @@ class DataImport extends React.Component {
         return obj;
       });
 
-    return data;
+    return data.filter(d => _.compact(Object.values(d)).length);
   };
 
   resetData = () => {

package/src/components/Functional/DataValidation/index.tsx

@@ -2,8 +2,8 @@
  * @Description:
  * @Author: rodchen
  * @Date: 2021-12-01 10:52:08
- * @LastEditTime: 2021-12-29 17:11:56
- * @LastEditors: rodchen
+ * @LastEditTime: 2024-07-11 19:28:43
+ * @LastEditors: rodchen rodchen_king@outlook.com
  */
 // @ts-nocheck
 import React from 'react';
@@ -194,10 +194,15 @@ class DataValidation extends React.Component {
         columnTitleCellRenderBefore: function (columnAbc, postion, ctx) {
           if (columnAbc.name) {
             let charCode = columnAbc.name.charCodeAt();
-            if (charCode - 65 <= items.length) {
-              columnAbc.name = itemsTemp[charCode - 65]
-                ? itemsTemp[charCode - 65].content
-                :  (!notValid ? '校验结果' : '');
+            let 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 = '';
             }
@@ -417,7 +422,8 @@ class DataValidation extends React.Component {
         return obj;
       });
 
-    return data;
+    // 解决 没有输入的行不要录入进去
+    return data.filter(d => _.compact(Object.values(d)).length);
   };
 
   resetData = () => {

package/src/components/Functional/SearchSelect/index.tsx

@@ -771,14 +771,14 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
       return item.text;
     } else {
       return specialBracket
-        ? `【${item.textShowKey}】${showText}`
-        : `${item.textShowKey}       ${showText}`
+        ? `【${item.textShowKey || ''}】${showText}`
+        : `${item.textShowKey || ''}       ${showText}`
     }
   };
 
   const getShowLabelTextStr = (kongValue): string => {
     if (selectMode) {
-      return value?.map(item => item.label || item.text || '')?.join(',') || kongValue;
+      return Array.isArray(value) && value?.map(item => item.label || item.text || '')?.join(',') || kongValue;
     }
     return (value?.label || value?.text || kongValue) as string;
   };
@@ -787,7 +787,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   }
   const getShowValueStr = (kongValue): string => {
     if (selectMode) {
-      return value?.map(item => getSelectValueText(item))?.join(',') || kongValue;
+      return Array.isArray(value) && value?.map(item => getSelectValueText(item))?.join(',') || kongValue;
     }
     return (getSelectValueText(value) || kongValue) as string;
   }