@kmkf-fe-packages/basic-components 0.6.3-alpha.38 → 0.6.3-alpha.39

package/dist/apaas/ApaasAddress/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 interface Option {
     value: string | number;
     label: string;
@@ -9,5 +10,5 @@ interface ProvinceType {
     disabled: boolean;
     onChange: (value: any, selectedOptions: any) => void;
 }
-declare const Province: (props: Partial<ProvinceType>) => JSX.Element;
+declare const Province: (props: Partial<ProvinceType>) => React.JSX.Element;
 export default Province;

package/dist/apaas/ApaasCascader/index.d.ts

@@ -1,2 +1,3 @@
-declare function ApaasCascader(props: any): JSX.Element;
+import React from 'react';
+declare function ApaasCascader(props: any): React.JSX.Element;
 export default ApaasCascader;

package/dist/apaas/ApaasCheckbox/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { CheckboxGroupProps, CheckboxValueType } from 'antd/es/checkbox/Group';
 type OptionsType = {
     label: string;
@@ -17,5 +18,5 @@ export interface ApaasCheckboxProps extends Omit<CheckboxGroupProps, 'onChange'
     value?: CheckboxValue;
     [key: string]: any;
 }
-declare function ApaasCheckbox(props: ApaasCheckboxProps): JSX.Element;
+declare function ApaasCheckbox(props: ApaasCheckboxProps): React.JSX.Element;
 export default ApaasCheckbox;

package/dist/apaas/ApaasDate/index.d.ts

@@ -1,8 +1,9 @@
+import React from 'react';
 declare const DateType: ["DATE", "DATE_TIME", "DATE_RANGE", "DATE_TIME_RANGE"];
 export declare type ButtonType = typeof DateType[number];
 export interface ApaasDate {
     dateType?: ButtonType;
     [propName: string]: any;
 }
-declare const ApaasDate: (props: ApaasDate) => JSX.Element;
+declare const ApaasDate: (props: ApaasDate) => React.JSX.Element;
 export default ApaasDate;

package/dist/apaas/ApaasInput/index.d.ts

@@ -1,7 +1,8 @@
+import React from 'react';
 import { InputProps } from 'antd';
 export interface ApaasInputProps extends InputProps {
     isNumber?: boolean;
     replaceWarn?: boolean;
 }
-declare function ApaasInput(props: ApaasInputProps): JSX.Element;
+declare function ApaasInput(props: ApaasInputProps): React.JSX.Element;
 export default ApaasInput;

package/dist/apaas/ApaasInputNumber/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { InputNumberProps } from 'antd';
-declare function ApaasInputNumber(props: InputNumberProps): JSX.Element;
+declare function ApaasInputNumber(props: InputNumberProps): React.JSX.Element;
 export default ApaasInputNumber;

package/dist/apaas/ApaasMultipleSelect/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { ApaasSelectProps } from '../ApaasSelect/index';
-declare function ApaasMultipleSelect(props: ApaasSelectProps): JSX.Element;
+declare function ApaasMultipleSelect(props: ApaasSelectProps): React.JSX.Element;
 export default ApaasMultipleSelect;

package/dist/apaas/ApaasSelect/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { SelectProps } from 'antd';
 type OptionsType = {
     label: string;
@@ -8,5 +9,5 @@ export interface ApaasSelectProps extends SelectProps<string[]> {
     options?: OptionsType[];
     [propName: string]: any;
 }
-declare function ApaasSelect(props: ApaasSelectProps): JSX.Element;
+declare function ApaasSelect(props: ApaasSelectProps): React.JSX.Element;
 export default ApaasSelect;

package/dist/apaas/ApaasTextArea/index.d.ts

@@ -1,7 +1,8 @@
+import React from 'react';
 import { TextAreaProps } from 'antd/es/input';
 export interface ITextAreaProps {
     minRows?: number;
     maxRows?: number;
 }
-declare function ApaasTextArea(props: TextAreaProps & ITextAreaProps): JSX.Element;
+declare function ApaasTextArea(props: TextAreaProps & ITextAreaProps): React.JSX.Element;
 export default ApaasTextArea;

package/dist/apaas/ApaasUpload/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { UploadProps } from 'antd';
 declare type UploadValue = string[];
 export interface ApaasUploadProps extends Omit<UploadProps, 'onChange' | 'value'> {
@@ -9,5 +10,5 @@ export interface ApaasUploadProps extends Omit<UploadProps, 'onChange' | 'value'
     onChange?: (value: UploadValue) => void;
     value?: UploadValue;
 }
-declare const ApaasUpload: ({ maxCount, maxSize, uploadText, onChange, value, accept, canPreview, disabled, ...resetProps }: ApaasUploadProps) => JSX.Element;
+declare const ApaasUpload: ({ maxCount, maxSize, uploadText, onChange, value, accept, canPreview, disabled, ...resetProps }: ApaasUploadProps) => React.JSX.Element;
 export default ApaasUpload;

package/dist/apaas/ApaasUploadAsync/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { UploadProps } from 'antd';
 declare type UploadValue = string[];
 export interface ApaasUploadProps extends Omit<UploadProps, 'onChange' | 'value'> {
@@ -12,5 +13,5 @@ export interface ApaasUploadProps extends Omit<UploadProps, 'onChange' | 'value'
     hostUrl?: string;
     actionUrl?: string;
 }
-declare const ApaasUploadAsync: ({ maxCount, maxSize, uploadText, onChange, value, accept, canPreview, disabled, uniqueKey, hostUrl, actionUrl, ...resetProps }: ApaasUploadProps) => JSX.Element;
+declare const ApaasUploadAsync: ({ maxCount, maxSize, uploadText, onChange, value, accept, canPreview, disabled, uniqueKey, hostUrl, actionUrl, ...resetProps }: ApaasUploadProps) => React.JSX.Element;
 export default ApaasUploadAsync;

package/dist/apaas/hoc/withFormItem.d.ts

@@ -9,4 +9,4 @@ export interface WithFormItemProps {
     initialValue?: string;
     [prop: string]: any;
 }
-export default function withFormItem(WrappedComponent: React.ComponentType<WithFormItemProps>): (props: WithFormItemProps) => JSX.Element;
+export default function withFormItem(WrappedComponent: React.ComponentType<WithFormItemProps>): (props: WithFormItemProps) => React.JSX.Element;

package/dist/basics/FormItem/index.d.ts

@@ -1,2 +1,3 @@
-declare const FormItem: (props: any) => JSX.Element;
+import React from 'react';
+declare const FormItem: (props: any) => React.JSX.Element;
 export default FormItem;

package/dist/business/AliPay/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 interface AliPayValueType {
     name?: string;
     user?: string;
@@ -9,5 +10,5 @@ interface AliPayProps {
     onChange: (value: AliPayValueType) => void;
     onBlur?: (value: string, type: string) => void;
 }
-declare const AliPay: (props: Partial<AliPayProps>) => JSX.Element;
+declare const AliPay: (props: Partial<AliPayProps>) => React.JSX.Element;
 export default AliPay;

package/dist/business/BuyerNick/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 interface BuyerNickValueType {
     buyerNick?: string;
     buyerOpenUid?: string;
@@ -10,5 +11,5 @@ interface BuyerNickProps {
     onChange: (value: BuyerNickValueType) => void;
     onBlur: (value: string, type: string) => void;
 }
-declare const BuyerNick: (props: Partial<BuyerNickProps>) => JSX.Element;
+declare const BuyerNick: (props: Partial<BuyerNickProps>) => React.JSX.Element;
 export default BuyerNick;

package/dist/business/ChooseBaby/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { GoodsProps } from '../../common/Goods';
-declare const ChooseBaby: (props: Partial<GoodsProps>) => JSX.Element;
+declare const ChooseBaby: (props: Partial<GoodsProps>) => React.JSX.Element;
 export default ChooseBaby;

package/dist/business/ExpressLogistics/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { LogisticsType } from '../../common/Logistics/index.d';
-declare const ExpressLogistics: (props: Partial<LogisticsType>) => JSX.Element;
+declare const ExpressLogistics: (props: Partial<LogisticsType>) => React.JSX.Element;
 export default ExpressLogistics;

package/dist/business/Invoice/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
 export interface InvoiceValueType {
     ordinaryTaitou: string;
@@ -10,5 +11,5 @@ export interface InvoiceProps {
     disabled?: boolean;
     onChange: (value: InvoiceValueType) => void;
 }
-declare const Invoice: (props: Partial<InvoiceProps>) => JSX.Element;
+declare const Invoice: (props: Partial<InvoiceProps>) => React.JSX.Element;
 export default Invoice;

package/dist/business/LogisticsInterception/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 interface LogisticsInterceptionValueType {
     interceptCompany: string;
     interceptCode: string;
@@ -6,8 +7,8 @@ interface LogisticsInterceptionValueType {
     interceptDetail: string;
     interceptReceiverName: string;
     interceptReceiverMobile: string;
-    interceptLogisticsStatus: string | number;
-    interceptLogisticsStatusOther: string;
+    interceptStatus: string | number;
+    interceptOther: string;
 }
 interface LogisticsInterceptionProps {
     value: Partial<LogisticsInterceptionValueType>;
@@ -16,7 +17,8 @@ interface LogisticsInterceptionProps {
     required: boolean;
     disabled: boolean;
     isEditing: boolean;
+    logisticsInterceptHandleStatus: string;
     onChange: (value: Partial<LogisticsInterceptionValueType>) => void;
 }
-declare const LogisticsInterception: (props: Partial<LogisticsInterceptionProps>) => JSX.Element;
+declare const LogisticsInterception: (props: Partial<LogisticsInterceptionProps>) => React.JSX.Element;
 export default LogisticsInterception;

package/dist/business/Payment/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 export interface PaymentProps {
     value: any;
     zhiFubaoRequired: boolean;
@@ -10,5 +11,5 @@ export interface PaymentProps {
     onSearch: (value: any) => void;
     onBlur: (value: any, type: string) => void;
 }
-declare const Payment: (props: Partial<PaymentProps>) => JSX.Element;
+declare const Payment: (props: Partial<PaymentProps>) => React.JSX.Element;
 export default Payment;

package/dist/business/Remark/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 interface ValueType {
     remark?: string;
     flag?: number;
@@ -8,5 +9,5 @@ interface RemarkType {
     value: ValueType;
     onChange: (value: ValueType) => void;
 }
-declare const RemarkInput: (props: Partial<RemarkType>) => JSX.Element;
+declare const RemarkInput: (props: Partial<RemarkType>) => React.JSX.Element;
 export default RemarkInput;

package/dist/business/ShopName/index.d.ts

@@ -1,8 +1,9 @@
+import React from 'react';
 interface ShopNameType {
     value: number;
     onChange: (value: number) => void;
     disabled: boolean;
     style: any;
 }
-declare const ShopNameSelect: (props: Partial<ShopNameType>) => JSX.Element;
+declare const ShopNameSelect: (props: Partial<ShopNameType>) => React.JSX.Element;
 export default ShopNameSelect;

package/dist/business/Status/index.d.ts

@@ -1,3 +1,12 @@
+/**
+ * props
+ * isUseCustomStatus true/false 是否自定义文案
+ * customStatusText 自定义文案内容
+ * isSelectStyle  true/false  是否为下拉框
+ * require true/false 是否必填
+ * originCustomer和isEditing  当状态组件处于编辑状态下，工单状态从未处理切换到已处理时候，我们需要将客服重置为初始值
+ */
+import React from 'react';
 export interface StatusProps {
     shopId: string;
     customStatusText: string;
@@ -12,5 +21,5 @@ export interface StatusProps {
     required: boolean;
     onChange: (value: any) => void;
 }
-declare const Status: (props: StatusProps) => JSX.Element;
+declare const Status: (props: StatusProps) => React.JSX.Element;
 export default Status;

package/dist/business/Supplier/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { GoodsProps } from '../../common/Goods';
-declare const Supplier: (props: Partial<GoodsProps>) => JSX.Element;
+declare const Supplier: (props: Partial<GoodsProps>) => React.JSX.Element;
 export default Supplier;

package/dist/business/TBGoodId/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { GoodsProps } from '../../common/Goods';
-declare const TBGoodId: (props: Partial<GoodsProps>) => JSX.Element;
+declare const TBGoodId: (props: Partial<GoodsProps>) => React.JSX.Element;
 export default TBGoodId;

package/dist/business/TBGoodSerial/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { GoodsProps } from '../../common/Goods';
-declare const TBGoodSerial: (props: Partial<GoodsProps>) => JSX.Element;
+declare const TBGoodSerial: (props: Partial<GoodsProps>) => React.JSX.Element;
 export default TBGoodSerial;

package/dist/business/TradeId/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { InputProps } from 'antd';
 interface TradeIdProps extends InputProps {
     value: string;
@@ -6,5 +7,5 @@ interface TradeIdProps extends InputProps {
     disabled?: boolean;
     onSearch: (value: any) => void;
 }
-declare function TradeId(props: Partial<TradeIdProps>): JSX.Element;
+declare function TradeId(props: Partial<TradeIdProps>): React.JSX.Element;
 export default TradeId;

package/dist/common/ExpressCompany/index.d.ts

@@ -1,7 +1,8 @@
+import React from 'react';
 type ExpressCompanyProps = {
     options: any[];
     value: string;
     onChange: (v: string) => void;
 };
-declare const ExpressCompany: (props: ExpressCompanyProps) => JSX.Element;
+declare const ExpressCompany: (props: ExpressCompanyProps) => React.JSX.Element;
 export default ExpressCompany;

package/dist/common/Goods/goodModel.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
 interface GoodModelProps {
     visible: boolean;
@@ -11,5 +12,5 @@ interface GoodModelProps {
     onSubmit: (...args: any[]) => any;
     onCancel: (...args: any[]) => any;
 }
-declare const GoodsModal: (props: GoodModelProps) => JSX.Element;
+declare const GoodsModal: (props: GoodModelProps) => React.JSX.Element;
 export default GoodsModal;

package/dist/common/Goods/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
 export interface GoodsProps {
     value?: GoodsValues;
@@ -33,5 +34,5 @@ export interface IEditState {
     itemId?: string | null;
     supplierName: string | null;
 }
-declare const Goods: (props: Partial<GoodsProps>) => JSX.Element;
+declare const Goods: (props: Partial<GoodsProps>) => React.JSX.Element;
 export default Goods;

package/dist/common/GoodsTable/goodModel.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
 interface GoodModelProps {
     visible: boolean;
@@ -9,5 +10,5 @@ interface GoodModelProps {
     onSubmit: (...args: any[]) => any;
     onCancel: (...args: any[]) => any;
 }
-declare const GoodsModal: (props: GoodModelProps) => JSX.Element;
+declare const GoodsModal: (props: GoodModelProps) => React.JSX.Element;
 export default GoodsModal;

package/dist/common/Logistics/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { LogisticsType } from './index.d';
-declare const Logistics: (props: Partial<LogisticsType>) => JSX.Element;
+declare const Logistics: (props: Partial<LogisticsType>) => React.JSX.Element;
 export default Logistics;

package/dist/index.esm.js

@@ -3119,7 +3119,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
     _props$disabled = props.disabled,
     disabled = _props$disabled === void 0 ? false : _props$disabled,
     _props$isEditing = props.isEditing,
-    isEditing = _props$isEditing === void 0 ? false : _props$isEditing;
+    isEditing = _props$isEditing === void 0 ? false : _props$isEditing,
+    logisticsInterceptHandleStatus = props.logisticsInterceptHandleStatus;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     initCompany = _useState2[0],
@@ -3153,7 +3154,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return item.value === (value === null || value === void 0 ? void 0 : value.interceptCompany);
     });
     setTypeOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []);
-    setStatusOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.logisticsStatusList) || []);
+    setStatusOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionStatusList) || []);
     setIsInterface(interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.isInterface);
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
   //拦截类型切换 需要清空新派送地
@@ -3182,8 +3183,18 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return item.value === (value === null || value === void 0 ? void 0 : value.interceptType);
     })) === null || _find === void 0 ? void 0 : (_find$config = _find.config) === null || _find$config === void 0 ? void 0 : _find$config.showAddress;
   }, [value === null || value === void 0 ? void 0 : value.interceptType, typeOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
-  //判断是否能修改物流信息
+  //判断是否能修改信息
   var canEdit = useMemo(function () {
+    // 已对接公司如果拦截状态为【拦截中】，可以修改物流拦截组件信息，否则该组件不能修改；
+    // 非对接公司可以修改组件
+    // 修改后把工单信息重新提交给快递公司，清空拦截状态的值
+    if (!isInterface) return true;
+    //已对接公司在拦截中可以修改
+    var INTERCEPTING = !logisticsInterceptHandleStatus || logisticsInterceptHandleStatus === 'INTERCEPTING';
+    return isEditing ? INTERCEPTING : true;
+  }, [value === null || value === void 0 ? void 0 : value.interceptCompany, statusOptions, isInterface, isEditing]);
+  //判断是否能修改物流信息
+  var canEditCompany = useMemo(function () {
     var company = expressInterceptData.find(function (item) {
       return item.value === initCompany;
     });
@@ -3196,8 +3207,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
         return item.value === val;
       });
       var returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
-        var _item$config2;
-        return item === null || item === void 0 ? void 0 : (_item$config2 = item.config) === null || _item$config2 === void 0 ? void 0 : _item$config2.isDefault;
+        return item === null || item === void 0 ? void 0 : item.isDefault;
       });
       newValue = _objectSpread2(_objectSpread2({}, value), {}, {
         interceptCompany: val,
@@ -3206,8 +3216,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         interceptDetail: undefined,
         interceptReceiverName: undefined,
         interceptReceiverMobile: undefined,
-        interceptLogisticsStatus: undefined,
-        interceptLogisticsStatusOther: undefined
+        interceptStatus: undefined,
+        interceptOther: undefined
       });
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
@@ -3217,7 +3227,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'logistics'
   }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, {
-    disabled: disabled || canEdit,
+    disabled: disabled || canEditCompany,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     style: {
       width: '150px'
@@ -3232,7 +3242,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), /*#__PURE__*/React.createElement(Input, {
-    disabled: disabled || canEdit,
+    disabled: disabled || canEditCompany,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptCode');
@@ -3243,7 +3253,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'interceptType'
   }, /*#__PURE__*/React.createElement(Select, {
-    disabled: disabled || canEdit,
+    disabled: disabled || !canEdit,
     style: {
       width: '200px'
     },
@@ -3268,31 +3278,31 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return changeHandle(val, 'interceptAddress');
     },
     options: [],
-    disabled: disabled || canEdit
+    disabled: disabled || !canEdit
   }), /*#__PURE__*/React.createElement(Input, {
     value: value === null || value === void 0 ? void 0 : value.interceptDetail,
-    disabled: disabled || canEdit,
+    disabled: disabled || !canEdit,
     placeholder: "\u8BE6\u7EC6\u5730\u5740",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptDetail');
     }
   })), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Input, {
     value: value === null || value === void 0 ? void 0 : value.interceptReceiverName,
-    disabled: disabled || canEdit,
+    disabled: disabled || !canEdit,
     placeholder: "\u6536\u4EF6\u4EBA\u59D3\u540D",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptReceiverName');
     }
   }), /*#__PURE__*/React.createElement(Input, {
     value: value === null || value === void 0 ? void 0 : value.interceptReceiverMobile,
-    disabled: disabled || canEdit,
+    disabled: disabled || !canEdit,
     placeholder: "\u6536\u4EF6\u4EBA\u7535\u8BDD",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptReceiverMobile');
     }
   }))), /*#__PURE__*/React.createElement(Item, {
-    label: '物流状态',
-    key: 'interceptLogisticsStatus'
+    label: '拦截状态',
+    key: 'interceptStatus'
   }, /*#__PURE__*/React.createElement(Select, {
     disabled: disabled || isInterface,
     style: {
@@ -3300,22 +3310,22 @@ var LogisticsInterception = function LogisticsInterception(props) {
     },
     options: statusOptions,
     onChange: function onChange(val) {
-      return changeHandle(val, 'interceptLogisticsStatus');
+      return changeHandle(val, 'interceptStatus');
     },
-    value: value === null || value === void 0 ? void 0 : value.interceptLogisticsStatus,
-    placeholder: "\u7269\u6D41\u72B6\u6001",
+    value: value === null || value === void 0 ? void 0 : value.interceptStatus,
+    placeholder: "\u62E6\u622A\u72B6\u6001",
     showSearch: true,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
     }
-  }), (value === null || value === void 0 ? void 0 : value.interceptLogisticsStatus) === 'OTHER' && /*#__PURE__*/React.createElement(Input, {
+  }), (value === null || value === void 0 ? void 0 : value.interceptStatus) === 'OTHER' && /*#__PURE__*/React.createElement(Input, {
     disabled: disabled || !canEdit,
     style: {
       width: '200px'
     },
     placeholder: "\u5176\u4ED6",
     onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'interceptLogisticsStatusOther');
+      return changeHandle(e.target.value, 'interceptOther');
     }
   })));
 };

package/dist/index.js

@@ -3129,7 +3129,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
     _props$disabled = props.disabled,
     disabled = _props$disabled === void 0 ? false : _props$disabled,
     _props$isEditing = props.isEditing,
-    isEditing = _props$isEditing === void 0 ? false : _props$isEditing;
+    isEditing = _props$isEditing === void 0 ? false : _props$isEditing,
+    logisticsInterceptHandleStatus = props.logisticsInterceptHandleStatus;
   var _useState = React.useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     initCompany = _useState2[0],
@@ -3163,7 +3164,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return item.value === (value === null || value === void 0 ? void 0 : value.interceptCompany);
     });
     setTypeOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []);
-    setStatusOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.logisticsStatusList) || []);
+    setStatusOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionStatusList) || []);
     setIsInterface(interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.isInterface);
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
   //拦截类型切换 需要清空新派送地
@@ -3192,8 +3193,18 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return item.value === (value === null || value === void 0 ? void 0 : value.interceptType);
     })) === null || _find === void 0 ? void 0 : (_find$config = _find.config) === null || _find$config === void 0 ? void 0 : _find$config.showAddress;
   }, [value === null || value === void 0 ? void 0 : value.interceptType, typeOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
-  //判断是否能修改物流信息
+  //判断是否能修改信息
   var canEdit = React.useMemo(function () {
+    // 已对接公司如果拦截状态为【拦截中】，可以修改物流拦截组件信息，否则该组件不能修改；
+    // 非对接公司可以修改组件
+    // 修改后把工单信息重新提交给快递公司，清空拦截状态的值
+    if (!isInterface) return true;
+    //已对接公司在拦截中可以修改
+    var INTERCEPTING = !logisticsInterceptHandleStatus || logisticsInterceptHandleStatus === 'INTERCEPTING';
+    return isEditing ? INTERCEPTING : true;
+  }, [value === null || value === void 0 ? void 0 : value.interceptCompany, statusOptions, isInterface, isEditing]);
+  //判断是否能修改物流信息
+  var canEditCompany = React.useMemo(function () {
     var company = expressInterceptData.find(function (item) {
       return item.value === initCompany;
     });
@@ -3206,8 +3217,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
         return item.value === val;
       });
       var returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
-        var _item$config2;
-        return item === null || item === void 0 ? void 0 : (_item$config2 = item.config) === null || _item$config2 === void 0 ? void 0 : _item$config2.isDefault;
+        return item === null || item === void 0 ? void 0 : item.isDefault;
       });
       newValue = _objectSpread2(_objectSpread2({}, value), {}, {
         interceptCompany: val,
@@ -3216,8 +3226,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         interceptDetail: undefined,
         interceptReceiverName: undefined,
         interceptReceiverMobile: undefined,
-        interceptLogisticsStatus: undefined,
-        interceptLogisticsStatusOther: undefined
+        interceptStatus: undefined,
+        interceptOther: undefined
       });
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
@@ -3227,7 +3237,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'logistics'
   }, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-    disabled: disabled || canEdit,
+    disabled: disabled || canEditCompany,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     style: {
       width: '150px'
@@ -3242,7 +3252,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    disabled: disabled || canEdit,
+    disabled: disabled || canEditCompany,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptCode');
@@ -3253,7 +3263,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'interceptType'
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-    disabled: disabled || canEdit,
+    disabled: disabled || !canEdit,
     style: {
       width: '200px'
     },
@@ -3278,31 +3288,31 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return changeHandle(val, 'interceptAddress');
     },
     options: [],
-    disabled: disabled || canEdit
+    disabled: disabled || !canEdit
   }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     value: value === null || value === void 0 ? void 0 : value.interceptDetail,
-    disabled: disabled || canEdit,
+    disabled: disabled || !canEdit,
     placeholder: "\u8BE6\u7EC6\u5730\u5740",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptDetail');
     }
   })), /*#__PURE__*/React__default['default'].createElement("br", null), /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     value: value === null || value === void 0 ? void 0 : value.interceptReceiverName,
-    disabled: disabled || canEdit,
+    disabled: disabled || !canEdit,
     placeholder: "\u6536\u4EF6\u4EBA\u59D3\u540D",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptReceiverName');
     }
   }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     value: value === null || value === void 0 ? void 0 : value.interceptReceiverMobile,
-    disabled: disabled || canEdit,
+    disabled: disabled || !canEdit,
     placeholder: "\u6536\u4EF6\u4EBA\u7535\u8BDD",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptReceiverMobile');
     }
   }))), /*#__PURE__*/React__default['default'].createElement(Item, {
-    label: '物流状态',
-    key: 'interceptLogisticsStatus'
+    label: '拦截状态',
+    key: 'interceptStatus'
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
     disabled: disabled || isInterface,
     style: {
@@ -3310,22 +3320,22 @@ var LogisticsInterception = function LogisticsInterception(props) {
     },
     options: statusOptions,
     onChange: function onChange(val) {
-      return changeHandle(val, 'interceptLogisticsStatus');
+      return changeHandle(val, 'interceptStatus');
     },
-    value: value === null || value === void 0 ? void 0 : value.interceptLogisticsStatus,
-    placeholder: "\u7269\u6D41\u72B6\u6001",
+    value: value === null || value === void 0 ? void 0 : value.interceptStatus,
+    placeholder: "\u62E6\u622A\u72B6\u6001",
     showSearch: true,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
     }
-  }), (value === null || value === void 0 ? void 0 : value.interceptLogisticsStatus) === 'OTHER' && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+  }), (value === null || value === void 0 ? void 0 : value.interceptStatus) === 'OTHER' && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled || !canEdit,
     style: {
       width: '200px'
     },
     placeholder: "\u5176\u4ED6",
     onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'interceptLogisticsStatusOther');
+      return changeHandle(e.target.value, 'interceptOther');
     }
   })));
 };

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

@@ -1,3 +1,4 @@
+import React from 'react';
 interface JstGoodsProps {
     value: any[];
     type: number;
@@ -6,5 +7,5 @@ interface JstGoodsProps {
     onChange: (val: any[]) => void;
     showField: string;
 }
-declare const jstGoods: (props: Partial<JstGoodsProps>) => JSX.Element;
+declare const jstGoods: (props: Partial<JstGoodsProps>) => React.JSX.Element;
 export default jstGoods;

package/dist/jst/ItemList/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
 export interface GoodsProps {
     value: any[];
@@ -15,5 +16,5 @@ export interface GoodsItem {
     price: string;
     [key: string]: any;
 }
-declare const ItemList: (props: Partial<GoodsProps>) => JSX.Element;
+declare const ItemList: (props: Partial<GoodsProps>) => React.JSX.Element;
 export default ItemList;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.6.3-alpha.38",
+  "version": "0.6.3-alpha.39",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -41,5 +41,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1e5da5160f4fb42e4bf813799a28fefca5fcf3cf"
+  "gitHead": "11e3dc7ff8cb374b91d27d81bccaaf27d168adc4"
 }