@kmkf-fe-packages/basic-components 0.7.15-alpha.57 → 0.7.15-alpha.59

package/dist/index.esm.js

@@ -10143,38 +10143,34 @@ 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) {
+    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));
     });
     //补发
-    reissueRef.current = pubsub.subscribeOnce('reissueType', function (type, val) {
+    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));
     });
-    return function () {
-      pubsub.unsubscribe(ref.current);
-      pubsub.unsubscribe(reissueRef.current);
-    };
-  }, [value, withInfo, disabled]);
+  }, [disabled, withType, withValue, setWithType, setWithValue, setTableSelect]);
   useEffect(function () {
     if (!disabled) {
       pubsub.publish('goodList', {
@@ -10182,17 +10178,19 @@ var BsGoods = function BsGoods(props) {
       });
     }
   }, [value, disabled]);
-  var _onSelect = useCallback(function (list) {
+  var onSelect = function onSelect(list) {
     if (disabled) return;
     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);
@@ -10210,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);
     },
@@ -10261,10 +10257,11 @@ var BsExchange = function BsExchange(props) {
         onChange(newValue);
       }
     });
-    pubsub.subscribe('selectList', function (_, data) {
+    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)
         }));
@@ -10279,11 +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.money = t.share;
-            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 {
@@ -10298,11 +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.money = t.share;
-            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),
@@ -10323,13 +10322,11 @@ var BsExchange = function BsExchange(props) {
     newValue.bsExchangeType = val;
     newValue.bsExchangeReturnGoods = [];
     newValue.bsExchangeGiftGoods = [];
-    if (['2', '4'].includes(val[0])) {
-      pubsub.publish('type', val[0]);
-    } else {
-      console.log(bsGoods, value);
+    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]);
   };
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
@@ -10495,9 +10492,7 @@ var BsReissue = function BsReissue(props) {
     newValue[key] = val;
     if (key === 'bsReissueType') {
       newValue.bsReissueGoods = [];
-      if (['2', '4'].includes(val[0])) {
-        pubsub.publish('reissueType', val[0]);
-      } else if (['1', '3'].includes(val[0])) {
+      if (['1', '3'].includes(val[0])) {
         newValue.bsReissueGoods = (bsGoods || []).map(function (item) {
           item.money = 0;
           item.share = 0;
@@ -10507,6 +10502,7 @@ var BsReissue = function BsReissue(props) {
       }
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
+    pubsub.publish('reissueType', val[0]);
   };
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = useMemo(function () {

package/dist/index.js

@@ -10154,38 +10154,34 @@ 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) {
+    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));
     });
     //补发
-    reissueRef.current = pubsub__default['default'].subscribeOnce('reissueType', function (type, val) {
+    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));
     });
-    return function () {
-      pubsub__default['default'].unsubscribe(ref.current);
-      pubsub__default['default'].unsubscribe(reissueRef.current);
-    };
-  }, [value, withInfo, disabled]);
+  }, [disabled, withType, withValue, setWithType, setWithValue, setTableSelect]);
   React.useEffect(function () {
     if (!disabled) {
       pubsub__default['default'].publish('goodList', {
@@ -10193,17 +10189,19 @@ var BsGoods = function BsGoods(props) {
       });
     }
   }, [value, disabled]);
-  var _onSelect = React.useCallback(function (list) {
+  var onSelect = function onSelect(list) {
     if (disabled) return;
     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);
@@ -10221,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);
     },
@@ -10272,10 +10268,11 @@ var BsExchange = function BsExchange(props) {
         onChange(newValue);
       }
     });
-    pubsub__default['default'].subscribe('selectList', function (_, data) {
+    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)
         }));
@@ -10290,11 +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.money = t.share;
-            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 {
@@ -10309,11 +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.money = t.share;
-            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),
@@ -10334,13 +10333,11 @@ var BsExchange = function BsExchange(props) {
     newValue.bsExchangeType = val;
     newValue.bsExchangeReturnGoods = [];
     newValue.bsExchangeGiftGoods = [];
-    if (['2', '4'].includes(val[0])) {
-      pubsub__default['default'].publish('type', val[0]);
-    } else {
-      console.log(bsGoods, value);
+    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]);
   };
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
@@ -10506,9 +10503,7 @@ var BsReissue = function BsReissue(props) {
     newValue[key] = val;
     if (key === 'bsReissueType') {
       newValue.bsReissueGoods = [];
-      if (['2', '4'].includes(val[0])) {
-        pubsub__default['default'].publish('reissueType', val[0]);
-      } else if (['1', '3'].includes(val[0])) {
+      if (['1', '3'].includes(val[0])) {
         newValue.bsReissueGoods = (bsGoods || []).map(function (item) {
           item.money = 0;
           item.share = 0;
@@ -10518,6 +10513,7 @@ var BsReissue = function BsReissue(props) {
       }
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
+    pubsub__default['default'].publish('reissueType', val[0]);
   };
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = React.useMemo(function () {

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.57",
+  "version": "0.7.15-alpha.59",
   "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.57",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.59",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "umi-request": "^1.4.0"
@@ -58,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f99147791d4b1ab930c7fbc4a401cd9ce49a19e2"
+  "gitHead": "ef98dc4d8d95dde163615b0127589766b2d0f36a"
 }