@kmkf-fe-packages/basic-components 0.7.15-alpha.65 → 0.7.15-alpha.69

package/dist/index.esm.js

@@ -9473,7 +9473,12 @@ var jstGoods = function jstGoods(props) {
     setChangeIndex(0);
   }, []);
   var content = function content(item, index) {
-    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        maxHeight: '300px',
+        overflowY: 'auto'
+      }
+    }, /*#__PURE__*/React.createElement("div", {
       style: {
         textAlign: 'center'
       }
@@ -10156,38 +10161,45 @@ var BsGoods = function BsGoods(props) {
     _useState2 = _slicedToArray(_useState, 2),
     tableSelect = _useState2[0],
     setTableSelect = _useState2[1];
-  // const [withInfo, setWithInfo] = useState({ type: '', val: '' });
-  // const [withType, setWithType] = useState('');
-  // const [withValue, setWithValue] = useState('');
   var withInfo = useRef(null);
+  var valueRef = useRef(null);
   useEffect(function () {
+    valueRef.current = value;
     pubsub.subscribe('type', function (type, val) {
       if (disabled) return;
-      console.log('type', type, val);
       withInfo.current = {
         type: type,
         val: 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) || [])
+        });
+      }
     });
     //补发
     pubsub.subscribe('reissueType', function (type, val) {
       if (disabled) return;
-      console.log('reissueType', type, val);
       withInfo.current = {
         type: type,
         val: 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) || [])
+        });
+      }
     });
-  }, [disabled]);
-  useEffect(function () {
-    if (!disabled) {
-      pubsub.publish('goodList', {
-        list: cloneDeep((value === null || value === void 0 ? void 0 : value.bsGoods) || [])
-      });
-    }
-  }, [value, disabled]);
+  }, [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;
@@ -10244,12 +10256,14 @@ var BsExchange = function BsExchange(props) {
     _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('goodList', function (_, data) {
-      setBsGoods(data.list);
-    });
-  }, []);
-  useEffect(function () {
+    valueRef.current = value;
     pubsub.subscribeOnce('deleteGood', function (_, data) {
       if (disabled) return;
       if (value) {
@@ -10270,17 +10284,29 @@ var BsExchange = function BsExchange(props) {
         onChange(newValue);
       }
     });
-    pubsub.subscribeOnce('selectList', function (_, data) {
+    // 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;
-      if (value) {
-        var newData = cloneDeep(data);
-        console.log(getListHandle(_toConsumableArray(newData.list), value));
-        onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-          bsExchangeReturnGoods: getListHandle(_toConsumableArray(newData.list), value)
+      // 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), {}, {
+          bsExchangeReturnGoods: getListHandle(newDataList, valueRef.current)
         }));
       }
     });
-  }, [value]);
+  }, []);
   var getListHandle = function getListHandle(list, val) {
     var _val$bsExchangeType, _val$bsExchangeType2;
     //如果是原单换
@@ -10335,9 +10361,9 @@ var BsExchange = function BsExchange(props) {
     newValue.bsExchangeType = val;
     newValue.bsExchangeReturnGoods = [];
     newValue.bsExchangeGiftGoods = [];
-    if (['1', '3'].includes(val[0])) {
-      newValue.bsExchangeReturnGoods = getListHandle(bsGoods, newValue);
-    }
+    // 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]);
   };
@@ -10463,12 +10489,29 @@ var BsReissue = function BsReissue(props) {
     _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('goodList', function (_, data) {
-      setBsGoods(data.list);
+    pubsub.subscribe('reissueSelectList', function (_, 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);
+      }
     });
   }, []);
   useEffect(function () {
+    valueRef.current = value;
     pubsub.subscribeOnce('reissueDeleteGood', function (_, data) {
       if (disabled) return;
       if (value) {
@@ -10479,19 +10522,19 @@ 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);
-      }
-    });
+    // 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);
@@ -10503,17 +10546,17 @@ var BsReissue = function BsReissue(props) {
       });
     }
     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;
-        });
-      }
-    }
+    // 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]);
   };

package/dist/index.js

@@ -9484,7 +9484,12 @@ var jstGoods = function jstGoods(props) {
     setChangeIndex(0);
   }, []);
   var content = function content(item, index) {
-    return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", {
+    return /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        maxHeight: '300px',
+        overflowY: 'auto'
+      }
+    }, /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
         textAlign: 'center'
       }
@@ -10167,38 +10172,45 @@ var BsGoods = function BsGoods(props) {
     _useState2 = _slicedToArray(_useState, 2),
     tableSelect = _useState2[0],
     setTableSelect = _useState2[1];
-  // const [withInfo, setWithInfo] = useState({ type: '', val: '' });
-  // const [withType, setWithType] = useState('');
-  // const [withValue, setWithValue] = useState('');
   var withInfo = React.useRef(null);
+  var valueRef = React.useRef(null);
   React.useEffect(function () {
+    valueRef.current = value;
     pubsub__default['default'].subscribe('type', function (type, val) {
       if (disabled) return;
-      console.log('type', type, val);
       withInfo.current = {
         type: type,
         val: 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) || [])
+        });
+      }
     });
     //补发
     pubsub__default['default'].subscribe('reissueType', function (type, val) {
       if (disabled) return;
-      console.log('reissueType', type, val);
       withInfo.current = {
         type: type,
         val: 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) || [])
+        });
+      }
     });
-  }, [disabled]);
-  React.useEffect(function () {
-    if (!disabled) {
-      pubsub__default['default'].publish('goodList', {
-        list: lodash.cloneDeep((value === null || value === void 0 ? void 0 : value.bsGoods) || [])
-      });
-    }
-  }, [value, disabled]);
+  }, [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;
@@ -10255,12 +10267,14 @@ var BsExchange = function BsExchange(props) {
     _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('goodList', function (_, data) {
-      setBsGoods(data.list);
-    });
-  }, []);
-  React.useEffect(function () {
+    valueRef.current = value;
     pubsub__default['default'].subscribeOnce('deleteGood', function (_, data) {
       if (disabled) return;
       if (value) {
@@ -10281,17 +10295,29 @@ var BsExchange = function BsExchange(props) {
         onChange(newValue);
       }
     });
-    pubsub__default['default'].subscribeOnce('selectList', function (_, data) {
+    // 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;
-      if (value) {
-        var newData = lodash.cloneDeep(data);
-        console.log(getListHandle(_toConsumableArray(newData.list), value));
-        onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-          bsExchangeReturnGoods: getListHandle(_toConsumableArray(newData.list), value)
+      // 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), {}, {
+          bsExchangeReturnGoods: getListHandle(newDataList, valueRef.current)
         }));
       }
     });
-  }, [value]);
+  }, []);
   var getListHandle = function getListHandle(list, val) {
     var _val$bsExchangeType, _val$bsExchangeType2;
     //如果是原单换
@@ -10346,9 +10372,9 @@ var BsExchange = function BsExchange(props) {
     newValue.bsExchangeType = val;
     newValue.bsExchangeReturnGoods = [];
     newValue.bsExchangeGiftGoods = [];
-    if (['1', '3'].includes(val[0])) {
-      newValue.bsExchangeReturnGoods = getListHandle(bsGoods, newValue);
-    }
+    // 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]);
   };
@@ -10474,12 +10500,29 @@ var BsReissue = function BsReissue(props) {
     _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('goodList', function (_, data) {
-      setBsGoods(data.list);
+    pubsub__default['default'].subscribe('reissueSelectList', function (_, 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);
+      }
     });
   }, []);
   React.useEffect(function () {
+    valueRef.current = value;
     pubsub__default['default'].subscribeOnce('reissueDeleteGood', function (_, data) {
       if (disabled) return;
       if (value) {
@@ -10490,19 +10533,19 @@ 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);
-      }
-    });
+    // 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);
@@ -10514,17 +10557,17 @@ var BsReissue = function BsReissue(props) {
       });
     }
     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;
-        });
-      }
-    }
+    // 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]);
   };

package/package.json

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