@fle-ui/plus-address-selection 1.0.3 → 1.0.6

package/es/index.js

@@ -16,18 +16,31 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { useEffect, useState } from 'react';
 import _ from 'lodash';
 import { httpClient } from './utils';
+var defaultProps = {
+  level: 4,
+  valueDivision: '',
+  value: [],
+  onChange: function onChange() {},
+  apiUrl: ''
+};
 var AddressSelection = function AddressSelection(props) {
-  var level = props.level,
-    value = props.value,
-    onChange = props.onChange,
-    valueDivision = props.valueDivision,
-    apiUrl = props.apiUrl,
-    otherProps = _objectWithoutProperties(props, _excluded);
+  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props),
+    level = _defaultProps$props.level,
+    value = _defaultProps$props.value,
+    onChange = _defaultProps$props.onChange,
+    valueDivision = _defaultProps$props.valueDivision,
+    apiUrl = _defaultProps$props.apiUrl,
+    otherProps = _objectWithoutProperties(_defaultProps$props, _excluded);
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     addressList = _useState2[0],
@@ -205,12 +218,18 @@ var AddressSelection = function AddressSelection(props) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             targetOption = selectedOptions[selectedOptions.length - 1];
+            if (!(stateValue === null || stateValue === void 0 ? void 0 : stateValue.includes(targetOption.value))) {
+              _context5.next = 3;
+              break;
+            }
+            return _context5.abrupt("return");
+          case 3:
             targetOption.loading = true;
-            _context5.next = 4;
+            _context5.next = 6;
             return getAddressAPI({
               parentCode: targetOption.value
             });
-          case 4:
+          case 6:
             data = _context5.sent;
             targetOption.loading = false;
             if (data.length) {
@@ -220,7 +239,7 @@ var AddressSelection = function AddressSelection(props) {
             }
             setIsLoad(true);
             setAddressList(_toConsumableArray(addressList));
-          case 9:
+          case 11:
           case "end":
             return _context5.stop();
         }
@@ -231,7 +250,7 @@ var AddressSelection = function AddressSelection(props) {
     };
   }();
   var handleChange = function handleChange(info, selectedOptions) {
-    var cascaderValue = info;
+    var cascaderValue = info || [];
     if (valueDivision) {
       cascaderValue = cascaderValue.join(valueDivision);
     }
@@ -243,14 +262,7 @@ var AddressSelection = function AddressSelection(props) {
     loadData: loadData,
     options: addressList,
     onChange: handleChange,
-    value: formatValue(value).length === 0 ? stateValue : formatValue(value)
+    value: props.value ? value : stateValue
   }));
 };
-AddressSelection.defaultProps = {
-  level: 4,
-  valueDivision: '',
-  value: [],
-  onChange: function onChange() {},
-  apiUrl: ''
-};
 export default AddressSelection;

package/lib/index.js

@@ -27,15 +27,28 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+var defaultProps = {
+  level: 4,
+  valueDivision: '',
+  value: [],
+  onChange: function onChange() {},
+  apiUrl: ''
+};
 var AddressSelection = function AddressSelection(props) {
-  var level = props.level,
-    value = props.value,
-    onChange = props.onChange,
-    valueDivision = props.valueDivision,
-    apiUrl = props.apiUrl,
-    otherProps = _objectWithoutProperties(props, _excluded);
+  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props),
+    level = _defaultProps$props.level,
+    value = _defaultProps$props.value,
+    onChange = _defaultProps$props.onChange,
+    valueDivision = _defaultProps$props.valueDivision,
+    apiUrl = _defaultProps$props.apiUrl,
+    otherProps = _objectWithoutProperties(_defaultProps$props, _excluded);
   var _useState = (0, _react.useState)([]),
     _useState2 = _slicedToArray(_useState, 2),
     addressList = _useState2[0],
@@ -213,12 +226,18 @@ var AddressSelection = function AddressSelection(props) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             targetOption = selectedOptions[selectedOptions.length - 1];
+            if (!(stateValue === null || stateValue === void 0 ? void 0 : stateValue.includes(targetOption.value))) {
+              _context5.next = 3;
+              break;
+            }
+            return _context5.abrupt("return");
+          case 3:
             targetOption.loading = true;
-            _context5.next = 4;
+            _context5.next = 6;
             return getAddressAPI({
               parentCode: targetOption.value
             });
-          case 4:
+          case 6:
             data = _context5.sent;
             targetOption.loading = false;
             if (data.length) {
@@ -228,7 +247,7 @@ var AddressSelection = function AddressSelection(props) {
             }
             setIsLoad(true);
             setAddressList(_toConsumableArray(addressList));
-          case 9:
+          case 11:
           case "end":
             return _context5.stop();
         }
@@ -239,7 +258,7 @@ var AddressSelection = function AddressSelection(props) {
     };
   }();
   var handleChange = function handleChange(info, selectedOptions) {
-    var cascaderValue = info;
+    var cascaderValue = info || [];
     if (valueDivision) {
       cascaderValue = cascaderValue.join(valueDivision);
     }
@@ -251,14 +270,7 @@ var AddressSelection = function AddressSelection(props) {
     loadData: loadData,
     options: addressList,
     onChange: handleChange,
-    value: formatValue(value).length === 0 ? stateValue : formatValue(value)
+    value: props.value ? value : stateValue
   }));
 };
-AddressSelection.defaultProps = {
-  level: 4,
-  valueDivision: '',
-  value: [],
-  onChange: function onChange() {},
-  apiUrl: ''
-};
 var _default = exports.default = AddressSelection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-address-selection",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "description": "@fle-ui/plus-address-selection",
   "private": false,
   "main": "lib/index.js",
@@ -41,5 +41,5 @@
   "devDependencies": {
     "@types/js-cookie": "^3.0.0"
   },
-  "gitHead": "41fb85a0e9ef436c6a33ce1af9a6a48053987f17"
+  "gitHead": "0a980499060a7123fdc020ac79051d911723b95b"
 }