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

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

@@ -6,8 +6,8 @@ interface LogisticsInterceptionValueType {
     interceptDetail: string;
     interceptReceiverName: string;
     interceptReceiverMobile: string;
-    interceptStatus: string | number;
-    interceptOther: string;
+    interceptLogisticsStatus: string | number;
+    interceptLogisticsStatusOther: string;
 }
 interface LogisticsInterceptionProps {
     value: Partial<LogisticsInterceptionValueType>;
@@ -16,7 +16,6 @@ interface LogisticsInterceptionProps {
     required: boolean;
     disabled: boolean;
     isEditing: boolean;
-    logisticsInterceptHandleStatus: string;
     onChange: (value: Partial<LogisticsInterceptionValueType>) => void;
 }
 declare const LogisticsInterception: (props: Partial<LogisticsInterceptionProps>) => JSX.Element;

package/dist/index.esm.js

@@ -3119,8 +3119,7 @@ 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,
-    logisticsInterceptHandleStatus = props.logisticsInterceptHandleStatus;
+    isEditing = _props$isEditing === void 0 ? false : _props$isEditing;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     initCompany = _useState2[0],
@@ -3154,7 +3153,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.interceptionStatusList) || []);
+    setStatusOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.logisticsStatusList) || []);
     setIsInterface(interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.isInterface);
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
   //拦截类型切换 需要清空新派送地
@@ -3183,18 +3182,8 @@ 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 canEdit = useMemo(function () {
     var company = expressInterceptData.find(function (item) {
       return item.value === initCompany;
     });
@@ -3207,7 +3196,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         return item.value === val;
       });
       var returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
-        return item === null || item === void 0 ? void 0 : item.isDefault;
+        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;
       });
       newValue = _objectSpread2(_objectSpread2({}, value), {}, {
         interceptCompany: val,
@@ -3216,8 +3206,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         interceptDetail: undefined,
         interceptReceiverName: undefined,
         interceptReceiverMobile: undefined,
-        interceptStatus: undefined,
-        interceptOther: undefined
+        interceptLogisticsStatus: undefined,
+        interceptLogisticsStatusOther: undefined
       });
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
@@ -3227,7 +3217,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'logistics'
   }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, {
-    disabled: disabled || canEditCompany,
+    disabled: disabled || canEdit,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     style: {
       width: '150px'
@@ -3242,7 +3232,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), /*#__PURE__*/React.createElement(Input, {
-    disabled: disabled || canEditCompany,
+    disabled: disabled || canEdit,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptCode');
@@ -3253,7 +3243,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'interceptType'
   }, /*#__PURE__*/React.createElement(Select, {
-    disabled: disabled || !canEdit,
+    disabled: disabled || canEdit,
     style: {
       width: '200px'
     },
@@ -3278,31 +3268,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: 'interceptStatus'
+    label: '物流状态',
+    key: 'interceptLogisticsStatus'
   }, /*#__PURE__*/React.createElement(Select, {
     disabled: disabled || isInterface,
     style: {
@@ -3310,22 +3300,22 @@ var LogisticsInterception = function LogisticsInterception(props) {
     },
     options: statusOptions,
     onChange: function onChange(val) {
-      return changeHandle(val, 'interceptStatus');
+      return changeHandle(val, 'interceptLogisticsStatus');
     },
-    value: value === null || value === void 0 ? void 0 : value.interceptStatus,
-    placeholder: "\u62E6\u622A\u72B6\u6001",
+    value: value === null || value === void 0 ? void 0 : value.interceptLogisticsStatus,
+    placeholder: "\u7269\u6D41\u72B6\u6001",
     showSearch: true,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
     }
-  }), (value === null || value === void 0 ? void 0 : value.interceptStatus) === 'OTHER' && /*#__PURE__*/React.createElement(Input, {
+  }), (value === null || value === void 0 ? void 0 : value.interceptLogisticsStatus) === 'OTHER' && /*#__PURE__*/React.createElement(Input, {
     disabled: disabled || !canEdit,
     style: {
       width: '200px'
     },
     placeholder: "\u5176\u4ED6",
     onChange: function onChange(e) {
-      return changeHandle(e.target.value, 'interceptOther');
+      return changeHandle(e.target.value, 'interceptLogisticsStatusOther');
     }
   })));
 };

package/dist/index.js

@@ -3129,8 +3129,7 @@ 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,
-    logisticsInterceptHandleStatus = props.logisticsInterceptHandleStatus;
+    isEditing = _props$isEditing === void 0 ? false : _props$isEditing;
   var _useState = React.useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     initCompany = _useState2[0],
@@ -3164,7 +3163,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.interceptionStatusList) || []);
+    setStatusOptions((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.logisticsStatusList) || []);
     setIsInterface(interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.isInterface);
   }, [value === null || value === void 0 ? void 0 : value.interceptCompany]);
   //拦截类型切换 需要清空新派送地
@@ -3193,18 +3192,8 @@ 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 canEdit = React.useMemo(function () {
     var company = expressInterceptData.find(function (item) {
       return item.value === initCompany;
     });
@@ -3217,7 +3206,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         return item.value === val;
       });
       var returnValue = ((interceptCompany === null || interceptCompany === void 0 ? void 0 : interceptCompany.interceptionTypeList) || []).find(function (item) {
-        return item === null || item === void 0 ? void 0 : item.isDefault;
+        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;
       });
       newValue = _objectSpread2(_objectSpread2({}, value), {}, {
         interceptCompany: val,
@@ -3226,8 +3216,8 @@ var LogisticsInterception = function LogisticsInterception(props) {
         interceptDetail: undefined,
         interceptReceiverName: undefined,
         interceptReceiverMobile: undefined,
-        interceptStatus: undefined,
-        interceptOther: undefined
+        interceptLogisticsStatus: undefined,
+        interceptLogisticsStatusOther: undefined
       });
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
@@ -3237,7 +3227,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 || canEditCompany,
+    disabled: disabled || canEdit,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     style: {
       width: '150px'
@@ -3252,7 +3242,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    disabled: disabled || canEditCompany,
+    disabled: disabled || canEdit,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptCode');
@@ -3263,7 +3253,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'
     },
@@ -3288,31 +3278,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: 'interceptStatus'
+    label: '物流状态',
+    key: 'interceptLogisticsStatus'
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
     disabled: disabled || isInterface,
     style: {
@@ -3320,22 +3310,22 @@ var LogisticsInterception = function LogisticsInterception(props) {
     },
     options: statusOptions,
     onChange: function onChange(val) {
-      return changeHandle(val, 'interceptStatus');
+      return changeHandle(val, 'interceptLogisticsStatus');
     },
-    value: value === null || value === void 0 ? void 0 : value.interceptStatus,
-    placeholder: "\u62E6\u622A\u72B6\u6001",
+    value: value === null || value === void 0 ? void 0 : value.interceptLogisticsStatus,
+    placeholder: "\u7269\u6D41\u72B6\u6001",
     showSearch: true,
     filterOption: function filterOption(input, option) {
       return option.label.includes(input);
     }
-  }), (value === null || value === void 0 ? void 0 : value.interceptStatus) === 'OTHER' && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+  }), (value === null || value === void 0 ? void 0 : value.interceptLogisticsStatus) === '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, 'interceptOther');
+      return changeHandle(e.target.value, 'interceptLogisticsStatusOther');
     }
   })));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.6.3-alpha.30",
+  "version": "0.6.3-alpha.38",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -24,7 +24,6 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.59.2",
     "@typescript-eslint/parser": "^5.59.2",
-    "@umijs/test": "^3.0.5",
     "babel-plugin-import": "^1.13.5",
     "dumi": "^1.0.16",
     "eslint": "^8.40.0",
@@ -42,5 +41,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "17f4fb7c97d953750f7bb2028bf2b5fc8205afc5"
+  "gitHead": "1e5da5160f4fb42e4bf813799a28fefca5fcf3cf"
 }