@fmdevui/fm-dev 1.0.86 → 1.0.88

package/es/core/index.d.ts

@@ -9,4 +9,5 @@ export * from './utils';
 export * from './auth';
 export * from './hook/dateTimeShortCust';
 export * from './hook/useVxeTableOptionsHook';
+export * from './utils/cityparess';
 export * from './types';

package/es/core/utils/cityparess/index.d.ts

@@ -0,0 +1,6 @@
+declare const addressparsing: (val: any) => Promise<{
+    province: string;
+    city: any;
+    county: any;
+}>;
+export { addressparsing };

package/es/index.mjs

@@ -38,6 +38,7 @@ export { PUB } from './packages/core/utils/const/index.mjs';
 export { auth, authAll, auths, hAuth, hAuthAll, hAuths } from './packages/core/auth/index.mjs';
 export { useDateTimeShortCust } from './packages/core/hook/dateTimeShortCust.mjs';
 export { useVxeTable } from './packages/core/hook/useVxeTableOptionsHook.mjs';
+export { addressparsing } from './packages/core/utils/cityparess/index.mjs';
 
 const install = installer.install;
 

package/es/packages/core/index.mjs

@@ -9,6 +9,7 @@ import './utils/index.mjs';
 export { auth, authAll, auths, hAuth, hAuthAll, hAuths } from './auth/index.mjs';
 export { useDateTimeShortCust } from './hook/dateTimeShortCust.mjs';
 export { useVxeTable } from './hook/useVxeTableOptionsHook.mjs';
+export { addressparsing } from './utils/cityparess/index.mjs';
 import './types/index.mjs';
 export { elSvg } from './ui/components/svgIcon/index.mjs';
 export { useApi, useBaseApi } from './api/base/index.mjs';

package/es/packages/core/ui/components/fmaddressparsing/index.vue2.mjs

@@ -57,9 +57,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       if (newValue.length < 2) {
         return;
       }
-      let cityobj = chkeCity(newValue.substr(0, 2));
+      let cityobj = chkeCity(province, newValue.substr(0, 2));
       if (cityobj.c == "" && newValue.length > 2) {
-        cityobj = chkeCity(newValue.substr(0, 3));
+        cityobj = chkeCity(province, newValue.substr(0, 3));
         if (cityobj.c != "" && province == "") {
           province = cityobj.p;
         }
@@ -68,29 +68,29 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       if (newValue.length < 2) {
         return;
       }
-      let countyOjb = chkeCounty(newValue.substr(0, 2));
+      let countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 2));
       if (countyOjb.x == "" && newValue.length > 2) {
-        countyOjb = chkeCounty(newValue.substr(0, 3));
+        countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 3));
         if (countyOjb.x == "" && newValue.length > 3) {
-          countyOjb = chkeCounty(newValue.substr(0, 4));
+          countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 4));
           if (countyOjb.x == "" && newValue.length > 4) {
-            countyOjb = chkeCounty(newValue.substr(0, 5));
+            countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 5));
             if (countyOjb.x == "" && newValue.length > 5) {
-              countyOjb = chkeCounty(newValue.substr(0, 6));
+              countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 6));
               if (countyOjb.x == "" && newValue.length > 6) {
-                countyOjb = chkeCounty(newValue.substr(0, 7));
+                countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 7));
                 if (countyOjb.x == "" && newValue.length > 7) {
-                  countyOjb = chkeCounty(newValue.substr(0, 8));
+                  countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 8));
                   if (countyOjb.x == "" && newValue.length > 8) {
-                    countyOjb = chkeCounty(newValue.substr(0, 9));
+                    countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 9));
                     if (countyOjb.x == "" && newValue.length > 9) {
-                      countyOjb = chkeCounty(newValue.substr(0, 10));
+                      countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 10));
                       if (countyOjb.x == "" && newValue.length > 10) {
-                        countyOjb = chkeCounty(newValue.substr(0, 11));
+                        countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 11));
                         if (countyOjb.x == "" && newValue.length > 11) {
-                          countyOjb = chkeCounty(newValue.substr(0, 12));
+                          countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 12));
                           if (countyOjb.x == "" && newValue.length > 12) {
-                            countyOjb = chkeCounty(newValue.substr(0, 13));
+                            countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 13));
                           }
                         }
                       }
@@ -180,7 +180,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return province;
     };
-    const chkeCity = (val) => {
+    const chkeCity = (province, val) => {
       if (val == null || val == void 0 || val == "") {
         return { p: "", c: "" };
       }
@@ -190,15 +190,24 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           const arrTemp = cityData[i].split("|");
           const arr = arrTemp.filter((item) => item == val);
           if (arr && arr.length > 0) {
-            cityobj.p = cityData[i].split("|")[0];
-            cityobj.c = cityData[i].split("|")[1];
+            if (province != "") {
+              if (cityData[i].split("|")[0] == province) {
+                cityobj.p = cityData[i].split("|")[0];
+                cityobj.c = cityData[i].split("|")[1];
+                break;
+              }
+            } else {
+              cityobj.p = cityData[i].split("|")[0];
+              cityobj.c = cityData[i].split("|")[1];
+              break;
+            }
             break;
           }
         }
       }
       return cityobj;
     };
-    const chkeCounty = (val) => {
+    const chkeCounty = (province, city, val) => {
       if (val == null || val == void 0 || val == "") {
         return { p: "", c: "", x: "" };
       }
@@ -208,10 +217,19 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           const arrTemp = countyData[i].split("|");
           const arr = arrTemp.filter((item) => item == val);
           if (arr && arr.length > 0) {
-            countyobj.p = countyData[i].split("|")[0];
-            countyobj.c = countyData[i].split("|")[1];
-            countyobj.x = countyData[i].split("|")[2];
-            break;
+            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;
+              }
+            } else {
+              countyobj.p = countyData[i].split("|")[0];
+              countyobj.c = countyData[i].split("|")[1];
+              countyobj.x = countyData[i].split("|")[2];
+              break;
+            }
           }
         }
       }