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

package/dist/index.esm.js

@@ -10165,41 +10165,38 @@ var BsGoods = function BsGoods(props) {
   var valueRef = useRef(null);
   useEffect(function () {
     valueRef.current = value;
-    pubsub.subscribe('type', function (type, val) {
+    pubsub.subscribe('type', function (type, data) {
       if (disabled) return;
       withInfo.current = {
         type: type,
-        val: val
+        val: data.val
       };
-      setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val)) {
-        pubsub.publish('selectList', {
-          list: cloneDeep((value === null || value === void 0 ? void 0 : value.bsGoods) || [])
+      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
         });
       }
     });
     //补发
-    pubsub.subscribe('reissueType', function (type, val) {
+    pubsub.subscribe('reissueType', function (type, data) {
       if (disabled) return;
       withInfo.current = {
         type: type,
-        val: val
+        val: data.val
       };
-      setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val)) {
-        pubsub.publish('reissueSelectList', {
-          list: cloneDeep((value === null || value === void 0 ? void 0 : value.bsGoods) || [])
+      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
         });
       }
     });
   }, [disabled, value]);
-  // useEffect(() => {
-  //   if (!disabled) {
-  //     pubsub.publish('goodList', {
-  //       list: cloneDeep(value?.bsGoods || []),
-  //     });
-  //   }
-  // }, [value, disabled]);
   var _onSelect = function onSelect(list) {
     var _withInfo$current, _withInfo$current2;
     if (disabled) return;
@@ -10252,16 +10249,7 @@ 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];
   var valueRef = useRef({});
-  // useEffect(() => {
-  //   pubsub.subscribe('goodList', (_: any, data: any) => {
-  //     setBsGoods(data.list);
-  //   });
-  // }, []);
   useEffect(function () {
     valueRef.current = value;
     pubsub.subscribeOnce('deleteGood', function (_, data) {
@@ -10284,21 +10272,10 @@ var BsExchange = function BsExchange(props) {
         onChange(newValue);
       }
     });
-    // pubsub.subscribeOnce('selectList', (_: any, data: any) => {
-    //   if (disabled) return;
-    //   if (value) {
-    //     const newData = cloneDeep(data);
-    //     onChange({
-    //       ...value,
-    //       bsExchangeReturnGoods: getListHandle([...newData.list], value),
-    //     });
-    //   }
-    // });
   }, [value]);
   useEffect(function () {
     pubsub.subscribe('selectList', function (_, data) {
       if (disabled) return;
-      // console.log('selectList', valueRef.current, data);
       if (valueRef.current) {
         var newDataList = cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
         onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
@@ -10307,6 +10284,15 @@ var BsExchange = function BsExchange(props) {
       }
     });
   }, []);
+  useEffect(function () {
+    pubsub.subscribe('selectListReturn', function (_, data) {
+      if (disabled) return;
+      var newDataList = cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
+      onChange(_objectSpread2(_objectSpread2({}, data.newValue), {}, {
+        bsExchangeReturnGoods: getListHandle(newDataList, valueRef.current)
+      }));
+    });
+  }, []);
   var getListHandle = function getListHandle(list, val) {
     var _val$bsExchangeType, _val$bsExchangeType2;
     //如果是原单换
@@ -10361,11 +10347,13 @@ 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]);
+    if (['2', '4'].includes(val[0])) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    }
+    pubsub.publish('type', {
+      val: val[0],
+      newValue: newValue
+    });
   };
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
@@ -10378,12 +10366,10 @@ var BsExchange = function BsExchange(props) {
     newValue[key] = val;
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     if (key === 'bsExchangeType') {
-      console.log(val);
       pubsub.publish('type', val[0]);
     }
   };
   var changeReturnHandle = function 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;
@@ -10485,16 +10471,7 @@ 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];
   var valueRef = useRef({});
-  // useEffect(() => {
-  //   pubsub.subscribe('goodList', (_: any, data: any) => {
-  //     setBsGoods(data.list);
-  //   });
-  // }, []);
   useEffect(function () {
     pubsub.subscribe('reissueSelectList', function (_, data) {
       if (disabled) return;
@@ -10510,6 +10487,19 @@ var BsReissue = function BsReissue(props) {
       }
     });
   }, []);
+  useEffect(function () {
+    pubsub.subscribe('reissueSelectListReturn', function (_, data) {
+      if (disabled) return;
+      var newValue = _objectSpread2({}, data.newValue);
+      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 () {
     valueRef.current = value;
     pubsub.subscribeOnce('reissueDeleteGood', function (_, data) {
@@ -10522,19 +10512,6 @@ var BsReissue = function BsReissue(props) {
         onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
       }
     });
-    // pubsub.subscribeOnce('reissueSelectList', (_: any, data: any) => {
-    //   if (disabled) return;
-    //   if (value) {
-    //     const newValue = { ...value };
-    //     newValue.bsReissueGoods = data?.list.map((item: any) => {
-    //       item.money = 0;
-    //       item.share = 0;
-    //       item.canUpdateNumber = true;
-    //       return item;
-    //     });
-    //     onChange?.(newValue);
-    //   }
-    // });
   }, [value, disabled]);
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
@@ -10546,19 +10523,16 @@ var BsReissue = function BsReissue(props) {
       });
     }
     newValue[key] = val;
-    // if (key === 'bsReissueType') {
-    //   newValue.bsReissueGoods = [];
-    //   if (['1', '3'].includes(val[0])) {
-    //     newValue.bsReissueGoods = (bsGoods || []).map((item: any) => {
-    //       item.money = 0;
-    //       item.share = 0;
-    //       item.canUpdateNumber = false;
-    //       return item;
-    //     });
-    //   }
-    // }
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
-    pubsub.publish('reissueType', val[0]);
+    if (key === 'bsReissueType') {
+      newValue.bsReissueGoods = [];
+    }
+    if (['2', '4'].includes(val[0])) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    }
+    pubsub.publish('reissueType', {
+      val: val[0],
+      newValue: newValue
+    });
   };
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = useMemo(function () {

package/dist/index.js

@@ -10176,41 +10176,38 @@ var BsGoods = function BsGoods(props) {
   var valueRef = React.useRef(null);
   React.useEffect(function () {
     valueRef.current = value;
-    pubsub__default['default'].subscribe('type', function (type, val) {
+    pubsub__default['default'].subscribe('type', function (type, data) {
       if (disabled) return;
       withInfo.current = {
         type: type,
-        val: val
+        val: data.val
       };
-      setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val)) {
-        pubsub__default['default'].publish('selectList', {
-          list: lodash.cloneDeep((value === null || value === void 0 ? void 0 : value.bsGoods) || [])
+      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
         });
       }
     });
     //补发
-    pubsub__default['default'].subscribe('reissueType', function (type, val) {
+    pubsub__default['default'].subscribe('reissueType', function (type, data) {
       if (disabled) return;
       withInfo.current = {
         type: type,
-        val: val
+        val: data.val
       };
-      setTableSelect(['2', '4'].includes(val));
-      if (['1', '3'].includes(val)) {
-        pubsub__default['default'].publish('reissueSelectList', {
-          list: lodash.cloneDeep((value === null || value === void 0 ? void 0 : value.bsGoods) || [])
+      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
         });
       }
     });
   }, [disabled, value]);
-  // useEffect(() => {
-  //   if (!disabled) {
-  //     pubsub.publish('goodList', {
-  //       list: cloneDeep(value?.bsGoods || []),
-  //     });
-  //   }
-  // }, [value, disabled]);
   var _onSelect = function onSelect(list) {
     var _withInfo$current, _withInfo$current2;
     if (disabled) return;
@@ -10263,16 +10260,7 @@ 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];
   var valueRef = React.useRef({});
-  // useEffect(() => {
-  //   pubsub.subscribe('goodList', (_: any, data: any) => {
-  //     setBsGoods(data.list);
-  //   });
-  // }, []);
   React.useEffect(function () {
     valueRef.current = value;
     pubsub__default['default'].subscribeOnce('deleteGood', function (_, data) {
@@ -10295,21 +10283,10 @@ var BsExchange = function BsExchange(props) {
         onChange(newValue);
       }
     });
-    // pubsub.subscribeOnce('selectList', (_: any, data: any) => {
-    //   if (disabled) return;
-    //   if (value) {
-    //     const newData = cloneDeep(data);
-    //     onChange({
-    //       ...value,
-    //       bsExchangeReturnGoods: getListHandle([...newData.list], value),
-    //     });
-    //   }
-    // });
   }, [value]);
   React.useEffect(function () {
     pubsub__default['default'].subscribe('selectList', function (_, data) {
       if (disabled) return;
-      // console.log('selectList', valueRef.current, data);
       if (valueRef.current) {
         var newDataList = lodash.cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
         onChange(_objectSpread2(_objectSpread2({}, valueRef.current), {}, {
@@ -10318,6 +10295,15 @@ var BsExchange = function BsExchange(props) {
       }
     });
   }, []);
+  React.useEffect(function () {
+    pubsub__default['default'].subscribe('selectListReturn', function (_, data) {
+      if (disabled) return;
+      var newDataList = lodash.cloneDeep((data === null || data === void 0 ? void 0 : data.list) || []);
+      onChange(_objectSpread2(_objectSpread2({}, data.newValue), {}, {
+        bsExchangeReturnGoods: getListHandle(newDataList, valueRef.current)
+      }));
+    });
+  }, []);
   var getListHandle = function getListHandle(list, val) {
     var _val$bsExchangeType, _val$bsExchangeType2;
     //如果是原单换
@@ -10372,11 +10358,13 @@ 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]);
+    if (['2', '4'].includes(val[0])) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    }
+    pubsub__default['default'].publish('type', {
+      val: val[0],
+      newValue: newValue
+    });
   };
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
@@ -10389,12 +10377,10 @@ var BsExchange = function BsExchange(props) {
     newValue[key] = val;
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     if (key === 'bsExchangeType') {
-      console.log(val);
       pubsub__default['default'].publish('type', val[0]);
     }
   };
   var changeReturnHandle = function 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;
@@ -10496,16 +10482,7 @@ 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];
   var valueRef = React.useRef({});
-  // useEffect(() => {
-  //   pubsub.subscribe('goodList', (_: any, data: any) => {
-  //     setBsGoods(data.list);
-  //   });
-  // }, []);
   React.useEffect(function () {
     pubsub__default['default'].subscribe('reissueSelectList', function (_, data) {
       if (disabled) return;
@@ -10521,6 +10498,19 @@ var BsReissue = function BsReissue(props) {
       }
     });
   }, []);
+  React.useEffect(function () {
+    pubsub__default['default'].subscribe('reissueSelectListReturn', function (_, data) {
+      if (disabled) return;
+      var newValue = _objectSpread2({}, data.newValue);
+      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 () {
     valueRef.current = value;
     pubsub__default['default'].subscribeOnce('reissueDeleteGood', function (_, data) {
@@ -10533,19 +10523,6 @@ var BsReissue = function BsReissue(props) {
         onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
       }
     });
-    // pubsub.subscribeOnce('reissueSelectList', (_: any, data: any) => {
-    //   if (disabled) return;
-    //   if (value) {
-    //     const newValue = { ...value };
-    //     newValue.bsReissueGoods = data?.list.map((item: any) => {
-    //       item.money = 0;
-    //       item.share = 0;
-    //       item.canUpdateNumber = true;
-    //       return item;
-    //     });
-    //     onChange?.(newValue);
-    //   }
-    // });
   }, [value, disabled]);
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
@@ -10557,19 +10534,16 @@ var BsReissue = function BsReissue(props) {
       });
     }
     newValue[key] = val;
-    // if (key === 'bsReissueType') {
-    //   newValue.bsReissueGoods = [];
-    //   if (['1', '3'].includes(val[0])) {
-    //     newValue.bsReissueGoods = (bsGoods || []).map((item: any) => {
-    //       item.money = 0;
-    //       item.share = 0;
-    //       item.canUpdateNumber = false;
-    //       return item;
-    //     });
-    //   }
-    // }
-    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
-    pubsub__default['default'].publish('reissueType', val[0]);
+    if (key === 'bsReissueType') {
+      newValue.bsReissueGoods = [];
+    }
+    if (['2', '4'].includes(val[0])) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    }
+    pubsub__default['default'].publish('reissueType', {
+      val: val[0],
+      newValue: newValue
+    });
   };
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = React.useMemo(function () {

package/package.json

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