@fle-ui/plus-address-selection 1.0.13 → 1.0.15

package/es/index.d.ts

@@ -20,7 +20,7 @@ export interface addressItem {
     tree?: string;
     level?: string;
     isLeaf?: boolean;
-    hasChildren?: boolean;
+    hasChildren?: boolean | 0 | 1;
     children?: addressItem[];
 }
 export interface SiteSelectProps extends Omit<CascaderProps<any>, 'options' | 'value'> {

package/es/index.js

@@ -74,9 +74,10 @@ var AddressSelection = function AddressSelection(props) {
             case 2:
               data = _context.sent;
               provinceList = formatArea(data, level === 1);
+              console.log(apiUrl, provinceList);
               setAddressList(provinceList);
               setStateValue(val);
-            case 6:
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -112,12 +113,16 @@ var AddressSelection = function AddressSelection(props) {
   };
   var formatArea = function formatArea(list, isLeaf) {
     return list === null || list === void 0 ? void 0 : list.map(function (item) {
+      var _isLeaf = isLeaf;
+      if (item.hasChildren === 0) {
+        _isLeaf = true;
+      }
       return {
         value: item.code,
         label: item.name,
         tree: item.tree,
         level: item.level,
-        isLeaf: item.hasChildren ? isLeaf : !item.hasChildren
+        isLeaf: _isLeaf
       };
     });
   };
@@ -195,18 +200,12 @@ var AddressSelection = function AddressSelection(props) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             targetOption = selectedOptions[selectedOptions.length - 1];
-            if (!(stateValue === null || stateValue === void 0 ? void 0 : stateValue.includes(targetOption.value))) {
-              _context4.next = 3;
-              break;
-            }
-            return _context4.abrupt("return");
-          case 3:
             targetOption.loading = true;
-            _context4.next = 6;
+            _context4.next = 4;
             return getAddress({
               parentCode: targetOption.value
             });
-          case 6:
+          case 4:
             data = _context4.sent;
             targetOption.loading = false;
             if (data.length) {
@@ -216,7 +215,7 @@ var AddressSelection = function AddressSelection(props) {
             }
             setIsLoad(true);
             setAddressList(_toConsumableArray(addressList));
-          case 11:
+          case 9:
           case "end":
             return _context4.stop();
         }
@@ -228,6 +227,7 @@ var AddressSelection = function AddressSelection(props) {
   }();
   var handleChange = function handleChange(info, selectedOptions) {
     var cascaderValue = info || [];
+    console.log(cascaderValue, 'cascaderValue');
     if (valueDivision) {
       cascaderValue = cascaderValue.join(valueDivision);
     }

package/lib/index.d.ts

@@ -20,7 +20,7 @@ export interface addressItem {
     tree?: string;
     level?: string;
     isLeaf?: boolean;
-    hasChildren?: boolean;
+    hasChildren?: boolean | 0 | 1;
     children?: addressItem[];
 }
 export interface SiteSelectProps extends Omit<CascaderProps<any>, 'options' | 'value'> {

package/lib/index.js

@@ -82,9 +82,10 @@ var AddressSelection = function AddressSelection(props) {
             case 2:
               data = _context.sent;
               provinceList = formatArea(data, level === 1);
+              console.log(apiUrl, provinceList);
               setAddressList(provinceList);
               setStateValue(val);
-            case 6:
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -120,12 +121,16 @@ var AddressSelection = function AddressSelection(props) {
   };
   var formatArea = function formatArea(list, isLeaf) {
     return list === null || list === void 0 ? void 0 : list.map(function (item) {
+      var _isLeaf = isLeaf;
+      if (item.hasChildren === 0) {
+        _isLeaf = true;
+      }
       return {
         value: item.code,
         label: item.name,
         tree: item.tree,
         level: item.level,
-        isLeaf: item.hasChildren ? isLeaf : !item.hasChildren
+        isLeaf: _isLeaf
       };
     });
   };
@@ -203,18 +208,12 @@ var AddressSelection = function AddressSelection(props) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             targetOption = selectedOptions[selectedOptions.length - 1];
-            if (!(stateValue === null || stateValue === void 0 ? void 0 : stateValue.includes(targetOption.value))) {
-              _context4.next = 3;
-              break;
-            }
-            return _context4.abrupt("return");
-          case 3:
             targetOption.loading = true;
-            _context4.next = 6;
+            _context4.next = 4;
             return getAddress({
               parentCode: targetOption.value
             });
-          case 6:
+          case 4:
             data = _context4.sent;
             targetOption.loading = false;
             if (data.length) {
@@ -224,7 +223,7 @@ var AddressSelection = function AddressSelection(props) {
             }
             setIsLoad(true);
             setAddressList(_toConsumableArray(addressList));
-          case 11:
+          case 9:
           case "end":
             return _context4.stop();
         }
@@ -236,6 +235,7 @@ var AddressSelection = function AddressSelection(props) {
   }();
   var handleChange = function handleChange(info, selectedOptions) {
     var cascaderValue = info || [];
+    console.log(cascaderValue, 'cascaderValue');
     if (valueDivision) {
       cascaderValue = cascaderValue.join(valueDivision);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-address-selection",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "@fle-ui/plus-address-selection",
   "private": false,
   "main": "lib/index.js",
@@ -41,5 +41,5 @@
   "devDependencies": {
     "@types/js-cookie": "^3.0.0"
   },
-  "gitHead": "efedcaf9e8359b7bc34f9687d38c66c14c5516af"
+  "gitHead": "7a7bd43ac08bdf95ee9040639078b87d121df077"
 }