@bit-sun/business-component 3.1.0-alpha.10 → 3.1.0-alpha.12

package/dist/index.esm.js

@@ -1228,6 +1228,10 @@ var go2BackAndClose = function go2BackAndClose(backHistoryPath) {
     history.goBack();
   }
 };
+var parseWidth = function parseWidth(widthStr) {
+  var parsedWidth = parseInt(widthStr.replace('px', ''));
+  return isNaN(parsedWidth) ? 0 : parsedWidth;
+};
 /**
  * 处理bssulaTable的公共回显样式
  * @param col 每一具体行
@@ -1246,9 +1250,10 @@ var handleBssulaColumnsSpecialParams = function handleBssulaColumnsSpecialParams
     };
   } else if (col.textOverflow) {
     // 处理文字太长
+    var colWidth = typeof (col === null || col === void 0 ? void 0 : col.width) === 'number' ? col.width : col.width && parseWidth(col.width);
     col.render = function (_ref3) {
       var text = _ref3.text;
-      return handleTextOverflow(text, col.width);
+      return handleTextOverflow(text, colWidth);
     };
   } else if (col.images) {
     col.render = function (_ref4) {
@@ -1302,8 +1307,9 @@ var handleAntdColumnsSpecialParams = function handleAntdColumnsSpecialParams(col
   }
   // 处理文字太长
   if (col.textOverflow) {
+    var colWidth = typeof (col === null || col === void 0 ? void 0 : col.width) === 'number' ? col.width : col.width && parseWidth(col.width);
     col.render = function (text) {
-      return handleTextOverflow(text);
+      return handleTextOverflow(text, colWidth);
     };
   }
   if (col.images) {
@@ -1544,37 +1550,38 @@ var resolveFile = /*#__PURE__*/function () {
 //读取文件 
 var readerXlsxToList = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(file, fileList, uploadRef, done, otherInfo) {
-    var _ref5, callback, sheetMap, data2, data;
+    var _ref5, callback, sheetMap, nowFile, 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;
+            _context2.next = 15;
             break;
           }
-          _context2.next = 4;
-          return resolveFile(file.originFileObj, {
+          nowFile = fileList[fileList.length - 1]; // 阻止了默认上传file没有originFileObj了 得从fileList中去取
+          _context2.next = 5;
+          return resolveFile(nowFile.originFileObj, {
             sheetMap: fieldMappingReverse(sheetMap),
             sheetCount: 1
           });
-        case 4:
+        case 5:
           data2 = _context2.sent;
           data = data2[0];
           if (data.length) {
-            _context2.next = 9;
+            _context2.next = 10;
             break;
           }
           message$1.error("\u8BF7\u5148\u5F55\u5165\u6570\u636E\u518D\u5BFC\u5165");
           return _context2.abrupt("return");
-        case 9:
+        case 10:
           if (callback) callback(data);
           !callback && message$1.success("\u5BFC\u5165\u6210\u529F");
           return _context2.abrupt("return", data);
-        case 14:
+        case 15:
           message$1.error("\u8BF7\u9009\u62E9\u6587\u4EF6");
           return _context2.abrupt("return");
-        case 16:
+        case 17:
         case "end":
           return _context2.stop();
       }
@@ -2861,7 +2868,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         return _.compact(Object.values(d)).length;
       });
       var resultColumns = (customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : customerColumnsMapping.length) ? customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : (_customerColumnsMappi = customerColumnsMapping.filter(function (c) {
-        return !(c === null || c === void 0 ? void 0 : c.name);
+        return !!(c === null || c === void 0 ? void 0 : c.name);
       })) === null || _customerColumnsMappi === void 0 ? void 0 : _customerColumnsMappi.map(function (c) {
         return c.name;
       }) : columns;
@@ -3136,7 +3143,6 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       var callBackFun = this.importExcelToLuckySheet;
       var uploadProps = {
         name: 'file',
-        action: '',
         headers: {},
         accept: accept || ['.xlsx', '.xls'],
         showUploadList: false,
@@ -3151,7 +3157,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
             message$1.error("\u8BF7\u4E0A\u4F20".concat(suffixRule.toString(), "\u7B49\u683C\u5F0F\u7684\u6587\u4EF6!"));
             return Upload.LIST_IGNORE;
           }
-          return true;
+          return false; // 阻止默认上传
         },
         onChange: function onChange(info) {
           var _Object$keys;
@@ -3812,7 +3818,6 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
       var callBackFun = this.importExcelToLuckySheet;
       var uploadProps = {
         name: 'file',
-        action: '',
         headers: {},
         accept: accept || ['.xlsx', '.xls'],
         showUploadList: false,
@@ -3827,7 +3832,7 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
             message$1.error("\u8BF7\u4E0A\u4F20".concat(suffixRule.toString(), "\u7B49\u683C\u5F0F\u7684\u6587\u4EF6!"));
             return Upload.LIST_IGNORE;
           }
-          return true;
+          return false; // 阻止默认上传
         },
         onChange: function onChange(info) {
           var _Object$keys;
@@ -4650,11 +4655,27 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     });
   };
   var onChangeCheckAll = function onChangeCheckAll(e) {
+    // 允许用户自定义 全选操作逻辑
+    if (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.onCheckAll) {
+      modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.onCheckAll(e, {
+        items: items,
+        itemsTotal: itemsTotal,
+        tablePagination: tablePagination,
+        onCheckAllData: onCheckAllData,
+        setSelectedRowKeys: setSelectedRowKeys,
+        setPopValue: setPopValue,
+        setSelectedRows: setSelectedRows,
+        setIndeterminate: setIndeterminate,
+        setCheckedAll: setCheckedAll
+      });
+      return;
+    }
     if (e.target.checked) {
       // 如果下拉框有所有数据就处理选中所有【items.length === itemsTotal】(最多可选100条)
       // 如果超过100条 就默认查出所有数据
-      if (items.length < itemsTotal) {
-        var totalPage = Math.ceil(itemsTotal / (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize));
+      if (items.length < itemsTotal || items.length === itemsTotal && itemsTotal == 0) {
+        var totalCount = (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total) || itemsTotal; // 兼容有查询条件的情况 首次加载是没有所有数据的，默认给加载后端返回的总条数
+        var totalPage = Math.ceil(totalCount / (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize));
         var allPageSize = totalPage * (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize);
         onCheckAllData(allPageSize);
       } else {
@@ -5080,7 +5101,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
         }
       };
     }
-  }), selectMode ? ( /*#__PURE__*/React$1.createElement("div", {
+  }), selectMode && !(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.isHiddenCheckAll) ? ( /*#__PURE__*/React$1.createElement("div", {
     className: 'select_list_selectAll'
   }, /*#__PURE__*/React$1.createElement(Checkbox, {
     indeterminate: indeterminate,
@@ -6922,7 +6943,7 @@ var AddSelect = function AddSelect(props) {
         item.width = item.width || getItemDefaultWidth$2(item);
         item.onHeaderCell = function (column) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
-            width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+            width: typeof column.width === 'number' ? column.width : parseWidth(column.width),
             onResize: handleResize(arr, indexArrInside, callback)
           });
         };
@@ -7974,7 +7995,7 @@ var BillEntry = function BillEntry(_ref3) {
         item.width = item.width || getItemDefaultWidth$2(item);
         item.onHeaderCell = function (column) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
-            width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+            width: typeof column.width === 'number' ? column.width : parseWidth(column.width),
             onResize: handleResize(arr, indexArrInside, callback)
           });
         };
@@ -13410,7 +13431,7 @@ var ColumnSettingSulaTable = /*#__PURE__*/function (_React$Component) {
             item.width = item.width || getItemDefaultWidth$2(item);
             item.onHeaderCell = function (column) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
-                width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+                width: typeof column.width === 'number' ? column.width : parseWidth(column.width),
                 onResize: _this2.handleResize(indexArrInside)
               });
             };
@@ -13644,7 +13665,7 @@ var ColumnSettingTable = /*#__PURE__*/function (_React$Component) {
             item.width = item.width || getItemDefaultWidth$2(item);
             item.onHeaderCell = function (column) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
-                width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+                width: typeof column.width === 'number' ? column.width : parseWidth(column.width),
                 onResize: _this2.handleResize(indexArrInside)
               });
             };
@@ -13804,9 +13825,9 @@ function matchRoute(path, routeObj, hideRouteObj) {
 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) {
+  var hideRouteObj = _defineProperty({}, newPath, Array.isArray(hideRouteArray) && (hideRouteArray === null || hideRouteArray === void 0 ? void 0 : hideRouteArray.find(function (itemRoute) {
     return pathToRegexp(itemRoute.path).test(newPath);
-  }));
+  })));
   var matchedRoute = matchRoute(newPath, routeObj, hideRouteObj);
   if (matchedRoute) {
     var modeTypeText = path.match(/.*\/action\/.*/) ? '' : getModeTypeText(path);
@@ -13822,7 +13843,7 @@ var getDetailMatchRoute = function getDetailMatchRoute(path, routeObj, hideRoute
   return undefined;
 };
 
-var css_248z$c = ".detail_page_head {\n  height: 54px;\n  z-index: 5;\n  display: flex;\n  align-items: center;\n  background-color: #FFFFFF;\n  border-bottom: 1px solid #f0f0f0;\n}\n.detail_page_head .ant-breadcrumb {\n  display: block !important;\n}\n.detail_page_head .ant-breadcrumb .ant-breadcrumb-separator {\n  margin: 0 2px;\n}\n.detail_page_head .ant-breadcrumb li .bread_name {\n  color: #8A8F8D;\n  font-size: 12px;\n  cursor: pointer;\n}\n.detail_page_head .ant-breadcrumb li .bread_name:hover {\n  color: #000000d9;\n}\n.detail_page_wrapper {\n  height: calc(100vh - 80px);\n  background-color: #FFF;\n}\n.back_home_img_content {\n  display: inline-block;\n  height: 28px;\n  width: 28px;\n  border: 1px solid #BABABA;\n  margin: 0 12px 0 20px;\n  border-radius: 14px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  cursor: pointer;\n}\n.back_home_img_content .anticon-arrow-left {\n  color: #BABABA;\n}\n.back_home_img_content:hover {\n  background-color: #00A94E;\n  border: 1px solid #00A94E;\n}\n.back_home_img_content:hover .anticon-arrow-left {\n  color: #FFFFFF;\n}\n.detail_page_title_box {\n  flex-grow: 1;\n}\n.detail_page_title {\n  height: 20px;\n  font-family: PingFangSC;\n  font-weight: 600;\n  font-size: 16px;\n  margin-top: 2px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 20px;\n}\n.detail_page_btns {\n  display: flex;\n  gap: 8px;\n  margin-right: 20px;\n}\n.detail_page_btns button {\n  height: 32px !important;\n  display: flex;\n  align-items: center;\n  gap: 2px;\n  border-radius: 3px;\n  padding: 0 10px;\n}\n.detail_page_btns .ant-btn-dangerous {\n  background-color: #EC5246 !important;\n}\n";
+var css_248z$c = ".detail_page_head {\n  height: 54px;\n  z-index: 5;\n  display: flex;\n  align-items: center;\n  background-color: #FFFFFF;\n  border-bottom: 1px solid #f0f0f0;\n}\n.detail_page_head .ant-breadcrumb {\n  display: block !important;\n}\n.detail_page_head .ant-breadcrumb .ant-breadcrumb-separator {\n  margin: 0 2px;\n}\n.detail_page_head .ant-breadcrumb li .bread_name {\n  color: #8A8F8D;\n  font-size: 12px;\n  cursor: pointer;\n}\n.detail_page_head .ant-breadcrumb li .bread_name:hover {\n  color: #000000d9;\n}\n.detail_page_wrapper {\n  min-height: calc(100vh - 80px);\n  background-color: #FFF;\n}\n.back_home_img_content {\n  display: inline-block;\n  height: 28px;\n  width: 28px;\n  border: 1px solid #BABABA;\n  margin: 0 12px 0 20px;\n  border-radius: 14px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  cursor: pointer;\n}\n.back_home_img_content .anticon-arrow-left {\n  color: #BABABA;\n}\n.back_home_img_content:hover {\n  background-color: #00A94E;\n  border: 1px solid #00A94E;\n}\n.back_home_img_content:hover .anticon-arrow-left {\n  color: #FFFFFF;\n}\n.detail_page_title_box {\n  flex-grow: 1;\n}\n.detail_page_title {\n  height: 20px;\n  font-family: PingFangSC;\n  font-weight: 600;\n  font-size: 16px;\n  margin-top: 2px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 20px;\n}\n.detail_page_btns {\n  display: flex;\n  gap: 8px;\n  margin-right: 20px;\n}\n.detail_page_btns button {\n  height: 32px !important;\n  display: flex;\n  align-items: center;\n  gap: 2px;\n  border-radius: 3px;\n  padding: 0 10px;\n}\n.detail_page_btns .ant-btn-dangerous {\n  background-color: #EC5246 !important;\n}\n";
 styleInject(css_248z$c);
 
 var quanping = "data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%3F%3E%3Csvg%20width%3D%2234px%22%20height%3D%2234px%22%20viewBox%3D%220%200%2034%2034%22%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%3E%20%20%20%20%3Ctitle%3E%E7%9F%A9%E5%BD%A2%3C%2Ftitle%3E%20%20%20%20%3Cg%20id%3D%22%E5%88%97%E8%A1%A8%E5%8A%9F%E8%83%BD%22%20stroke%3D%22none%22%20stroke-width%3D%221%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%20%20%20%20%20%20%20%20%3Cg%20id%3D%22%E6%98%9F%E6%BE%9C-%E6%90%9C%E7%B4%A2-%E6%90%9C%E7%B4%A2%E5%8A%9F%E8%83%BD%22%20transform%3D%22translate%28-1823.000000%2C%20-297.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22%E6%90%9C%E7%B4%A2%E7%BB%84%E4%BB%B6-%E6%A0%B7%E5%BC%8F%E4%B8%80%22%20transform%3D%22translate%28230.000000%2C%20284.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22%E7%A1%AE%E5%AE%9A%E5%A4%87%E4%BB%BD-2%22%20transform%3D%22translate%281593.000000%2C%2013.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cpath%20d%3D%22M5.55801813%2C1%20L28.4419819%2C1%20C30.0269041%2C1%2030.6016352%2C1.16502331%2031.181059%2C1.47490258%20C31.7604829%2C1.78478186%2032.2152181%2C2.2395171%2032.5250974%2C2.81894097%20C32.8349767%2C3.39836484%2033%2C3.97309593%2033%2C5.55801813%20L33%2C28.4419819%20C33%2C30.0269041%2032.8349767%2C30.6016352%2032.5250974%2C31.181059%20C32.2152181%2C31.7604829%2031.7604829%2C32.2152181%2031.181059%2C32.5250974%20C30.6016352%2C32.8349767%2030.0269041%2C33%2028.4419819%2C33%20L5.55801813%2C33%20C3.97309593%2C33%203.39836484%2C32.8349767%202.81894097%2C32.5250974%20C2.2395171%2C32.2152181%201.78478186%2C31.7604829%201.47490258%2C31.181059%20C1.16502331%2C30.6016352%201%2C30.0269041%201%2C28.4419819%20L1%2C5.55801813%20C1%2C3.97309593%201.16502331%2C3.39836484%201.47490258%2C2.81894097%20C1.78478186%2C2.2395171%202.2395171%2C1.78478186%202.81894097%2C1.47490258%20C3.39836484%2C1.16502331%203.97309593%2C1%205.55801813%2C1%20Z%22%20id%3D%22%E7%9F%A9%E5%BD%A2%22%20stroke%3D%22%23D9D9D9%22%20stroke-width%3D%220.888888889%22%3E%3C%2Fpath%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22scanning%22%20transform%3D%22translate%289.000000%2C%209.000000%29%22%20fill%3D%22%23000000%22%20fill-rule%3D%22nonzero%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cpath%20d%3D%22M5.21873562%2C9.69278114%20L6.28954184%2C10.7432953%20L2.532%2C14.5%20L5.24949999%2C14.5%20L5.24949999%2C16%20L1.5%2C16%20C0.671572876%2C16%200%2C15.3284271%200%2C14.5%20L0%2C11%20L1.5%2C11%20L1.5%2C13.41%20L5.21873562%2C9.69278114%20Z%20M10.7898541%2C9.72266777%20L14.499%2C13.431%20L14.5%2C11%20L16%2C11%20L16%2C14.5%20C16%2C15.3284271%2015.3284271%2C16%2014.5%2C16%20L10.7495%2C16%20L10.7495%2C14.5%20L13.446%2C14.5%20L9.71904783%2C10.7731819%20L10.7898541%2C9.72266777%20Z%20M14.5%2C0%20C15.3284271%2C0%2016%2C0.671572876%2016%2C1.5%20L16%2C5%20L14.5%2C5%20L14.499%2C2.588%20L10.779708%2C6.3074783%20L9.71904783%2C5.24681813%20L13.465%2C1.5%20L10.75%2C1.5%20L10.75%2C0%20L14.5%2C0%20Z%20M5.25000001%2C0%20L5.25000001%2C1.5%20L2.567%2C1.5%20L6.31400442%2C5.24681813%20L5.25334424%2C6.3074783%20L1.5%2C2.554%20L1.5%2C5%20L0%2C5%20L0%2C1.5%20C0%2C0.671572876%200.671572876%2C0%201.5%2C0%20L5.25000001%2C0%20Z%22%20id%3D%22%E5%BD%A2%E7%8A%B6%22%3E%3C%2Fpath%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%3C%2Fg%3E%3C%2Fsvg%3E";
@@ -13934,7 +13955,7 @@ var DetailWrapper = /*#__PURE__*/React$1.memo(function (_ref) {
     return pathKey ? breadcrumbNameMap[pathKey] : undefined;
   };
   var getPageTitle = function getPageTitle(pathname) {
-    var _ref3 = localStorage.getItem(getCommonInfoKey()) && JSON.parse(localStorage.getItem('commonInfo')) || {},
+    var _ref3 = localStorage.getItem(getCommonInfoKey()) && JSON.parse(localStorage.getItem(getCommonInfoKey())) || {},
       _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, {
@@ -15703,10 +15724,6 @@ var BsSulaQueryTable = (function (props) {
     }
     var columns = props.columns;
     var columnConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.COLUMN_CONDITION);
-    var parseWidth = function parseWidth(widthStr) {
-      var parsedWidth = parseInt(widthStr.replace('px', ''));
-      return isNaN(parsedWidth) ? 0 : parsedWidth;
-    };
     var showColumns = getSettingFieldOrColumn(columnConfig, columns, 'columns');
     showColumns.forEach(function (item, index) {
       item.width = item.width || getItemDefaultWidth(item);
@@ -15726,7 +15743,7 @@ var BsSulaQueryTable = (function (props) {
       handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = function (column) {
         return _objectSpread2(_objectSpread2({}, item), {}, {
-          width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+          width: typeof column.width === 'number' ? column.width : parseWidth(column.width),
           onResize: handleResize(index)
         });
       };
@@ -15804,7 +15821,7 @@ var BsSulaQueryTable = (function (props) {
   };
   // 处理 table 基本参数
   var setTableProps = function setTableProps() {
-    var _tableProps, _tableProps$initialPa, _tableProps2, _tableProps2$initialP;
+    var _tableProps, _tableProps$initialPa, _tableProps2, _tableProps3, _tableProps3$initialP;
     var tableProps = value.tableProps || {};
     tableProps = _objectSpread2(_objectSpread2({}, tableProps), {}, {
       size: value.size || 'middle',
@@ -15832,14 +15849,14 @@ var BsSulaQueryTable = (function (props) {
       rowClassName: function rowClassName(record, index) {
         return index % 2 === 0 ? 'table_base' : 'table_odd';
       },
-      components: {
+      components: _objectSpread2({
         header: {
           cell: ResizeableTitle$2
         }
-      }
+      }, (_tableProps2 = tableProps) === null || _tableProps2 === void 0 ? void 0 : _tableProps2.components)
     });
     // @ts-ignore
-    if ((_tableProps2 = tableProps) === null || _tableProps2 === void 0 ? void 0 : (_tableProps2$initialP = _tableProps2.initialPaging) === null || _tableProps2$initialP === void 0 ? void 0 : _tableProps2$initialP.pagination) {
+    if ((_tableProps3 = tableProps) === null || _tableProps3 === void 0 ? void 0 : (_tableProps3$initialP = _tableProps3.initialPaging) === null || _tableProps3$initialP === void 0 ? void 0 : _tableProps3$initialP.pagination) {
       // @ts-ignore
       tableProps.initialPaging.pagination.showSizeChanger = true;
     }
@@ -35103,4 +35120,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, 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 };
+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, parseWidth, 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 };

package/dist/index.js

@@ -1251,6 +1251,10 @@ var go2BackAndClose = function go2BackAndClose(backHistoryPath) {
     umi.history.goBack();
   }
 };
+var parseWidth = function parseWidth(widthStr) {
+  var parsedWidth = parseInt(widthStr.replace('px', ''));
+  return isNaN(parsedWidth) ? 0 : parsedWidth;
+};
 /**
  * 处理bssulaTable的公共回显样式
  * @param col 每一具体行
@@ -1269,9 +1273,10 @@ var handleBssulaColumnsSpecialParams = function handleBssulaColumnsSpecialParams
     };
   } else if (col.textOverflow) {
     // 处理文字太长
+    var colWidth = typeof (col === null || col === void 0 ? void 0 : col.width) === 'number' ? col.width : col.width && parseWidth(col.width);
     col.render = function (_ref3) {
       var text = _ref3.text;
-      return handleTextOverflow(text, col.width);
+      return handleTextOverflow(text, colWidth);
     };
   } else if (col.images) {
     col.render = function (_ref4) {
@@ -1325,8 +1330,9 @@ var handleAntdColumnsSpecialParams = function handleAntdColumnsSpecialParams(col
   }
   // 处理文字太长
   if (col.textOverflow) {
+    var colWidth = typeof (col === null || col === void 0 ? void 0 : col.width) === 'number' ? col.width : col.width && parseWidth(col.width);
     col.render = function (text) {
-      return handleTextOverflow(text);
+      return handleTextOverflow(text, colWidth);
     };
   }
   if (col.images) {
@@ -1567,37 +1573,38 @@ var resolveFile = /*#__PURE__*/function () {
 //读取文件 
 var readerXlsxToList = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(file, fileList, uploadRef, done, otherInfo) {
-    var _ref5, callback, sheetMap, data2, data;
+    var _ref5, callback, sheetMap, nowFile, 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;
+            _context2.next = 15;
             break;
           }
-          _context2.next = 4;
-          return resolveFile(file.originFileObj, {
+          nowFile = fileList[fileList.length - 1]; // 阻止了默认上传file没有originFileObj了 得从fileList中去取
+          _context2.next = 5;
+          return resolveFile(nowFile.originFileObj, {
             sheetMap: fieldMappingReverse(sheetMap),
             sheetCount: 1
           });
-        case 4:
+        case 5:
           data2 = _context2.sent;
           data = data2[0];
           if (data.length) {
-            _context2.next = 9;
+            _context2.next = 10;
             break;
           }
           antd.message.error("\u8BF7\u5148\u5F55\u5165\u6570\u636E\u518D\u5BFC\u5165");
           return _context2.abrupt("return");
-        case 9:
+        case 10:
           if (callback) callback(data);
           !callback && antd.message.success("\u5BFC\u5165\u6210\u529F");
           return _context2.abrupt("return", data);
-        case 14:
+        case 15:
           antd.message.error("\u8BF7\u9009\u62E9\u6587\u4EF6");
           return _context2.abrupt("return");
-        case 16:
+        case 17:
         case "end":
           return _context2.stop();
       }
@@ -2884,7 +2891,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         return ___default['default'].compact(Object.values(d)).length;
       });
       var resultColumns = (customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : customerColumnsMapping.length) ? customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : (_customerColumnsMappi = customerColumnsMapping.filter(function (c) {
-        return !(c === null || c === void 0 ? void 0 : c.name);
+        return !!(c === null || c === void 0 ? void 0 : c.name);
       })) === null || _customerColumnsMappi === void 0 ? void 0 : _customerColumnsMappi.map(function (c) {
         return c.name;
       }) : columns;
@@ -3159,7 +3166,6 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       var callBackFun = this.importExcelToLuckySheet;
       var uploadProps = {
         name: 'file',
-        action: '',
         headers: {},
         accept: accept || ['.xlsx', '.xls'],
         showUploadList: false,
@@ -3174,7 +3180,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
             antd.message.error("\u8BF7\u4E0A\u4F20".concat(suffixRule.toString(), "\u7B49\u683C\u5F0F\u7684\u6587\u4EF6!"));
             return antd.Upload.LIST_IGNORE;
           }
-          return true;
+          return false; // 阻止默认上传
         },
         onChange: function onChange(info) {
           var _Object$keys;
@@ -3835,7 +3841,6 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
       var callBackFun = this.importExcelToLuckySheet;
       var uploadProps = {
         name: 'file',
-        action: '',
         headers: {},
         accept: accept || ['.xlsx', '.xls'],
         showUploadList: false,
@@ -3850,7 +3855,7 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
             antd.message.error("\u8BF7\u4E0A\u4F20".concat(suffixRule.toString(), "\u7B49\u683C\u5F0F\u7684\u6587\u4EF6!"));
             return antd.Upload.LIST_IGNORE;
           }
-          return true;
+          return false; // 阻止默认上传
         },
         onChange: function onChange(info) {
           var _Object$keys;
@@ -4673,11 +4678,27 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     });
   };
   var onChangeCheckAll = function onChangeCheckAll(e) {
+    // 允许用户自定义 全选操作逻辑
+    if (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.onCheckAll) {
+      modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.onCheckAll(e, {
+        items: items,
+        itemsTotal: itemsTotal,
+        tablePagination: tablePagination,
+        onCheckAllData: onCheckAllData,
+        setSelectedRowKeys: setSelectedRowKeys,
+        setPopValue: setPopValue,
+        setSelectedRows: setSelectedRows,
+        setIndeterminate: setIndeterminate,
+        setCheckedAll: setCheckedAll
+      });
+      return;
+    }
     if (e.target.checked) {
       // 如果下拉框有所有数据就处理选中所有【items.length === itemsTotal】(最多可选100条)
       // 如果超过100条 就默认查出所有数据
-      if (items.length < itemsTotal) {
-        var totalPage = Math.ceil(itemsTotal / (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize));
+      if (items.length < itemsTotal || items.length === itemsTotal && itemsTotal == 0) {
+        var totalCount = (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total) || itemsTotal; // 兼容有查询条件的情况 首次加载是没有所有数据的，默认给加载后端返回的总条数
+        var totalPage = Math.ceil(totalCount / (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize));
         var allPageSize = totalPage * (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize);
         onCheckAllData(allPageSize);
       } else {
@@ -5103,7 +5124,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
         }
       };
     }
-  }), selectMode ? ( /*#__PURE__*/React__default['default'].createElement("div", {
+  }), selectMode && !(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.isHiddenCheckAll) ? ( /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'select_list_selectAll'
   }, /*#__PURE__*/React__default['default'].createElement(antd.Checkbox, {
     indeterminate: indeterminate,
@@ -6945,7 +6966,7 @@ var AddSelect = function AddSelect(props) {
         item.width = item.width || getItemDefaultWidth$2(item);
         item.onHeaderCell = function (column) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
-            width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+            width: typeof column.width === 'number' ? column.width : parseWidth(column.width),
             onResize: handleResize(arr, indexArrInside, callback)
           });
         };
@@ -7997,7 +8018,7 @@ var BillEntry = function BillEntry(_ref3) {
         item.width = item.width || getItemDefaultWidth$2(item);
         item.onHeaderCell = function (column) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
-            width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+            width: typeof column.width === 'number' ? column.width : parseWidth(column.width),
             onResize: handleResize(arr, indexArrInside, callback)
           });
         };
@@ -13433,7 +13454,7 @@ var ColumnSettingSulaTable = /*#__PURE__*/function (_React$Component) {
             item.width = item.width || getItemDefaultWidth$2(item);
             item.onHeaderCell = function (column) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
-                width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+                width: typeof column.width === 'number' ? column.width : parseWidth(column.width),
                 onResize: _this2.handleResize(indexArrInside)
               });
             };
@@ -13667,7 +13688,7 @@ var ColumnSettingTable = /*#__PURE__*/function (_React$Component) {
             item.width = item.width || getItemDefaultWidth$2(item);
             item.onHeaderCell = function (column) {
               return _objectSpread2(_objectSpread2({}, item), {}, {
-                width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+                width: typeof column.width === 'number' ? column.width : parseWidth(column.width),
                 onResize: _this2.handleResize(indexArrInside)
               });
             };
@@ -13827,9 +13848,9 @@ function matchRoute(path, routeObj, hideRouteObj) {
 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) {
+  var hideRouteObj = _defineProperty({}, newPath, Array.isArray(hideRouteArray) && (hideRouteArray === null || hideRouteArray === void 0 ? void 0 : hideRouteArray.find(function (itemRoute) {
     return pathToRegexp(itemRoute.path).test(newPath);
-  }));
+  })));
   var matchedRoute = matchRoute(newPath, routeObj, hideRouteObj);
   if (matchedRoute) {
     var modeTypeText = path.match(/.*\/action\/.*/) ? '' : getModeTypeText(path);
@@ -13845,7 +13866,7 @@ var getDetailMatchRoute = function getDetailMatchRoute(path, routeObj, hideRoute
   return undefined;
 };
 
-var css_248z$c = ".detail_page_head {\n  height: 54px;\n  z-index: 5;\n  display: flex;\n  align-items: center;\n  background-color: #FFFFFF;\n  border-bottom: 1px solid #f0f0f0;\n}\n.detail_page_head .ant-breadcrumb {\n  display: block !important;\n}\n.detail_page_head .ant-breadcrumb .ant-breadcrumb-separator {\n  margin: 0 2px;\n}\n.detail_page_head .ant-breadcrumb li .bread_name {\n  color: #8A8F8D;\n  font-size: 12px;\n  cursor: pointer;\n}\n.detail_page_head .ant-breadcrumb li .bread_name:hover {\n  color: #000000d9;\n}\n.detail_page_wrapper {\n  height: calc(100vh - 80px);\n  background-color: #FFF;\n}\n.back_home_img_content {\n  display: inline-block;\n  height: 28px;\n  width: 28px;\n  border: 1px solid #BABABA;\n  margin: 0 12px 0 20px;\n  border-radius: 14px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  cursor: pointer;\n}\n.back_home_img_content .anticon-arrow-left {\n  color: #BABABA;\n}\n.back_home_img_content:hover {\n  background-color: #00A94E;\n  border: 1px solid #00A94E;\n}\n.back_home_img_content:hover .anticon-arrow-left {\n  color: #FFFFFF;\n}\n.detail_page_title_box {\n  flex-grow: 1;\n}\n.detail_page_title {\n  height: 20px;\n  font-family: PingFangSC;\n  font-weight: 600;\n  font-size: 16px;\n  margin-top: 2px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 20px;\n}\n.detail_page_btns {\n  display: flex;\n  gap: 8px;\n  margin-right: 20px;\n}\n.detail_page_btns button {\n  height: 32px !important;\n  display: flex;\n  align-items: center;\n  gap: 2px;\n  border-radius: 3px;\n  padding: 0 10px;\n}\n.detail_page_btns .ant-btn-dangerous {\n  background-color: #EC5246 !important;\n}\n";
+var css_248z$c = ".detail_page_head {\n  height: 54px;\n  z-index: 5;\n  display: flex;\n  align-items: center;\n  background-color: #FFFFFF;\n  border-bottom: 1px solid #f0f0f0;\n}\n.detail_page_head .ant-breadcrumb {\n  display: block !important;\n}\n.detail_page_head .ant-breadcrumb .ant-breadcrumb-separator {\n  margin: 0 2px;\n}\n.detail_page_head .ant-breadcrumb li .bread_name {\n  color: #8A8F8D;\n  font-size: 12px;\n  cursor: pointer;\n}\n.detail_page_head .ant-breadcrumb li .bread_name:hover {\n  color: #000000d9;\n}\n.detail_page_wrapper {\n  min-height: calc(100vh - 80px);\n  background-color: #FFF;\n}\n.back_home_img_content {\n  display: inline-block;\n  height: 28px;\n  width: 28px;\n  border: 1px solid #BABABA;\n  margin: 0 12px 0 20px;\n  border-radius: 14px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  cursor: pointer;\n}\n.back_home_img_content .anticon-arrow-left {\n  color: #BABABA;\n}\n.back_home_img_content:hover {\n  background-color: #00A94E;\n  border: 1px solid #00A94E;\n}\n.back_home_img_content:hover .anticon-arrow-left {\n  color: #FFFFFF;\n}\n.detail_page_title_box {\n  flex-grow: 1;\n}\n.detail_page_title {\n  height: 20px;\n  font-family: PingFangSC;\n  font-weight: 600;\n  font-size: 16px;\n  margin-top: 2px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 20px;\n}\n.detail_page_btns {\n  display: flex;\n  gap: 8px;\n  margin-right: 20px;\n}\n.detail_page_btns button {\n  height: 32px !important;\n  display: flex;\n  align-items: center;\n  gap: 2px;\n  border-radius: 3px;\n  padding: 0 10px;\n}\n.detail_page_btns .ant-btn-dangerous {\n  background-color: #EC5246 !important;\n}\n";
 styleInject(css_248z$c);
 
 var quanping = "data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%3F%3E%3Csvg%20width%3D%2234px%22%20height%3D%2234px%22%20viewBox%3D%220%200%2034%2034%22%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%3E%20%20%20%20%3Ctitle%3E%E7%9F%A9%E5%BD%A2%3C%2Ftitle%3E%20%20%20%20%3Cg%20id%3D%22%E5%88%97%E8%A1%A8%E5%8A%9F%E8%83%BD%22%20stroke%3D%22none%22%20stroke-width%3D%221%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%20%20%20%20%20%20%20%20%3Cg%20id%3D%22%E6%98%9F%E6%BE%9C-%E6%90%9C%E7%B4%A2-%E6%90%9C%E7%B4%A2%E5%8A%9F%E8%83%BD%22%20transform%3D%22translate%28-1823.000000%2C%20-297.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22%E6%90%9C%E7%B4%A2%E7%BB%84%E4%BB%B6-%E6%A0%B7%E5%BC%8F%E4%B8%80%22%20transform%3D%22translate%28230.000000%2C%20284.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22%E7%A1%AE%E5%AE%9A%E5%A4%87%E4%BB%BD-2%22%20transform%3D%22translate%281593.000000%2C%2013.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cpath%20d%3D%22M5.55801813%2C1%20L28.4419819%2C1%20C30.0269041%2C1%2030.6016352%2C1.16502331%2031.181059%2C1.47490258%20C31.7604829%2C1.78478186%2032.2152181%2C2.2395171%2032.5250974%2C2.81894097%20C32.8349767%2C3.39836484%2033%2C3.97309593%2033%2C5.55801813%20L33%2C28.4419819%20C33%2C30.0269041%2032.8349767%2C30.6016352%2032.5250974%2C31.181059%20C32.2152181%2C31.7604829%2031.7604829%2C32.2152181%2031.181059%2C32.5250974%20C30.6016352%2C32.8349767%2030.0269041%2C33%2028.4419819%2C33%20L5.55801813%2C33%20C3.97309593%2C33%203.39836484%2C32.8349767%202.81894097%2C32.5250974%20C2.2395171%2C32.2152181%201.78478186%2C31.7604829%201.47490258%2C31.181059%20C1.16502331%2C30.6016352%201%2C30.0269041%201%2C28.4419819%20L1%2C5.55801813%20C1%2C3.97309593%201.16502331%2C3.39836484%201.47490258%2C2.81894097%20C1.78478186%2C2.2395171%202.2395171%2C1.78478186%202.81894097%2C1.47490258%20C3.39836484%2C1.16502331%203.97309593%2C1%205.55801813%2C1%20Z%22%20id%3D%22%E7%9F%A9%E5%BD%A2%22%20stroke%3D%22%23D9D9D9%22%20stroke-width%3D%220.888888889%22%3E%3C%2Fpath%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22scanning%22%20transform%3D%22translate%289.000000%2C%209.000000%29%22%20fill%3D%22%23000000%22%20fill-rule%3D%22nonzero%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cpath%20d%3D%22M5.21873562%2C9.69278114%20L6.28954184%2C10.7432953%20L2.532%2C14.5%20L5.24949999%2C14.5%20L5.24949999%2C16%20L1.5%2C16%20C0.671572876%2C16%200%2C15.3284271%200%2C14.5%20L0%2C11%20L1.5%2C11%20L1.5%2C13.41%20L5.21873562%2C9.69278114%20Z%20M10.7898541%2C9.72266777%20L14.499%2C13.431%20L14.5%2C11%20L16%2C11%20L16%2C14.5%20C16%2C15.3284271%2015.3284271%2C16%2014.5%2C16%20L10.7495%2C16%20L10.7495%2C14.5%20L13.446%2C14.5%20L9.71904783%2C10.7731819%20L10.7898541%2C9.72266777%20Z%20M14.5%2C0%20C15.3284271%2C0%2016%2C0.671572876%2016%2C1.5%20L16%2C5%20L14.5%2C5%20L14.499%2C2.588%20L10.779708%2C6.3074783%20L9.71904783%2C5.24681813%20L13.465%2C1.5%20L10.75%2C1.5%20L10.75%2C0%20L14.5%2C0%20Z%20M5.25000001%2C0%20L5.25000001%2C1.5%20L2.567%2C1.5%20L6.31400442%2C5.24681813%20L5.25334424%2C6.3074783%20L1.5%2C2.554%20L1.5%2C5%20L0%2C5%20L0%2C1.5%20C0%2C0.671572876%200.671572876%2C0%201.5%2C0%20L5.25000001%2C0%20Z%22%20id%3D%22%E5%BD%A2%E7%8A%B6%22%3E%3C%2Fpath%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%3C%2Fg%3E%3C%2Fsvg%3E";
@@ -13957,7 +13978,7 @@ var DetailWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
     return pathKey ? breadcrumbNameMap[pathKey] : undefined;
   };
   var getPageTitle = function getPageTitle(pathname) {
-    var _ref3 = localStorage.getItem(getCommonInfoKey()) && JSON.parse(localStorage.getItem('commonInfo')) || {},
+    var _ref3 = localStorage.getItem(getCommonInfoKey()) && JSON.parse(localStorage.getItem(getCommonInfoKey())) || {},
       _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, {
@@ -15726,10 +15747,6 @@ var BsSulaQueryTable = (function (props) {
     }
     var columns = props.columns;
     var columnConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.COLUMN_CONDITION);
-    var parseWidth = function parseWidth(widthStr) {
-      var parsedWidth = parseInt(widthStr.replace('px', ''));
-      return isNaN(parsedWidth) ? 0 : parsedWidth;
-    };
     var showColumns = getSettingFieldOrColumn(columnConfig, columns, 'columns');
     showColumns.forEach(function (item, index) {
       item.width = item.width || getItemDefaultWidth(item);
@@ -15749,7 +15766,7 @@ var BsSulaQueryTable = (function (props) {
       handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = function (column) {
         return _objectSpread2(_objectSpread2({}, item), {}, {
-          width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+          width: typeof column.width === 'number' ? column.width : parseWidth(column.width),
           onResize: handleResize(index)
         });
       };
@@ -15827,7 +15844,7 @@ var BsSulaQueryTable = (function (props) {
   };
   // 处理 table 基本参数
   var setTableProps = function setTableProps() {
-    var _tableProps, _tableProps$initialPa, _tableProps2, _tableProps2$initialP;
+    var _tableProps, _tableProps$initialPa, _tableProps2, _tableProps3, _tableProps3$initialP;
     var tableProps = value.tableProps || {};
     tableProps = _objectSpread2(_objectSpread2({}, tableProps), {}, {
       size: value.size || 'middle',
@@ -15855,14 +15872,14 @@ var BsSulaQueryTable = (function (props) {
       rowClassName: function rowClassName(record, index) {
         return index % 2 === 0 ? 'table_base' : 'table_odd';
       },
-      components: {
+      components: _objectSpread2({
         header: {
           cell: ResizeableTitle$2
         }
-      }
+      }, (_tableProps2 = tableProps) === null || _tableProps2 === void 0 ? void 0 : _tableProps2.components)
     });
     // @ts-ignore
-    if ((_tableProps2 = tableProps) === null || _tableProps2 === void 0 ? void 0 : (_tableProps2$initialP = _tableProps2.initialPaging) === null || _tableProps2$initialP === void 0 ? void 0 : _tableProps2$initialP.pagination) {
+    if ((_tableProps3 = tableProps) === null || _tableProps3 === void 0 ? void 0 : (_tableProps3$initialP = _tableProps3.initialPaging) === null || _tableProps3$initialP === void 0 ? void 0 : _tableProps3$initialP.pagination) {
       // @ts-ignore
       tableProps.initialPaging.pagination.showSizeChanger = true;
     }
@@ -35220,6 +35237,7 @@ exports.keyToWord = keyToWord;
 exports.memoizeOneFormatter = memoizeOneFormatter;
 exports.noEmptyArr = noEmptyArr;
 exports.paramsControl = paramsControl;
+exports.parseWidth = parseWidth;
 exports.precisionQuantity = precisionQuantity;
 exports.randomString = randomString;
 exports.readerXlsxToList = readerXlsxToList;

package/dist/utils/utils.d.ts

@@ -2,6 +2,7 @@ export declare function downloadExcel(data: any, fileName?: any, isResUrl?: bool
 export declare const formatter: (data: any, parentAuthority: any, parentName: any) => any;
 export declare const memoizeOneFormatter: import("memoize-one").MemoizedFn<(data: any, parentAuthority: any, parentName: any) => any>;
 export declare const go2BackAndClose: (backHistoryPath: any) => void;
+export declare const parseWidth: (widthStr: string) => number;
 /**
  * 处理bssulaTable的公共回显样式
  * @param col 每一具体行

package/package.json

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

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

@@ -19,7 +19,7 @@ import shezhi from '../../../assets/icon-shezhi.svg';
 import { debounce } from 'lodash';
 import ExportIcon from '@/components/Functional/ExportFunctions/ExportIcon';
 import ENUM from '@/utils/enumConfig';
-import { handleBssulaColumnsSpecialParams, uuid } from '@/utils/utils';
+import { handleBssulaColumnsSpecialParams, uuid, parseWidth } from '@/utils/utils';
 import './bssulaquerytable.less';
 import { getMenuAuthDataKey } from '@/utils/LocalstorageUtils';
 import { shouldUseAuth } from '@/utils';
@@ -265,12 +265,6 @@ const getSettingFieldOrColumn = (savedConfig, originConfig, type: string) => {
     const { columns } = props;
     let columnConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.COLUMN_CONDITION);
 
-
-    const parseWidth = (widthStr: string): number => {
-      const parsedWidth = parseInt(widthStr.replace('px', ''));
-      return isNaN(parsedWidth) ? 0 : parsedWidth;
-    }
-
     let showColumns = getSettingFieldOrColumn(columnConfig, columns, 'columns');
     
     showColumns.forEach((item, index) => {
@@ -297,10 +291,9 @@ const getSettingFieldOrColumn = (savedConfig, originConfig, type: string) => {
       handleBssulaColumnsSpecialParams(item);
       item.onHeaderCell = (column) => ({
         ...item,
-        width:
-          typeof column.width === 'number'
-            ? column.width
-            : parseInt(column.width.replace('px', '')),
+        width: typeof column.width === 'number'
+        ? column.width
+        : parseWidth(column.width),
         onResize: handleResize(index),
       });
     });
@@ -418,6 +411,7 @@ const getSettingFieldOrColumn = (savedConfig, originConfig, type: string) => {
         header: {
           cell: ResizeableTitle,
         },
+        ...tableProps?.components,
       },
     };
 

package/src/components/Business/DetailPageWrapper/index.less

@@ -26,7 +26,7 @@
 }
 .detail_page_wrapper {
   // padding-top: 51px;
-  height: calc(100vh - 80px);
+  min-height: calc(100vh - 80px);
   background-color: #FFF;
 }
 

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

@@ -92,7 +92,7 @@ const DetailWrapper = React.memo(
     };
 
     const getPageTitle = (pathname: string) => {
-      const  { hideRouteArray = [] } = localStorage.getItem(getCommonInfoKey()) && JSON.parse(localStorage.getItem('commonInfo')) || {};
+      const  { hideRouteArray = [] } = localStorage.getItem(getCommonInfoKey()) && JSON.parse(localStorage.getItem(getCommonInfoKey())) || {};
       const currRouterData = matchParamsPath(
         `${basePath}${pathname}`,
         breadcrumbNameMap,

package/src/components/Business/DetailPageWrapper/utils.tsx

@@ -147,7 +147,7 @@ export function matchRoute(path, routeObj, hideRouteObj) {
 export const getDetailMatchRoute = (path, routeObj, hideRouteArray, { pathToRegexp }) => {
   const newPath = path.split('?')[0]
   const hideRouteObj = {
-    [newPath]: hideRouteArray.find((itemRoute) => pathToRegexp(itemRoute.path).test(newPath))
+    [newPath]: Array.isArray(hideRouteArray) && hideRouteArray?.find((itemRoute) => pathToRegexp(itemRoute.path).test(newPath))
   }
   const matchedRoute = matchRoute(newPath, routeObj, hideRouteObj);
   if (matchedRoute) {

package/src/components/Business/columnSettingTable/index.md

@@ -273,6 +273,21 @@ export default () => {
         dataIndex: 'standardPrice',
         title: '标准单价',
       },
+      {
+        key: 'createUserName',
+        title: '操作人',
+      },
+      {
+        key: 'remark',
+        title: '备注',
+        textOverflow: true,
+      },
+      {
+        key: 'operator',
+        title: '操作',
+        isPermissionColumn: true,
+        fixed: 'right',
+      }
     ]
   const config = {
     modeType: 'view',

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

@@ -5,7 +5,7 @@ import ColumnSetting from './columnSetting';
 import { getItemDefaultWidth, getShowColumns, handleTextOverflow } from './utils';
 import { noEmptyArray } from './utils';
 import ENUM from '@/utils/enumConfig';
-import { handleAntdColumnsSpecialParams } from '@/utils/utils';
+import { handleAntdColumnsSpecialParams, parseWidth } from '@/utils/utils';
 const { Text } = Typography;
 export default class ColumnSettingTable extends React.Component {
   state: any;
@@ -168,10 +168,9 @@ export default class ColumnSettingTable extends React.Component {
           item.width = item.width || getItemDefaultWidth(item);
           item.onHeaderCell = (column: any) => ({
             ...item,
-            width:
-              typeof column.width === 'number'
-                ? column.width
-                : parseInt(column.width.replace('px', '')),
+            width: typeof column.width === 'number'
+            ? column.width
+            : parseWidth(column.width),
             onResize: this.handleResize(indexArrInside),
           });
         }

package/src/components/Business/columnSettingTable/sulaSettingTable.tsx

@@ -9,7 +9,7 @@ import {
   Typography,
 } from 'antd';
 import ENUM from '@/utils/enumConfig';
-import { handleBssulaColumnsSpecialParams } from '@/utils/utils';
+import { handleBssulaColumnsSpecialParams, parseWidth } from '@/utils/utils';
 const { Text } = Typography;
 export default class ColumnSettingSulaTable extends React.Component {
   sulaTableRef: React.RefObject<unknown>;
@@ -173,10 +173,9 @@ export default class ColumnSettingSulaTable extends React.Component {
           item.width = item.width || getItemDefaultWidth(item);
           item.onHeaderCell = (column: any) => ({
             ...item,
-            width:
-              typeof column.width === 'number'
-                ? column.width
-                : parseInt(column.width.replace('px', '')),
+            width: typeof column.width === 'number'
+            ? column.width
+            : parseWidth(column.width),
             onResize: this.handleResize(indexArrInside),
           });
         }

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

@@ -12,7 +12,7 @@ import { Resizable } from 'react-resizable';
 import { checkQuantityAccuracy, precisionQuantity } from '@/utils/checkUtils';
 import TableColumnSetting from '@/plugin/TableColumnSetting';
 import { setInitialShowColumn } from '@/plugin/TableColumnSetting/utils';
-import { handleAntdColumnsSpecialParams, uuid } from '@/utils/utils';
+import { handleAntdColumnsSpecialParams, uuid, parseWidth } from '@/utils/utils';
 import { judgeIsRequestError } from '@/utils/requestUtils';
 import { getItemDefaultWidth, noEmptyArray } from '@/components/Business/columnSettingTable/utils';
 import { getSelectDataList, loadSelectSource, formatFormSourceList } from './helps';
@@ -903,10 +903,9 @@ const AddSelect = (props: any) => {
         item.width = item.width || getItemDefaultWidth(item);
         item.onHeaderCell = (column: any) => ({
           ...item,
-          width:
-            typeof column.width === 'number'
-              ? column.width
-              : parseInt(column.width.replace('px', '')),
+          width: typeof column.width === 'number'
+          ? column.width
+          : parseWidth(column.width),
           onResize: handleResize(arr,indexArrInside, callback),
         });
       }

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

@@ -12,7 +12,7 @@ import { getSkuImg } from '@/utils/TableUtils';
 import TableColumnSetting from '@/plugin/TableColumnSetting';
 import { setInitialShowColumn } from '@/plugin/TableColumnSetting/utils';
 import { getItemDefaultWidth, noEmptyArray } from '@/components/Business/columnSettingTable/utils';
-import { handleAntdColumnsSpecialParams } from '@/utils/utils';
+import { handleAntdColumnsSpecialParams, parseWidth } from '@/utils/utils';
 import { judgeIsRequestSuccess, judgeIsRequestError } from '@/utils/requestUtils';
 
 const InputElement = ({
@@ -714,10 +714,9 @@ const BillEntry: React.FC = ({ onSaveCallback, validDataUrl="/items/sku/import/c
         item.width = item.width || getItemDefaultWidth(item);
         item.onHeaderCell = (column: any) => ({
           ...item,
-          width:
-            typeof column.width === 'number'
-              ? column.width
-              : parseInt(column.width.replace('px', '')),
+          width: typeof column.width === 'number'
+          ? column.width
+          : parseWidth(column.width),
           onResize: handleResize(arr,indexArrInside, callback),
         });
       }

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

@@ -656,7 +656,6 @@ class DataImport extends React.Component {
 
     const uploadProps = {
       name: 'file',
-      action: '',
       headers: {},
       accept: accept || ['.xlsx', '.xls'],
       showUploadList: false,
@@ -673,7 +672,7 @@ class DataImport extends React.Component {
           message.error(`请上传${suffixRule.toString()}等格式的文件!`);
           return Upload.LIST_IGNORE;
         }
-        return true;
+        return false; // 阻止默认上传
       },
       onChange(info) {
         if(!(sheetMap && Object.keys(sheetMap)?.length)) return;

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

@@ -426,7 +426,8 @@ class DataValidation extends React.Component {
     const resultData = this.getData().filter(d => {
       return _.compact(Object.values(d)).length
     })
-    const resultColumns = customerColumnsMapping?.length? customerColumnsMapping?.filter((c: any) => !c?.name)?.map((c: any) => c.name) : columns
+
+    const resultColumns = customerColumnsMapping?.length? customerColumnsMapping?.filter((c: any) => !!c?.name)?.map((c: any) => c.name) : columns
 
     // 处理业务参数
     let otherParams={}
@@ -660,7 +661,6 @@ class DataValidation extends React.Component {
 
     const uploadProps = {
       name: 'file',
-      action: '',
       headers: {},
       accept: accept || ['.xlsx', '.xls'],
       showUploadList: false,
@@ -677,7 +677,7 @@ class DataValidation extends React.Component {
           message.error(`请上传${suffixRule.toString()}等格式的文件!`);
           return Upload.LIST_IGNORE;
         }
-        return true;
+        return false; // 阻止默认上传
       },
       onChange(info) {
         if(!(sheetMap && Object.keys(sheetMap)?.length)) return;

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

@@ -563,11 +563,18 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   }
 
   const onChangeCheckAll = (e) => {
+    // 允许用户自定义 全选操作逻辑
+    if(modalTableProps?.onCheckAll) {
+      modalTableProps?.onCheckAll(e,{items,itemsTotal,tablePagination,onCheckAllData,setSelectedRowKeys,setPopValue,setSelectedRows,setIndeterminate,setCheckedAll})
+      return;
+    }
+
     if (e.target.checked) {
       // 如果下拉框有所有数据就处理选中所有【items.length === itemsTotal】(最多可选100条)
       // 如果超过100条 就默认查出所有数据
-      if (items.length < itemsTotal) {
-        const totalPage = Math.ceil(itemsTotal / tablePagination?.pageSize);
+      if ((items.length < itemsTotal) || (items.length === itemsTotal && itemsTotal == 0)) {
+        const totalCount = tablePagination?.total || itemsTotal // 兼容有查询条件的情况 首次加载是没有所有数据的，默认给加载后端返回的总条数
+        const totalPage = Math.ceil(totalCount / tablePagination?.pageSize);
         const allPageSize = totalPage * tablePagination?.pageSize;
         onCheckAllData(allPageSize)
       } else {
@@ -1009,7 +1016,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                     };
                   }}
                 />
-                {selectMode ? (
+                {(selectMode && !modalTableProps?.isHiddenCheckAll) ? (
                   <div className={'select_list_selectAll'}>
                     <Checkbox
                       indeterminate={indeterminate}

package/src/utils/utils.ts

@@ -70,6 +70,11 @@ export const go2BackAndClose = (backHistoryPath) => {
   }
 }
 
+export const parseWidth = (widthStr: string): number => {
+  const parsedWidth = parseInt(widthStr.replace('px', ''));
+  return isNaN(parsedWidth) ? 0 : parsedWidth;
+}
+
 /**
  * 处理bssulaTable的公共回显样式
  * @param col 每一具体行
@@ -83,7 +88,8 @@ export const handleBssulaColumnsSpecialParams = (col: any) => {
     col.render = ({ text }: any) => handleTooltip(text, col.timeRender);
   } else if (col.textOverflow) {
     // 处理文字太长
-    col.render = ({ text }: any) => handleTextOverflow(text, col.width);
+    const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width))
+    col.render = ({ text }: any) => handleTextOverflow(text, colWidth);
   } else if (col.images) {
     col.render = ({ text }: any) => tableColumnsImage(text);
   } else if (col.double) {
@@ -117,7 +123,8 @@ export const handleBssulaColumnsSpecialParams = (col: any) => {
   }
   // 处理文字太长
   if (col.textOverflow) {
-    col.render = (text: any) => handleTextOverflow(text);
+    const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width))
+    col.render = (text: any) => handleTextOverflow(text,colWidth);
   }
   if (col.images) {
     col.render = (text: any) => tableColumnsImage(text);

package/src/utils/xlsxUtil.tsx

@@ -76,8 +76,8 @@ export const readerXlsxToList = async(file: any, fileList: any, uploadRef?: any,
   const { callback, sheetMap } = otherInfo||{};
   
 	if (Array.isArray(fileList) && fileList.length > 0) {
-		
-		const data2: any = await resolveFile(file.originFileObj,{ sheetMap: fieldMappingReverse(sheetMap),sheetCount:1 });
+    const nowFile = fileList[fileList.length - 1]; // 阻止了默认上传file没有originFileObj了 得从fileList中去取
+		const data2: any = await resolveFile(nowFile.originFileObj,{ sheetMap: fieldMappingReverse(sheetMap),sheetCount:1 });
 		const data = data2[0]
 
 		if(!data.length){