@fmdevui/fm-dev 1.0.88 → 1.0.90

package/lib/packages/core/utils/cityparess/index.js

@@ -3,116 +3,150 @@
 var index = require('../../api/base/index.js');
 
 const addressparsing = async (val) => {
-  let province = "";
-  let city = "";
-  let county = "";
   if (val == null || val == void 0 || val == "" || val.trim() == "" || val.trim().length < 2) {
     return { province: "", city: "", county: "" };
   }
+  let _Province = "";
+  let _City = "";
+  let _County = "";
   const oldvalue = val.trim();
-  let newValue = "";
-  province = chkeProvince(oldvalue.substr(0, 2));
-  if (province == "" && oldvalue.length > 2) {
-    province = chkeProvince(oldvalue.substr(0, 3));
-  }
-  newValue = oldvalue.replace(province, "").trim();
-  if (newValue.length < 2) {
-    return { province, city: "", county: "" };
-  }
-  let cityobj = chkeCity(province, newValue.substr(0, 2));
-  if (cityobj.c == "" && newValue.length > 2) {
-    cityobj = chkeCity(province, newValue.substr(0, 3));
-    if (cityobj.c != "" && province == "") {
-      province = cityobj.p;
+  const oldValueLen = val.trim().length;
+  const oneObje = getProvince(oldvalue);
+  let nextValue = oldvalue;
+  if (oneObje.p != "") {
+    _Province = oneObje.p;
+    nextValue = oldvalue.replace(oneObje.p, "").trim();
+    if (nextValue.length == oldValueLen) {
+      for (let i = _Province.length - 1; i >= 1; i--) {
+        nextValue = oldvalue.replace(oneObje.p.substr(0, i), "").trim();
+        if (nextValue.length < oldValueLen) {
+          break;
+        }
+      }
     }
   }
-  if (cityobj.p != "" && province == "") {
-    province = cityobj.p;
-  }
-  newValue = oldvalue.replace(province, "").replace(cityobj.c, "").trim();
-  let countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 2));
-  if (countyOjb.x == "" && newValue.length > 2) {
-    countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 3));
-    if (countyOjb.x == "" && newValue.length > 3) {
-      countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 4));
-      if (countyOjb.x == "" && newValue.length > 4) {
-        countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 5));
-        if (countyOjb.x == "" && newValue.length > 5) {
-          countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 6));
-          if (countyOjb.x == "" && newValue.length > 6) {
-            countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 7));
-            if (countyOjb.x == "" && newValue.length > 7) {
-              countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 8));
-              if (countyOjb.x == "" && newValue.length > 8) {
-                countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 9));
-                if (countyOjb.x == "" && newValue.length > 9) {
-                  countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 10));
-                  if (countyOjb.x == "" && newValue.length > 10) {
-                    countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 11));
-                    if (countyOjb.x == "" && newValue.length > 11) {
-                      countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 12));
-                      if (countyOjb.x == "" && newValue.length > 12) {
-                        countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 13));
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
+  const oldValueLen2 = nextValue.length;
+  const twoObje = getCity(nextValue, _Province);
+  if (twoObje.c != "") {
+    _City = twoObje.c;
+    if (_Province == "") {
+      _Province = twoObje.p;
+    }
+    nextValue = nextValue.replace(twoObje.c, "").trim();
+    if (nextValue.length == oldValueLen2) {
+      for (let i = _City.length - 1; i >= 1; i--) {
+        nextValue = nextValue.replace(twoObje.c.substr(0, i), "").trim();
+        if (nextValue.length < oldValueLen2) {
+          break;
         }
       }
     }
   }
-  if (province == "") {
-    province = countyOjb.p;
-  }
-  if (cityobj.c == "") {
-    cityobj.c = countyOjb.c;
+  const oldValueLen3 = nextValue.length;
+  const threeObje = getCounty(nextValue, _City, _Province);
+  if (threeObje.x != "") {
+    _County = threeObje.x;
+    if (_Province == "") {
+      _Province = threeObje.p;
+    }
+    if (_City == "") {
+      _City = threeObje.c;
+    }
+    nextValue = nextValue.replace(threeObje.x, "").trim();
+    if (nextValue.length == oldValueLen3) {
+      for (let i = _City.length - 1; i >= 1; i--) {
+        nextValue = nextValue.replace(threeObje.x.substr(0, i), "").trim();
+        if (nextValue.length < oldValueLen3) {
+          break;
+        }
+      }
+    }
   }
-  if (province != "" && cityobj.c != "" && countyOjb.x != "") {
-    return { province, city: cityobj.c, county: countyOjb.x };
+  if (_Province != "" && _City != "" && _County != "") {
+    return { province: _Province, city: _City, county: _County };
   }
-  newValue = oldvalue.replace(province, "").replace(cityobj.c, "").replace(countyOjb.x, "").trim();
-  if (newValue.length < 2) {
-    return { province, city: cityobj.c, county: countyOjb.x };
+  if (nextValue.length < 2) {
+    return { province: _Province, city: _City, county: _County };
   }
-  const res = await index.useBaseApi("sysRegion").post({ Province: province, City: cityobj.c, text: oldvalue, textnew: newValue }, "qRegionInfo");
+  const res = await index.useBaseApi("sysRegion").post({ Province: _Province, City: _City, text: oldvalue, textnew: nextValue }, "qRegionInfo");
   const streetobj = res.data.result;
-  const rpdata = { province, city: cityobj.c, county: countyOjb.x };
   if (streetobj.province != "") {
-    rpdata.province = streetobj.province;
+    _Province = streetobj.province;
   }
   if (streetobj.city != "") {
-    rpdata.city = streetobj.city;
+    _City = streetobj.city;
   }
   if (streetobj.county != "") {
-    rpdata.county = streetobj.county;
+    _County = streetobj.county;
   }
-  return rpdata;
+  return { province: _Province, city: _City, county: _County };
 };
-const chkeProvince = (val) => {
+const getProvince = (val) => {
+  if (val == null || val == void 0 || val == "" || val.length < 2) {
+    return { p: "", jval: "" };
+  }
+  const jval = val.substr(0, 2);
+  const objectOne = splitProvince(jval);
+  if (objectOne.list.length == 1) {
+    return { p: objectOne.list[0], jval };
+  } else if (objectOne.list.length > 1) {
+    const jval3 = val.substr(0, 3);
+    const objectThreed = splitProvince(jval3);
+    if (objectThreed.list.length == 1) {
+      return { p: objectThreed.list[0], jval: jval3 };
+    }
+  }
+  return { p: "", jval: "" };
+};
+const splitProvince = (val) => {
   if (val == null || val == void 0 || val == "") {
-    return "";
+    return { p: "", list: [], count: 0 };
   }
-  let province = "";
+  const findList = [];
   for (let i = 0; i < provinceData.length; i++) {
     if (provinceData[i].indexOf(val) > -1) {
       const arrTemp = provinceData[i].split("|");
       const arr = arrTemp.filter((item) => item == val);
       if (arr && arr.length > 0) {
-        province = provinceData[i].split("|")[0];
-        break;
+        findList.push(provinceData[i].split("|")[0]);
+      }
+    }
+  }
+  const firstOne = findList.length > 0 ? findList[0] : "";
+  return { p: firstOne, list: findList, count: findList.length };
+};
+const getCity = (val, province) => {
+  if (val == null || val == void 0 || val == "" || val.length < 2) {
+    return { p: "", c: "", jval: "" };
+  }
+  const jval = val.substr(0, 2);
+  const objectOne = splitCity(jval, province);
+  if (objectOne.list.length == 1) {
+    return { p: objectOne.p, c: objectOne.c, jval };
+  } else if (objectOne.list.length > 1) {
+    const jval3 = val.substr(0, 3);
+    const objectThreed = splitCity(jval3, province);
+    if (objectThreed.list.length == 1) {
+      return { p: objectThreed.p, c: objectThreed.c, jval: jval3 };
+    } else if (objectThreed.list.length == 0) {
+      return { p: objectOne.p, c: objectOne.c, jval: val };
+    } else if (objectThreed.list.length > 0) {
+      const jval4 = val.substr(0, 4);
+      const objectFoure = splitCity(jval4, province);
+      if (objectFoure.list.length > 0) {
+        return { p: objectFoure.p, c: objectFoure.c, jval: jval4 };
+      } else if (objectFoure.list.length == 0) {
+        return { p: objectThreed.p, c: objectThreed.c, jval: jval3 };
       }
     }
   }
-  return province;
+  return { p: "", c: "", jval: "" };
 };
-const chkeCity = (province, val) => {
+const splitCity = (val, province) => {
   if (val == null || val == void 0 || val == "") {
-    return { p: "", c: "" };
+    return { p: "", c: "", list: [] };
   }
-  let cityobj = { p: "", c: "" };
+  const findList = [];
   for (let i = 0; i < cityData.length; i++) {
     if (cityData[i].indexOf(val) > -1) {
       const arrTemp = cityData[i].split("|");
@@ -120,26 +154,60 @@ const chkeCity = (province, val) => {
       if (arr && arr.length > 0) {
         if (province != "") {
           if (cityData[i].split("|")[0] == province) {
-            cityobj.p = cityData[i].split("|")[0];
-            cityobj.c = cityData[i].split("|")[1];
-            break;
+            findList.push(
+              {
+                p: cityData[i].split("|")[0],
+                c: cityData[i].split("|")[1]
+              }
+            );
           }
         } else {
-          cityobj.p = cityData[i].split("|")[0];
-          cityobj.c = cityData[i].split("|")[1];
-          break;
+          findList.push(
+            {
+              p: cityData[i].split("|")[0],
+              c: cityData[i].split("|")[1]
+            }
+          );
         }
-        break;
       }
     }
   }
-  return cityobj;
+  const _p = findList.length > 0 ? findList[0].p : "";
+  const _c = findList.length > 0 ? findList[0].c : "";
+  return { p: _p, c: _c, list: findList };
 };
-const chkeCounty = (province, city, val) => {
+const getCounty = (val, city, province) => {
+  if (val == null || val == void 0 || val == "" || val.length < 2) {
+    return { p: "", c: "", x: "", jval: "" };
+  }
+  const jval = val.substr(0, 2);
+  const objectOne = splitCounty(jval, city, province);
+  if (objectOne.list.length == 1) {
+    return { p: objectOne.p, c: objectOne.c, x: objectOne.x, jval };
+  } else if (objectOne.list.length > 1) {
+    const jval3 = val.substr(0, 3);
+    const objectThreed = splitCounty(jval3, city, province);
+    if (objectThreed.list.length == 1) {
+      return { p: objectThreed.p, c: objectThreed.c, x: objectThreed.x, jval: jval3 };
+    } else if (objectThreed.list.length == 0) {
+      return { p: objectOne.p, c: objectOne.c, x: objectOne.x, jval: val };
+    } else if (objectThreed.list.length > 0) {
+      const jval4 = val.substr(0, 4);
+      const objectFoure = splitCounty(jval3, city, province);
+      if (objectFoure.list.length > 0) {
+        return { p: objectFoure.p, c: objectFoure.c, x: objectFoure.x, jval: jval4 };
+      } else if (objectFoure.list.length == 0) {
+        return { p: objectThreed.p, c: objectThreed.c, x: objectThreed.x, jval: jval3 };
+      }
+    }
+  }
+  return { p: "", c: "", x: "", jval: "" };
+};
+const splitCounty = (val, city, province) => {
   if (val == null || val == void 0 || val == "") {
-    return { p: "", c: "", x: "" };
+    return { p: "", c: "", x: "", list: [] };
   }
-  let countyobj = { p: "", c: "", x: "" };
+  const findList = [];
   for (let i = 0; i < countyData.length; i++) {
     if (countyData[i].indexOf(val) > -1) {
       const arrTemp = countyData[i].split("|");
@@ -147,21 +215,26 @@ const chkeCounty = (province, city, val) => {
       if (arr && arr.length > 0) {
         if (province != "" && city != "") {
           if (countyData[i].split("|")[0] == province && countyData[i].split("|")[1] == city) {
-            countyobj.p = countyData[i].split("|")[0];
-            countyobj.c = countyData[i].split("|")[1];
-            countyobj.x = countyData[i].split("|")[2];
-            break;
+            findList.push({
+              p: countyData[i].split("|")[0],
+              c: countyData[i].split("|")[1],
+              x: countyData[i].split("|")[2]
+            });
           }
         } else {
-          countyobj.p = countyData[i].split("|")[0];
-          countyobj.c = countyData[i].split("|")[1];
-          countyobj.x = countyData[i].split("|")[2];
-          break;
+          findList.push({
+            p: countyData[i].split("|")[0],
+            c: countyData[i].split("|")[1],
+            x: countyData[i].split("|")[2]
+          });
         }
       }
     }
   }
-  return countyobj;
+  const _p = findList.length > 0 ? findList[0].p : "";
+  const _c = findList.length > 0 ? findList[0].c : "";
+  const _x = findList.length > 0 ? findList[0].x : "";
+  return { p: _p, c: _c, x: _x, list: findList };
 };
 const provinceData = [
   "\u5317\u4EAC\u5E02|\u5317\u4EAC",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fmdevui/fm-dev",
-  "version": "1.0.88",
+  "version": "1.0.90",
   "description": "Page level components developed based on Element Plus.",
   "author": "fmdevui",
   "keywords": [