@kmkf-fe-packages/kmkf-utils 2.2.31-beta.53 → 2.2.31-beta.59

package/README.md

@@ -1 +1 @@
-112311133111
+1123111331111

package/dist/esm/baseAddressData/baseAddressData.d.ts

@@ -5,5 +5,5 @@ export default abstract class BaseAddressData {
     protected abstract addressOptions: TreeOption[];
     getProCodeByName(proName: string): number | undefined;
     getNameByCode(code: string | number): string;
-    getCodesByNames(names: Array<string>): (string | undefined)[];
+    getCodesByNames(names: Array<string>, isIncludesDistrict?: boolean): (string | undefined)[];
 }

package/dist/esm/baseAddressData/baseAddressData.js

@@ -1,7 +1,4 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -27,32 +24,32 @@ var BaseAddressData = /*#__PURE__*/function () {
       var _ref;
       return (_ref = (this.addrData || {})[code] || []) === null || _ref === void 0 ? void 0 : _ref[0];
     }
+
+    // isIncludesDistrict 为true时区县如果未找到全等的就查找包含的<暂时仅jst识别地址需要>
   }, {
     key: "getCodesByNames",
     value: function getCodesByNames(names) {
+      var isIncludesDistrict = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var codes = [];
       var currentData = this.addressOptions;
-      var _iterator = _createForOfIteratorHelper(names),
-        _step;
-      try {
-        var _loop = function _loop() {
-          var name = _step.value;
-          var foundChild = currentData.find(function (item) {
-            return item.label === name;
+      names.forEach(function (name, index) {
+        var _foundChild, _foundChild2;
+        var foundChild = currentData.find(function (item) {
+          return item.label === name;
+        });
+
+        // 区县如果未找到全等的就查找包含的
+        if (!foundChild && isIncludesDistrict && index === 2) {
+          foundChild = currentData.find(function (item) {
+            return item.label.includes(name);
           });
-          codes.push(foundChild === null || foundChild === void 0 ? void 0 : foundChild.value);
-          if (!isEmpty(foundChild === null || foundChild === void 0 ? void 0 : foundChild.children)) {
-            currentData = (foundChild === null || foundChild === void 0 ? void 0 : foundChild.children) || [];
-          }
-        };
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          _loop();
         }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
+        codes.push((_foundChild = foundChild) === null || _foundChild === void 0 ? void 0 : _foundChild.value);
+        if (!isEmpty((_foundChild2 = foundChild) === null || _foundChild2 === void 0 ? void 0 : _foundChild2.children)) {
+          var _foundChild3;
+          currentData = ((_foundChild3 = foundChild) === null || _foundChild3 === void 0 ? void 0 : _foundChild3.children) || [];
+        }
+      });
       return codes.filter(Boolean);
     }
   }]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.2.31-beta.53",
+  "version": "2.2.31-beta.59",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "da633abe80f99d28e5ab6d93e38822a002674de0",
+  "gitHead": "667f2e77063db5c02eb02af929adefd29c399c4c",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }