@kmkf-fe-packages/basic-components 1.22.1-beta.60 → 1.22.1-beta.62

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseCircleOutlined, CaretUpOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterKmOrders, KM_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, GY_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, msgTypeCh } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterKmOrders, KM_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, GY_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, msgTypeCh } from '@kmkf-fe-packages/kmkf-utils';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
@@ -7361,7 +7361,8 @@ var Province = function Province(props) {
   var mapping = {
     workOrder: AddressData.getInstance(),
     bs: BsAddressData.getInstance(),
-    wdt: WdtAddressData.getInstance()
+    wdt: WdtAddressData.getInstance(),
+    gy: GyAddressData.getInstance()
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
     options: ((_mapping$type = mapping[type]) === null || _mapping$type === void 0 ? void 0 : _mapping$type.addressOptions) || [],
@@ -7466,6 +7467,7 @@ var IdentifyAddress = function IdentifyAddress(props) {
     var addressData = (type && {
       bs: BsAddressData,
       wdt: WdtAddressData,
+      gy: GyAddressData,
       workOrder: AddressData
     }[type] || AddressData).getInstance();
     if ((val === null || val === void 0 ? void 0 : val.province) && addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province)) {
@@ -7547,11 +7549,13 @@ function ApaasPosting(props) {
   });
 }
 
-var _excluded$a = ["value", "onChange", "platformType"];
+var _excluded$a = ["value", "onChange", "platformType", "type"];
 function ApaasLogistics(props) {
   var value = props.value,
     onChange = props.onChange,
     platformType = props.platformType,
+    _props$type = props.type,
+    type = _props$type === void 0 ? 'select' : _props$type,
     other = _objectWithoutProperties(props, _excluded$a);
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -7582,7 +7586,14 @@ function ApaasLogistics(props) {
       isFirst.current = true;
     }
   }, []);
-  return /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
+  var handleInputChange = function handleInputChange(e) {
+    var val = e.target.value;
+    onChange === null || onChange === void 0 ? void 0 : onChange(val);
+  };
+  return type === 'input' ? /*#__PURE__*/React.createElement(Input, _objectSpread2(_objectSpread2({}, other), {}, {
+    value: value,
+    onChange: handleInputChange
+  })) : /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
     value: value,
     onChange: onChange,
     options: option,
@@ -11019,6 +11030,7 @@ var jstGoods = function jstGoods(props) {
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = SendDataCenter.getInstance(platformType).getSendData();
   var isSelectName = ['wdt', 'bsE3', 'km', 'gy'].includes(platformType);
+  var logisticsType = type === 1 && platformType === 'gy' ? 'input' : 'select';
   useEffect(function () {
     //没有值塞个默认值
     if (!(value === null || value === void 0 ? void 0 : value.length) && type !== 1) {
@@ -11092,24 +11104,32 @@ 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, {
+  }))) : 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,
     disabled: disabled,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     onChange: function onChange(val) {
-      return changeInputHandle(val, 'logisticsCompany');
+      if (logisticsType === 'input') {
+        changeInputHandle(null, 'logisticsCompany');
+        changeInputHandle(val, 'logisticsCompanyName');
+      } else {
+        changeInputHandle(val, 'logisticsCompany');
+      }
     },
-    value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.logisticsCompany,
+    value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex[logisticsType === 'input' ? 'logisticsCompanyName' : 'logisticsCompany']
+  }, logisticsType === 'input' ? {} : {
     showSearch: true,
+    dropdownMatchSelectWidth: false,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
-    },
-    dropdownMatchSelectWidth: false,
+    }
+  }), {}, {
     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) {
@@ -15385,7 +15405,8 @@ var getGyOrderListSingleton = function getGyOrderListSingleton(orderNo) {
                 billType: item.orderTypeName,
                 billTag: item.tagName,
                 tradeTagName: item.tradeTagName,
-                deliveryState: GY_DELIVERY_STATE_MAPPING[item.deliveryState]
+                deliveryState: item.deliveryState,
+                deliveryStateName: GY_DELIVERY_STATE_MAPPING[item.deliveryState]
               });
             });
           }
@@ -15818,7 +15839,8 @@ var index$1 = (function (props) {
                     billType: billType,
                     billTag: billTag,
                     tradeTagName: tradeTagName,
-                    deliveryState: GY_DELIVERY_STATE_MAPPING[deliveryState]
+                    deliveryState: deliveryState,
+                    deliveryStateName: GY_DELIVERY_STATE_MAPPING[deliveryState]
                   };
                 })
               }));
@@ -17763,7 +17785,8 @@ var GyReissue = function GyReissue(props) {
                   billType: billType,
                   billTag: billTag,
                   tradeTagName: tradeTagName,
-                  deliveryState: GY_DELIVERY_STATE_MAPPING[deliveryState]
+                  deliveryState: deliveryState,
+                  deliveryStateName: GY_DELIVERY_STATE_MAPPING[deliveryState]
                 });
               });
               onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type5 = typeMap$3[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type6 = typeMap$3[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]), {}, {

package/dist/index.js

@@ -7373,7 +7373,8 @@ var Province = function Province(props) {
   var mapping = {
     workOrder: kmkfUtils.AddressData.getInstance(),
     bs: kmkfUtils.BsAddressData.getInstance(),
-    wdt: kmkfUtils.WdtAddressData.getInstance()
+    wdt: kmkfUtils.WdtAddressData.getInstance(),
+    gy: kmkfUtils.GyAddressData.getInstance()
   };
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
     options: ((_mapping$type = mapping[type]) === null || _mapping$type === void 0 ? void 0 : _mapping$type.addressOptions) || [],
@@ -7478,6 +7479,7 @@ var IdentifyAddress = function IdentifyAddress(props) {
     var addressData = (type && {
       bs: kmkfUtils.BsAddressData,
       wdt: kmkfUtils.WdtAddressData,
+      gy: kmkfUtils.GyAddressData,
       workOrder: kmkfUtils.AddressData
     }[type] || kmkfUtils.AddressData).getInstance();
     if ((val === null || val === void 0 ? void 0 : val.province) && addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province)) {
@@ -7559,11 +7561,13 @@ function ApaasPosting(props) {
   });
 }
 
-var _excluded$a = ["value", "onChange", "platformType"];
+var _excluded$a = ["value", "onChange", "platformType", "type"];
 function ApaasLogistics(props) {
   var value = props.value,
     onChange = props.onChange,
     platformType = props.platformType,
+    _props$type = props.type,
+    type = _props$type === void 0 ? 'select' : _props$type,
     other = _objectWithoutProperties(props, _excluded$a);
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -7594,7 +7598,14 @@ function ApaasLogistics(props) {
       isFirst.current = true;
     }
   }, []);
-  return /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
+  var handleInputChange = function handleInputChange(e) {
+    var val = e.target.value;
+    onChange === null || onChange === void 0 ? void 0 : onChange(val);
+  };
+  return type === 'input' ? /*#__PURE__*/React__default['default'].createElement(antd.Input, _objectSpread2(_objectSpread2({}, other), {}, {
+    value: value,
+    onChange: handleInputChange
+  })) : /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
     value: value,
     onChange: onChange,
     options: option,
@@ -11031,6 +11042,7 @@ var jstGoods = function jstGoods(props) {
     setChangeIndex = _useState2[1]; //选中的包裹
   var sendOptions = kmkfUtils.SendDataCenter.getInstance(platformType).getSendData();
   var isSelectName = ['wdt', 'bsE3', 'km', 'gy'].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) {
@@ -11104,24 +11116,32 @@ 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, {
+  }))) : 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,
     disabled: disabled,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     onChange: function onChange(val) {
-      return changeInputHandle(val, 'logisticsCompany');
+      if (logisticsType === 'input') {
+        changeInputHandle(null, 'logisticsCompany');
+        changeInputHandle(val, 'logisticsCompanyName');
+      } else {
+        changeInputHandle(val, 'logisticsCompany');
+      }
     },
-    value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.logisticsCompany,
+    value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex[logisticsType === 'input' ? 'logisticsCompanyName' : 'logisticsCompany']
+  }, logisticsType === 'input' ? {} : {
     showSearch: true,
+    dropdownMatchSelectWidth: false,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
-    },
-    dropdownMatchSelectWidth: false,
+    }
+  }), {}, {
     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) {
@@ -15397,7 +15417,8 @@ var getGyOrderListSingleton = function getGyOrderListSingleton(orderNo) {
                 billType: item.orderTypeName,
                 billTag: item.tagName,
                 tradeTagName: item.tradeTagName,
-                deliveryState: kmkfUtils.GY_DELIVERY_STATE_MAPPING[item.deliveryState]
+                deliveryState: item.deliveryState,
+                deliveryStateName: kmkfUtils.GY_DELIVERY_STATE_MAPPING[item.deliveryState]
               });
             });
           }
@@ -15830,7 +15851,8 @@ var index$1 = (function (props) {
                     billType: billType,
                     billTag: billTag,
                     tradeTagName: tradeTagName,
-                    deliveryState: kmkfUtils.GY_DELIVERY_STATE_MAPPING[deliveryState]
+                    deliveryState: deliveryState,
+                    deliveryStateName: kmkfUtils.GY_DELIVERY_STATE_MAPPING[deliveryState]
                   };
                 })
               }));
@@ -17775,7 +17797,8 @@ var GyReissue = function GyReissue(props) {
                   billType: billType,
                   billTag: billTag,
                   tradeTagName: tradeTagName,
-                  deliveryState: kmkfUtils.GY_DELIVERY_STATE_MAPPING[deliveryState]
+                  deliveryState: deliveryState,
+                  deliveryStateName: kmkfUtils.GY_DELIVERY_STATE_MAPPING[deliveryState]
                 });
               });
               onChange(_objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, (_typeMap$type5 = typeMap$3[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.systemOrder, _objectSpread2(_objectSpread2({}, value[(_typeMap$type6 = typeMap$3[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder]), {}, {

package/dist/src/apaas/ApaasLogistics/index.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 export interface ApaasLogisticsProps {
+    type?: 'select' | 'input';
     value: any;
     onChange: (val: any) => void;
     [propName: string]: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "1.22.1-beta.60",
+  "version": "1.22.1-beta.62",
   "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": "1.22.1-beta.60",
+    "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.62",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4294b9ce062ebadf9b41a69e74d2904b58632ef8"
+  "gitHead": "8292bf6d7b28318d4475d2ddf1ed82ee90d23b77"
 }