@kmkf-fe-packages/basic-components 2.0.54-beta.3 → 2.0.54-beta.5

package/dist/index.esm.js

@@ -8001,7 +8001,8 @@ var WidgetMap = {
 var pageSize = 50;
 var SubForm = function SubForm(props) {
   var _selectOptions$;
-  var value = props.value,
+  var _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
     needFilterShopByPermission = props.needFilterShopByPermission,
     _props$subConfig = props.subConfig,
@@ -8303,7 +8304,7 @@ var SubForm = function SubForm(props) {
         }
       });
     }
-    onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value), [_objectSpread2(_objectSpread2({}, newValue), {}, {
+    onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value || []), [_objectSpread2(_objectSpread2({}, newValue), {}, {
       uuid: uuid()
     })]));
   };
@@ -11501,7 +11502,7 @@ var typeInitValueMap = {
   }]
 };
 var jstGoods = function jstGoods(props) {
-  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9;
+  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9, _value$changeIndex10, _value$changeIndex11;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
@@ -11519,8 +11520,8 @@ var jstGoods = function jstGoods(props) {
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
   var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst'].includes(platformType);
+  var expressDateInstance = ExpressData.getInstance(platformType);
   var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
-  var logisticsType = type === 1 && platformType === 'gy' ? 'input' : 'select';
   useEffect(function () {
     //没有值塞个默认值
     if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
@@ -11603,59 +11604,51 @@ var jstGoods = function jstGoods(props) {
         return setChangeIndex(index);
       }
     }, "\u5305\u88F9".concat(index + 1)));
-  }))) : null, value.length || type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, type === 1 ? /*#__PURE__*/React.createElement(Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React.createElement(ApaasLogistics, _objectSpread2(_objectSpread2({
-    type: logisticsType,
+  }))) : null, value.length || type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, type === 1 ? /*#__PURE__*/React.createElement(Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React.createElement(ApaasLogistics, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     onChange: function onChange(val) {
-      if (logisticsType === 'input') {
-        changeInputHandle(null, 'logisticsCompany');
-        changeInputHandle(val, 'logisticsCompanyName');
-      } else {
-        changeInputHandle(val, 'logisticsCompany');
-      }
+      changeInputHandle(val, 'logisticsCompany');
     },
-    value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex[logisticsType === 'input' ? 'logisticsCompanyName' : 'logisticsCompany']
-  }, logisticsType === 'input' ? {} : {
+    value: platformType === 'gy' ? expressDateInstance.getExpressNameByCode((_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex['logisticsCompany'], false) || ((_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2['logisticsCompanyName']) : (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3['logisticsCompany'],
     showSearch: true,
     dropdownMatchSelectWidth: false,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
-    }
-  }), {}, {
+    },
     style: {
       minWidth: '100px',
       maxWidth: '180px'
     },
     platformType: platformType
-  })) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React.createElement(Input, {
+  }) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'logisticsCode');
     },
-    value: (_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2.logisticsCode
+    value: (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4.logisticsCode
   }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement(Space, null, ['supplyId', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u4F9B\u9500\u5546\u7F16\u7801",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'supplyId');
     },
-    value: (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.supplyId
+    value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.supplyId
   }), ['supplyName', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u4F9B\u9500\u5546\u540D\u79F0",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'supplyName');
     },
-    value: (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4.supplyName
+    value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.supplyName
   })) : null, type === 3 ? /*#__PURE__*/React.createElement(Space, null, ['sendId', 'all'].includes(showField) && /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u53D1\u8D27\u4ED3\u7F16\u7801",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'sendId');
     },
-    value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.sendId
+    value: (_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.sendId
   }), ['sendName', 'all'].includes(showField) && (isSelectName ? /*#__PURE__*/React.createElement(Select, {
     style: {
       minWidth: '100px',
@@ -11666,7 +11659,7 @@ var jstGoods = function jstGoods(props) {
     showSearch: true,
     options: sendOptions,
     filterOption: filterOption,
-    value: ((_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.sendSnapshotId) || ((_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.sendName) || null,
+    value: ((_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendSnapshotId) || ((_value$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendName) || null,
     onChange: function onChange(value, option) {
       return handleSelected(value, 'sendName', option, onlyShowFieldSelect);
     }
@@ -11676,14 +11669,14 @@ var jstGoods = function jstGoods(props) {
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'sendName');
     },
-    value: (_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendName
+    value: (_value$changeIndex10 = value[changeIndex]) === null || _value$changeIndex10 === void 0 ? void 0 : _value$changeIndex10.sendName
   }))) : null, type === 4 ? /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u51FA\u5E93\u5355\u7F16\u53F7",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'deliveryNo');
     },
-    value: (_value$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendName
+    value: (_value$changeIndex11 = value[changeIndex]) === null || _value$changeIndex11 === void 0 ? void 0 : _value$changeIndex11.sendName
   })) : null) : null);
 };
 

package/dist/index.js

@@ -8013,7 +8013,8 @@ var WidgetMap = {
 var pageSize = 50;
 var SubForm = function SubForm(props) {
   var _selectOptions$;
-  var value = props.value,
+  var _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
     needFilterShopByPermission = props.needFilterShopByPermission,
     _props$subConfig = props.subConfig,
@@ -8315,7 +8316,7 @@ var SubForm = function SubForm(props) {
         }
       });
     }
-    onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value), [_objectSpread2(_objectSpread2({}, newValue), {}, {
+    onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value || []), [_objectSpread2(_objectSpread2({}, newValue), {}, {
       uuid: kmkfUtils.uuid()
     })]));
   };
@@ -11513,7 +11514,7 @@ var typeInitValueMap = {
   }]
 };
 var jstGoods = function jstGoods(props) {
-  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9;
+  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8, _value$changeIndex9, _value$changeIndex10, _value$changeIndex11;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
@@ -11531,8 +11532,8 @@ var jstGoods = function jstGoods(props) {
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = kmkfUtils.SendDataCenter.getInstance(platformType).getSendData();
   var isSelectName = ['wdt', 'bsE3', 'km', 'gy', 'jst'].includes(platformType);
+  var expressDateInstance = kmkfUtils.ExpressData.getInstance(platformType);
   var isSendGoodSavedId = isSelectName && !['jst'].includes(platformType);
-  var logisticsType = type === 1 && platformType === 'gy' ? 'input' : 'select';
   React.useEffect(function () {
     //没有值塞个默认值
     if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
@@ -11615,59 +11616,51 @@ var jstGoods = function jstGoods(props) {
         return setChangeIndex(index);
       }
     }, "\u5305\u88F9".concat(index + 1)));
-  }))) : null, value.length || type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, _objectSpread2(_objectSpread2({
-    type: logisticsType,
+  }))) : null, value.length || type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, !showField || showField === 'logisticsCompany' ? /*#__PURE__*/React__default['default'].createElement(ApaasLogistics, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     onChange: function onChange(val) {
-      if (logisticsType === 'input') {
-        changeInputHandle(null, 'logisticsCompany');
-        changeInputHandle(val, 'logisticsCompanyName');
-      } else {
-        changeInputHandle(val, 'logisticsCompany');
-      }
+      changeInputHandle(val, 'logisticsCompany');
     },
-    value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex[logisticsType === 'input' ? 'logisticsCompanyName' : 'logisticsCompany']
-  }, logisticsType === 'input' ? {} : {
+    value: platformType === 'gy' ? expressDateInstance.getExpressNameByCode((_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex['logisticsCompany'], false) || ((_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2['logisticsCompanyName']) : (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3['logisticsCompany'],
     showSearch: true,
     dropdownMatchSelectWidth: false,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
-    }
-  }), {}, {
+    },
     style: {
       minWidth: '100px',
       maxWidth: '180px'
     },
     platformType: platformType
-  })) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+  }) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'logisticsCode');
     },
-    value: (_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2.logisticsCode
+    value: (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4.logisticsCode
   }) : null) : null, type === 2 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, ['supplyId', 'all'].includes(showField) && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u4F9B\u9500\u5546\u7F16\u7801",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'supplyId');
     },
-    value: (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3.supplyId
+    value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.supplyId
   }), ['supplyName', 'all'].includes(showField) && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u4F9B\u9500\u5546\u540D\u79F0",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'supplyName');
     },
-    value: (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4.supplyName
+    value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.supplyName
   })) : null, type === 3 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, ['sendId', 'all'].includes(showField) && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u53D1\u8D27\u4ED3\u7F16\u7801",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'sendId');
     },
-    value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.sendId
+    value: (_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.sendId
   }), ['sendName', 'all'].includes(showField) && (isSelectName ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
     style: {
       minWidth: '100px',
@@ -11678,7 +11671,7 @@ var jstGoods = function jstGoods(props) {
     showSearch: true,
     options: sendOptions,
     filterOption: filterOption,
-    value: ((_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.sendSnapshotId) || ((_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.sendName) || null,
+    value: ((_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendSnapshotId) || ((_value$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendName) || null,
     onChange: function onChange(value, option) {
       return handleSelected(value, 'sendName', option, onlyShowFieldSelect);
     }
@@ -11688,14 +11681,14 @@ var jstGoods = function jstGoods(props) {
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'sendName');
     },
-    value: (_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendName
+    value: (_value$changeIndex10 = value[changeIndex]) === null || _value$changeIndex10 === void 0 ? void 0 : _value$changeIndex10.sendName
   }))) : null, type === 4 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u51FA\u5E93\u5355\u7F16\u53F7",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'deliveryNo');
     },
-    value: (_value$changeIndex9 = value[changeIndex]) === null || _value$changeIndex9 === void 0 ? void 0 : _value$changeIndex9.sendName
+    value: (_value$changeIndex11 = value[changeIndex]) === null || _value$changeIndex11 === void 0 ? void 0 : _value$changeIndex11.sendName
   })) : null) : null);
 };
 

package/dist/src/jst/Goods/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
 interface JstGoodsProps {
     value: any[];
     type: number;
@@ -8,6 +9,7 @@ interface JstGoodsProps {
     showField: string;
     platformType?: string;
     onlyShowFieldSelect: boolean;
+    expressDateInstance: InstanceType<typeof ExpressData>;
 }
 declare const jstGoods: (props: Partial<JstGoodsProps>) => React.JSX.Element;
 export default jstGoods;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.54-beta.3",
+  "version": "2.0.54-beta.5",
   "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": "2.0.54-beta.2",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.54-beta.5",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "589761f1e797ee16bb6ffe7c973181646609e556"
+  "gitHead": "4647c900ae4f74bb1739444efa1a4709ac21ae4f"
 }