@fle-ui/plus-address-selection 1.0.3-beta.2 → 1.0.4

package/es/index.d.ts

@@ -1,13 +1,13 @@
 import React from 'react';
 import { CascaderProps } from 'antd';
-export declare type CascaderValueType = string | (string | number)[];
+export declare type CascaderValueType = string | Array<string | number>;
 export interface CascaderOptionType {
     value?: string | number;
     label?: React.ReactNode;
     disabled?: boolean;
     isLeaf?: boolean;
     loading?: boolean;
-    children?: Array<CascaderOptionType>;
+    children?: CascaderOptionType[];
     hasChildren?: boolean;
     [key: string]: any;
 }
@@ -24,7 +24,7 @@ export interface addressItem {
 }
 export interface SiteSelectProps extends Omit<CascaderProps<any>, 'options' | 'value'> {
     /**
-     * @description 格式化value
+     * @description 格式化 value
      * @default
      */
     valueDivision?: string;
@@ -39,12 +39,12 @@ export interface SiteSelectProps extends Omit<CascaderProps<any>, 'options' | 'v
      */
     level?: number;
     /**
-     * @description 指定选中项-
+     * @description 指定选中项
      * @default []
      */
     value?: CascaderValueType;
     /**
-     * @description 可选项数据源-
+     * @description 可选项数据源
      * @default []
      */
     options?: CascaderOptionType[];

package/es/index.js

@@ -18,7 +18,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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, useRef, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import _ from 'lodash';
 import { httpClient } from './utils';
 var AddressSelection = function AddressSelection(props) {
@@ -40,29 +40,46 @@ var AddressSelection = function AddressSelection(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     stateValue = _useState6[0],
     setStateValue = _useState6[1];
-  var firstTime = useRef(true);
   useEffect(function () {
-    var _props$defaultValue;
-    var val = value;
-    if (firstTime.current && !(value === null || value === void 0 ? void 0 : value.length) && ((_props$defaultValue = props.defaultValue) === null || _props$defaultValue === void 0 ? void 0 : _props$defaultValue.length)) {
-      val = formatValue(props.defaultValue || '');
+    var val = formatValue((value === null || value === void 0 ? void 0 : value.length) ? value : props.defaultValue || '');
+    function init() {
+      return _init.apply(this, arguments);
     }
-    if (!isLoad && level) {
-      initAddress(formatValue(val), 0);
-      setStateValue(formatValue(val));
-    } else {
-      setStateValue([]);
+    function _init() {
+      _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var data, provinceList;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return getAddressAPI({
+                parentCode: 0
+              });
+            case 2:
+              data = _context.sent;
+              provinceList = formatArea(data, level === 1);
+              setAddressList(provinceList);
+              setStateValue(val);
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return _init.apply(this, arguments);
     }
-    // leval改变后需要更新，不然动态切换 level会有bug
-    if (isLoad && !firstTime.current && level) {
-      initAddress(formatValue(val), 0);
-      setStateValue(formatValue(val));
+    init();
+  }, [level]);
+  useEffect(function () {
+    var val = formatValue((value === null || value === void 0 ? void 0 : value.length) ? value : props.defaultValue || '');
+    if (addressList.length && (val === null || val === void 0 ? void 0 : val.length) && !isLoad) {
+      initAddress(val);
+      setStateValue(val);
     }
-    firstTime.current = false;
-  }, [value, level]);
+  }, [value, addressList.length, isLoad]);
   var formatValue = function formatValue(value) {
     var localvalue = [];
-    if (!!value) {
+    if (value) {
       if (!!valueDivision && !_.isArray(value)) {
         localvalue = value.split(valueDivision);
       } else {
@@ -89,62 +106,56 @@ var AddressSelection = function AddressSelection(props) {
     });
   };
   var getAddressAPI = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var params,
         _yield$httpClient$pos,
         data,
-        _args = arguments;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+        _args2 = arguments;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-            _context.next = 3;
+            params = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+            _context2.next = 3;
             return httpClient.post(apiUrl || '/basic/area/areas', params);
           case 3:
-            _yield$httpClient$pos = _context.sent;
+            _yield$httpClient$pos = _context2.sent;
             data = _yield$httpClient$pos.data;
-            return _context.abrupt("return", data);
+            return _context2.abrupt("return", data);
           case 6:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
     return function getAddressAPI() {
       return _ref.apply(this, arguments);
     };
   }();
   var initAddress = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(defaultValue, parentCode) {
-      var data, provinceList, len, thisAddress, _loop, i;
-      return _regeneratorRuntime().wrap(function _callee2$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(defaultValue, parentCode) {
+      var provinceList, len, thisAddress, _loop, i;
+      return _regeneratorRuntime().wrap(function _callee3$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context3.next = 2;
-            return getAddressAPI({
-              parentCode: parentCode
-            });
-          case 2:
-            data = _context3.sent;
-            provinceList = formatArea(data, level === 1);
-            if (!defaultValue) {
-              _context3.next = 14;
+            provinceList = _.cloneDeep(addressList);
+            len = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.length;
+            if (!len) {
+              _context4.next = 11;
               break;
             }
-            len = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.length;
             thisAddress = provinceList;
             _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop(i) {
               var _thisAddress;
               var levelData, thisIndex;
-              return _regeneratorRuntime().wrap(function _loop$(_context2) {
-                while (1) switch (_context2.prev = _context2.next) {
+              return _regeneratorRuntime().wrap(function _loop$(_context3) {
+                while (1) switch (_context3.prev = _context3.next) {
                   case 0:
-                    _context2.next = 2;
+                    _context3.next = 2;
                     return getAddressAPI({
                       parentCode: defaultValue[i]
                     });
                   case 2:
-                    levelData = _context2.sent;
+                    levelData = _context3.sent;
                     thisIndex = -1;
                     (_thisAddress = thisAddress) === null || _thisAddress === void 0 ? void 0 : _thisAddress.forEach(function (item, index) {
                       if (item.value === defaultValue[i]) {
@@ -155,62 +166,71 @@ var AddressSelection = function AddressSelection(props) {
                     if (thisIndex !== -1 && thisAddress[thisIndex].children) {
                       thisAddress = thisAddress[thisIndex].children;
                     }
-                  case 6:
+                    if (i === len - 2) {
+                      setIsLoad(true);
+                    }
+                  case 7:
                   case "end":
-                    return _context2.stop();
+                    return _context3.stop();
                 }
               }, _loop);
             });
             i = 0;
-          case 9:
+          case 6:
             if (!(i < len - 1)) {
-              _context3.next = 14;
+              _context4.next = 11;
               break;
             }
-            return _context3.delegateYield(_loop(i), "t0", 11);
-          case 11:
+            return _context4.delegateYield(_loop(i), "t0", 8);
+          case 8:
             i++;
-            _context3.next = 9;
+            _context4.next = 6;
             break;
-          case 14:
+          case 11:
             setAddressList(provinceList);
-          case 15:
+          case 12:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return function initAddress(_x, _x2) {
       return _ref2.apply(this, arguments);
     };
   }();
   var loadData = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(selectedOptions) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(selectedOptions) {
       var targetOption, data;
-      return _regeneratorRuntime().wrap(function _callee3$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context5) {
+        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;
-            _context4.next = 4;
+            _context5.next = 6;
             return getAddressAPI({
               parentCode: targetOption.value
             });
-          case 4:
-            data = _context4.sent;
+          case 6:
+            data = _context5.sent;
             targetOption.loading = false;
-            if (!!data.length) {
+            if (data.length) {
               targetOption.children = formatArea(data, targetOption.level + 1 === level);
             } else {
               targetOption.isLeaf = true;
             }
             setIsLoad(true);
             setAddressList(_toConsumableArray(addressList));
-          case 9:
+          case 11:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
     return function loadData(_x3) {
       return _ref3.apply(this, arguments);
@@ -218,13 +238,14 @@ var AddressSelection = function AddressSelection(props) {
   }();
   var handleChange = function handleChange(info, selectedOptions) {
     var cascaderValue = info;
-    if (!!valueDivision) {
+    if (valueDivision) {
       cascaderValue = cascaderValue.join(valueDivision);
     }
     setStateValue(info);
     onChange && onChange(cascaderValue, selectedOptions);
   };
   return /*#__PURE__*/React.createElement(_Cascader, _extends({}, otherProps, {
+    defaultValue: props.defaultValue,
     loadData: loadData,
     options: addressList,
     onChange: handleChange,

package/lib/index.d.ts

@@ -1,13 +1,13 @@
 import React from 'react';
 import { CascaderProps } from 'antd';
-export declare type CascaderValueType = string | (string | number)[];
+export declare type CascaderValueType = string | Array<string | number>;
 export interface CascaderOptionType {
     value?: string | number;
     label?: React.ReactNode;
     disabled?: boolean;
     isLeaf?: boolean;
     loading?: boolean;
-    children?: Array<CascaderOptionType>;
+    children?: CascaderOptionType[];
     hasChildren?: boolean;
     [key: string]: any;
 }
@@ -24,7 +24,7 @@ export interface addressItem {
 }
 export interface SiteSelectProps extends Omit<CascaderProps<any>, 'options' | 'value'> {
     /**
-     * @description 格式化value
+     * @description 格式化 value
      * @default
      */
     valueDivision?: string;
@@ -39,12 +39,12 @@ export interface SiteSelectProps extends Omit<CascaderProps<any>, 'options' | 'v
      */
     level?: number;
     /**
-     * @description 指定选中项-
+     * @description 指定选中项
      * @default []
      */
     value?: CascaderValueType;
     /**
-     * @description 可选项数据源-
+     * @description 可选项数据源
      * @default []
      */
     options?: CascaderOptionType[];

package/lib/index.js

@@ -48,29 +48,46 @@ var AddressSelection = function AddressSelection(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     stateValue = _useState6[0],
     setStateValue = _useState6[1];
-  var firstTime = (0, _react.useRef)(true);
   (0, _react.useEffect)(function () {
-    var _props$defaultValue;
-    var val = value;
-    if (firstTime.current && !(value === null || value === void 0 ? void 0 : value.length) && ((_props$defaultValue = props.defaultValue) === null || _props$defaultValue === void 0 ? void 0 : _props$defaultValue.length)) {
-      val = formatValue(props.defaultValue || '');
+    var val = formatValue((value === null || value === void 0 ? void 0 : value.length) ? value : props.defaultValue || '');
+    function init() {
+      return _init.apply(this, arguments);
     }
-    if (!isLoad && level) {
-      initAddress(formatValue(val), 0);
-      setStateValue(formatValue(val));
-    } else {
-      setStateValue([]);
+    function _init() {
+      _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var data, provinceList;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return getAddressAPI({
+                parentCode: 0
+              });
+            case 2:
+              data = _context.sent;
+              provinceList = formatArea(data, level === 1);
+              setAddressList(provinceList);
+              setStateValue(val);
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return _init.apply(this, arguments);
     }
-    // leval改变后需要更新，不然动态切换 level会有bug
-    if (isLoad && !firstTime.current && level) {
-      initAddress(formatValue(val), 0);
-      setStateValue(formatValue(val));
+    init();
+  }, [level]);
+  (0, _react.useEffect)(function () {
+    var val = formatValue((value === null || value === void 0 ? void 0 : value.length) ? value : props.defaultValue || '');
+    if (addressList.length && (val === null || val === void 0 ? void 0 : val.length) && !isLoad) {
+      initAddress(val);
+      setStateValue(val);
     }
-    firstTime.current = false;
-  }, [value, level]);
+  }, [value, addressList.length, isLoad]);
   var formatValue = function formatValue(value) {
     var localvalue = [];
-    if (!!value) {
+    if (value) {
       if (!!valueDivision && !_lodash.default.isArray(value)) {
         localvalue = value.split(valueDivision);
       } else {
@@ -97,62 +114,56 @@ var AddressSelection = function AddressSelection(props) {
     });
   };
   var getAddressAPI = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var params,
         _yield$httpClient$pos,
         data,
-        _args = arguments;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+        _args2 = arguments;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-            _context.next = 3;
+            params = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+            _context2.next = 3;
             return _utils.httpClient.post(apiUrl || '/basic/area/areas', params);
           case 3:
-            _yield$httpClient$pos = _context.sent;
+            _yield$httpClient$pos = _context2.sent;
             data = _yield$httpClient$pos.data;
-            return _context.abrupt("return", data);
+            return _context2.abrupt("return", data);
           case 6:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
     return function getAddressAPI() {
       return _ref.apply(this, arguments);
     };
   }();
   var initAddress = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(defaultValue, parentCode) {
-      var data, provinceList, len, thisAddress, _loop, i;
-      return _regeneratorRuntime().wrap(function _callee2$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(defaultValue, parentCode) {
+      var provinceList, len, thisAddress, _loop, i;
+      return _regeneratorRuntime().wrap(function _callee3$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context3.next = 2;
-            return getAddressAPI({
-              parentCode: parentCode
-            });
-          case 2:
-            data = _context3.sent;
-            provinceList = formatArea(data, level === 1);
-            if (!defaultValue) {
-              _context3.next = 14;
+            provinceList = _lodash.default.cloneDeep(addressList);
+            len = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.length;
+            if (!len) {
+              _context4.next = 11;
               break;
             }
-            len = defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.length;
             thisAddress = provinceList;
             _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop(i) {
               var _thisAddress;
               var levelData, thisIndex;
-              return _regeneratorRuntime().wrap(function _loop$(_context2) {
-                while (1) switch (_context2.prev = _context2.next) {
+              return _regeneratorRuntime().wrap(function _loop$(_context3) {
+                while (1) switch (_context3.prev = _context3.next) {
                   case 0:
-                    _context2.next = 2;
+                    _context3.next = 2;
                     return getAddressAPI({
                       parentCode: defaultValue[i]
                     });
                   case 2:
-                    levelData = _context2.sent;
+                    levelData = _context3.sent;
                     thisIndex = -1;
                     (_thisAddress = thisAddress) === null || _thisAddress === void 0 ? void 0 : _thisAddress.forEach(function (item, index) {
                       if (item.value === defaultValue[i]) {
@@ -163,62 +174,71 @@ var AddressSelection = function AddressSelection(props) {
                     if (thisIndex !== -1 && thisAddress[thisIndex].children) {
                       thisAddress = thisAddress[thisIndex].children;
                     }
-                  case 6:
+                    if (i === len - 2) {
+                      setIsLoad(true);
+                    }
+                  case 7:
                   case "end":
-                    return _context2.stop();
+                    return _context3.stop();
                 }
               }, _loop);
             });
             i = 0;
-          case 9:
+          case 6:
             if (!(i < len - 1)) {
-              _context3.next = 14;
+              _context4.next = 11;
               break;
             }
-            return _context3.delegateYield(_loop(i), "t0", 11);
-          case 11:
+            return _context4.delegateYield(_loop(i), "t0", 8);
+          case 8:
             i++;
-            _context3.next = 9;
+            _context4.next = 6;
             break;
-          case 14:
+          case 11:
             setAddressList(provinceList);
-          case 15:
+          case 12:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return function initAddress(_x, _x2) {
       return _ref2.apply(this, arguments);
     };
   }();
   var loadData = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(selectedOptions) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(selectedOptions) {
       var targetOption, data;
-      return _regeneratorRuntime().wrap(function _callee3$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context5) {
+        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;
-            _context4.next = 4;
+            _context5.next = 6;
             return getAddressAPI({
               parentCode: targetOption.value
             });
-          case 4:
-            data = _context4.sent;
+          case 6:
+            data = _context5.sent;
             targetOption.loading = false;
-            if (!!data.length) {
+            if (data.length) {
               targetOption.children = formatArea(data, targetOption.level + 1 === level);
             } else {
               targetOption.isLeaf = true;
             }
             setIsLoad(true);
             setAddressList(_toConsumableArray(addressList));
-          case 9:
+          case 11:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
     return function loadData(_x3) {
       return _ref3.apply(this, arguments);
@@ -226,13 +246,14 @@ var AddressSelection = function AddressSelection(props) {
   }();
   var handleChange = function handleChange(info, selectedOptions) {
     var cascaderValue = info;
-    if (!!valueDivision) {
+    if (valueDivision) {
       cascaderValue = cascaderValue.join(valueDivision);
     }
     setStateValue(info);
     onChange && onChange(cascaderValue, selectedOptions);
   };
   return /*#__PURE__*/_react.default.createElement(_antd.Cascader, _extends({}, otherProps, {
+    defaultValue: props.defaultValue,
     loadData: loadData,
     options: addressList,
     onChange: handleChange,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-address-selection",
-  "version": "1.0.3-beta.2",
+  "version": "1.0.4",
   "description": "@fle-ui/plus-address-selection",
   "private": false,
   "main": "lib/index.js",
@@ -41,5 +41,5 @@
   "devDependencies": {
     "@types/js-cookie": "^3.0.0"
   },
-  "gitHead": "75b9376fa7e8dd672e468d237643943b5868e20a"
+  "gitHead": "e5c22e59ebc5a0af73f90323e8ed3e825b7a5035"
 }