@kmkf-fe-packages/basic-components 0.7.15-alpha.60 → 0.7.15-alpha.61

package/dist/index.esm.js

@@ -9337,6 +9337,13 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       trajectoryCode = value.trajectoryCode,
       trajectoryPhone = value.trajectoryPhone;
     var newCompany = company ? company : trajectoryCompany;
+    //不展示拦截状态不请求
+    if (!(showField && showField.includes('snapshot'))) {
+      return;
+    }
+    if (disabled) {
+      return;
+    }
     if (newCompany === 'SF' && !(newCompany && trajectoryCode && trajectoryPhone)) {
       return;
     } else if (!(newCompany && trajectoryCode)) {
@@ -9930,6 +9937,8 @@ var GoodItem = function GoodItem(props) {
     showChangeBtn = _props$showChangeBtn === void 0 ? true : _props$showChangeBtn,
     _props$tableSelect = props.tableSelect,
     tableSelect = _props$tableSelect === void 0 ? false : _props$tableSelect,
+    _props$selectType = props.selectType,
+    selectType = _props$selectType === void 0 ? '' : _props$selectType,
     _props$otherOperation = props.otherOperations,
     otherOperations = _props$otherOperation === void 0 ? null : _props$otherOperation,
     _props$canUpdateNumbe = props.canUpdateNumber,
@@ -9950,10 +9959,8 @@ var GoodItem = function GoodItem(props) {
     selectedRowKeys = _useState2[0],
     setSelectedRowKeys = _useState2[1];
   useEffect(function () {
-    if (!tableSelect) {
-      setSelectedRowKeys([]);
-    }
-  }, [tableSelect]);
+    setSelectedRowKeys([]);
+  }, [tableSelect, selectType]);
   var updateHandle = function updateHandle(val, index, type) {
     if (value === null || value === void 0 ? void 0 : value.length) {
       value[index][type] = val;
@@ -10137,6 +10144,7 @@ var GoodItem = function GoodItem(props) {
 };
 
 var BsGoods = function BsGoods(props) {
+  var _withInfo$current3, _withInfo$current4;
   var value = props.value,
     disabled = props.disabled,
     onChange = props.onChange;
@@ -10145,33 +10153,30 @@ var BsGoods = function BsGoods(props) {
     tableSelect = _useState2[0],
     setTableSelect = _useState2[1];
   // const [withInfo, setWithInfo] = useState({ type: '', val: '' });
-  var _useState3 = useState(''),
-    _useState4 = _slicedToArray(_useState3, 2),
-    withType = _useState4[0],
-    setWithType = _useState4[1];
-  var _useState5 = useState(''),
-    _useState6 = _slicedToArray(_useState5, 2),
-    withValue = _useState6[0],
-    setWithValue = _useState6[1];
+  // const [withType, setWithType] = useState('');
+  // const [withValue, setWithValue] = useState('');
+  var withInfo = useRef(null);
   useEffect(function () {
     pubsub.subscribe('type', function (type, val) {
       if (disabled) return;
       console.log('type', type, val);
-      // setWithInfo({ type, val });
-      setWithType(type);
-      setWithValue(val);
+      withInfo.current = {
+        type: type,
+        val: val
+      };
       setTableSelect(['2', '4'].includes(val));
     });
     //补发
     pubsub.subscribe('reissueType', function (type, val) {
       if (disabled) return;
       console.log('reissueType', type, val);
-      // setWithInfo({ type, val });
-      setWithType(type);
-      setWithValue(val);
+      withInfo.current = {
+        type: type,
+        val: val
+      };
       setTableSelect(['2', '4'].includes(val));
     });
-  }, [disabled, withType, withValue, setWithType, setWithValue, setTableSelect]);
+  }, [disabled]);
   useEffect(function () {
     if (!disabled) {
       pubsub.publish('goodList', {
@@ -10179,13 +10184,13 @@ var BsGoods = function BsGoods(props) {
       });
     }
   }, [value, disabled]);
-  var onSelect = function onSelect(list) {
+  var _onSelect = function onSelect(list) {
+    var _withInfo$current, _withInfo$current2;
     if (disabled) return;
     var newList = cloneDeep(list);
-    var type = withType === 'reissueType' ? 'reissueSelectList' : 'selectList';
-    console.log(withType, withValue, type);
+    var type = ((_withInfo$current = withInfo.current) === null || _withInfo$current === void 0 ? void 0 : _withInfo$current.type) === 'reissueType' ? 'reissueSelectList' : 'selectList';
     pubsub.publish(type, {
-      type: withValue,
+      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;
@@ -10208,8 +10213,11 @@ var BsGoods = function BsGoods(props) {
     disabled: disabled,
     value: value === null || value === void 0 ? void 0 : value.bsGoods,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    tableSelect: tableSelect,
-    onSelect: onSelect,
+    tableSelect: ['2', '4'].includes(withInfo === null || withInfo === void 0 ? void 0 : (_withInfo$current3 = withInfo.current) === null || _withInfo$current3 === void 0 ? void 0 : _withInfo$current3.val),
+    selectType: withInfo === null || withInfo === void 0 ? void 0 : (_withInfo$current4 = withInfo.current) === null || _withInfo$current4 === void 0 ? void 0 : _withInfo$current4.type,
+    onSelect: function onSelect(list) {
+      return _onSelect(list);
+    },
     onDelete: function onDelete(item) {
       return _onDelete(item);
     },

package/dist/index.js

@@ -9348,6 +9348,13 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       trajectoryCode = value.trajectoryCode,
       trajectoryPhone = value.trajectoryPhone;
     var newCompany = company ? company : trajectoryCompany;
+    //不展示拦截状态不请求
+    if (!(showField && showField.includes('snapshot'))) {
+      return;
+    }
+    if (disabled) {
+      return;
+    }
     if (newCompany === 'SF' && !(newCompany && trajectoryCode && trajectoryPhone)) {
       return;
     } else if (!(newCompany && trajectoryCode)) {
@@ -9941,6 +9948,8 @@ var GoodItem = function GoodItem(props) {
     showChangeBtn = _props$showChangeBtn === void 0 ? true : _props$showChangeBtn,
     _props$tableSelect = props.tableSelect,
     tableSelect = _props$tableSelect === void 0 ? false : _props$tableSelect,
+    _props$selectType = props.selectType,
+    selectType = _props$selectType === void 0 ? '' : _props$selectType,
     _props$otherOperation = props.otherOperations,
     otherOperations = _props$otherOperation === void 0 ? null : _props$otherOperation,
     _props$canUpdateNumbe = props.canUpdateNumber,
@@ -9961,10 +9970,8 @@ var GoodItem = function GoodItem(props) {
     selectedRowKeys = _useState2[0],
     setSelectedRowKeys = _useState2[1];
   React.useEffect(function () {
-    if (!tableSelect) {
-      setSelectedRowKeys([]);
-    }
-  }, [tableSelect]);
+    setSelectedRowKeys([]);
+  }, [tableSelect, selectType]);
   var updateHandle = function updateHandle(val, index, type) {
     if (value === null || value === void 0 ? void 0 : value.length) {
       value[index][type] = val;
@@ -10148,6 +10155,7 @@ var GoodItem = function GoodItem(props) {
 };
 
 var BsGoods = function BsGoods(props) {
+  var _withInfo$current3, _withInfo$current4;
   var value = props.value,
     disabled = props.disabled,
     onChange = props.onChange;
@@ -10156,33 +10164,30 @@ var BsGoods = function BsGoods(props) {
     tableSelect = _useState2[0],
     setTableSelect = _useState2[1];
   // const [withInfo, setWithInfo] = useState({ type: '', val: '' });
-  var _useState3 = React.useState(''),
-    _useState4 = _slicedToArray(_useState3, 2),
-    withType = _useState4[0],
-    setWithType = _useState4[1];
-  var _useState5 = React.useState(''),
-    _useState6 = _slicedToArray(_useState5, 2),
-    withValue = _useState6[0],
-    setWithValue = _useState6[1];
+  // const [withType, setWithType] = useState('');
+  // const [withValue, setWithValue] = useState('');
+  var withInfo = React.useRef(null);
   React.useEffect(function () {
     pubsub__default['default'].subscribe('type', function (type, val) {
       if (disabled) return;
       console.log('type', type, val);
-      // setWithInfo({ type, val });
-      setWithType(type);
-      setWithValue(val);
+      withInfo.current = {
+        type: type,
+        val: val
+      };
       setTableSelect(['2', '4'].includes(val));
     });
     //补发
     pubsub__default['default'].subscribe('reissueType', function (type, val) {
       if (disabled) return;
       console.log('reissueType', type, val);
-      // setWithInfo({ type, val });
-      setWithType(type);
-      setWithValue(val);
+      withInfo.current = {
+        type: type,
+        val: val
+      };
       setTableSelect(['2', '4'].includes(val));
     });
-  }, [disabled, withType, withValue, setWithType, setWithValue, setTableSelect]);
+  }, [disabled]);
   React.useEffect(function () {
     if (!disabled) {
       pubsub__default['default'].publish('goodList', {
@@ -10190,13 +10195,13 @@ var BsGoods = function BsGoods(props) {
       });
     }
   }, [value, disabled]);
-  var onSelect = function onSelect(list) {
+  var _onSelect = function onSelect(list) {
+    var _withInfo$current, _withInfo$current2;
     if (disabled) return;
     var newList = lodash.cloneDeep(list);
-    var type = withType === 'reissueType' ? 'reissueSelectList' : 'selectList';
-    console.log(withType, withValue, type);
+    var type = ((_withInfo$current = withInfo.current) === null || _withInfo$current === void 0 ? void 0 : _withInfo$current.type) === 'reissueType' ? 'reissueSelectList' : 'selectList';
     pubsub__default['default'].publish(type, {
-      type: withValue,
+      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;
@@ -10219,8 +10224,11 @@ var BsGoods = function BsGoods(props) {
     disabled: disabled,
     value: value === null || value === void 0 ? void 0 : value.bsGoods,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    tableSelect: tableSelect,
-    onSelect: onSelect,
+    tableSelect: ['2', '4'].includes(withInfo === null || withInfo === void 0 ? void 0 : (_withInfo$current3 = withInfo.current) === null || _withInfo$current3 === void 0 ? void 0 : _withInfo$current3.val),
+    selectType: withInfo === null || withInfo === void 0 ? void 0 : (_withInfo$current4 = withInfo.current) === null || _withInfo$current4 === void 0 ? void 0 : _withInfo$current4.type,
+    onSelect: function onSelect(list) {
+      return _onSelect(list);
+    },
     onDelete: function onDelete(item) {
       return _onDelete(item);
     },

package/package.json

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