@fmdevui/fm-dev 1.0.85 → 1.0.87

package/lib/packages/core/locales/index.js

@@ -1,24 +1,24 @@
 'use strict';
 
 var vueI18n = require('vue-i18n');
-var de = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/de.js');
-var en = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/en.js');
-var es = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/es.js');
-var fi = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/fi.js');
-var fr = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/fr.js');
-var it = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/it.js');
-var ja = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/ja.js');
-var ko = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/ko.js');
-var no = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/no.js');
-var pl = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/pl.js');
-var pt = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/pt.js');
-var ru = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/ru.js');
-var zhCn = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/zh-cn.js');
-var zhTw = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/zh-tw.js');
-var th = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/th.js');
-var id = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/id.js');
-var ms = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/ms.js');
-var vi = require('../../../node_modules/.pnpm/element-plus@2.10.3_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/vi.js');
+var de = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/de.js');
+var en = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/en.js');
+var es = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/es.js');
+var fi = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/fi.js');
+var fr = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/fr.js');
+var it = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/it.js');
+var ja = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/ja.js');
+var ko = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/ko.js');
+var no = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/no.js');
+var pl = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/pl.js');
+var pt = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/pt.js');
+var ru = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/ru.js');
+var zhCn = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/zh-cn.js');
+var zhTw = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/zh-tw.js');
+var th = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/th.js');
+var id = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/id.js');
+var ms = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/ms.js');
+var vi = require('../../../node_modules/.pnpm/element-plus@2.10.7_vue@3.5.18_typescript@5.8.3_/node_modules/element-plus/es/locale/lang/vi.js');
 var enUS = require('../../../_virtual/en-US.js');
 var deDE = require('../../../_virtual/de-DE.js');
 var esES = require('../../../_virtual/es-ES.js');

package/lib/packages/core/ui/components/fmaddressparsing/index.vue2.js

@@ -61,9 +61,9 @@ var _sfc_main = /* @__PURE__ */ vue.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;
         }
@@ -72,29 +72,29 @@ var _sfc_main = /* @__PURE__ */ vue.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));
                           }
                         }
                       }
@@ -184,7 +184,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
       return province;
     };
-    const chkeCity = (val) => {
+    const chkeCity = (province, val) => {
       if (val == null || val == void 0 || val == "") {
         return { p: "", c: "" };
       }
@@ -194,15 +194,24 @@ var _sfc_main = /* @__PURE__ */ vue.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: "" };
       }
@@ -212,10 +221,19 @@ var _sfc_main = /* @__PURE__ */ vue.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;
+            }
           }
         }
       }

package/package.json

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