@fmdevui/fm-dev 1.0.86 → 1.0.87

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/es/packages/core/ui/components/fmaddressparsing/index.vue2.mjs +40 -22
  2. package/index.js +41 -23
  3. package/index.min.js +2 -2
  4. package/index.min.mjs +2 -2
  5. package/index.mjs +41 -23
  6. package/lib/packages/core/ui/components/fmaddressparsing/index.vue2.js +40 -22
  7. package/package.json +1 -1
  8. /package/es/{defaults.css → index.css} +0 -0
package/index.mjs CHANGED
@@ -1,4 +1,4 @@
1
- /*! fm-dev v1.0.86 */
1
+ /*! fm-dev v1.0.87 */
2
2
  import { defineComponent, reactive, computed, watch, resolveComponent, createBlock, openBlock, withCtx, createVNode, createElementVNode, createTextVNode, toDisplayString as toDisplayString$1, withDirectives, createElementBlock, Fragment, renderList, vShow, ref, onMounted, nextTick, normalizeStyle, createCommentVNode, normalizeClass, withModifiers, mergeModels, useModel, effectScope, getCurrentInstance, shallowRef, isRef as isRef$1, inject, onUnmounted, h, Text, markRaw, hasInjectionContext, toRaw as toRaw$1, isReactive as isReactive$1, toRef, unref, getCurrentScope, onScopeDispose, toRefs, resolveDirective, resolveDynamicComponent, useSlots, mergeProps, createSlots, renderSlot, toHandlers, onBeforeUnmount, onUpdated, useAttrs, normalizeProps, guardReactiveProps } from 'vue';
3
3
  import crypto from 'crypto';
4
4
  import require$$0 from 'url';
@@ -37793,9 +37793,9 @@ var _sfc_main$2 = /* @__PURE__ */ defineComponent({
37793
37793
  if (newValue.length < 2) {
37794
37794
  return;
37795
37795
  }
37796
- let cityobj = chkeCity(newValue.substr(0, 2));
37796
+ let cityobj = chkeCity(province, newValue.substr(0, 2));
37797
37797
  if (cityobj.c == "" && newValue.length > 2) {
37798
- cityobj = chkeCity(newValue.substr(0, 3));
37798
+ cityobj = chkeCity(province, newValue.substr(0, 3));
37799
37799
  if (cityobj.c != "" && province == "") {
37800
37800
  province = cityobj.p;
37801
37801
  }
@@ -37804,29 +37804,29 @@ var _sfc_main$2 = /* @__PURE__ */ defineComponent({
37804
37804
  if (newValue.length < 2) {
37805
37805
  return;
37806
37806
  }
37807
- let countyOjb = chkeCounty(newValue.substr(0, 2));
37807
+ let countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 2));
37808
37808
  if (countyOjb.x == "" && newValue.length > 2) {
37809
- countyOjb = chkeCounty(newValue.substr(0, 3));
37809
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 3));
37810
37810
  if (countyOjb.x == "" && newValue.length > 3) {
37811
- countyOjb = chkeCounty(newValue.substr(0, 4));
37811
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 4));
37812
37812
  if (countyOjb.x == "" && newValue.length > 4) {
37813
- countyOjb = chkeCounty(newValue.substr(0, 5));
37813
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 5));
37814
37814
  if (countyOjb.x == "" && newValue.length > 5) {
37815
- countyOjb = chkeCounty(newValue.substr(0, 6));
37815
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 6));
37816
37816
  if (countyOjb.x == "" && newValue.length > 6) {
37817
- countyOjb = chkeCounty(newValue.substr(0, 7));
37817
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 7));
37818
37818
  if (countyOjb.x == "" && newValue.length > 7) {
37819
- countyOjb = chkeCounty(newValue.substr(0, 8));
37819
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 8));
37820
37820
  if (countyOjb.x == "" && newValue.length > 8) {
37821
- countyOjb = chkeCounty(newValue.substr(0, 9));
37821
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 9));
37822
37822
  if (countyOjb.x == "" && newValue.length > 9) {
37823
- countyOjb = chkeCounty(newValue.substr(0, 10));
37823
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 10));
37824
37824
  if (countyOjb.x == "" && newValue.length > 10) {
37825
- countyOjb = chkeCounty(newValue.substr(0, 11));
37825
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 11));
37826
37826
  if (countyOjb.x == "" && newValue.length > 11) {
37827
- countyOjb = chkeCounty(newValue.substr(0, 12));
37827
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 12));
37828
37828
  if (countyOjb.x == "" && newValue.length > 12) {
37829
- countyOjb = chkeCounty(newValue.substr(0, 13));
37829
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 13));
37830
37830
  }
37831
37831
  }
37832
37832
  }
@@ -37916,7 +37916,7 @@ var _sfc_main$2 = /* @__PURE__ */ defineComponent({
37916
37916
  }
37917
37917
  return province;
37918
37918
  };
37919
- const chkeCity = (val) => {
37919
+ const chkeCity = (province, val) => {
37920
37920
  if (val == null || val == void 0 || val == "") {
37921
37921
  return { p: "", c: "" };
37922
37922
  }
@@ -37926,15 +37926,24 @@ var _sfc_main$2 = /* @__PURE__ */ defineComponent({
37926
37926
  const arrTemp = cityData[i].split("|");
37927
37927
  const arr = arrTemp.filter((item) => item == val);
37928
37928
  if (arr && arr.length > 0) {
37929
- cityobj.p = cityData[i].split("|")[0];
37930
- cityobj.c = cityData[i].split("|")[1];
37929
+ if (province != "") {
37930
+ if (cityData[i].split("|")[0] == province) {
37931
+ cityobj.p = cityData[i].split("|")[0];
37932
+ cityobj.c = cityData[i].split("|")[1];
37933
+ break;
37934
+ }
37935
+ } else {
37936
+ cityobj.p = cityData[i].split("|")[0];
37937
+ cityobj.c = cityData[i].split("|")[1];
37938
+ break;
37939
+ }
37931
37940
  break;
37932
37941
  }
37933
37942
  }
37934
37943
  }
37935
37944
  return cityobj;
37936
37945
  };
37937
- const chkeCounty = (val) => {
37946
+ const chkeCounty = (province, city, val) => {
37938
37947
  if (val == null || val == void 0 || val == "") {
37939
37948
  return { p: "", c: "", x: "" };
37940
37949
  }
@@ -37944,10 +37953,19 @@ var _sfc_main$2 = /* @__PURE__ */ defineComponent({
37944
37953
  const arrTemp = countyData[i].split("|");
37945
37954
  const arr = arrTemp.filter((item) => item == val);
37946
37955
  if (arr && arr.length > 0) {
37947
- countyobj.p = countyData[i].split("|")[0];
37948
- countyobj.c = countyData[i].split("|")[1];
37949
- countyobj.x = countyData[i].split("|")[2];
37950
- break;
37956
+ if (province != "" && city != "") {
37957
+ if (countyData[i].split("|")[0] == province && countyData[i].split("|")[1] == city) {
37958
+ countyobj.p = countyData[i].split("|")[0];
37959
+ countyobj.c = countyData[i].split("|")[1];
37960
+ countyobj.x = countyData[i].split("|")[2];
37961
+ break;
37962
+ }
37963
+ } else {
37964
+ countyobj.p = countyData[i].split("|")[0];
37965
+ countyobj.c = countyData[i].split("|")[1];
37966
+ countyobj.x = countyData[i].split("|")[2];
37967
+ break;
37968
+ }
37951
37969
  }
37952
37970
  }
37953
37971
  }
package/lib/packages/core/ui/components/fmaddressparsing/index.vue2.js CHANGED
@@ -61,9 +61,9 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
61
61
  if (newValue.length < 2) {
62
62
  return;
63
63
  }
64
- let cityobj = chkeCity(newValue.substr(0, 2));
64
+ let cityobj = chkeCity(province, newValue.substr(0, 2));
65
65
  if (cityobj.c == "" && newValue.length > 2) {
66
- cityobj = chkeCity(newValue.substr(0, 3));
66
+ cityobj = chkeCity(province, newValue.substr(0, 3));
67
67
  if (cityobj.c != "" && province == "") {
68
68
  province = cityobj.p;
69
69
  }
@@ -72,29 +72,29 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
72
72
  if (newValue.length < 2) {
73
73
  return;
74
74
  }
75
- let countyOjb = chkeCounty(newValue.substr(0, 2));
75
+ let countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 2));
76
76
  if (countyOjb.x == "" && newValue.length > 2) {
77
- countyOjb = chkeCounty(newValue.substr(0, 3));
77
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 3));
78
78
  if (countyOjb.x == "" && newValue.length > 3) {
79
- countyOjb = chkeCounty(newValue.substr(0, 4));
79
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 4));
80
80
  if (countyOjb.x == "" && newValue.length > 4) {
81
- countyOjb = chkeCounty(newValue.substr(0, 5));
81
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 5));
82
82
  if (countyOjb.x == "" && newValue.length > 5) {
83
- countyOjb = chkeCounty(newValue.substr(0, 6));
83
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 6));
84
84
  if (countyOjb.x == "" && newValue.length > 6) {
85
- countyOjb = chkeCounty(newValue.substr(0, 7));
85
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 7));
86
86
  if (countyOjb.x == "" && newValue.length > 7) {
87
- countyOjb = chkeCounty(newValue.substr(0, 8));
87
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 8));
88
88
  if (countyOjb.x == "" && newValue.length > 8) {
89
- countyOjb = chkeCounty(newValue.substr(0, 9));
89
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 9));
90
90
  if (countyOjb.x == "" && newValue.length > 9) {
91
- countyOjb = chkeCounty(newValue.substr(0, 10));
91
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 10));
92
92
  if (countyOjb.x == "" && newValue.length > 10) {
93
- countyOjb = chkeCounty(newValue.substr(0, 11));
93
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 11));
94
94
  if (countyOjb.x == "" && newValue.length > 11) {
95
- countyOjb = chkeCounty(newValue.substr(0, 12));
95
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 12));
96
96
  if (countyOjb.x == "" && newValue.length > 12) {
97
- countyOjb = chkeCounty(newValue.substr(0, 13));
97
+ countyOjb = chkeCounty(province, cityobj.c, newValue.substr(0, 13));
98
98
  }
99
99
  }
100
100
  }
@@ -184,7 +184,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
184
184
  }
185
185
  return province;
186
186
  };
187
- const chkeCity = (val) => {
187
+ const chkeCity = (province, val) => {
188
188
  if (val == null || val == void 0 || val == "") {
189
189
  return { p: "", c: "" };
190
190
  }
@@ -194,15 +194,24 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
194
194
  const arrTemp = cityData[i].split("|");
195
195
  const arr = arrTemp.filter((item) => item == val);
196
196
  if (arr && arr.length > 0) {
197
- cityobj.p = cityData[i].split("|")[0];
198
- cityobj.c = cityData[i].split("|")[1];
197
+ if (province != "") {
198
+ if (cityData[i].split("|")[0] == province) {
199
+ cityobj.p = cityData[i].split("|")[0];
200
+ cityobj.c = cityData[i].split("|")[1];
201
+ break;
202
+ }
203
+ } else {
204
+ cityobj.p = cityData[i].split("|")[0];
205
+ cityobj.c = cityData[i].split("|")[1];
206
+ break;
207
+ }
199
208
  break;
200
209
  }
201
210
  }
202
211
  }
203
212
  return cityobj;
204
213
  };
205
- const chkeCounty = (val) => {
214
+ const chkeCounty = (province, city, val) => {
206
215
  if (val == null || val == void 0 || val == "") {
207
216
  return { p: "", c: "", x: "" };
208
217
  }
@@ -212,10 +221,19 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
212
221
  const arrTemp = countyData[i].split("|");
213
222
  const arr = arrTemp.filter((item) => item == val);
214
223
  if (arr && arr.length > 0) {
215
- countyobj.p = countyData[i].split("|")[0];
216
- countyobj.c = countyData[i].split("|")[1];
217
- countyobj.x = countyData[i].split("|")[2];
218
- break;
224
+ if (province != "" && city != "") {
225
+ if (countyData[i].split("|")[0] == province && countyData[i].split("|")[1] == city) {
226
+ countyobj.p = countyData[i].split("|")[0];
227
+ countyobj.c = countyData[i].split("|")[1];
228
+ countyobj.x = countyData[i].split("|")[2];
229
+ break;
230
+ }
231
+ } else {
232
+ countyobj.p = countyData[i].split("|")[0];
233
+ countyobj.c = countyData[i].split("|")[1];
234
+ countyobj.x = countyData[i].split("|")[2];
235
+ break;
236
+ }
219
237
  }
220
238
  }
221
239
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fmdevui/fm-dev",
3
- "version": "1.0.86",
3
+ "version": "1.0.87",
4
4
  "description": "Page level components developed based on Element Plus.",
5
5
  "author": "fmdevui",
6
6
  "keywords": [
/package/es/{defaults.css → index.css} RENAMED
File without changes