@kmkf-fe-packages/basic-components 0.24.0-alpha.1 → 0.24.0-alpha.6

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, request as request$1, ExpressData, LogisticsAddressData, uuid } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, toTree, request as request$1, ExpressData, LogisticsAddressData, uuid } from '@kmkf-fe-packages/kmkf-utils';
 import zhCN from 'antd/lib/locale/zh_CN';
 import { cloneDeep } from 'lodash';
 import { useDebounceEffect } from 'ahooks';
@@ -7358,11 +7358,12 @@ function ApaasRate(props) {
   }));
 }
 
-AddressData.getInstance();
-BsAddressData.getInstance();
+var addressData = AddressData.getInstance();
+var bsAddressData = BsAddressData.getInstance();
 var Province = function Province(props) {
   var _props$type = props.type,
-    type = _props$type === void 0 ? 'workOrder' : _props$type;
+    type = _props$type === void 0 ? 'workOrder' : _props$type,
+    value = props.value;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     option = _useState2[0],
@@ -7377,7 +7378,7 @@ var Province = function Province(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             num++;
-            options = type !== 'bs' ? AddressData.getInstance().addressOptions || [] : BsAddressData.getInstance().addressOptions || [];
+            options = type !== 'bs' ? addressData.addressOptions || [] : bsAddressData.addressOptions || [];
             if (!(options === null || options === void 0 ? void 0 : options.length) && num < 6) {
               time.current = setTimeout(function () {
                 initPageSource();
@@ -7394,6 +7395,19 @@ var Province = function Province(props) {
       return _ref.apply(this, arguments);
     };
   }();
+  var getBsAddress = function getBsAddress() {
+    var data = JSON.parse(localStorage.getItem('bsAddressData') || '[]');
+    if (data.length) {
+      var options = toTree(data, 1);
+      setOptions(options);
+    }
+  };
+  //如果值改变地址不存在则再获取一遍
+  useEffect(function () {
+    if (value && type == 'bs' && !option.length) {
+      getBsAddress();
+    }
+  }, [value, type, option]);
   useEffect(function () {
     if (!isFirst.current) {
       initPageSource();
@@ -7715,10 +7729,7 @@ var ShopNameSelect = function ShopNameSelect(props) {
 function ApaasAddress(props) {
   var value = props.value,
     onChange = props.onChange,
-    disabled = props.disabled,
-    _props$showIdentify = props.showIdentify,
-    showIdentify = _props$showIdentify === void 0 ? true : _props$showIdentify,
-    type = props.type;
+    disabled = props.disabled;
   var changeCity = function changeCity(city) {
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
       address: city
@@ -7730,20 +7741,7 @@ function ApaasAddress(props) {
       detail: e.target.value
     });
   };
-  var handleParseLogistics = function handleParseLogistics(val) {
-    var params = {
-      detail: val === null || val === void 0 ? void 0 : val.addressDetail,
-      address: []
-    };
-    var addressData = type === 'bs' ? BsAddressData.getInstance() : AddressData.getInstance();
-    if ((val === null || val === void 0 ? void 0 : val.province) && addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province)) {
-      params.address = [addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province), addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.city), addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.district)];
-    }
-    onChange === null || onChange === void 0 ? void 0 : onChange(params);
-  };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !disabled && showIdentify && /*#__PURE__*/React.createElement(ParseLogistics, {
-    onChange: handleParseLogistics
-  }), /*#__PURE__*/React.createElement(Province, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Province, {
     value: value === null || value === void 0 ? void 0 : value.address,
     onChange: changeCity,
     disabled: disabled

package/dist/index.js

@@ -7369,11 +7369,12 @@ function ApaasRate(props) {
   }));
 }
 
-kmkfUtils.AddressData.getInstance();
-kmkfUtils.BsAddressData.getInstance();
+var addressData = kmkfUtils.AddressData.getInstance();
+var bsAddressData = kmkfUtils.BsAddressData.getInstance();
 var Province = function Province(props) {
   var _props$type = props.type,
-    type = _props$type === void 0 ? 'workOrder' : _props$type;
+    type = _props$type === void 0 ? 'workOrder' : _props$type,
+    value = props.value;
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     option = _useState2[0],
@@ -7388,7 +7389,7 @@ var Province = function Province(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             num++;
-            options = type !== 'bs' ? kmkfUtils.AddressData.getInstance().addressOptions || [] : kmkfUtils.BsAddressData.getInstance().addressOptions || [];
+            options = type !== 'bs' ? addressData.addressOptions || [] : bsAddressData.addressOptions || [];
             if (!(options === null || options === void 0 ? void 0 : options.length) && num < 6) {
               time.current = setTimeout(function () {
                 initPageSource();
@@ -7405,6 +7406,19 @@ var Province = function Province(props) {
       return _ref.apply(this, arguments);
     };
   }();
+  var getBsAddress = function getBsAddress() {
+    var data = JSON.parse(localStorage.getItem('bsAddressData') || '[]');
+    if (data.length) {
+      var options = kmkfUtils.toTree(data, 1);
+      setOptions(options);
+    }
+  };
+  //如果值改变地址不存在则再获取一遍
+  React.useEffect(function () {
+    if (value && type == 'bs' && !option.length) {
+      getBsAddress();
+    }
+  }, [value, type, option]);
   React.useEffect(function () {
     if (!isFirst.current) {
       initPageSource();
@@ -7726,10 +7740,7 @@ var ShopNameSelect = function ShopNameSelect(props) {
 function ApaasAddress(props) {
   var value = props.value,
     onChange = props.onChange,
-    disabled = props.disabled,
-    _props$showIdentify = props.showIdentify,
-    showIdentify = _props$showIdentify === void 0 ? true : _props$showIdentify,
-    type = props.type;
+    disabled = props.disabled;
   var changeCity = function changeCity(city) {
     onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
       address: city
@@ -7741,20 +7752,7 @@ function ApaasAddress(props) {
       detail: e.target.value
     });
   };
-  var handleParseLogistics = function handleParseLogistics(val) {
-    var params = {
-      detail: val === null || val === void 0 ? void 0 : val.addressDetail,
-      address: []
-    };
-    var addressData = type === 'bs' ? kmkfUtils.BsAddressData.getInstance() : kmkfUtils.AddressData.getInstance();
-    if ((val === null || val === void 0 ? void 0 : val.province) && addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province)) {
-      params.address = [addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.province), addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.city), addressData.getProCodeByName(val === null || val === void 0 ? void 0 : val.district)];
-    }
-    onChange === null || onChange === void 0 ? void 0 : onChange(params);
-  };
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, !disabled && showIdentify && /*#__PURE__*/React__default['default'].createElement(ParseLogistics, {
-    onChange: handleParseLogistics
-  }), /*#__PURE__*/React__default['default'].createElement(Province, {
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(Province, {
     value: value === null || value === void 0 ? void 0 : value.address,
     onChange: changeCity,
     disabled: disabled

package/dist/src/business/Address/index.d.ts

@@ -6,8 +6,6 @@ interface valueType {
 export interface AddressType {
     value: valueType;
     disabled: boolean;
-    showIdentify?: boolean;
-    type?: string;
     onChange: (value: valueType) => void;
     [key: string]: any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.24.0-alpha.1",
+  "version": "0.24.0-alpha.6",
   "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.24.0-alpha.0",
+    "@kmkf-fe-packages/kmkf-utils": "^0.24.0-alpha.6",
     "ahooks": "^3.7.4",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
@@ -62,5 +62,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "265ad70e00afb81994f410ebe9bd77fb57b520b6"
+  "gitHead": "6e3d1a99ef237be68f0bb97ca9b597a594a02a68"
 }