@kmkf-fe-packages/basic-components 0.7.15-alpha.77 → 0.7.15-alpha.78

package/dist/index.esm.js

@@ -9795,7 +9795,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
         case 5:
           res = _context.sent;
           products = res.data.products;
-          newProducts = products.map(function (item, index) {
+          newProducts = (products || []).map(function (item, index) {
             return _objectSpread2(_objectSpread2({}, item), {}, {
               index: index + 1
             });
@@ -9907,7 +9907,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     dataSource: goodList,
     scroll: {
       x: true,
-      y: 300
+      y: '50%'
     },
     pagination: {
       size: 'small',
@@ -9994,6 +9994,7 @@ var GoodItem = function GoodItem(props) {
             label: '否',
             value: '否'
           }],
+          disabled: disabled,
           value: val,
           onChange: function onChange(val) {
             return updateHandle(val, index, 'mark');
@@ -10044,6 +10045,9 @@ var GoodItem = function GoodItem(props) {
       width: 100,
       render: function render(val, record, index) {
         return record.canUpdateNumber && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
           value: val,
           min: 0,
           precision: 0,
@@ -10191,32 +10195,36 @@ var BsGoods = function BsGoods(props) {
   useEffect(function () {
     pubsub.subscribe('type', function (type, data) {
       if (disabled) return;
+      console.log(type, data);
       withInfo.current = {
         type: type,
-        val: data.val
+        val: data.val,
+        goodValue: data.goodValue
       };
       setTableSelect(['2', '4'].includes(data.val));
       if (['1', '3'].includes(data.val)) {
         var _valueRef$current;
         pubsub.publish('selectListReturn', {
           list: cloneDeep((valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current = valueRef.current) === null || _valueRef$current === void 0 ? void 0 : _valueRef$current.bsGoods) || []),
-          newValue: data === null || data === void 0 ? void 0 : data.newValue
+          goodValue: data === null || data === void 0 ? void 0 : data.goodValue
         });
       }
     });
     //补发
     pubsub.subscribe('reissueType', function (type, data) {
       if (disabled) return;
+      console.log(type, data);
       withInfo.current = {
         type: type,
-        val: data.val
+        val: data.val,
+        goodValue: data.goodValue
       };
       setTableSelect(['2', '4'].includes(data.val));
       if (['1', '3'].includes(data.val)) {
         var _valueRef$current2;
         pubsub.publish('reissueSelectListReturn', {
           list: cloneDeep((valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current2 = valueRef.current) === null || _valueRef$current2 === void 0 ? void 0 : _valueRef$current2.bsGoods) || []),
-          newValue: data === null || data === void 0 ? void 0 : data.newValue
+          goodValue: data === null || data === void 0 ? void 0 : data.goodValue
         });
       }
     });
@@ -10226,13 +10234,14 @@ var BsGoods = function BsGoods(props) {
     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);
+    console.log('onSelect', type, withInfo.current, newList);
     pubsub.publish(type, {
       type: (_withInfo$current2 = withInfo.current) === null || _withInfo$current2 === void 0 ? void 0 : _withInfo$current2.val,
       list: newList.map(function (item) {
         item.canDelete = true;
         return item;
-      })
+      }),
+      goodValue: withInfo.current.goodValue
     });
   };
   var _onDelete = function onDelete(item) {
@@ -10302,21 +10311,19 @@ var BsExchange = function BsExchange(props) {
     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) || []);
-        onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
-          bsExchangeReturnGoods: getListHandle(newDataList, valueRef.current)
-        }));
-      }
+      var newDataList = cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
+      onChange(_objectSpread2(_objectSpread2({}, data.goodValue), {}, {
+        bsExchangeReturnGoods: getListHandle(newDataList, valueRef.current)
+      }));
     });
   }, []);
   useEffect(function () {
     pubsub.subscribe('selectListReturn', function (_, data) {
       console.log('selectListReturn', data);
       if (disabled) return;
-      var newValue = _objectSpread2({}, data.newValue);
+      var newValue = _objectSpread2({}, data.goodValue);
       var newDataList = cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
-      onChange(_objectSpread2(_objectSpread2({}, data.newValue), {}, {
+      onChange(_objectSpread2(_objectSpread2({}, newValue), {}, {
         bsExchangeReturnGoods: getListHandle(newDataList, newValue)
       }));
     });
@@ -10380,7 +10387,7 @@ var BsExchange = function BsExchange(props) {
     }
     pubsub.publish('type', {
       val: val[0],
-      newValue: newValue
+      goodValue: newValue
     });
   };
   var changeHandle = function changeHandle(val, key) {
@@ -10504,25 +10511,23 @@ var BsReissue = function BsReissue(props) {
   var valueRef = useRef({});
   useEffect(function () {
     pubsub.subscribe('reissueSelectList', function (_, data) {
-      console.log('reissueSelectList', valueRef.current);
+      console.log('reissueSelectList', data);
       if (disabled) return;
-      if (valueRef.current) {
-        var newValue = _objectSpread2({}, valueRef.current);
-        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);
-      }
+      var newValue = _objectSpread2({}, data.goodValue);
+      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);
     });
   }, []);
   useEffect(function () {
     pubsub.subscribe('reissueSelectListReturn', function (_, data) {
       console.log('reissueSelectListReturn', data);
       if (disabled) return;
-      var newValue = _objectSpread2({}, data.newValue);
+      var newValue = _objectSpread2({}, data.goodValue);
       newValue.bsReissueGoods = data === null || data === void 0 ? void 0 : data.list.map(function (item) {
         item.money = 0;
         item.share = 0;
@@ -10551,10 +10556,11 @@ var BsReissue = function BsReissue(props) {
     newValue.bsReissueGoods = [];
     if (['2', '4'].includes(val[0])) {
       onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+      valueRef.current = newValue;
     }
     pubsub.publish('reissueType', {
       val: val[0],
-      newValue: newValue
+      goodValue: newValue
     });
   };
   var changeGoodHandle = function changeGoodHandle(val) {

package/dist/index.js

@@ -9806,7 +9806,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
         case 5:
           res = _context.sent;
           products = res.data.products;
-          newProducts = products.map(function (item, index) {
+          newProducts = (products || []).map(function (item, index) {
             return _objectSpread2(_objectSpread2({}, item), {}, {
               index: index + 1
             });
@@ -9918,7 +9918,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     dataSource: goodList,
     scroll: {
       x: true,
-      y: 300
+      y: '50%'
     },
     pagination: {
       size: 'small',
@@ -10005,6 +10005,7 @@ var GoodItem = function GoodItem(props) {
             label: '否',
             value: '否'
           }],
+          disabled: disabled,
           value: val,
           onChange: function onChange(val) {
             return updateHandle(val, index, 'mark');
@@ -10055,6 +10056,9 @@ var GoodItem = function GoodItem(props) {
       width: 100,
       render: function render(val, record, index) {
         return record.canUpdateNumber && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
           value: val,
           min: 0,
           precision: 0,
@@ -10202,32 +10206,36 @@ var BsGoods = function BsGoods(props) {
   React.useEffect(function () {
     pubsub__default['default'].subscribe('type', function (type, data) {
       if (disabled) return;
+      console.log(type, data);
       withInfo.current = {
         type: type,
-        val: data.val
+        val: data.val,
+        goodValue: data.goodValue
       };
       setTableSelect(['2', '4'].includes(data.val));
       if (['1', '3'].includes(data.val)) {
         var _valueRef$current;
         pubsub__default['default'].publish('selectListReturn', {
           list: lodash.cloneDeep((valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current = valueRef.current) === null || _valueRef$current === void 0 ? void 0 : _valueRef$current.bsGoods) || []),
-          newValue: data === null || data === void 0 ? void 0 : data.newValue
+          goodValue: data === null || data === void 0 ? void 0 : data.goodValue
         });
       }
     });
     //补发
     pubsub__default['default'].subscribe('reissueType', function (type, data) {
       if (disabled) return;
+      console.log(type, data);
       withInfo.current = {
         type: type,
-        val: data.val
+        val: data.val,
+        goodValue: data.goodValue
       };
       setTableSelect(['2', '4'].includes(data.val));
       if (['1', '3'].includes(data.val)) {
         var _valueRef$current2;
         pubsub__default['default'].publish('reissueSelectListReturn', {
           list: lodash.cloneDeep((valueRef === null || valueRef === void 0 ? void 0 : (_valueRef$current2 = valueRef.current) === null || _valueRef$current2 === void 0 ? void 0 : _valueRef$current2.bsGoods) || []),
-          newValue: data === null || data === void 0 ? void 0 : data.newValue
+          goodValue: data === null || data === void 0 ? void 0 : data.goodValue
         });
       }
     });
@@ -10237,13 +10245,14 @@ var BsGoods = function BsGoods(props) {
     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);
+    console.log('onSelect', type, withInfo.current, newList);
     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) {
         item.canDelete = true;
         return item;
-      })
+      }),
+      goodValue: withInfo.current.goodValue
     });
   };
   var _onDelete = function onDelete(item) {
@@ -10313,21 +10322,19 @@ var BsExchange = function BsExchange(props) {
     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) || []);
-        onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
-          bsExchangeReturnGoods: getListHandle(newDataList, valueRef.current)
-        }));
-      }
+      var newDataList = lodash.cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
+      onChange(_objectSpread2(_objectSpread2({}, data.goodValue), {}, {
+        bsExchangeReturnGoods: getListHandle(newDataList, valueRef.current)
+      }));
     });
   }, []);
   React.useEffect(function () {
     pubsub__default['default'].subscribe('selectListReturn', function (_, data) {
       console.log('selectListReturn', data);
       if (disabled) return;
-      var newValue = _objectSpread2({}, data.newValue);
+      var newValue = _objectSpread2({}, data.goodValue);
       var newDataList = lodash.cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
-      onChange(_objectSpread2(_objectSpread2({}, data.newValue), {}, {
+      onChange(_objectSpread2(_objectSpread2({}, newValue), {}, {
         bsExchangeReturnGoods: getListHandle(newDataList, newValue)
       }));
     });
@@ -10391,7 +10398,7 @@ var BsExchange = function BsExchange(props) {
     }
     pubsub__default['default'].publish('type', {
       val: val[0],
-      newValue: newValue
+      goodValue: newValue
     });
   };
   var changeHandle = function changeHandle(val, key) {
@@ -10515,25 +10522,23 @@ var BsReissue = function BsReissue(props) {
   var valueRef = React.useRef({});
   React.useEffect(function () {
     pubsub__default['default'].subscribe('reissueSelectList', function (_, data) {
-      console.log('reissueSelectList', valueRef.current);
+      console.log('reissueSelectList', data);
       if (disabled) return;
-      if (valueRef.current) {
-        var newValue = _objectSpread2({}, valueRef.current);
-        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);
-      }
+      var newValue = _objectSpread2({}, data.goodValue);
+      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);
     });
   }, []);
   React.useEffect(function () {
     pubsub__default['default'].subscribe('reissueSelectListReturn', function (_, data) {
       console.log('reissueSelectListReturn', data);
       if (disabled) return;
-      var newValue = _objectSpread2({}, data.newValue);
+      var newValue = _objectSpread2({}, data.goodValue);
       newValue.bsReissueGoods = data === null || data === void 0 ? void 0 : data.list.map(function (item) {
         item.money = 0;
         item.share = 0;
@@ -10562,10 +10567,11 @@ var BsReissue = function BsReissue(props) {
     newValue.bsReissueGoods = [];
     if (['2', '4'].includes(val[0])) {
       onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+      valueRef.current = newValue;
     }
     pubsub__default['default'].publish('reissueType', {
       val: val[0],
-      newValue: newValue
+      goodValue: newValue
     });
   };
   var changeGoodHandle = function changeGoodHandle(val) {

package/package.json

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