@kmkf-fe-packages/kmkf-utils 0.8.13-alpha.1 → 0.8.15-alpha.1

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

@@ -20,10 +20,18 @@ export default class ExpressInterceptData {
         label: string;
         value: string;
     }[];
+    typeConditionOptions: {
+        label: string;
+        value: string;
+    }[];
     statusOptions: {
         label: string;
         value: string;
     }[];
+    statusConditionOptions: {
+        label: string;
+        value: string;
+    }[];
     constructor();
     initData: () => OptionsItem[] | undefined;
     getExpressData: () => OptionsItem[] | undefined;
@@ -37,10 +45,18 @@ export default class ExpressInterceptData {
         label: string;
         value: string;
     }[];
+    getTypeConditionOptions(): {
+        label: string;
+        value: string;
+    }[];
     getStatusOptions(): {
         label: string;
         value: string;
     }[];
+    getStatusConditionOptions(): {
+        label: string;
+        value: string;
+    }[];
     setExpressData: (val: OptionsItem[]) => OptionsItem[];
     isInterfaceCompany: (company: string) => boolean;
     static getInstance(): ExpressInterceptData;

package/dist/esm/expressInterceptData/index.js

@@ -14,6 +14,12 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import request from "../request";
+var companyTypeMap = {
+  SF: '顺丰',
+  ZTO: '中通',
+  JT: '极兔',
+  DEFAULT: ''
+};
 var ExpressInterceptData = /*#__PURE__*/function () {
   //展示拦截按钮映射
   //展示发件人手机号映射
@@ -21,8 +27,11 @@ var ExpressInterceptData = /*#__PURE__*/function () {
   //退回诶之显示映射
   //拦截类型映射
   //物流状态映射
+
   //拦截类型筛选options
+  // 拦截类型筛选options 顺丰/中通/极兔要拆开
   //物流状态筛选options
+  //物流状态条件选择筛选
   function ExpressInterceptData() {
     var _this = this;
     _classCallCheck(this, ExpressInterceptData);
@@ -34,12 +43,14 @@ var ExpressInterceptData = /*#__PURE__*/function () {
     _defineProperty(this, "typeNameMap", null);
     _defineProperty(this, "statusNameMap", null);
     _defineProperty(this, "typeOptions", []);
+    _defineProperty(this, "typeConditionOptions", []);
     _defineProperty(this, "statusOptions", []);
+    _defineProperty(this, "statusConditionOptions", []);
     _defineProperty(this, "initData", function () {
       if (_this.expressData.length > 0) return _this.expressData;
       request({
-        url: "/qy/logistics/listLogisticsWithInterceptInfo",
-        method: "post",
+        url: '/qy/logistics/listLogisticsWithInterceptInfo',
+        method: 'post',
         data: {
           platformType: 118
         }
@@ -106,15 +117,35 @@ var ExpressInterceptData = /*#__PURE__*/function () {
         _this.typeOptions = Object.keys(typeObj).map(function (key) {
           return {
             label: key,
-            value: _toConsumableArray(typeObj[key]).join(",")
+            value: _toConsumableArray(typeObj[key]).join(',')
+          };
+        });
+        _this.typeConditionOptions = Object.keys(_this.typeNameMap).map(function (key) {
+          var type = key.split('|')[0];
+          return {
+            label: "".concat(companyTypeMap[type] || '').concat(_this.typeNameMap[key]),
+            value: key
           };
         });
         _this.statusOptions = Object.keys(statusObj).map(function (key) {
           return {
             label: key,
-            value: _toConsumableArray(statusObj[key]).join(",")
+            value: _toConsumableArray(statusObj[key]).join(',')
           };
         });
+        var tempList = [];
+        var tempObj = {};
+        Object.keys(_this.statusNameMap).forEach(function (key) {
+          var type = key.split('|')[1];
+          if (!tempObj[type]) {
+            tempList.push({
+              label: _this.statusNameMap[key],
+              value: type
+            });
+            tempObj[type] = _this.statusNameMap[key];
+          }
+        });
+        _this.statusConditionOptions = tempList;
       }).catch(function (e) {
         console.log(e);
       });
@@ -177,11 +208,21 @@ var ExpressInterceptData = /*#__PURE__*/function () {
     value: function getTypeOptions() {
       return this.typeOptions;
     }
+  }, {
+    key: "getTypeConditionOptions",
+    value: function getTypeConditionOptions() {
+      return this.typeConditionOptions;
+    }
   }, {
     key: "getStatusOptions",
     value: function getStatusOptions() {
       return this.statusOptions;
     }
+  }, {
+    key: "getStatusConditionOptions",
+    value: function getStatusConditionOptions() {
+      return this.statusConditionOptions;
+    }
   }], [{
     key: "getInstance",
     value: function getInstance() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "0.8.13-alpha.1",
+  "version": "0.8.15-alpha.1",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -42,5 +42,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "eaffaa8f384544cd8abb9cac141419f4812af9be"
+  "gitHead": "7dfa5c1a4e86ef9ab482cd3dd611eb41e7ac2400"
 }