@kmkf-fe-packages/services-components 0.27.1-test.7 → 0.27.1-test.9

package/dist/esm/commonComponents/GlobalContext/index.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-declare type RequestType = "queryAddressData" | "queryBsAddressData" | "queryExpressInterceptData" | "queryLogisticsAddressData" | "queryPlatData" | "queryWdtAddressData" | "queryAllLogisticsCompany";
+declare type RequestType = "queryAddressData" | "queryBsAddressData" | "queryExpressInterceptData" | "queryLogisticsAddressData" | "queryPlatData" | "queryWdtAddressData" | "queryAllLogisticsCompany" | "queryWdtLogisticsCompany";
 declare const Global: ({ children, requestList, repeatRequestList }: React.PropsWithChildren<{
     requestList?: RequestType[] | undefined;
     repeatRequestList?: Record<string, () => Promise<any>> | undefined;

package/dist/esm/commonComponents/GlobalContext/index.js

@@ -15,7 +15,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from "react";
 import { Skeleton, Result, Button } from "antd";
-import { queryExpressInterceptData, queryLogisticsAddressData, queryPlatData, queryAllLogisticsCompany } from "../../service/api";
+import { queryExpressInterceptData, queryLogisticsAddressData, queryPlatData, queryAllLogisticsCompany, queryWdtLogisticsCompany } from "../../service/api";
 import { servers } from '@kmkf-fe-packages/kmkf-utils';
 var Global = function Global(_ref) {
   var children = _ref.children,
@@ -40,7 +40,8 @@ var Global = function Global(_ref) {
               queryLogisticsAddressData: queryLogisticsAddressData,
               queryPlatData: queryPlatData,
               queryWdtAddressData: servers.queryWdtAddressData,
-              queryAllLogisticsCompany: queryAllLogisticsCompany
+              queryAllLogisticsCompany: queryAllLogisticsCompany,
+              queryWdtLogisticsCompany: queryWdtLogisticsCompany
             };
             mergeMapping = _objectSpread(_objectSpread({}, mapping), repeatRequestList);
             promises = [];

package/dist/esm/components/BS/BsLogistics/index.js

@@ -204,7 +204,7 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
       return Promise.resolve();
     }
   }] : [];
-  this.expressDateInstance = ExpressData.getInstance();
+  this.expressDateInstance = ExpressData.getInstance(this.type === 'WDT_LOGISTICS' ? 'wdt' : 'default');
   this.sortChildField = this.getSortChildFields(((_this$componentConfig4 = this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.showField) || "", _options);
 });
 export default BsLogistics;

package/dist/esm/components/BS/common/expressCompany.js

@@ -61,7 +61,8 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
     }
     return /*#__PURE__*/React.createElement(BsExpressRender, {
       list: record === null || record === void 0 ? void 0 : record["".concat(key, "_").concat(parentKey, "_").concat((_typeMap$_this$type2 = typeMap[_this.type]) === null || _typeMap$_this$type2 === void 0 ? void 0 : _typeMap$_this$type2.key)],
-      showField: "company"
+      showField: "company",
+      componentType: _this.type
     });
   });
   _defineProperty(this, "renderLog", function (r) {
@@ -108,7 +109,7 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
   this.componentConfig = options.componentConfig;
   this.rules = [];
   this.align = "left";
-  this.expressDateInstance = ExpressData.getInstance();
+  this.expressDateInstance = ExpressData.getInstance(options.type === 'WDT_LOGISTICS' ? 'wdt' : 'default');
   this.width = (options === null || options === void 0 ? void 0 : options.width) || 150;
   this.isCombinationComponent = false;
   this.canSort = false;

package/dist/esm/components/Common/index.d.ts

@@ -16,7 +16,7 @@ export declare const showImage: ({ item, type, index, showHeader, }: {
 export declare const ShowTotalImage: ({ total, allImage, type, showHeader, }: any) => React.JSX.Element;
 export declare const GoodImage: ({ list, type, showHeader }: any) => React.JSX.Element | null;
 export declare const JstGoodImage: ({ list, type, componentType }: any) => any;
-export declare const BsExpressRender: ({ list, showField }: any) => any;
+export declare const BsExpressRender: ({ list, showField, componentType }: any) => any;
 export declare const CommonOrderContent: ({ list, valueKey, failValue, options, }: any) => any;
 export declare const BsGoodImage: ({ item, index }: {
     item: any;

package/dist/esm/components/Common/index.js

@@ -14,7 +14,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Form, Button, Modal, Tooltip, Space, Image, Popover, Table, message, Typography } from "antd";
 import React, { useState, useMemo } from "react";
-import { ExpressData, useSendData, useLogisticsData } from "@kmkf-fe-packages/kmkf-utils";
+import { ExpressData, useSendData } from "@kmkf-fe-packages/kmkf-utils";
 import { getAlipayBillReceipt } from "../../service/api";
 import { CopyToClipboard } from "react-copy-to-clipboard";
 import styles from "./index.module.less";
@@ -259,11 +259,9 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
     componentType = _ref6$componentType === void 0 ? '' : _ref6$componentType;
   var _useSendData = useSendData(componentType === 'WDT_SEND_GOOD' ? 'wdt' : ''),
     getSendNameByCode = _useSendData.getSendNameByCode;
-  var _useLogisticsData = useLogisticsData(componentType === 'WDT_LOGISTICS' ? 'wdt' : ''),
-    getNameByCode = _useLogisticsData.getNameByCode;
   return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
     var logisticsCompany = item.logisticsCompany;
-    var company = componentType === 'WDT_LOGISTICS' ? getNameByCode(logisticsCompany) : ExpressData.getInstance().getExpressNameByCode(logisticsCompany);
+    var company = ExpressData.getInstance(componentType === 'WDT_LOGISTICS' ? 'wdt' : 'default').getExpressNameByCode(logisticsCompany);
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
       content: content(item, index),
       overlayStyle: {
@@ -282,10 +280,12 @@ export var BsExpressRender = function BsExpressRender(_ref7) {
   var _ref7$list = _ref7.list,
     list = _ref7$list === void 0 ? [] : _ref7$list,
     _ref7$showField = _ref7.showField,
-    showField = _ref7$showField === void 0 ? "" : _ref7$showField;
+    showField = _ref7$showField === void 0 ? "" : _ref7$showField,
+    _ref7$componentType = _ref7.componentType,
+    componentType = _ref7$componentType === void 0 ? "" : _ref7$componentType;
   return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
     var logisticsCompany = item.logisticsCompany;
-    var company = ExpressData.getInstance().getExpressNameByCode(logisticsCompany);
+    var company = ExpressData.getInstance(componentType === 'WDT_LOGISTICS' ? 'wdt' : 'default').getExpressNameByCode(logisticsCompany);
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
       content: content(item, index),
       overlayStyle: {

package/dist/esm/service/api.d.ts

@@ -6,4 +6,5 @@ export declare const queryPlatData: () => Promise<void>;
 export declare const queryExpressInterceptData: () => Promise<void>;
 export declare const queryLogisticsAddressData: () => Promise<void>;
 export declare const queryAllLogisticsCompany: () => Promise<void>;
+export declare const queryWdtLogisticsCompany: () => Promise<void>;
 export declare const getAlipayBillReceipt: (data: any) => Promise<any>;

package/dist/esm/service/api.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
-import { AddressData, toTree, BsAddressData, WdtAddressData, PlatData, ExpressInterceptData, LogisticsAddressData, ExpressData } from "@kmkf-fe-packages/kmkf-utils";
+import { AddressData, toTree, BsAddressData, WdtAddressData, PlatData, ExpressInterceptData, LogisticsAddressData, ExpressData, servers } from "@kmkf-fe-packages/kmkf-utils";
 import get from "lodash/get";
 import request from "./request";
 // 重复校验
@@ -248,6 +248,12 @@ export var queryAllLogisticsCompany = function queryAllLogisticsCompany() {
     instance.expressData = expressList;
   });
 };
+export var queryWdtLogisticsCompany = function queryWdtLogisticsCompany() {
+  var instance = ExpressData.getInstance('wdt');
+  return servers.getWdtSellerLogisticsCompanyRelation().then(function (data) {
+    instance.expressData = data;
+  }).catch(console.log);
+};
 // 获取支付宝电子回单
 export var getAlipayBillReceipt = function getAlipayBillReceipt(data) {
   return request({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.27.1-test.7",
+  "version": "0.27.1-test.9",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -20,8 +20,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^0.27.1-test.7",
-    "@kmkf-fe-packages/kmkf-utils": "^0.27.1-test.7"
+    "@kmkf-fe-packages/basic-components": "^0.27.1-test.8",
+    "@kmkf-fe-packages/kmkf-utils": "^0.27.1-test.8"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.59.2",
@@ -37,7 +37,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8d75e5eeca6c2b783dd065d893e62731da836488",
+  "gitHead": "d384ca51fb9fe193ce70de7bab03257242dc4377",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }