@kmkf-fe-packages/basic-components 0.27.1-test.4 → 0.27.1-test.7

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, LogisticsAddressData, WDT, WDT_ORDER_TYPE_MAP } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, request as request$1, useLogisticsData, ExpressData, uuid, LogisticsAddressData, useSendData, WDT_ORDER_TYPE_MAP } from '@kmkf-fe-packages/kmkf-utils';
 import zhCN from 'antd/lib/locale/zh_CN';
 import { cloneDeep, difference, differenceWith } from 'lodash';
 import { useDebounceEffect } from 'ahooks';
@@ -7563,15 +7563,18 @@ function ApaasPosting(props) {
   });
 }
 
-var _excluded$a = ["value", "onChange"];
+var _excluded$a = ["value", "onChange", "type"];
 function ApaasLogistics(props) {
   var value = props.value,
     onChange = props.onChange,
+    type = props.type,
     other = _objectWithoutProperties(props, _excluded$a);
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     option = _useState2[0],
     setOptions = _useState2[1];
+  var _useLogisticsData = useLogisticsData(type),
+    logisticsData = _useLogisticsData.logisticsData;
   var isFirst = useRef(false);
   var initPageSource = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -7597,6 +7600,11 @@ function ApaasLogistics(props) {
       isFirst.current = true;
     }
   }, []);
+  useEffect(function () {
+    if (type === 'wdt') {
+      setOptions(_toConsumableArray(logisticsData || []));
+    }
+  }, [logisticsData]);
   return /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
     value: value,
     onChange: onChange,
@@ -10417,23 +10425,14 @@ var jstGoods = function jstGoods(props) {
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
-  var _useState3 = useState([]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    wdtSendOptions = _useState4[0],
-    setSendOptions = _useState4[1];
+  var _useSendData = useSendData(componentType === 'WDT_SEND_GOOD' ? 'wdt' : ''),
+    wdtSendOptions = _useSendData.sendData;
   useEffect(function () {
     //没有值塞个默认值
     if (!(value === null || value === void 0 ? void 0 : value.length)) {
       onChange === null || onChange === void 0 ? void 0 : onChange(typeInitValueMap[type]);
     }
   }, [value, type]);
-  useEffect(function () {
-    if (type === 3 && componentType === 'WDT_SEND_GOOD' && ['sendName', 'all'].includes(showField)) {
-      WDT.getWarehouseDataAsync().then(setSendOptions).catch(function (e) {
-        message.error((e === null || e === void 0 ? void 0 : e.message) || '获取发货仓数据失败，请刷新重试');
-      });
-    }
-  }, []);
   var content = function content(item, index) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
@@ -10507,7 +10506,8 @@ var jstGoods = function jstGoods(props) {
     style: {
       minWidth: '100px',
       maxWidth: '180px'
-    }
+    },
+    type: componentType === 'WDT_LOGISTICS' ? 'wdt' : 'default'
   }) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u5355\u53F7",

package/dist/index.js

@@ -7574,15 +7574,18 @@ function ApaasPosting(props) {
   });
 }
 
-var _excluded$a = ["value", "onChange"];
+var _excluded$a = ["value", "onChange", "type"];
 function ApaasLogistics(props) {
   var value = props.value,
     onChange = props.onChange,
+    type = props.type,
     other = _objectWithoutProperties(props, _excluded$a);
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     option = _useState2[0],
     setOptions = _useState2[1];
+  var _useLogisticsData = kmkfUtils.useLogisticsData(type),
+    logisticsData = _useLogisticsData.logisticsData;
   var isFirst = React.useRef(false);
   var initPageSource = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -7608,6 +7611,11 @@ function ApaasLogistics(props) {
       isFirst.current = true;
     }
   }, []);
+  React.useEffect(function () {
+    if (type === 'wdt') {
+      setOptions(_toConsumableArray(logisticsData || []));
+    }
+  }, [logisticsData]);
   return /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
     value: value,
     onChange: onChange,
@@ -10428,23 +10436,14 @@ var jstGoods = function jstGoods(props) {
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
-  var _useState3 = React.useState([]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    wdtSendOptions = _useState4[0],
-    setSendOptions = _useState4[1];
+  var _useSendData = kmkfUtils.useSendData(componentType === 'WDT_SEND_GOOD' ? 'wdt' : ''),
+    wdtSendOptions = _useSendData.sendData;
   React.useEffect(function () {
     //没有值塞个默认值
     if (!(value === null || value === void 0 ? void 0 : value.length)) {
       onChange === null || onChange === void 0 ? void 0 : onChange(typeInitValueMap[type]);
     }
   }, [value, type]);
-  React.useEffect(function () {
-    if (type === 3 && componentType === 'WDT_SEND_GOOD' && ['sendName', 'all'].includes(showField)) {
-      kmkfUtils.WDT.getWarehouseDataAsync().then(setSendOptions).catch(function (e) {
-        antd.message.error((e === null || e === void 0 ? void 0 : e.message) || '获取发货仓数据失败，请刷新重试');
-      });
-    }
-  }, []);
   var content = function content(item, index) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
@@ -10518,7 +10517,8 @@ var jstGoods = function jstGoods(props) {
     style: {
       minWidth: '100px',
       maxWidth: '180px'
-    }
+    },
+    type: componentType === 'WDT_LOGISTICS' ? 'wdt' : 'default'
   }) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u5355\u53F7",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.27.1-test.4",
+  "version": "0.27.1-test.7",
   "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": "^0.27.1-test.4",
+    "@kmkf-fe-packages/kmkf-utils": "^0.27.1-test.7",
     "ahooks": "^3.7.4",
     "kmkf-monitor": "^0.8.8",
     "lodash": "^4.17.21",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "156d314130701c3e3fd39a375bea1456b569591e"
+  "gitHead": "8d75e5eeca6c2b783dd065d893e62731da836488"
 }