@bit-sun/business-component 2.0.10 → 2.0.13

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import 'antd/dist/antd.css';
 import './utils/requestUtils';
 export { default as DataValidation } from './components/Functional/DataValidation';
 export { default as DataImport } from './components/Functional/DataImport';

package/dist/index.esm.js

@@ -1,4 +1,3 @@
-import 'antd/dist/antd.css';
 import axios from 'axios';
 import React, { createContext, useContext, useEffect, forwardRef, createElement, useState, useRef, useMemo } from 'react';
 import { message, Menu, Space, Dropdown, Tooltip, Button, Checkbox, Input, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, InputNumber, Popover } from 'antd';
@@ -7,6 +6,7 @@ import classNames from 'classnames';
 import _ from 'loadsh';
 import { useDebounceFn } from 'ahooks';
 import { stringify } from 'querystring';
+import { Resizable } from 'react-resizable';
 
 var resposne = JSON.parse(localStorage.getItem('userInfo') || '{}');
 function handleRequestAuthHeader(config) {
@@ -4430,9 +4430,11 @@ var SearchSelect = function SearchSelect(props) {
   }), " \u5168\u9009\u6240\u6709\u9875\u9762") : '')))));
 };
 
-var css_248z$4 = ".add_select_show {\n  display: flex;\n}\n.add_select_expand_button {\n  position: relative;\n  width: 30px;\n  color: #ffffff;\n  cursor: pointer;\n}\n.add_select_expand_button span {\n  position: absolute;\n  height: 20px;\n  line-height: 14px;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.add_select_header {\n  border-bottom: 1px solid #D9D9D9;\n  height: 24px;\n  height: 40px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 40px;\n  margin-bottom: 10px;\n  padding-left: 10px;\n}\n.add_select_header > span {\n  margin-left: 20px;\n  font-weight: 400;\n  font-size: 12px;\n  color: #666666;\n  letter-spacing: 0;\n  line-height: 40px;\n}\n.add_select_header > span > span {\n  color: #ff0000;\n}\n.add_select_header_close span {\n  position: absolute;\n  color: black !important;\n  right: 10px;\n  top: 10px;\n}\n.add_select_quick_header {\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.add_select_quick_header_title {\n  display: flex;\n  justify-content: space-between;\n}\n.add_select_quick_header > span {\n  font-weight: 400;\n  font-size: 12px;\n  color: #666666;\n  letter-spacing: 0;\n  line-height: 20px;\n}\n.add_select_quick_header > span > span {\n  color: #ff0000;\n}\n.add_select_quick_header_close span {\n  position: absolute;\n  color: black !important;\n  right: 10px;\n  top: 10px;\n}\n.add_select_wrapper {\n  position: relative;\n  display: flex;\n  max-height: 60vh;\n  overflow: hidden;\n  font-size: 14px;\n  margin: 5px 10px;\n}\n.add_select_wrapper .ant-table-pagination.ant-pagination {\n  margin: 5px;\n  padding-right: 5px;\n}\n.add_select_wrapper .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.add_select_wrapper .ant-form-item-label {\n  padding: 0PX;\n  line-height: 23px !important;\n}\n.add_select_wrapper .ant-form-item-label > label {\n  font-size: 12px;\n}\n.add_select_wrapper .ant-table-thead th {\n  height: 20px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper .row-class {\n  height: 24px;\n}\n.add_select_wrapper .row-class td {\n  font-size: 12px !important;\n  height: 24px !important;\n  padding: 0px 8px !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-table-body {\n  height: 240px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_click_flag {\n  position: absolute;\n  z-index: 10;\n}\n.add_select_wrapper_click_flag_arrow {\n  transform: rotate(0deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_click_flag_arrow_1 {\n  transform: rotate(-180deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_left {\n  flex-basis: 298px;\n  width: 298px;\n  overflow-y: hidden;\n  transition: all 0.3s;\n  margin-right: 10px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_left1 {\n  width: 0;\n  height: 0;\n  transition: all 0.3s;\n  display: none;\n}\n.add_select_wrapper_right {\n  width: 872px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_right1 {\n  width: 100%;\n  margin-left: 10px;\n}\n.add_select_wrapper_right,\n.add_select_wrapper_right1 {\n  overflow-x: auto;\n}\n.add_select_wrapper .select_list_columns {\n  height: 272px;\n  overflow-y: auto;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_columns_tips {\n  background: #eee;\n  padding: 6px 20px;\n  margin-bottom: 10px;\n}\n.add_select_wrapper .select_list_columns_formItems {\n  padding: 7px 10px;\n}\n.add_select_wrapper .select_list_searchButton {\n  display: flex;\n  margin: 10px;\n  justify-content: flex-end;\n}\n.add_select_wrapper .select_list_button_space {\n  margin-right: 10px;\n}\n.add_select_wrapper .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 5px;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_selectAll {\n  position: relative;\n  top: -40px;\n  left: 20px;\n  width: 160px;\n}\n.add_select_wrapper_select {\n  margin-top: 4px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n  margin: 5px 10px;\n}\n.add_select_wrapper_select .ant-table-pagination.ant-pagination {\n  margin: 9px;\n  padding-right: 5px;\n}\n.add_select_wrapper_select .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper_select .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper_select .ant-table-thead th {\n  height: 23px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 23px !important;\n}\n.add_select_wrapper_select .ant-modal-close-x {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class td {\n  font-size: 12px !important;\n  height: 30px !important;\n  padding: 4px 8px !important;\n}\n.add_select_wrapper_select .ant-table-body {\n  height: 200px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper_select .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_select .ant-input-number-input,\n.add_select_wrapper_select .ant-input {\n  height: auto;\n  height: 22px;\n  padding: 0px 10px;\n  font-size: 12px;\n}\n.add_select_wrapper_select .ant-select-selection-search-input {\n  height: auto;\n  height: 22px !important;\n  padding: 0px 10px;\n  font-size: 12px;\n}\n.add_select_wrapper_select .ant-select .ant-select-arrow {\n  top: 13px;\n}\n.add_select_wrapper_select .ant-select-selector {\n  position: relative;\n  top: 1px;\n  height: 23px  !important;\n  line-height: 23px  !important;\n}\n.add_select_wrapper_select .ant-select-selector .ant-select-selection-item,\n.add_select_wrapper_select .ant-select-selector ant-select-selection-search {\n  height: 23px !important;\n  line-height: 23px !important;\n  font-size: 12px;\n}\n.add_select_wrapper_select .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 3px;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper_select_quick {\n  margin: 0;\n}\n";
+var css_248z$4 = ".add_select_show {\n  display: flex;\n}\n.add_select_expand_button {\n  position: relative;\n  width: 30px;\n  color: #ffffff;\n  cursor: pointer;\n}\n.add_select_expand_button span {\n  position: absolute;\n  height: 20px;\n  line-height: 14px;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.add_select_header {\n  border-bottom: 1px solid #D9D9D9;\n  height: 24px;\n  height: 40px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 40px;\n  margin-bottom: 10px;\n  padding-left: 10px;\n}\n.add_select_header > span {\n  margin-left: 20px;\n  font-weight: 400;\n  font-size: 12px;\n  color: #666666;\n  letter-spacing: 0;\n  line-height: 40px;\n}\n.add_select_header > span > span {\n  color: #ff0000;\n}\n.add_select_header_close span {\n  position: absolute;\n  color: black !important;\n  right: 10px;\n  top: 10px;\n}\n.add_select_quick_header {\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.add_select_quick_header_title {\n  display: flex;\n  justify-content: space-between;\n}\n.add_select_quick_header > span {\n  font-weight: 400;\n  font-size: 12px;\n  color: #666666;\n  letter-spacing: 0;\n  line-height: 20px;\n}\n.add_select_quick_header > span > span {\n  color: #ff0000;\n}\n.add_select_quick_header_close span {\n  position: absolute;\n  color: black !important;\n  right: 10px;\n  top: 10px;\n}\n.add_select_wrapper {\n  position: relative;\n  display: flex;\n  max-height: 60vh;\n  overflow: hidden;\n  font-size: 14px;\n  margin: 5px 10px;\n}\n.add_select_wrapper .ant-table-pagination.ant-pagination {\n  margin: 5px;\n  padding-right: 5px;\n}\n.add_select_wrapper .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.add_select_wrapper .ant-form-item-label {\n  padding: 0PX;\n  line-height: 23px !important;\n}\n.add_select_wrapper .ant-form-item-label > label {\n  font-size: 12px;\n}\n.add_select_wrapper .ant-table-thead th {\n  height: 20px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper .row-class {\n  height: 24px;\n}\n.add_select_wrapper .row-class td {\n  font-size: 12px !important;\n  height: 24px !important;\n  padding: 0px 8px !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-table-body {\n  height: 240px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_click_flag {\n  position: absolute;\n  z-index: 10;\n}\n.add_select_wrapper_click_flag_arrow {\n  transform: rotate(0deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_click_flag_arrow_1 {\n  transform: rotate(-180deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_left {\n  flex-basis: 298px;\n  width: 298px;\n  overflow-y: hidden;\n  transition: all 0.3s;\n  margin-right: 10px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_left1 {\n  width: 0;\n  height: 0;\n  transition: all 0.3s;\n  display: none;\n}\n.add_select_wrapper_right {\n  width: 872px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_right1 {\n  width: 100%;\n  margin-left: 10px;\n}\n.add_select_wrapper_right,\n.add_select_wrapper_right1 {\n  overflow-x: auto;\n}\n.add_select_wrapper .select_list_columns {\n  height: 272px;\n  overflow-y: auto;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_columns_tips {\n  background: #eee;\n  padding: 6px 20px;\n  margin-bottom: 10px;\n}\n.add_select_wrapper .select_list_columns_formItems {\n  padding: 7px 10px;\n}\n.add_select_wrapper .select_list_searchButton {\n  display: flex;\n  margin: 10px;\n  justify-content: flex-end;\n}\n.add_select_wrapper .select_list_button_space {\n  margin-right: 10px;\n}\n.add_select_wrapper .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 5px;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_selectAll {\n  position: relative;\n  top: -40px;\n  left: 20px;\n  width: 160px;\n}\n.add_select_wrapper_select {\n  margin-top: 4px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n  margin: 5px 10px;\n}\n.add_select_wrapper_select .ant-table-pagination.ant-pagination {\n  margin: 9px;\n  padding-right: 5px;\n}\n.add_select_wrapper_select .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper_select .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper_select .ant-table-thead th {\n  height: 23px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 23px !important;\n}\n.add_select_wrapper_select .ant-modal-close-x {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class td {\n  font-size: 12px !important;\n  height: 30px !important;\n  padding: 4px 8px !important;\n}\n.add_select_wrapper_select .ant-table-body {\n  height: 200px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper_select .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_select .ant-input-number-input,\n.add_select_wrapper_select .ant-input {\n  height: auto;\n  height: 22px;\n  padding: 0px 10px;\n  font-size: 12px;\n}\n.add_select_wrapper_select .ant-select-selection-search-input {\n  height: auto;\n  height: 22px !important;\n  padding: 0px 10px;\n  font-size: 12px;\n}\n.add_select_wrapper_select .ant-select .ant-select-arrow {\n  top: 13px;\n}\n.add_select_wrapper_select .ant-select-selector {\n  position: relative;\n  top: 1px;\n  height: 23px  !important;\n  line-height: 23px  !important;\n}\n.add_select_wrapper_select .ant-select-selector .ant-select-selection-item,\n.add_select_wrapper_select .ant-select-selector ant-select-selection-search {\n  height: 23px !important;\n  line-height: 23px !important;\n  font-size: 12px;\n}\n.add_select_wrapper_select .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 3px;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper_select_quick {\n  margin: 0;\n}\n.react-resizable {\n  position: relative;\n  background-clip: padding-box;\n}\n.react-resizable-handle {\n  position: absolute;\n  width: 10px;\n  height: 100%;\n  bottom: 0;\n  right: -5px;\n  cursor: col-resize;\n  z-index: 1;\n}\n";
 styleInject(css_248z$4);
 
+var _excluded$4 = ["onResize", "width"];
+
 var loadSelectSource = function loadSelectSource(url, params) {
   return new Promise(function (resolve, reject) {
     axios.get("".concat(url, "?").concat(stringify(params))).then(function (result) {
@@ -4452,6 +4454,25 @@ var loadSelectSource = function loadSelectSource(url, params) {
   });
 };
 
+var ResizeableTitle = function ResizeableTitle(props) {
+  var onResize = props.onResize,
+      width = props.width,
+      restProps = _objectWithoutProperties(props, _excluded$4);
+
+  if (!width) {
+    return /*#__PURE__*/React.createElement("th", _objectSpread2({}, restProps));
+  }
+
+  return /*#__PURE__*/React.createElement(Resizable, {
+    width: width,
+    height: 0,
+    onResize: onResize,
+    draggableOpts: {
+      enableUserSelectHack: false
+    }
+  }, /*#__PURE__*/React.createElement("th", _objectSpread2({}, restProps)));
+};
+
 var formatSource = function formatSource(reData, position, changePosition, changeSearchForm) {
   var _reData$position;
 
@@ -4667,8 +4688,26 @@ var AddSelect = function AddSelect(props) {
   var _useState33 = useState({}),
       _useState34 = _slicedToArray(_useState33, 2),
       tableFormParams = _useState34[0],
-      setTableFormParams = _useState34[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
+      setTableFormParams = _useState34[1];
 
+  var _useState35 = useState([]),
+      _useState36 = _slicedToArray(_useState35, 2),
+      tableColumns = _useState36[0],
+      setTableColumns = _useState36[1];
+
+  useEffect(function () {
+    setTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns.map(function (item, index) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        width: item.width || 200,
+        onHeaderCell: function onHeaderCell(column) {
+          return _objectSpread2(_objectSpread2({}, item), {}, {
+            width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+            onResize: handleResize(index)
+          });
+        }
+      });
+    }));
+  }, [modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns]); // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
 
   var getData = function getData() {
     var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -5192,7 +5231,7 @@ var AddSelect = function AddSelect(props) {
           if (record.needFocus === true && currentIndex === 0) ;
 
           return /*#__PURE__*/React.createElement(InputNumber, {
-            defaultValue: text || 0,
+            defaultValue: text || '',
             min: 0,
             autoFocus: record.needFocus,
             keyboard: false,
@@ -5331,6 +5370,21 @@ var AddSelect = function AddSelect(props) {
       }, "\u5220\u9664");
     }
   }]);
+
+  var handleResize = function handleResize(index) {
+    return function (e, _ref4) {
+      var size = _ref4.size;
+      setTableColumns(function (columns) {
+        var newColumns = _toConsumableArray(columns);
+
+        newColumns[index] = _objectSpread2(_objectSpread2({}, newColumns[index]), {}, {
+          width: size.width
+        });
+        return _toConsumableArray(newColumns);
+      });
+    };
+  };
+
   return /*#__PURE__*/React.createElement("div", {
     className: 'add_select'
   }, /*#__PURE__*/React.createElement("div", {
@@ -5419,7 +5473,7 @@ var AddSelect = function AddSelect(props) {
   }, (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) || 0), "\xA0\u9879") : '')), /*#__PURE__*/React.createElement(Table, {
     size: 'small',
     rowSelection: rowSelection,
-    columns: _toConsumableArray(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns),
+    columns: tableColumns,
     dataSource: tableData,
     pagination: tablePagination,
     loading: fetching,
@@ -5428,6 +5482,11 @@ var AddSelect = function AddSelect(props) {
     rowClassName: 'row-class',
     scroll: {
       y: 500
+    },
+    components: {
+      header: {
+        cell: ResizeableTitle
+      }
     }
   })))), /*#__PURE__*/React.createElement("div", {
     className: 'add_select_wrapper_select'
@@ -5876,7 +5935,7 @@ var InputElement = function InputElement(_ref) {
   }) : /*#__PURE__*/React.createElement(InputNumber // onBlur={() => {updateHoverVisibled(false)}}
   , {
     // onBlur={() => {updateHoverVisibled(false)}}
-    defaultValue: text || 0,
+    defaultValue: text || '',
     min: 0,
     keyboard: false,
     onChange: function onChange(value) {
@@ -6020,41 +6079,12 @@ var BillEntry = function BillEntry(_ref3) {
     width: 100,
     isSelectItem: true,
     render: function render(text, record) {
-      var baseUnitCode = '';
-
-      if (record === null || record === void 0 ? void 0 : record.packingUnitList) {
-        var base = record.packingUnitList.filter(function (item) {
-          return item.unitCode;
-        });
-
-        if (base.length) {
-          var _base$;
-
-          baseUnitCode = base[0].unitCode;
-          record.selectUnitCode = base[0].unitCode;
-          record.selectedScale = ((_base$ = base[0]) === null || _base$ === void 0 ? void 0 : _base$.baseUnitScale) || 1;
-        }
-      }
-
-      if (baseUnitCode) {
-        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Select, {
-          defaultValue: baseUnitCode,
-          onChange: function onChange(value) {
-            var _record$packingUnitLi, _record$packingUnitLi2;
+      var _record$packingUnitLi;
 
-            record.selectUnitCode = value;
-            record.selectedScale = (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : (_record$packingUnitLi2 = _record$packingUnitLi.find(function (item) {
-              return item.unitCode === value;
-            })) === null || _record$packingUnitLi2 === void 0 ? void 0 : _record$packingUnitLi2.baseUnitScale) || 1;
-          },
-          style: {
-            width: '60px'
-          }
-        }, record.packingUnitList && record.packingUnitList.map(function (item) {
-          return /*#__PURE__*/React.createElement(Select.Option, {
-            value: item.unitCode
-          }, item.name);
-        })));
+      if (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : _record$packingUnitLi.length) {
+        var basePackUnit = record === null || record === void 0 ? void 0 : record.packingUnitList[0];
+        record.selectUnitCode = basePackUnit.unitCode;
+        return basePackUnit.name || basePackUnit.unitCode;
       }
 
       return /*#__PURE__*/React.createElement(React.Fragment, null);
@@ -8232,41 +8262,12 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
         showTitle: false
       },
       render: function render(text, record) {
-        var baseUnitCode = '';
+        var _record$packingUnitLi;
 
-        if (record === null || record === void 0 ? void 0 : record.packingUnitList) {
-          var base = record.packingUnitList.filter(function (item) {
-            return item.unitCode;
-          });
-
-          if (base.length) {
-            var _base$;
-
-            baseUnitCode = base[0].unitCode;
-            record.selectUnitCode = base[0].unitCode;
-            record.selectedScale = ((_base$ = base[0]) === null || _base$ === void 0 ? void 0 : _base$.baseUnitScale) || 1;
-          }
-        }
-
-        if (baseUnitCode) {
-          return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Select, {
-            defaultValue: baseUnitCode,
-            onChange: function onChange(value) {
-              var _record$packingUnitLi, _record$packingUnitLi2;
-
-              record.selectUnitCode = value;
-              record.selectedScale = (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : (_record$packingUnitLi2 = _record$packingUnitLi.find(function (item) {
-                return item.unitCode === value;
-              })) === null || _record$packingUnitLi2 === void 0 ? void 0 : _record$packingUnitLi2.baseUnitScale) || 1;
-            },
-            style: {
-              width: '60px'
-            }
-          }, record.packingUnitList && record.packingUnitList.map(function (item) {
-            return /*#__PURE__*/React.createElement(Select.Option, {
-              value: item.unitCode
-            }, item.name);
-          })));
+        if (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : _record$packingUnitLi.length) {
+          var basePackUnit = record === null || record === void 0 ? void 0 : record.packingUnitList[0];
+          record.selectUnitCode = basePackUnit.unitCode;
+          return basePackUnit.name || basePackUnit.unitCode;
         }
 
         return /*#__PURE__*/React.createElement(React.Fragment, null);

package/dist/index.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('antd/dist/antd.css');
 var axios = require('axios');
 var React = require('react');
 var antd = require('antd');
@@ -11,6 +10,7 @@ var classNames = require('classnames');
 var _ = require('loadsh');
 var ahooks = require('ahooks');
 var querystring = require('querystring');
+var reactResizable = require('react-resizable');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -4441,9 +4441,11 @@ var SearchSelect = function SearchSelect(props) {
   }), " \u5168\u9009\u6240\u6709\u9875\u9762") : '')))));
 };
 
-var css_248z$4 = ".add_select_show {\n  display: flex;\n}\n.add_select_expand_button {\n  position: relative;\n  width: 30px;\n  color: #ffffff;\n  cursor: pointer;\n}\n.add_select_expand_button span {\n  position: absolute;\n  height: 20px;\n  line-height: 14px;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.add_select_header {\n  border-bottom: 1px solid #D9D9D9;\n  height: 24px;\n  height: 40px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 40px;\n  margin-bottom: 10px;\n  padding-left: 10px;\n}\n.add_select_header > span {\n  margin-left: 20px;\n  font-weight: 400;\n  font-size: 12px;\n  color: #666666;\n  letter-spacing: 0;\n  line-height: 40px;\n}\n.add_select_header > span > span {\n  color: #ff0000;\n}\n.add_select_header_close span {\n  position: absolute;\n  color: black !important;\n  right: 10px;\n  top: 10px;\n}\n.add_select_quick_header {\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.add_select_quick_header_title {\n  display: flex;\n  justify-content: space-between;\n}\n.add_select_quick_header > span {\n  font-weight: 400;\n  font-size: 12px;\n  color: #666666;\n  letter-spacing: 0;\n  line-height: 20px;\n}\n.add_select_quick_header > span > span {\n  color: #ff0000;\n}\n.add_select_quick_header_close span {\n  position: absolute;\n  color: black !important;\n  right: 10px;\n  top: 10px;\n}\n.add_select_wrapper {\n  position: relative;\n  display: flex;\n  max-height: 60vh;\n  overflow: hidden;\n  font-size: 14px;\n  margin: 5px 10px;\n}\n.add_select_wrapper .ant-table-pagination.ant-pagination {\n  margin: 5px;\n  padding-right: 5px;\n}\n.add_select_wrapper .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.add_select_wrapper .ant-form-item-label {\n  padding: 0PX;\n  line-height: 23px !important;\n}\n.add_select_wrapper .ant-form-item-label > label {\n  font-size: 12px;\n}\n.add_select_wrapper .ant-table-thead th {\n  height: 20px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper .row-class {\n  height: 24px;\n}\n.add_select_wrapper .row-class td {\n  font-size: 12px !important;\n  height: 24px !important;\n  padding: 0px 8px !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-table-body {\n  height: 240px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_click_flag {\n  position: absolute;\n  z-index: 10;\n}\n.add_select_wrapper_click_flag_arrow {\n  transform: rotate(0deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_click_flag_arrow_1 {\n  transform: rotate(-180deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_left {\n  flex-basis: 298px;\n  width: 298px;\n  overflow-y: hidden;\n  transition: all 0.3s;\n  margin-right: 10px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_left1 {\n  width: 0;\n  height: 0;\n  transition: all 0.3s;\n  display: none;\n}\n.add_select_wrapper_right {\n  width: 872px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_right1 {\n  width: 100%;\n  margin-left: 10px;\n}\n.add_select_wrapper_right,\n.add_select_wrapper_right1 {\n  overflow-x: auto;\n}\n.add_select_wrapper .select_list_columns {\n  height: 272px;\n  overflow-y: auto;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_columns_tips {\n  background: #eee;\n  padding: 6px 20px;\n  margin-bottom: 10px;\n}\n.add_select_wrapper .select_list_columns_formItems {\n  padding: 7px 10px;\n}\n.add_select_wrapper .select_list_searchButton {\n  display: flex;\n  margin: 10px;\n  justify-content: flex-end;\n}\n.add_select_wrapper .select_list_button_space {\n  margin-right: 10px;\n}\n.add_select_wrapper .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 5px;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_selectAll {\n  position: relative;\n  top: -40px;\n  left: 20px;\n  width: 160px;\n}\n.add_select_wrapper_select {\n  margin-top: 4px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n  margin: 5px 10px;\n}\n.add_select_wrapper_select .ant-table-pagination.ant-pagination {\n  margin: 9px;\n  padding-right: 5px;\n}\n.add_select_wrapper_select .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper_select .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper_select .ant-table-thead th {\n  height: 23px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 23px !important;\n}\n.add_select_wrapper_select .ant-modal-close-x {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class td {\n  font-size: 12px !important;\n  height: 30px !important;\n  padding: 4px 8px !important;\n}\n.add_select_wrapper_select .ant-table-body {\n  height: 200px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper_select .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_select .ant-input-number-input,\n.add_select_wrapper_select .ant-input {\n  height: auto;\n  height: 22px;\n  padding: 0px 10px;\n  font-size: 12px;\n}\n.add_select_wrapper_select .ant-select-selection-search-input {\n  height: auto;\n  height: 22px !important;\n  padding: 0px 10px;\n  font-size: 12px;\n}\n.add_select_wrapper_select .ant-select .ant-select-arrow {\n  top: 13px;\n}\n.add_select_wrapper_select .ant-select-selector {\n  position: relative;\n  top: 1px;\n  height: 23px  !important;\n  line-height: 23px  !important;\n}\n.add_select_wrapper_select .ant-select-selector .ant-select-selection-item,\n.add_select_wrapper_select .ant-select-selector ant-select-selection-search {\n  height: 23px !important;\n  line-height: 23px !important;\n  font-size: 12px;\n}\n.add_select_wrapper_select .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 3px;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper_select_quick {\n  margin: 0;\n}\n";
+var css_248z$4 = ".add_select_show {\n  display: flex;\n}\n.add_select_expand_button {\n  position: relative;\n  width: 30px;\n  color: #ffffff;\n  cursor: pointer;\n}\n.add_select_expand_button span {\n  position: absolute;\n  height: 20px;\n  line-height: 14px;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.add_select_header {\n  border-bottom: 1px solid #D9D9D9;\n  height: 24px;\n  height: 40px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 40px;\n  margin-bottom: 10px;\n  padding-left: 10px;\n}\n.add_select_header > span {\n  margin-left: 20px;\n  font-weight: 400;\n  font-size: 12px;\n  color: #666666;\n  letter-spacing: 0;\n  line-height: 40px;\n}\n.add_select_header > span > span {\n  color: #ff0000;\n}\n.add_select_header_close span {\n  position: absolute;\n  color: black !important;\n  right: 10px;\n  top: 10px;\n}\n.add_select_quick_header {\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.add_select_quick_header_title {\n  display: flex;\n  justify-content: space-between;\n}\n.add_select_quick_header > span {\n  font-weight: 400;\n  font-size: 12px;\n  color: #666666;\n  letter-spacing: 0;\n  line-height: 20px;\n}\n.add_select_quick_header > span > span {\n  color: #ff0000;\n}\n.add_select_quick_header_close span {\n  position: absolute;\n  color: black !important;\n  right: 10px;\n  top: 10px;\n}\n.add_select_wrapper {\n  position: relative;\n  display: flex;\n  max-height: 60vh;\n  overflow: hidden;\n  font-size: 14px;\n  margin: 5px 10px;\n}\n.add_select_wrapper .ant-table-pagination.ant-pagination {\n  margin: 5px;\n  padding-right: 5px;\n}\n.add_select_wrapper .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.add_select_wrapper .ant-form-item-label {\n  padding: 0PX;\n  line-height: 23px !important;\n}\n.add_select_wrapper .ant-form-item-label > label {\n  font-size: 12px;\n}\n.add_select_wrapper .ant-table-thead th {\n  height: 20px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper .row-class {\n  height: 24px;\n}\n.add_select_wrapper .row-class td {\n  font-size: 12px !important;\n  height: 24px !important;\n  padding: 0px 8px !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-table-body {\n  height: 240px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_click_flag {\n  position: absolute;\n  z-index: 10;\n}\n.add_select_wrapper_click_flag_arrow {\n  transform: rotate(0deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_click_flag_arrow_1 {\n  transform: rotate(-180deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_left {\n  flex-basis: 298px;\n  width: 298px;\n  overflow-y: hidden;\n  transition: all 0.3s;\n  margin-right: 10px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_left1 {\n  width: 0;\n  height: 0;\n  transition: all 0.3s;\n  display: none;\n}\n.add_select_wrapper_right {\n  width: 872px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_right1 {\n  width: 100%;\n  margin-left: 10px;\n}\n.add_select_wrapper_right,\n.add_select_wrapper_right1 {\n  overflow-x: auto;\n}\n.add_select_wrapper .select_list_columns {\n  height: 272px;\n  overflow-y: auto;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_columns_tips {\n  background: #eee;\n  padding: 6px 20px;\n  margin-bottom: 10px;\n}\n.add_select_wrapper .select_list_columns_formItems {\n  padding: 7px 10px;\n}\n.add_select_wrapper .select_list_searchButton {\n  display: flex;\n  margin: 10px;\n  justify-content: flex-end;\n}\n.add_select_wrapper .select_list_button_space {\n  margin-right: 10px;\n}\n.add_select_wrapper .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 5px;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_selectAll {\n  position: relative;\n  top: -40px;\n  left: 20px;\n  width: 160px;\n}\n.add_select_wrapper_select {\n  margin-top: 4px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n  margin: 5px 10px;\n}\n.add_select_wrapper_select .ant-table-pagination.ant-pagination {\n  margin: 9px;\n  padding-right: 5px;\n}\n.add_select_wrapper_select .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper_select .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper_select .ant-table-thead th {\n  height: 23px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 23px !important;\n}\n.add_select_wrapper_select .ant-modal-close-x {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class td {\n  font-size: 12px !important;\n  height: 30px !important;\n  padding: 4px 8px !important;\n}\n.add_select_wrapper_select .ant-table-body {\n  height: 200px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper_select .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_select .ant-input-number-input,\n.add_select_wrapper_select .ant-input {\n  height: auto;\n  height: 22px;\n  padding: 0px 10px;\n  font-size: 12px;\n}\n.add_select_wrapper_select .ant-select-selection-search-input {\n  height: auto;\n  height: 22px !important;\n  padding: 0px 10px;\n  font-size: 12px;\n}\n.add_select_wrapper_select .ant-select .ant-select-arrow {\n  top: 13px;\n}\n.add_select_wrapper_select .ant-select-selector {\n  position: relative;\n  top: 1px;\n  height: 23px  !important;\n  line-height: 23px  !important;\n}\n.add_select_wrapper_select .ant-select-selector .ant-select-selection-item,\n.add_select_wrapper_select .ant-select-selector ant-select-selection-search {\n  height: 23px !important;\n  line-height: 23px !important;\n  font-size: 12px;\n}\n.add_select_wrapper_select .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 3px;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper_select_quick {\n  margin: 0;\n}\n.react-resizable {\n  position: relative;\n  background-clip: padding-box;\n}\n.react-resizable-handle {\n  position: absolute;\n  width: 10px;\n  height: 100%;\n  bottom: 0;\n  right: -5px;\n  cursor: col-resize;\n  z-index: 1;\n}\n";
 styleInject(css_248z$4);
 
+var _excluded$4 = ["onResize", "width"];
+
 var loadSelectSource = function loadSelectSource(url, params) {
   return new Promise(function (resolve, reject) {
     axios__default['default'].get("".concat(url, "?").concat(querystring.stringify(params))).then(function (result) {
@@ -4463,6 +4465,25 @@ var loadSelectSource = function loadSelectSource(url, params) {
   });
 };
 
+var ResizeableTitle = function ResizeableTitle(props) {
+  var onResize = props.onResize,
+      width = props.width,
+      restProps = _objectWithoutProperties(props, _excluded$4);
+
+  if (!width) {
+    return /*#__PURE__*/React__default['default'].createElement("th", _objectSpread2({}, restProps));
+  }
+
+  return /*#__PURE__*/React__default['default'].createElement(reactResizable.Resizable, {
+    width: width,
+    height: 0,
+    onResize: onResize,
+    draggableOpts: {
+      enableUserSelectHack: false
+    }
+  }, /*#__PURE__*/React__default['default'].createElement("th", _objectSpread2({}, restProps)));
+};
+
 var formatSource = function formatSource(reData, position, changePosition, changeSearchForm) {
   var _reData$position;
 
@@ -4678,8 +4699,26 @@ var AddSelect = function AddSelect(props) {
   var _useState33 = React.useState({}),
       _useState34 = _slicedToArray(_useState33, 2),
       tableFormParams = _useState34[0],
-      setTableFormParams = _useState34[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
+      setTableFormParams = _useState34[1];
 
+  var _useState35 = React.useState([]),
+      _useState36 = _slicedToArray(_useState35, 2),
+      tableColumns = _useState36[0],
+      setTableColumns = _useState36[1];
+
+  React.useEffect(function () {
+    setTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns.map(function (item, index) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        width: item.width || 200,
+        onHeaderCell: function onHeaderCell(column) {
+          return _objectSpread2(_objectSpread2({}, item), {}, {
+            width: typeof column.width === 'number' ? column.width : parseInt(column.width.replace('px', '')),
+            onResize: handleResize(index)
+          });
+        }
+      });
+    }));
+  }, [modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns]); // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
 
   var getData = function getData() {
     var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -5203,7 +5242,7 @@ var AddSelect = function AddSelect(props) {
           if (record.needFocus === true && currentIndex === 0) ;
 
           return /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
-            defaultValue: text || 0,
+            defaultValue: text || '',
             min: 0,
             autoFocus: record.needFocus,
             keyboard: false,
@@ -5342,6 +5381,21 @@ var AddSelect = function AddSelect(props) {
       }, "\u5220\u9664");
     }
   }]);
+
+  var handleResize = function handleResize(index) {
+    return function (e, _ref4) {
+      var size = _ref4.size;
+      setTableColumns(function (columns) {
+        var newColumns = _toConsumableArray(columns);
+
+        newColumns[index] = _objectSpread2(_objectSpread2({}, newColumns[index]), {}, {
+          width: size.width
+        });
+        return _toConsumableArray(newColumns);
+      });
+    };
+  };
+
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'add_select'
   }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -5430,7 +5484,7 @@ var AddSelect = function AddSelect(props) {
   }, (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) || 0), "\xA0\u9879") : '')), /*#__PURE__*/React__default['default'].createElement(antd.Table, {
     size: 'small',
     rowSelection: rowSelection,
-    columns: _toConsumableArray(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns),
+    columns: tableColumns,
     dataSource: tableData,
     pagination: tablePagination,
     loading: fetching,
@@ -5439,6 +5493,11 @@ var AddSelect = function AddSelect(props) {
     rowClassName: 'row-class',
     scroll: {
       y: 500
+    },
+    components: {
+      header: {
+        cell: ResizeableTitle
+      }
     }
   })))), /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'add_select_wrapper_select'
@@ -5887,7 +5946,7 @@ var InputElement = function InputElement(_ref) {
   }) : /*#__PURE__*/React__default['default'].createElement(antd.InputNumber // onBlur={() => {updateHoverVisibled(false)}}
   , {
     // onBlur={() => {updateHoverVisibled(false)}}
-    defaultValue: text || 0,
+    defaultValue: text || '',
     min: 0,
     keyboard: false,
     onChange: function onChange(value) {
@@ -6031,41 +6090,12 @@ var BillEntry = function BillEntry(_ref3) {
     width: 100,
     isSelectItem: true,
     render: function render(text, record) {
-      var baseUnitCode = '';
-
-      if (record === null || record === void 0 ? void 0 : record.packingUnitList) {
-        var base = record.packingUnitList.filter(function (item) {
-          return item.unitCode;
-        });
-
-        if (base.length) {
-          var _base$;
-
-          baseUnitCode = base[0].unitCode;
-          record.selectUnitCode = base[0].unitCode;
-          record.selectedScale = ((_base$ = base[0]) === null || _base$ === void 0 ? void 0 : _base$.baseUnitScale) || 1;
-        }
-      }
-
-      if (baseUnitCode) {
-        return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-          defaultValue: baseUnitCode,
-          onChange: function onChange(value) {
-            var _record$packingUnitLi, _record$packingUnitLi2;
+      var _record$packingUnitLi;
 
-            record.selectUnitCode = value;
-            record.selectedScale = (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : (_record$packingUnitLi2 = _record$packingUnitLi.find(function (item) {
-              return item.unitCode === value;
-            })) === null || _record$packingUnitLi2 === void 0 ? void 0 : _record$packingUnitLi2.baseUnitScale) || 1;
-          },
-          style: {
-            width: '60px'
-          }
-        }, record.packingUnitList && record.packingUnitList.map(function (item) {
-          return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
-            value: item.unitCode
-          }, item.name);
-        })));
+      if (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : _record$packingUnitLi.length) {
+        var basePackUnit = record === null || record === void 0 ? void 0 : record.packingUnitList[0];
+        record.selectUnitCode = basePackUnit.unitCode;
+        return basePackUnit.name || basePackUnit.unitCode;
       }
 
       return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
@@ -8243,41 +8273,12 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
         showTitle: false
       },
       render: function render(text, record) {
-        var baseUnitCode = '';
+        var _record$packingUnitLi;
 
-        if (record === null || record === void 0 ? void 0 : record.packingUnitList) {
-          var base = record.packingUnitList.filter(function (item) {
-            return item.unitCode;
-          });
-
-          if (base.length) {
-            var _base$;
-
-            baseUnitCode = base[0].unitCode;
-            record.selectUnitCode = base[0].unitCode;
-            record.selectedScale = ((_base$ = base[0]) === null || _base$ === void 0 ? void 0 : _base$.baseUnitScale) || 1;
-          }
-        }
-
-        if (baseUnitCode) {
-          return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-            defaultValue: baseUnitCode,
-            onChange: function onChange(value) {
-              var _record$packingUnitLi, _record$packingUnitLi2;
-
-              record.selectUnitCode = value;
-              record.selectedScale = (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : (_record$packingUnitLi2 = _record$packingUnitLi.find(function (item) {
-                return item.unitCode === value;
-              })) === null || _record$packingUnitLi2 === void 0 ? void 0 : _record$packingUnitLi2.baseUnitScale) || 1;
-            },
-            style: {
-              width: '60px'
-            }
-          }, record.packingUnitList && record.packingUnitList.map(function (item) {
-            return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
-              value: item.unitCode
-            }, item.name);
-          })));
+        if (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : _record$packingUnitLi.length) {
+          var basePackUnit = record === null || record === void 0 ? void 0 : record.packingUnitList[0];
+          record.selectUnitCode = basePackUnit.unitCode;
+          return basePackUnit.name || basePackUnit.unitCode;
         }
 
         return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.0.10",
+  "version": "2.0.13",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -34,7 +34,8 @@
     "loadsh": "^0.0.4",
     "querystring": "^0.2.1",
     "react": "^16.12.0",
-    "react-beautiful-dnd": "10.0.0"
+    "react-beautiful-dnd": "10.0.0",
+    "react-resizable": "^3.0.4"
   },
   "devDependencies": {
     "@umijs/test": "^3.0.5",

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

@@ -238,25 +238,13 @@ export const AddSkuSelect = (parProps: any) => {
           showTitle: false,
         },
         render: (text: any, record: any) => {
-          let baseUnitCode = '';
-          if (record?.packingUnitList) {
-            let base = record.packingUnitList.filter((item: any) => item.unitCode)
-            if (base.length) {
-              baseUnitCode = base[0].unitCode
-              record.selectUnitCode = base[0].unitCode
-              record.selectedScale = base[0]?.baseUnitScale || 1
-            }
+          if (record?.packingUnitList?.length) {
+            const basePackUnit = record?.packingUnitList[0]
+            record.selectUnitCode = basePackUnit.unitCode
+            return basePackUnit.name || basePackUnit.unitCode
           }
 
-          if (baseUnitCode) {
-            return <>
-              <Select defaultValue={baseUnitCode}  onChange={(value) => {record.selectUnitCode = value;record.selectedScale = record?.packingUnitList?.find((item: any) => item.unitCode === value)?.baseUnitScale || 1}} style={{width: '60px'}}>
-                  {record.packingUnitList && record.packingUnitList.map((item: any) => {
-                    return <Select.Option value={item.unitCode}>{item.name}</Select.Option>
-                  })}
-                </Select>
-              </>
-          }
+          
           return <></>
         },
       },

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

@@ -350,3 +350,18 @@
     margin: 0;
   }
 }
+
+.react-resizable {
+  position: relative;
+  background-clip: padding-box;
+}
+
+.react-resizable-handle {
+  position: absolute;
+  width: 10px;
+  height: 100%;
+  bottom: 0;
+  right: -5px;
+  cursor: col-resize;
+  z-index: 1;
+}

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

@@ -8,6 +8,7 @@ import { stringify } from 'querystring';
 import _ from "loadsh"
 import './index.less';
 import { BusinessSearchSelect, QueryMutipleInput } from '@/index';
+import { Resizable } from 'react-resizable';
 
 const loadSelectSource = (url: string, params?: any) => {
   return new Promise((resolve, reject) => {
@@ -27,6 +28,24 @@ const loadSelectSource = (url: string, params?: any) => {
   })
 };
 
+const ResizeableTitle = (props) => {
+  const { onResize, width, ...restProps } = props;
+
+  if (!width) {
+    return <th {...restProps} />;
+  }
+  return (
+    <Resizable
+      width={width}
+      height={0}
+      onResize={onResize}
+      draggableOpts={{ enableUserSelectHack: false }}
+    >
+      <th {...restProps} />
+    </Resizable>
+  );
+};
+
 const formatSource = (reData: any, position: number, changePosition: number,changeSearchForm: any,resKeyValue=['code', 'name']) => {
   const data = reData && reData[position]?.data;
   const list = Array.isArray(data) ? data :(data?.items || data?.list || data?.children || []);
@@ -133,6 +152,26 @@ const AddSelect = (props: any) => {
   const [checkedAll, setCheckedAll] = useState(false)
   const [indeterminate, setIndeterminate] = useState(false)
   const [tableFormParams, setTableFormParams] = useState({});
+  const [tableColumns, setTableColumns] = useState([]);
+
+  useEffect(() => {
+    setTableColumns(
+      modalTableProps?.tableColumns.map((item, index) => {
+        return {
+          ...item,
+          width: item.width || 200,
+          onHeaderCell: (column) => ({
+            ...item,
+            width:
+              typeof column.width === 'number'
+                ? column.width
+                : parseInt(column.width.replace('px', '')),
+            onResize: handleResize(index),
+          })
+        }
+      })
+    )
+  }, [modalTableProps?.tableColumns])
 
   // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
   const getData = (params = {}, type = 1) => {
@@ -443,7 +482,6 @@ const AddSelect = (props: any) => {
           document.getElementById('first-query')?.focus()
         !isContinue && handleCancel();
         } else {
-          message.error(res)
         }
       }).catch(Error => {
         message.error(Error)
@@ -671,7 +709,7 @@ const AddSelect = (props: any) => {
           }
           return (
             <InputNumber
-              defaultValue={text || 0}
+              defaultValue={text || ''}
               min={0}
               autoFocus={record.needFocus}
               keyboard={false}
@@ -771,6 +809,19 @@ const AddSelect = (props: any) => {
     }
   },]
 
+  const handleResize =
+    (index) =>
+      (e, { size }) => {
+        setTableColumns((columns: any) => {
+          let newColumns = [...columns];
+          newColumns[index] = {
+            ...newColumns[index],
+            width: size.width,
+          };
+          return [...newColumns];
+        });
+      };
+
   return (
     <div className={'add_select'}>
       <div className="add_select_show" id={`add_select_div_${uniqueValue}`}>
@@ -838,7 +889,7 @@ const AddSelect = (props: any) => {
                   <Table
                     size='small'
                     rowSelection={rowSelection}
-                    columns={[...modalTableProps?.tableColumns]}
+                    columns={tableColumns}
                     dataSource={tableData}
                     pagination={tablePagination}
                     loading={fetching}
@@ -846,6 +897,11 @@ const AddSelect = (props: any) => {
                     rowKey={mappingValueField}
                     rowClassName={'row-class'}
                     scroll={{ y: 500 }}
+                    components={{
+                      header: {
+                        cell: ResizeableTitle,
+                      },
+                    }}
                   />
                 </div>
               </div>

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

@@ -307,7 +307,7 @@ const InputElement = ({
         :
         <InputNumber
           // onBlur={() => {updateHoverVisibled(false)}}
-          defaultValue={text || 0}
+          defaultValue={text || ''}
           min={0}
           keyboard={false}
           onChange={(value) => {
@@ -418,28 +418,14 @@ const BillEntry: React.FC = ({ onSaveCallback }) => {
       width: 100,
       isSelectItem: true,
       render: (text: any, record: any) => {
-        let baseUnitCode = '';
-          if (record?.packingUnitList) {
-            let base = record.packingUnitList.filter((item: any) => item.unitCode)
-            if (base.length) {
-              baseUnitCode = base[0].unitCode
-              record.selectUnitCode = base[0].unitCode
-              record.selectedScale = base[0]?.baseUnitScale || 1
-            }
-          }
+        if (record?.packingUnitList?.length) {
+          const basePackUnit = record?.packingUnitList[0]
+          record.selectUnitCode = basePackUnit.unitCode
+          return basePackUnit.name || basePackUnit.unitCode
+        }
 
-          if (baseUnitCode) {
-            return <>
-              <Select defaultValue={baseUnitCode}  onChange={(value) => {
-                record.selectUnitCode = value;record.selectedScale = record?.packingUnitList?.find((item: any) => item.unitCode === value)?.baseUnitScale || 1}
-              } style={{width: '60px'}}>
-                  {record.packingUnitList && record.packingUnitList.map((item: any) => {
-                    return <Select.Option value={item.unitCode}>{item.name}</Select.Option>
-                  })}
-                </Select>
-              </>
-          }
-          return <></>
+        
+        return <></>
       },
     },
     {

package/src/index.ts

@@ -5,7 +5,7 @@
  * @LastEditTime: 2022-01-14 16:10:27
  * @LastEditors: rodchen
  */
-import 'antd/dist/antd.css';
+// import 'antd/dist/antd.css';
 import './utils/requestUtils';
 
 export { default as DataValidation } from './components/Functional/DataValidation';