@kmkf-fe-packages/basic-components 0.2.2-alpha.1 → 0.2.2-alpha.2

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

@@ -14,6 +14,7 @@ interface LogisticsInterceptionProps {
     logisticsOptions: any[];
     required: boolean;
     disabled: boolean;
+    isEditing: boolean;
     id: string;
     onChange: (value: Partial<LogisticsInterceptionValueType>) => void;
 }

package/dist/index.esm.js

@@ -3122,9 +3122,13 @@ var LogisticsInterception = function LogisticsInterception(props) {
     value = _props$value === void 0 ? {} : _props$value,
     _props$logisticsOptio = props.logisticsOptions,
     logisticsOptions = _props$logisticsOptio === void 0 ? [] : _props$logisticsOptio,
-    required = props.required,
+    _props$required = props.required,
+    required = _props$required === void 0 ? false : _props$required,
     onChange = props.onChange,
-    disabled = props.disabled;
+    _props$disabled = props.disabled,
+    disabled = _props$disabled === void 0 ? false : _props$disabled,
+    _props$isEditing = props.isEditing,
+    isEditing = _props$isEditing === void 0 ? false : _props$isEditing;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     typeOptions = _useState2[0],
@@ -3133,16 +3137,24 @@ var LogisticsInterception = function LogisticsInterception(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     statusOptions = _useState4[0],
     setStatusOptions = _useState4[1];
-  var _useState5 = useState(true),
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
     isInterface = _useState6[0],
     setIsInterface = _useState6[1];
+  var canEdit = useMemo(function () {
+    //非对接公司可以修改
+    if (!isInterface) return true;
+    //已对接公司在拦截中可以修改
+    var INTERCEPTING = statusOptions.some(function (item) {
+      return item.value === (value === null || value === void 0 ? void 0 : value.interceptStatus) && (item === null || item === void 0 ? void 0 : item.showInterceptionBtn);
+    });
+    return isEditing && (value === null || value === void 0 ? void 0 : value.interceptStatus) ? INTERCEPTING && isEditing : true;
+  }, [value, statusOptions, isInterface, isEditing]);
   useEffect(function () {
-    console.log(value === null || value === void 0 ? void 0 : value.interceptCompany);
     if (!(value === null || value === void 0 ? void 0 : value.interceptCompany)) {
       setTypeOptions([]);
       setStatusOptions([]);
-      setIsInterface(true);
+      setIsInterface(false);
       return;
     }
     var interceptCompany = logisticsOptions.find(function (item) {
@@ -3158,7 +3170,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     return (_find = (typeOptions || []).find(function (item) {
       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]);
+  }, [value === null || value === void 0 ? void 0 : value.interceptType, typeOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
   var changeHandle = function changeHandle(val, type) {
     var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val));
     if (type === 'interceptCompany') {
@@ -3180,7 +3192,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'logistics'
   }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, {
-    disabled: disabled,
+    disabled: disabled || !canEdit,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     style: {
       width: '200px'
@@ -3195,7 +3207,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), /*#__PURE__*/React.createElement(Input, {
-    disabled: disabled,
+    disabled: disabled || !canEdit,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptCode');
@@ -3206,7 +3218,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'interceptType'
   }, /*#__PURE__*/React.createElement(Select, {
-    disabled: disabled,
+    disabled: disabled || !canEdit,
     style: {
       width: '200px'
     },
@@ -3222,26 +3234,26 @@ var LogisticsInterception = function LogisticsInterception(props) {
     }
   })), /*#__PURE__*/React.createElement(Item, {
     label: '新派送地',
-    required: required,
+    required: true,
     key: 'newAddress',
-    hidden: isInterface && showNewAddress
+    hidden: !showNewAddress
   }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Province, {
     value: value === null || value === void 0 ? void 0 : value.interceptAddress,
     onChange: function onChange(val) {
       return changeHandle(val, 'interceptAddress');
     },
     options: [],
-    disabled: disabled
+    disabled: disabled || !canEdit
   }), /*#__PURE__*/React.createElement(Input, {
     value: value === null || value === void 0 ? void 0 : value.interceptDetail,
-    disabled: disabled,
+    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,
+    disabled: disabled || !canEdit,
     style: {
       width: '200px'
     },
@@ -3251,7 +3263,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     }
   }), /*#__PURE__*/React.createElement(Input, {
     value: value === null || value === void 0 ? void 0 : value.interceptReceiverMobile,
-    disabled: disabled,
+    disabled: disabled || !canEdit,
     placeholder: "\u6536\u4EF6\u4EBA\u7535\u8BDD",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptReceiverMobile');
@@ -3275,6 +3287,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), (value === null || value === void 0 ? void 0 : value.interceptStatus) === 'OTHER' && /*#__PURE__*/React.createElement(Input, {
+    disabled: disabled || canEdit,
     style: {
       width: '200px'
     },

package/dist/index.js

@@ -3132,9 +3132,13 @@ var LogisticsInterception = function LogisticsInterception(props) {
     value = _props$value === void 0 ? {} : _props$value,
     _props$logisticsOptio = props.logisticsOptions,
     logisticsOptions = _props$logisticsOptio === void 0 ? [] : _props$logisticsOptio,
-    required = props.required,
+    _props$required = props.required,
+    required = _props$required === void 0 ? false : _props$required,
     onChange = props.onChange,
-    disabled = props.disabled;
+    _props$disabled = props.disabled,
+    disabled = _props$disabled === void 0 ? false : _props$disabled,
+    _props$isEditing = props.isEditing,
+    isEditing = _props$isEditing === void 0 ? false : _props$isEditing;
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     typeOptions = _useState2[0],
@@ -3143,16 +3147,24 @@ var LogisticsInterception = function LogisticsInterception(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     statusOptions = _useState4[0],
     setStatusOptions = _useState4[1];
-  var _useState5 = React.useState(true),
+  var _useState5 = React.useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
     isInterface = _useState6[0],
     setIsInterface = _useState6[1];
+  var canEdit = React.useMemo(function () {
+    //非对接公司可以修改
+    if (!isInterface) return true;
+    //已对接公司在拦截中可以修改
+    var INTERCEPTING = statusOptions.some(function (item) {
+      return item.value === (value === null || value === void 0 ? void 0 : value.interceptStatus) && (item === null || item === void 0 ? void 0 : item.showInterceptionBtn);
+    });
+    return isEditing && (value === null || value === void 0 ? void 0 : value.interceptStatus) ? INTERCEPTING && isEditing : true;
+  }, [value, statusOptions, isInterface, isEditing]);
   React.useEffect(function () {
-    console.log(value === null || value === void 0 ? void 0 : value.interceptCompany);
     if (!(value === null || value === void 0 ? void 0 : value.interceptCompany)) {
       setTypeOptions([]);
       setStatusOptions([]);
-      setIsInterface(true);
+      setIsInterface(false);
       return;
     }
     var interceptCompany = logisticsOptions.find(function (item) {
@@ -3168,7 +3180,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     return (_find = (typeOptions || []).find(function (item) {
       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]);
+  }, [value === null || value === void 0 ? void 0 : value.interceptType, typeOptions, value === null || value === void 0 ? void 0 : value.interceptCompany]);
   var changeHandle = function changeHandle(val, type) {
     var newValue = _objectSpread2(_objectSpread2({}, value), {}, _defineProperty({}, type, val));
     if (type === 'interceptCompany') {
@@ -3190,7 +3202,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,
+    disabled: disabled || !canEdit,
     placeholder: "\u7269\u6D41\u516C\u53F8",
     style: {
       width: '200px'
@@ -3205,7 +3217,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    disabled: disabled,
+    disabled: disabled || !canEdit,
     placeholder: "\u7269\u6D41\u5355\u53F7",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptCode');
@@ -3216,7 +3228,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     required: required,
     key: 'interceptType'
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
-    disabled: disabled,
+    disabled: disabled || !canEdit,
     style: {
       width: '200px'
     },
@@ -3232,26 +3244,26 @@ var LogisticsInterception = function LogisticsInterception(props) {
     }
   })), /*#__PURE__*/React__default['default'].createElement(Item, {
     label: '新派送地',
-    required: required,
+    required: true,
     key: 'newAddress',
-    hidden: isInterface && showNewAddress
+    hidden: !showNewAddress
   }, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(Province, {
     value: value === null || value === void 0 ? void 0 : value.interceptAddress,
     onChange: function onChange(val) {
       return changeHandle(val, 'interceptAddress');
     },
     options: [],
-    disabled: disabled
+    disabled: disabled || !canEdit
   }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     value: value === null || value === void 0 ? void 0 : value.interceptDetail,
-    disabled: disabled,
+    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,
+    disabled: disabled || !canEdit,
     style: {
       width: '200px'
     },
@@ -3261,7 +3273,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
     }
   }), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     value: value === null || value === void 0 ? void 0 : value.interceptReceiverMobile,
-    disabled: disabled,
+    disabled: disabled || !canEdit,
     placeholder: "\u6536\u4EF6\u4EBA\u7535\u8BDD",
     onChange: function onChange(e) {
       return changeHandle(e.target.value, 'interceptReceiverMobile');
@@ -3285,6 +3297,7 @@ var LogisticsInterception = function LogisticsInterception(props) {
       return option.label.includes(input);
     }
   }), (value === null || value === void 0 ? void 0 : value.interceptStatus) === 'OTHER' && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    disabled: disabled || canEdit,
     style: {
       width: '200px'
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.2.2-alpha.1",
+  "version": "0.2.2-alpha.2",
   "description": "> TODO: description",
   "author": "wangzhenggui <jianjia.wzg@raycloud.com>",
   "homepage": "",
@@ -13,7 +13,7 @@
     "async": "yarn build && yalc push",
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
-  "gitHead": "3f43f0b3abcd408e27c8cdd3d52d175bec7a95bb",
+  "gitHead": "9b5e231fe191b63e8cba25fffa6e7da93a99eba6",
   "publishConfig": {
     "access": "public"
   },