@kmkf-fe-packages/basic-components 0.7.15-alpha.56 → 0.7.15-alpha.58

package/dist/index.esm.js

@@ -9632,10 +9632,12 @@ var ItemList = function ItemList(props) {
 var columns = [{
   dataIndex: 'index',
   title: '序号',
-  // with: 70,
-  ellipsis: true,
   render: function render(val, record, index) {
-    return /*#__PURE__*/React.createElement("span", null, index + 1);
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: '50px'
+      }
+    }, index + 1);
   }
 }, {
   dataIndex: 'name',
@@ -9656,7 +9658,14 @@ var columns = [{
   dataIndex: 'code',
   title: '商品编码',
   with: 200,
-  ellipsis: true
+  // ellipsis: true,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: '100px'
+      }
+    }, val);
+  }
 }, {
   dataIndex: 'skuCode',
   title: '商品sku编码',
@@ -9665,8 +9674,15 @@ var columns = [{
 }, {
   dataIndex: 'marketPrice',
   title: '市场价',
-  with: 200,
-  ellipsis: true
+  // with: 200,
+  // ellipsis: true,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: '70px'
+      }
+    }, val);
+  }
 }];
 var GoodsModal$1 = function GoodsModal(props, ref) {
   useImperativeHandle(ref, function () {
@@ -9924,7 +9940,7 @@ var GoodItem = function GoodItem(props) {
   var handleDelete = function handleDelete(record, index) {
     onDelete === null || onDelete === void 0 ? void 0 : onDelete(value[index]);
     var newList = _toConsumableArray(value).filter(function (item, i) {
-      return record.uuid !== item.uuid;
+      return index !== i;
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(_toConsumableArray(newList));
   };
@@ -9991,6 +10007,8 @@ var GoodItem = function GoodItem(props) {
       render: function render(val, record, index) {
         return record.canUpdateNumber && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           value: val,
+          min: 0,
+          precision: 0,
           onChange: function onChange(num) {
             return updateHandle(num, index, 'number');
           }
@@ -10056,7 +10074,7 @@ var GoodItem = function GoodItem(props) {
         code: code,
         sku: skuCode,
         money: marketPrice || 0,
-        share: '',
+        share: marketPrice || 0,
         number: 1,
         type: '',
         uuid: uuid(),
@@ -10125,73 +10143,54 @@ var BsGoods = function BsGoods(props) {
     _useState2 = _slicedToArray(_useState, 2),
     tableSelect = _useState2[0],
     setTableSelect = _useState2[1];
-  var _useState3 = useState({
-      type: '',
-      val: ''
-    }),
+  // const [withInfo, setWithInfo] = useState({ type: '', val: '' });
+  var _useState3 = useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
-    withInfo = _useState4[0],
-    setWithInfo = _useState4[1];
-  var ref = useRef();
-  var reissueRef = useRef();
+    withType = _useState4[0],
+    setWithType = _useState4[1];
+  var _useState5 = useState(''),
+    _useState6 = _slicedToArray(_useState5, 2),
+    withValue = _useState6[0],
+    setWithValue = _useState6[1];
   useEffect(function () {
-    ref.current = pubsub.subscribeOnce('type', function (type, val) {
-      var _value$bsGoods;
-      console.log(value);
+    pubsub.subscribe('type', function (type, val) {
       if (disabled) return;
-      setWithInfo({
-        type: type,
-        val: val
-      });
+      console.log('type', type, val);
+      // setWithInfo({ type, val });
+      setWithType(type);
+      setWithValue(val);
       setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : (_value$bsGoods = value.bsGoods) === null || _value$bsGoods === void 0 ? void 0 : _value$bsGoods.length)) {
-        var newGoods = cloneDeep(value === null || value === void 0 ? void 0 : value.bsGoods);
-        pubsub.publish('selectList', {
-          type: val,
-          list: (newGoods || []).map(function (item) {
-            item.canDelete = false;
-            return item;
-          })
-        });
-      }
     });
     //补发
-    reissueRef.current = pubsub.subscribeOnce('reissueType', function (type, val) {
-      var _value$bsGoods2;
+    pubsub.subscribe('reissueType', function (type, val) {
       if (disabled) return;
-      setWithInfo({
-        type: type,
-        val: val
-      });
+      console.log('reissueType', type, val);
+      // setWithInfo({ type, val });
+      setWithType(type);
+      setWithValue(val);
       setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : (_value$bsGoods2 = value.bsGoods) === null || _value$bsGoods2 === void 0 ? void 0 : _value$bsGoods2.length)) {
-        var newGoods = cloneDeep(value === null || value === void 0 ? void 0 : value.bsGoods);
-        pubsub.publish('reissueSelectList', {
-          type: val,
-          list: (newGoods || []).map(function (item) {
-            item.canDelete = false;
-            return item;
-          })
-        });
-      }
     });
-    return function () {
-      pubsub.unsubscribe(ref.current);
-      pubsub.unsubscribe(reissueRef.current);
-    };
-  }, [value, withInfo, disabled]);
-  var _onSelect = useCallback(function (list) {
+  }, [disabled, withType, withValue, setWithType, setWithValue, setTableSelect]);
+  useEffect(function () {
+    if (!disabled) {
+      pubsub.publish('goodList', {
+        list: cloneDeep((value === null || value === void 0 ? void 0 : value.bsGoods) || [])
+      });
+    }
+  }, [value, disabled]);
+  var onSelect = function onSelect(list) {
     if (disabled) return;
-    console.log('withInfo', withInfo, list);
     var newList = cloneDeep(list);
-    pubsub.publish(withInfo.type === 'reissueType' ? 'reissueSelectList' : 'selectList', {
-      type: withInfo.val,
+    var type = withType === 'reissueType' ? 'reissueSelectList' : 'selectList';
+    console.log(withType, withValue, type);
+    pubsub.publish(type, {
+      type: withValue,
       list: newList.map(function (item) {
         item.canDelete = true;
         return item;
       })
     });
-  }, [withInfo]);
+  };
   var _onDelete = function onDelete(item) {
     var deleteId = item === null || item === void 0 ? void 0 : item.sku;
     pubsub.publish('deleteGood', deleteId);
@@ -10209,9 +10208,7 @@ var BsGoods = function BsGoods(props) {
     value: value === null || value === void 0 ? void 0 : value.bsGoods,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     tableSelect: tableSelect,
-    onSelect: function onSelect(list) {
-      return _onSelect(list);
-    },
+    onSelect: onSelect,
     onDelete: function onDelete(item) {
       return _onDelete(item);
     },
@@ -10230,6 +10227,15 @@ var BsExchange = function BsExchange(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     other = _objectWithoutProperties(props, _excluded$b);
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    bsGoods = _useState2[0],
+    setBsGoods = _useState2[1];
+  useEffect(function () {
+    pubsub.subscribe('goodList', function (_, data) {
+      setBsGoods(data.list);
+    });
+  }, []);
   useEffect(function () {
     pubsub.subscribeOnce('deleteGood', function (_, data) {
       if (disabled) return;
@@ -10251,6 +10257,16 @@ var BsExchange = function BsExchange(props) {
         onChange(newValue);
       }
     });
+    pubsub.subscribeOnce('selectList', function (_, data) {
+      if (disabled) return;
+      if (value) {
+        var newData = cloneDeep(data);
+        console.log(getListHandle(_toConsumableArray(newData.list), value));
+        onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+          bsExchangeReturnGoods: getListHandle(_toConsumableArray(newData.list), value)
+        }));
+      }
+    });
   }, [value]);
   var getListHandle = function getListHandle(list, val) {
     var _val$bsExchangeType, _val$bsExchangeType2;
@@ -10260,10 +10276,12 @@ var BsExchange = function BsExchange(props) {
         next.canDelete = false;
         //数量大于1 拆开
         if (next.number > 1) {
-          var newList = Array(next.number).fill(_objectSpread2({}, next)).map(function (t) {
-            t.number = 1;
-            t.uuid = uuid();
-            return t;
+          var newList = Array(next.number).fill({}).map(function () {
+            var newNext = _objectSpread2({}, next);
+            newNext.money = newNext.share;
+            newNext.number = 1;
+            newNext.uuid = uuid();
+            return newNext;
           });
           prv.push.apply(prv, _toConsumableArray(newList));
         } else {
@@ -10278,10 +10296,12 @@ var BsExchange = function BsExchange(props) {
         next.index = index;
         //数量大于1 拆开
         if (next.number > 1) {
-          var newList = Array(next.number).fill(_objectSpread2({}, next)).map(function (t) {
-            t.number = 1;
-            t.uuid = uuid();
-            return t;
+          var newList = Array(next.number).fill({}).map(function () {
+            var newNext = _objectSpread2({}, next);
+            newNext.money = newNext.share;
+            newNext.number = 1;
+            newNext.uuid = uuid();
+            return newNext;
           });
           prv.push({
             bsExchangeReturnGoods: _toConsumableArray(newList),
@@ -10302,17 +10322,11 @@ var BsExchange = function BsExchange(props) {
     newValue.bsExchangeType = val;
     newValue.bsExchangeReturnGoods = [];
     newValue.bsExchangeGiftGoods = [];
+    if (['1', '3'].includes(val[0])) {
+      newValue.bsExchangeReturnGoods = getListHandle(bsGoods, newValue);
+    }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     pubsub.publish('type', val[0]);
-    pubsub.subscribe('selectList', function (_, data) {
-      if (disabled) return;
-      if (newValue) {
-        var newData = cloneDeep(data);
-        onChange(_objectSpread2(_objectSpread2({}, newValue), {}, {
-          bsExchangeReturnGoods: getListHandle(_toConsumableArray(newData.list), newValue)
-        }));
-      }
-    });
   };
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
@@ -10330,7 +10344,7 @@ var BsExchange = function BsExchange(props) {
     }
   };
   var changeReturnHandle = function changeReturnHandle(val, index, key) {
-    // console.log('changeReturnHandle', val, index, key);
+    console.log('changeReturnHandle', val, index, key);
     var newValue = _objectSpread2({}, value);
     newValue.bsExchangeReturnGoods[index][key] = (val || []).map(function (t) {
       t.index = index;
@@ -10432,6 +10446,15 @@ var BsReissue = function BsReissue(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     other = _objectWithoutProperties(props, _excluded$c);
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    bsGoods = _useState2[0],
+    setBsGoods = _useState2[1];
+  useEffect(function () {
+    pubsub.subscribe('goodList', function (_, data) {
+      setBsGoods(data.list);
+    });
+  }, []);
   useEffect(function () {
     pubsub.subscribeOnce('reissueDeleteGood', function (_, data) {
       if (disabled) return;
@@ -10443,36 +10466,43 @@ var BsReissue = function BsReissue(props) {
         onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
       }
     });
+    pubsub.subscribeOnce('reissueSelectList', function (_, data) {
+      if (disabled) return;
+      if (value) {
+        var newValue = _objectSpread2({}, value);
+        newValue.bsReissueGoods = data === null || data === void 0 ? void 0 : data.list.map(function (item) {
+          item.money = 0;
+          item.share = 0;
+          item.canUpdateNumber = true;
+          return item;
+        });
+        onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+      }
+    });
   }, [value, disabled]);
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
     if (key === 'bsReissueGoods') {
       val = (val || []).map(function (item) {
         item.money = 0;
+        item.share = 0;
         return item;
       });
     }
     newValue[key] = val;
     if (key === 'bsReissueType') {
       newValue.bsReissueGoods = [];
+      if (['1', '3'].includes(val[0])) {
+        newValue.bsReissueGoods = (bsGoods || []).map(function (item) {
+          item.money = 0;
+          item.share = 0;
+          item.canUpdateNumber = false;
+          return item;
+        });
+      }
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
-    if (key === 'bsReissueType') {
-      pubsub.publish('reissueType', val[0]);
-      pubsub.subscribe('reissueSelectList', function (_, data) {
-        if (disabled) return;
-        if (value) {
-          var newData = cloneDeep(data);
-          onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, newValue), {}, {
-            bsReissueGoods: ((newData === null || newData === void 0 ? void 0 : newData.list) || []).map(function (item) {
-              item.money = 0;
-              item.canUpdateNumber = ['2', '4'].includes(newData === null || newData === void 0 ? void 0 : newData.type);
-              return item;
-            })
-          }));
-        }
-      });
-    }
+    pubsub.publish('reissueType', val[0]);
   };
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = useMemo(function () {
@@ -10490,7 +10520,7 @@ var BsReissue = function BsReissue(props) {
     onChange: function onChange(val) {
       return changeHandle(val, 'bsReissueType');
     }
-  }), /*#__PURE__*/React.createElement("div", null, "\u9000\u56DE\u5546\u54C1"), /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
+  }), /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
     key: 'reissueGoods'
   }, other), {}, {
     disabled: disabled,

package/dist/index.js

@@ -9643,10 +9643,12 @@ var ItemList = function ItemList(props) {
 var columns = [{
   dataIndex: 'index',
   title: '序号',
-  // with: 70,
-  ellipsis: true,
   render: function render(val, record, index) {
-    return /*#__PURE__*/React__default['default'].createElement("span", null, index + 1);
+    return /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        width: '50px'
+      }
+    }, index + 1);
   }
 }, {
   dataIndex: 'name',
@@ -9667,7 +9669,14 @@ var columns = [{
   dataIndex: 'code',
   title: '商品编码',
   with: 200,
-  ellipsis: true
+  // ellipsis: true,
+  render: function render(val) {
+    return /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        width: '100px'
+      }
+    }, val);
+  }
 }, {
   dataIndex: 'skuCode',
   title: '商品sku编码',
@@ -9676,8 +9685,15 @@ var columns = [{
 }, {
   dataIndex: 'marketPrice',
   title: '市场价',
-  with: 200,
-  ellipsis: true
+  // with: 200,
+  // ellipsis: true,
+  render: function render(val) {
+    return /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        width: '70px'
+      }
+    }, val);
+  }
 }];
 var GoodsModal$1 = function GoodsModal(props, ref) {
   React.useImperativeHandle(ref, function () {
@@ -9935,7 +9951,7 @@ var GoodItem = function GoodItem(props) {
   var handleDelete = function handleDelete(record, index) {
     onDelete === null || onDelete === void 0 ? void 0 : onDelete(value[index]);
     var newList = _toConsumableArray(value).filter(function (item, i) {
-      return record.uuid !== item.uuid;
+      return index !== i;
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(_toConsumableArray(newList));
   };
@@ -10002,6 +10018,8 @@ var GoodItem = function GoodItem(props) {
       render: function render(val, record, index) {
         return record.canUpdateNumber && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           value: val,
+          min: 0,
+          precision: 0,
           onChange: function onChange(num) {
             return updateHandle(num, index, 'number');
           }
@@ -10067,7 +10085,7 @@ var GoodItem = function GoodItem(props) {
         code: code,
         sku: skuCode,
         money: marketPrice || 0,
-        share: '',
+        share: marketPrice || 0,
         number: 1,
         type: '',
         uuid: kmkfUtils.uuid(),
@@ -10136,73 +10154,54 @@ var BsGoods = function BsGoods(props) {
     _useState2 = _slicedToArray(_useState, 2),
     tableSelect = _useState2[0],
     setTableSelect = _useState2[1];
-  var _useState3 = React.useState({
-      type: '',
-      val: ''
-    }),
+  // const [withInfo, setWithInfo] = useState({ type: '', val: '' });
+  var _useState3 = React.useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
-    withInfo = _useState4[0],
-    setWithInfo = _useState4[1];
-  var ref = React.useRef();
-  var reissueRef = React.useRef();
+    withType = _useState4[0],
+    setWithType = _useState4[1];
+  var _useState5 = React.useState(''),
+    _useState6 = _slicedToArray(_useState5, 2),
+    withValue = _useState6[0],
+    setWithValue = _useState6[1];
   React.useEffect(function () {
-    ref.current = pubsub__default['default'].subscribeOnce('type', function (type, val) {
-      var _value$bsGoods;
-      console.log(value);
+    pubsub__default['default'].subscribe('type', function (type, val) {
       if (disabled) return;
-      setWithInfo({
-        type: type,
-        val: val
-      });
+      console.log('type', type, val);
+      // setWithInfo({ type, val });
+      setWithType(type);
+      setWithValue(val);
       setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : (_value$bsGoods = value.bsGoods) === null || _value$bsGoods === void 0 ? void 0 : _value$bsGoods.length)) {
-        var newGoods = lodash.cloneDeep(value === null || value === void 0 ? void 0 : value.bsGoods);
-        pubsub__default['default'].publish('selectList', {
-          type: val,
-          list: (newGoods || []).map(function (item) {
-            item.canDelete = false;
-            return item;
-          })
-        });
-      }
     });
     //补发
-    reissueRef.current = pubsub__default['default'].subscribeOnce('reissueType', function (type, val) {
-      var _value$bsGoods2;
+    pubsub__default['default'].subscribe('reissueType', function (type, val) {
       if (disabled) return;
-      setWithInfo({
-        type: type,
-        val: val
-      });
+      console.log('reissueType', type, val);
+      // setWithInfo({ type, val });
+      setWithType(type);
+      setWithValue(val);
       setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : (_value$bsGoods2 = value.bsGoods) === null || _value$bsGoods2 === void 0 ? void 0 : _value$bsGoods2.length)) {
-        var newGoods = lodash.cloneDeep(value === null || value === void 0 ? void 0 : value.bsGoods);
-        pubsub__default['default'].publish('reissueSelectList', {
-          type: val,
-          list: (newGoods || []).map(function (item) {
-            item.canDelete = false;
-            return item;
-          })
-        });
-      }
     });
-    return function () {
-      pubsub__default['default'].unsubscribe(ref.current);
-      pubsub__default['default'].unsubscribe(reissueRef.current);
-    };
-  }, [value, withInfo, disabled]);
-  var _onSelect = React.useCallback(function (list) {
+  }, [disabled, withType, withValue, setWithType, setWithValue, setTableSelect]);
+  React.useEffect(function () {
+    if (!disabled) {
+      pubsub__default['default'].publish('goodList', {
+        list: lodash.cloneDeep((value === null || value === void 0 ? void 0 : value.bsGoods) || [])
+      });
+    }
+  }, [value, disabled]);
+  var onSelect = function onSelect(list) {
     if (disabled) return;
-    console.log('withInfo', withInfo, list);
     var newList = lodash.cloneDeep(list);
-    pubsub__default['default'].publish(withInfo.type === 'reissueType' ? 'reissueSelectList' : 'selectList', {
-      type: withInfo.val,
+    var type = withType === 'reissueType' ? 'reissueSelectList' : 'selectList';
+    console.log(withType, withValue, type);
+    pubsub__default['default'].publish(type, {
+      type: withValue,
       list: newList.map(function (item) {
         item.canDelete = true;
         return item;
       })
     });
-  }, [withInfo]);
+  };
   var _onDelete = function onDelete(item) {
     var deleteId = item === null || item === void 0 ? void 0 : item.sku;
     pubsub__default['default'].publish('deleteGood', deleteId);
@@ -10220,9 +10219,7 @@ var BsGoods = function BsGoods(props) {
     value: value === null || value === void 0 ? void 0 : value.bsGoods,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     tableSelect: tableSelect,
-    onSelect: function onSelect(list) {
-      return _onSelect(list);
-    },
+    onSelect: onSelect,
     onDelete: function onDelete(item) {
       return _onDelete(item);
     },
@@ -10241,6 +10238,15 @@ var BsExchange = function BsExchange(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     other = _objectWithoutProperties(props, _excluded$b);
+  var _useState = React.useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    bsGoods = _useState2[0],
+    setBsGoods = _useState2[1];
+  React.useEffect(function () {
+    pubsub__default['default'].subscribe('goodList', function (_, data) {
+      setBsGoods(data.list);
+    });
+  }, []);
   React.useEffect(function () {
     pubsub__default['default'].subscribeOnce('deleteGood', function (_, data) {
       if (disabled) return;
@@ -10262,6 +10268,16 @@ var BsExchange = function BsExchange(props) {
         onChange(newValue);
       }
     });
+    pubsub__default['default'].subscribeOnce('selectList', function (_, data) {
+      if (disabled) return;
+      if (value) {
+        var newData = lodash.cloneDeep(data);
+        console.log(getListHandle(_toConsumableArray(newData.list), value));
+        onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+          bsExchangeReturnGoods: getListHandle(_toConsumableArray(newData.list), value)
+        }));
+      }
+    });
   }, [value]);
   var getListHandle = function getListHandle(list, val) {
     var _val$bsExchangeType, _val$bsExchangeType2;
@@ -10271,10 +10287,12 @@ var BsExchange = function BsExchange(props) {
         next.canDelete = false;
         //数量大于1 拆开
         if (next.number > 1) {
-          var newList = Array(next.number).fill(_objectSpread2({}, next)).map(function (t) {
-            t.number = 1;
-            t.uuid = kmkfUtils.uuid();
-            return t;
+          var newList = Array(next.number).fill({}).map(function () {
+            var newNext = _objectSpread2({}, next);
+            newNext.money = newNext.share;
+            newNext.number = 1;
+            newNext.uuid = kmkfUtils.uuid();
+            return newNext;
           });
           prv.push.apply(prv, _toConsumableArray(newList));
         } else {
@@ -10289,10 +10307,12 @@ var BsExchange = function BsExchange(props) {
         next.index = index;
         //数量大于1 拆开
         if (next.number > 1) {
-          var newList = Array(next.number).fill(_objectSpread2({}, next)).map(function (t) {
-            t.number = 1;
-            t.uuid = kmkfUtils.uuid();
-            return t;
+          var newList = Array(next.number).fill({}).map(function () {
+            var newNext = _objectSpread2({}, next);
+            newNext.money = newNext.share;
+            newNext.number = 1;
+            newNext.uuid = kmkfUtils.uuid();
+            return newNext;
           });
           prv.push({
             bsExchangeReturnGoods: _toConsumableArray(newList),
@@ -10313,17 +10333,11 @@ var BsExchange = function BsExchange(props) {
     newValue.bsExchangeType = val;
     newValue.bsExchangeReturnGoods = [];
     newValue.bsExchangeGiftGoods = [];
+    if (['1', '3'].includes(val[0])) {
+      newValue.bsExchangeReturnGoods = getListHandle(bsGoods, newValue);
+    }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     pubsub__default['default'].publish('type', val[0]);
-    pubsub__default['default'].subscribe('selectList', function (_, data) {
-      if (disabled) return;
-      if (newValue) {
-        var newData = lodash.cloneDeep(data);
-        onChange(_objectSpread2(_objectSpread2({}, newValue), {}, {
-          bsExchangeReturnGoods: getListHandle(_toConsumableArray(newData.list), newValue)
-        }));
-      }
-    });
   };
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
@@ -10341,7 +10355,7 @@ var BsExchange = function BsExchange(props) {
     }
   };
   var changeReturnHandle = function changeReturnHandle(val, index, key) {
-    // console.log('changeReturnHandle', val, index, key);
+    console.log('changeReturnHandle', val, index, key);
     var newValue = _objectSpread2({}, value);
     newValue.bsExchangeReturnGoods[index][key] = (val || []).map(function (t) {
       t.index = index;
@@ -10443,6 +10457,15 @@ var BsReissue = function BsReissue(props) {
     reasonList = _props$reasonList === void 0 ? [] : _props$reasonList,
     disabled = props.disabled,
     other = _objectWithoutProperties(props, _excluded$c);
+  var _useState = React.useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    bsGoods = _useState2[0],
+    setBsGoods = _useState2[1];
+  React.useEffect(function () {
+    pubsub__default['default'].subscribe('goodList', function (_, data) {
+      setBsGoods(data.list);
+    });
+  }, []);
   React.useEffect(function () {
     pubsub__default['default'].subscribeOnce('reissueDeleteGood', function (_, data) {
       if (disabled) return;
@@ -10454,36 +10477,43 @@ var BsReissue = function BsReissue(props) {
         onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
       }
     });
+    pubsub__default['default'].subscribeOnce('reissueSelectList', function (_, data) {
+      if (disabled) return;
+      if (value) {
+        var newValue = _objectSpread2({}, value);
+        newValue.bsReissueGoods = data === null || data === void 0 ? void 0 : data.list.map(function (item) {
+          item.money = 0;
+          item.share = 0;
+          item.canUpdateNumber = true;
+          return item;
+        });
+        onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+      }
+    });
   }, [value, disabled]);
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
     if (key === 'bsReissueGoods') {
       val = (val || []).map(function (item) {
         item.money = 0;
+        item.share = 0;
         return item;
       });
     }
     newValue[key] = val;
     if (key === 'bsReissueType') {
       newValue.bsReissueGoods = [];
+      if (['1', '3'].includes(val[0])) {
+        newValue.bsReissueGoods = (bsGoods || []).map(function (item) {
+          item.money = 0;
+          item.share = 0;
+          item.canUpdateNumber = false;
+          return item;
+        });
+      }
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
-    if (key === 'bsReissueType') {
-      pubsub__default['default'].publish('reissueType', val[0]);
-      pubsub__default['default'].subscribe('reissueSelectList', function (_, data) {
-        if (disabled) return;
-        if (value) {
-          var newData = lodash.cloneDeep(data);
-          onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, newValue), {}, {
-            bsReissueGoods: ((newData === null || newData === void 0 ? void 0 : newData.list) || []).map(function (item) {
-              item.money = 0;
-              item.canUpdateNumber = ['2', '4'].includes(newData === null || newData === void 0 ? void 0 : newData.type);
-              return item;
-            })
-          }));
-        }
-      });
-    }
+    pubsub__default['default'].publish('reissueType', val[0]);
   };
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = React.useMemo(function () {
@@ -10501,7 +10531,7 @@ var BsReissue = function BsReissue(props) {
     onChange: function onChange(val) {
       return changeHandle(val, 'bsReissueType');
     }
-  }), /*#__PURE__*/React__default['default'].createElement("div", null, "\u9000\u56DE\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
+  }), /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
     key: 'reissueGoods'
   }, other), {}, {
     disabled: disabled,

package/dist/src/bs/component/GoodItem/index.d.ts

@@ -10,7 +10,8 @@ interface BsGoodsProps {
     shopId: string | number;
     maxLength: number;
     showChangeBtn: boolean;
-    tableSelect: boolean;
+    tableSelect?: boolean;
+    selectType?: string;
     otherOperations: any;
     canUpdateNumber: boolean;
     shopCode: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.7.15-alpha.56",
+  "version": "0.7.15-alpha.58",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.56",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.57",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "umi-request": "^1.4.0"
@@ -58,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "87c92d90ef4c8365b2ed9b0f3689ac76cd972261"
+  "gitHead": "4a61916bb9e43996cd0bb1b0350f51ae8c32501b"
 }

package/dist/src/bs/component/eventEmitter.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="node" />
-import { EventEmitter } from 'events';
-declare const eventEmitter: EventEmitter;
-export default eventEmitter;