@kmkf-fe-packages/kmkf-utils 0.6.3-alpha.15 → 0.6.3-alpha.21

package/dist/esm/addressData/index.d.ts

@@ -1,9 +1,3 @@
-declare type AddressMapT = {
-    [p in string]: string;
-};
-declare type AddressTuples = {
-    [p in string]: [string, string | number];
-};
 interface TreeOption {
     label: string;
     value: string;
@@ -11,8 +5,8 @@ interface TreeOption {
 }
 export default class AddressData {
     private static instance;
-    addrData: AddressTuples;
-    addrNameMap: AddressMapT;
+    addrData: Record<string, [string, string | number]>;
+    addrNameMap: Record<string, string>;
     treeData: TreeOption[];
     constructor();
     initData: () => void;

package/dist/esm/addressData/index.js

@@ -38,7 +38,7 @@ var AddressData = /*#__PURE__*/function () {
       var nameCode = {},
         arr = [];
       for (var key in _this.addrData) {
-        if (_this.addrData.hasOwnProperty(key)) {
+        if (Object.prototype.hasOwnProperty.call(_this.addrData, key)) {
           var valueArray = _this.addrData[key];
           if (valueArray[1] === Number(addrCode)) {
             nameCode[valueArray[0]] = key;

package/dist/esm/expressInterceptData/index.d.ts

@@ -14,6 +14,14 @@ export default class ExpressInterceptData {
     showNewAddressMap: any;
     typeNameMap: any;
     statusNameMap: any;
+    typeOptions: {
+        label: string;
+        value: string;
+    }[];
+    statusOptions: {
+        label: string;
+        value: string;
+    }[];
     constructor();
     initData: () => OptionsItem[] | undefined;
     getExpressData: () => OptionsItem[] | undefined;
@@ -21,6 +29,14 @@ export default class ExpressInterceptData {
     getTypeNameMap(): any;
     getStatusNameMap(): any;
     getShowNewAddressMap(): any;
+    getTypeOptions(): {
+        label: string;
+        value: string;
+    }[];
+    getStatusOptions(): {
+        label: string;
+        value: string;
+    }[];
     setExpressData: (val: OptionsItem[]) => OptionsItem[];
     getExpressNameByCode: (code: string | number) => string | number;
     getExpressNameByName: (name: string | number) => string | number;

package/dist/esm/expressInterceptData/index.js

@@ -1,4 +1,10 @@
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -13,6 +19,8 @@ var ExpressInterceptData = /*#__PURE__*/function () {
   //展示新收货地映射
   //拦截类型映射
   //拦截状态映射
+  //拦截类型筛选options
+  //拦截状态筛选options
   function ExpressInterceptData() {
     var _this = this;
     _classCallCheck(this, ExpressInterceptData);
@@ -21,6 +29,8 @@ var ExpressInterceptData = /*#__PURE__*/function () {
     _defineProperty(this, "showNewAddressMap", {});
     _defineProperty(this, "typeNameMap", null);
     _defineProperty(this, "statusNameMap", null);
+    _defineProperty(this, "typeOptions", []);
+    _defineProperty(this, "statusOptions", []);
     _defineProperty(this, "initData", function () {
       if (_this.expressData.length > 0) return _this.expressData;
       request({
@@ -41,23 +51,35 @@ var ExpressInterceptData = /*#__PURE__*/function () {
         var showBtn = {},
           showAddress = {},
           typeMap = {},
-          statusMap = {};
+          statusMap = {},
+          typeObj = {},
+          statusObj = {};
         expressList.forEach(function (item) {
           var _item$interceptionSta, _item$interceptionTyp;
           if (item !== null && item !== void 0 && (_item$interceptionSta = item.interceptionStatusList) !== null && _item$interceptionSta !== void 0 && _item$interceptionSta.length) {
             item.interceptionStatusList.forEach(function (t) {
-              statusMap["".concat(item.value, "_").concat(t.value)] = t.label;
+              statusMap["".concat(t.value)] = t.label;
+              if (statusObj[t.label]) {
+                statusObj[t.label] = statusObj[t.label].add(t.value);
+              } else {
+                statusObj[t.label] = new Set([t.value]);
+              }
               if (t !== null && t !== void 0 && t.showInterceptionBtn) {
-                showBtn["".concat(item.value, "_").concat(t.value)] = true;
+                showBtn["".concat(t.value)] = true;
               }
             });
           }
           if (item !== null && item !== void 0 && (_item$interceptionTyp = item.interceptionTypeList) !== null && _item$interceptionTyp !== void 0 && _item$interceptionTyp.length) {
             item.interceptionTypeList.forEach(function (t) {
               var _t$config;
-              typeMap["".concat(item.value, "_").concat(t.value)] = t.label;
+              typeMap["".concat(t.value)] = t.label;
+              if (typeObj[t.label]) {
+                typeObj[t.label] = typeObj[t.label].add(t.value);
+              } else {
+                typeObj[t.label] = new Set([t.value]);
+              }
               if (t !== null && t !== void 0 && (_t$config = t.config) !== null && _t$config !== void 0 && _t$config.showAddress) {
-                showAddress["".concat(item.value, "_").concat(t.value)] = true;
+                showAddress["".concat(t.value)] = true;
               }
             });
           }
@@ -66,6 +88,18 @@ var ExpressInterceptData = /*#__PURE__*/function () {
         _this.typeNameMap = typeMap;
         _this.statusNameMap = statusMap;
         _this.showNewAddressMap = showAddress;
+        _this.typeOptions = Object.keys(statusObj).map(function (key) {
+          return {
+            label: key,
+            value: _toConsumableArray(statusObj[key]).join(",")
+          };
+        });
+        _this.statusOptions = Object.keys(typeObj).map(function (key) {
+          return {
+            label: key,
+            value: _toConsumableArray(typeObj[key]).join(",")
+          };
+        });
       });
     });
     _defineProperty(this, "getExpressData", function () {
@@ -121,6 +155,16 @@ var ExpressInterceptData = /*#__PURE__*/function () {
     value: function getShowNewAddressMap() {
       return this.showNewAddressMap;
     }
+  }, {
+    key: "getTypeOptions",
+    value: function getTypeOptions() {
+      return this.typeOptions;
+    }
+  }, {
+    key: "getStatusOptions",
+    value: function getStatusOptions() {
+      return this.statusOptions;
+    }
   }], [{
     key: "getInstance",
     value: function getInstance() {

package/dist/esm/platData/index.d.ts

@@ -23,9 +23,7 @@ interface PlatInterface {
 export default class PlatData {
     private static instance;
     platTypeList: PlatInterface[];
-    platMap: {
-        [prop in string]: string;
-    };
+    platMap: Record<string, string>;
     platSelectList: {
         label: string;
         value: string;
@@ -36,9 +34,7 @@ export default class PlatData {
     /**
      * 获取平台类型和平台名称映射关系
      */
-    getPlatMap: () => {
-        [x: string]: string;
-    };
+    getPlatMap: () => Record<string, string>;
     /**
      * 获取平台选择列表
      * @returns

package/dist/esm/utils/findLabelBySelectValue.js

@@ -19,18 +19,4 @@ export default (function (vales, options) {
     });
   });
   return newKV;
-});
-var findNodeById = function findNodeById(tree) {
-  var actived = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-  for (var i = 0; i < tree.length; i++) {
-    if (tree[i].actived == actived) {
-      return tree[i];
-    }
-    if (tree[i].children) {
-      var result = findNodeById(tree[i].children, actived);
-      if (result) {
-        return result;
-      }
-    }
-  }
-};
+});

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "0.6.3-alpha.15",
+  "version": "0.6.3-alpha.21",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "father build"
+    "build": "yarn run lint && father build",
+    "lint": "eslint . --ext .ts",
+    "lint:fix": "npx eslint . --ext .ts --fix"
   },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [
@@ -22,6 +24,9 @@
     "umi-request": "^1.4.0"
   },
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^5.59.2",
+    "@typescript-eslint/parser": "^5.59.2",
+    "eslint": "^8.40.0",
     "father": "^4.1.7"
   },
   "publishConfig": {
@@ -30,5 +35,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "48cd1f4dc355b1b386299c085845494a7068c374"
+  "gitHead": "79d6a0773ee444beb4c8d2c646b9adfcf1c628a5"
 }