gxxc-util 1.0.15 → 1.0.17

package/dist/cjs/index.js

@@ -17,6 +17,7 @@ exports.author_router_filter = author.author_router_filter;
 exports.author_rsa = author.author_rsa;
 exports.author_strict = author.author_strict;
 exports.author_traceId = author.author_traceId;
+exports.city_code_query_text = cityOptions.city_code_query_text;
 exports.city_code_text = cityOptions.city_code_text;
 exports.city_options = cityOptions.city_options;
 exports.city_two_code_text = cityOptions.city_two_code_text;

package/dist/cjs/modules/cityOptions.js

@@ -70,7 +70,31 @@ const city_code_text = (provinceId, cityId, districtId) => {
     }
     return cityName;
 };
+/**
+ * 编码转城市，通过数组
+ */
+const city_code_query_text = (cityIds) => {
+    if (cityIds == null)
+        cityIds = [];
+    const cityNames = [];
+    let cityList = city_options();
+    for (let cityId of cityIds) {
+        if (cityId === "000000") {
+            cityNames.push("全国");
+            break;
+        }
+        for (let cityItem of cityList) {
+            if (cityItem.value === cityId) {
+                cityNames.push(cityItem.label);
+                cityList = cityItem.children;
+                break;
+            }
+        }
+    }
+    return cityNames;
+};
 
+exports.city_code_query_text = city_code_query_text;
 exports.city_code_text = city_code_text;
 exports.city_options = city_options;
 exports.city_two_code_text = city_two_code_text;

package/dist/cjs/modules/validation.js

@@ -180,8 +180,8 @@ const val_beforeAfter_space = (_, value) => {
 const val_address = (_rule, value) => {
     if (value) {
         const idAddressRegex = /^.{10,50}$/;
-        if (/\s/.test(value)) {
-            return Promise.reject(new Error("请去除文本前后及内容中的空格！"));
+        if (/^\s|\s$/g.test(value)) {
+            return Promise.reject(new Error("请去除文本前后中的空格！"));
         }
         else if (!idAddressRegex.test(value)) {
             return Promise.reject(new Error("地址格式10-50位！"));

package/dist/esm/index.js

@@ -1,5 +1,5 @@
 export { author_passwordCheck, author_router_add, author_router_filter, author_rsa, author_strict, author_traceId } from './modules/author.js';
-export { city_code_text, city_options, city_two_code_text } from './modules/cityOptions.js';
+export { city_code_query_text, city_code_text, city_options, city_two_code_text } from './modules/cityOptions.js';
 export { get_multiple_color, hex_to_rgb, reduce_opacity, rgb_to_hex, theme_change } from './modules/color.js';
 export { demo } from './modules/demo.js';
 export { file_calculate_md5, file_load, file_open } from './modules/file.js';

package/dist/esm/modules/cityOptions.js

@@ -68,5 +68,28 @@ const city_code_text = (provinceId, cityId, districtId) => {
     }
     return cityName;
 };
+/**
+ * 编码转城市，通过数组
+ */
+const city_code_query_text = (cityIds) => {
+    if (cityIds == null)
+        cityIds = [];
+    const cityNames = [];
+    let cityList = city_options();
+    for (let cityId of cityIds) {
+        if (cityId === "000000") {
+            cityNames.push("全国");
+            break;
+        }
+        for (let cityItem of cityList) {
+            if (cityItem.value === cityId) {
+                cityNames.push(cityItem.label);
+                cityList = cityItem.children;
+                break;
+            }
+        }
+    }
+    return cityNames;
+};
 
-export { city_code_text, city_options, city_two_code_text };
+export { city_code_query_text, city_code_text, city_options, city_two_code_text };

package/dist/esm/modules/validation.js

@@ -178,8 +178,8 @@ const val_beforeAfter_space = (_, value) => {
 const val_address = (_rule, value) => {
     if (value) {
         const idAddressRegex = /^.{10,50}$/;
-        if (/\s/.test(value)) {
-            return Promise.reject(new Error("请去除文本前后及内容中的空格！"));
+        if (/^\s|\s$/g.test(value)) {
+            return Promise.reject(new Error("请去除文本前后中的空格！"));
         }
         else if (!idAddressRegex.test(value)) {
             return Promise.reject(new Error("地址格式10-50位！"));

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
 export { author_passwordCheck, author_router_add, author_router_filter, author_rsa, author_strict, author_traceId } from './modules/author.js';
-export { city_code_text, city_options, city_two_code_text } from './modules/cityOptions.js';
+export { city_code_query_text, city_code_text, city_options, city_two_code_text } from './modules/cityOptions.js';
 export { get_multiple_color, hex_to_rgb, reduce_opacity, rgb_to_hex, theme_change } from './modules/color.js';
 export { demo } from './modules/demo.js';
 export { file_calculate_md5, file_load, file_open } from './modules/file.js';

package/dist/types/modules/cityOptions.d.ts

@@ -22,5 +22,9 @@ declare const city_two_code_text: (provinceId: string, cityId?: string) => strin
  * 编码转城市，默认三级
  */
 declare const city_code_text: (provinceId: string, cityId?: string, districtId?: string) => string;
+/**
+ * 编码转城市，通过数组
+ */
+declare const city_code_query_text: (cityIds: []) => any[];
 
-export { city_code_text, city_options, city_two_code_text };
+export { city_code_query_text, city_code_text, city_options, city_two_code_text };