@kmkf-fe-packages/basic-components 0.7.15-alpha.73 → 0.7.15-alpha.76

package/dist/index.esm.js

@@ -9980,6 +9980,27 @@ var GoodItem = function GoodItem(props) {
   var GOODS_INFO_COLUMNS = function GOODS_INFO_COLUMNS() {
     var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     return [{
+      dataIndex: 'mark',
+      title: "\u5546\u54C1\u6807\u8BB0",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record, index) {
+        return /*#__PURE__*/React.createElement(Select, {
+          options: [{
+            label: '是',
+            value: '是'
+          }, {
+            label: '否',
+            value: '否'
+          }],
+          value: val,
+          onChange: function onChange(val) {
+            return updateHandle(val, index, 'mark');
+          }
+        });
+      }
+    }, {
       dataIndex: 'pic',
       title: "\u56FE\u7247",
       align: 'center',
@@ -10086,6 +10107,7 @@ var GoodItem = function GoodItem(props) {
         marketPrice = item.marketPrice;
       return {
         id: goodsId,
+        mark: '是',
         pic: '',
         name: name,
         code: code,
@@ -10165,6 +10187,8 @@ var BsGoods = function BsGoods(props) {
   var valueRef = useRef(null);
   useEffect(function () {
     valueRef.current = value;
+  }, [value]);
+  useEffect(function () {
     pubsub.subscribe('type', function (type, data) {
       if (disabled) return;
       withInfo.current = {
@@ -10196,12 +10220,13 @@ var BsGoods = function BsGoods(props) {
         });
       }
     });
-  }, [disabled, value]);
+  }, [disabled]);
   var _onSelect = function onSelect(list) {
     var _withInfo$current, _withInfo$current2;
     if (disabled) return;
     var newList = cloneDeep(list);
     var type = ((_withInfo$current = withInfo.current) === null || _withInfo$current === void 0 ? void 0 : _withInfo$current.type) === 'reissueType' ? 'reissueSelectList' : 'selectList';
+    console.log('onSelect', type, withInfo.current);
     pubsub.publish(type, {
       type: (_withInfo$current2 = withInfo.current) === null || _withInfo$current2 === void 0 ? void 0 : _withInfo$current2.val,
       list: newList.map(function (item) {
@@ -10275,6 +10300,7 @@ var BsExchange = function BsExchange(props) {
   }, [value]);
   useEffect(function () {
     pubsub.subscribe('selectList', function (_, data) {
+      console.log('selectList', data, valueRef.current);
       if (disabled) return;
       if (valueRef.current) {
         var newDataList = cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
@@ -10286,10 +10312,12 @@ var BsExchange = function BsExchange(props) {
   }, []);
   useEffect(function () {
     pubsub.subscribe('selectListReturn', function (_, data) {
+      console.log('selectListReturn', data);
       if (disabled) return;
+      var newValue = _objectSpread2({}, data.newValue);
       var newDataList = cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
       onChange(_objectSpread2(_objectSpread2({}, data.newValue), {}, {
-        bsExchangeReturnGoods: getListHandle(newDataList, valueRef.current)
+        bsExchangeReturnGoods: getListHandle(newDataList, newValue)
       }));
     });
   }, []);
@@ -10365,17 +10393,19 @@ var BsExchange = function BsExchange(props) {
     }
     newValue[key] = val;
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-    if (key === 'bsExchangeType') {
-      pubsub.publish('type', val[0]);
-    }
   };
   var changeReturnHandle = function changeReturnHandle(val, index, key) {
     var newValue = _objectSpread2({}, value);
-    newValue.bsExchangeReturnGoods[index][key] = (val || []).map(function (t) {
+    newValue.bsExchangeReturnGoods[index][key] = (val || []).map(function (t, i) {
       t.index = index;
       if (key === 'bsExchangeGiftGoods') {
         t.money = 0;
       }
+      //换出的分摊价等于退回的分摊价
+      if (key === 'bsExchangeSwapOutGoods') {
+        var _newValue$bsExchangeR, _newValue$bsExchangeR2, _newValue$bsExchangeR3, _newValue$bsExchangeR4;
+        t.share = (_newValue$bsExchangeR = newValue.bsExchangeReturnGoods) === null || _newValue$bsExchangeR === void 0 ? void 0 : (_newValue$bsExchangeR2 = _newValue$bsExchangeR[index]) === null || _newValue$bsExchangeR2 === void 0 ? void 0 : (_newValue$bsExchangeR3 = _newValue$bsExchangeR2['bsExchangeReturnGoods']) === null || _newValue$bsExchangeR3 === void 0 ? void 0 : (_newValue$bsExchangeR4 = _newValue$bsExchangeR3[i]) === null || _newValue$bsExchangeR4 === void 0 ? void 0 : _newValue$bsExchangeR4.share;
+      }
       return t;
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
@@ -10474,6 +10504,7 @@ var BsReissue = function BsReissue(props) {
   var valueRef = useRef({});
   useEffect(function () {
     pubsub.subscribe('reissueSelectList', function (_, data) {
+      console.log('reissueSelectList', valueRef.current);
       if (disabled) return;
       if (valueRef.current) {
         var newValue = _objectSpread2({}, valueRef.current);
@@ -10489,6 +10520,7 @@ var BsReissue = function BsReissue(props) {
   }, []);
   useEffect(function () {
     pubsub.subscribe('reissueSelectListReturn', function (_, data) {
+      console.log('reissueSelectListReturn', data);
       if (disabled) return;
       var newValue = _objectSpread2({}, data.newValue);
       newValue.bsReissueGoods = data === null || data === void 0 ? void 0 : data.list.map(function (item) {
@@ -10513,19 +10545,10 @@ var BsReissue = function BsReissue(props) {
       }
     });
   }, [value, disabled]);
-  var changeHandle = function changeHandle(val, key) {
+  var changeTypeHandle = function changeTypeHandle(val) {
     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 = [];
-    }
+    newValue['bsReissueType'] = val;
+    newValue.bsReissueGoods = [];
     if (['2', '4'].includes(val[0])) {
       onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     }
@@ -10534,6 +10557,15 @@ var BsReissue = function BsReissue(props) {
       newValue: newValue
     });
   };
+  var changeGoodHandle = function changeGoodHandle(val) {
+    var newValue = _objectSpread2({}, value);
+    newValue['bsReissueGoods'] = (val || []).map(function (item) {
+      item.money = 0;
+      item.share = 0;
+      return item;
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  };
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = useMemo(function () {
     var _value$bsReissueType;
@@ -10548,7 +10580,7 @@ var BsReissue = function BsReissue(props) {
     options: reasonList,
     value: value === null || value === void 0 ? void 0 : value.bsReissueType,
     onChange: function onChange(val) {
-      return changeHandle(val, 'bsReissueType');
+      return changeTypeHandle(val);
     }
   }), /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
     key: 'reissueGoods'
@@ -10559,7 +10591,7 @@ var BsReissue = function BsReissue(props) {
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value.bsReissueGoods,
     onChange: function onChange(val) {
-      return changeHandle(val, 'bsReissueGoods');
+      return changeGoodHandle(val);
     }
   })));
 };

package/dist/index.js

@@ -9991,6 +9991,27 @@ var GoodItem = function GoodItem(props) {
   var GOODS_INFO_COLUMNS = function GOODS_INFO_COLUMNS() {
     var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     return [{
+      dataIndex: 'mark',
+      title: "\u5546\u54C1\u6807\u8BB0",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record, index) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          options: [{
+            label: '是',
+            value: '是'
+          }, {
+            label: '否',
+            value: '否'
+          }],
+          value: val,
+          onChange: function onChange(val) {
+            return updateHandle(val, index, 'mark');
+          }
+        });
+      }
+    }, {
       dataIndex: 'pic',
       title: "\u56FE\u7247",
       align: 'center',
@@ -10097,6 +10118,7 @@ var GoodItem = function GoodItem(props) {
         marketPrice = item.marketPrice;
       return {
         id: goodsId,
+        mark: '是',
         pic: '',
         name: name,
         code: code,
@@ -10176,6 +10198,8 @@ var BsGoods = function BsGoods(props) {
   var valueRef = React.useRef(null);
   React.useEffect(function () {
     valueRef.current = value;
+  }, [value]);
+  React.useEffect(function () {
     pubsub__default['default'].subscribe('type', function (type, data) {
       if (disabled) return;
       withInfo.current = {
@@ -10207,12 +10231,13 @@ var BsGoods = function BsGoods(props) {
         });
       }
     });
-  }, [disabled, value]);
+  }, [disabled]);
   var _onSelect = function onSelect(list) {
     var _withInfo$current, _withInfo$current2;
     if (disabled) return;
     var newList = lodash.cloneDeep(list);
     var type = ((_withInfo$current = withInfo.current) === null || _withInfo$current === void 0 ? void 0 : _withInfo$current.type) === 'reissueType' ? 'reissueSelectList' : 'selectList';
+    console.log('onSelect', type, withInfo.current);
     pubsub__default['default'].publish(type, {
       type: (_withInfo$current2 = withInfo.current) === null || _withInfo$current2 === void 0 ? void 0 : _withInfo$current2.val,
       list: newList.map(function (item) {
@@ -10286,6 +10311,7 @@ var BsExchange = function BsExchange(props) {
   }, [value]);
   React.useEffect(function () {
     pubsub__default['default'].subscribe('selectList', function (_, data) {
+      console.log('selectList', data, valueRef.current);
       if (disabled) return;
       if (valueRef.current) {
         var newDataList = lodash.cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
@@ -10297,10 +10323,12 @@ var BsExchange = function BsExchange(props) {
   }, []);
   React.useEffect(function () {
     pubsub__default['default'].subscribe('selectListReturn', function (_, data) {
+      console.log('selectListReturn', data);
       if (disabled) return;
+      var newValue = _objectSpread2({}, data.newValue);
       var newDataList = lodash.cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
       onChange(_objectSpread2(_objectSpread2({}, data.newValue), {}, {
-        bsExchangeReturnGoods: getListHandle(newDataList, valueRef.current)
+        bsExchangeReturnGoods: getListHandle(newDataList, newValue)
       }));
     });
   }, []);
@@ -10376,17 +10404,19 @@ var BsExchange = function BsExchange(props) {
     }
     newValue[key] = val;
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-    if (key === 'bsExchangeType') {
-      pubsub__default['default'].publish('type', val[0]);
-    }
   };
   var changeReturnHandle = function changeReturnHandle(val, index, key) {
     var newValue = _objectSpread2({}, value);
-    newValue.bsExchangeReturnGoods[index][key] = (val || []).map(function (t) {
+    newValue.bsExchangeReturnGoods[index][key] = (val || []).map(function (t, i) {
       t.index = index;
       if (key === 'bsExchangeGiftGoods') {
         t.money = 0;
       }
+      //换出的分摊价等于退回的分摊价
+      if (key === 'bsExchangeSwapOutGoods') {
+        var _newValue$bsExchangeR, _newValue$bsExchangeR2, _newValue$bsExchangeR3, _newValue$bsExchangeR4;
+        t.share = (_newValue$bsExchangeR = newValue.bsExchangeReturnGoods) === null || _newValue$bsExchangeR === void 0 ? void 0 : (_newValue$bsExchangeR2 = _newValue$bsExchangeR[index]) === null || _newValue$bsExchangeR2 === void 0 ? void 0 : (_newValue$bsExchangeR3 = _newValue$bsExchangeR2['bsExchangeReturnGoods']) === null || _newValue$bsExchangeR3 === void 0 ? void 0 : (_newValue$bsExchangeR4 = _newValue$bsExchangeR3[i]) === null || _newValue$bsExchangeR4 === void 0 ? void 0 : _newValue$bsExchangeR4.share;
+      }
       return t;
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
@@ -10485,6 +10515,7 @@ var BsReissue = function BsReissue(props) {
   var valueRef = React.useRef({});
   React.useEffect(function () {
     pubsub__default['default'].subscribe('reissueSelectList', function (_, data) {
+      console.log('reissueSelectList', valueRef.current);
       if (disabled) return;
       if (valueRef.current) {
         var newValue = _objectSpread2({}, valueRef.current);
@@ -10500,6 +10531,7 @@ var BsReissue = function BsReissue(props) {
   }, []);
   React.useEffect(function () {
     pubsub__default['default'].subscribe('reissueSelectListReturn', function (_, data) {
+      console.log('reissueSelectListReturn', data);
       if (disabled) return;
       var newValue = _objectSpread2({}, data.newValue);
       newValue.bsReissueGoods = data === null || data === void 0 ? void 0 : data.list.map(function (item) {
@@ -10524,19 +10556,10 @@ var BsReissue = function BsReissue(props) {
       }
     });
   }, [value, disabled]);
-  var changeHandle = function changeHandle(val, key) {
+  var changeTypeHandle = function changeTypeHandle(val) {
     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 = [];
-    }
+    newValue['bsReissueType'] = val;
+    newValue.bsReissueGoods = [];
     if (['2', '4'].includes(val[0])) {
       onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     }
@@ -10545,6 +10568,15 @@ var BsReissue = function BsReissue(props) {
       newValue: newValue
     });
   };
+  var changeGoodHandle = function changeGoodHandle(val) {
+    var newValue = _objectSpread2({}, value);
+    newValue['bsReissueGoods'] = (val || []).map(function (item) {
+      item.money = 0;
+      item.share = 0;
+      return item;
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+  };
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = React.useMemo(function () {
     var _value$bsReissueType;
@@ -10559,7 +10591,7 @@ var BsReissue = function BsReissue(props) {
     options: reasonList,
     value: value === null || value === void 0 ? void 0 : value.bsReissueType,
     onChange: function onChange(val) {
-      return changeHandle(val, 'bsReissueType');
+      return changeTypeHandle(val);
     }
   }), /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
     key: 'reissueGoods'
@@ -10570,7 +10602,7 @@ var BsReissue = function BsReissue(props) {
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
     value: value === null || value === void 0 ? void 0 : value.bsReissueGoods,
     onChange: function onChange(val) {
-      return changeHandle(val, 'bsReissueGoods');
+      return changeGoodHandle(val);
     }
   })));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.7.15-alpha.73",
+  "version": "0.7.15-alpha.76",
   "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.71",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.76",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "umi-request": "^1.4.0"
@@ -58,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a212416de89353bc5f4a45a00bb6670cc10e5feb"
+  "gitHead": "59a50bea3ca62d5010ccb7a81ae5a95d8d724fcc"
 }