@kmkf-fe-packages/services-components 1.0.1-rc.0 → 1.0.1-rc.2

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,8 @@ 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 { queryAddressData, queryBsAddressData, queryExpressInterceptData, queryLogisticsAddressData, queryPlatData, queryWdtAddressData, 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,
     _ref$requestList = _ref.requestList,
@@ -33,13 +34,14 @@ var Global = function Global(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             mapping = {
-              queryAddressData: queryAddressData,
-              queryBsAddressData: queryBsAddressData,
+              queryAddressData: servers.queryAddressData,
+              queryBsAddressData: servers.queryBsAddressData,
               queryExpressInterceptData: queryExpressInterceptData,
               queryLogisticsAddressData: queryLogisticsAddressData,
               queryPlatData: queryPlatData,
-              queryWdtAddressData: queryWdtAddressData,
-              queryAllLogisticsCompany: queryAllLogisticsCompany
+              queryWdtAddressData: servers.queryWdtAddressData,
+              queryAllLogisticsCompany: queryAllLogisticsCompany,
+              queryWdtLogisticsCompany: queryWdtLogisticsCompany
             };
             mergeMapping = _objectSpread(_objectSpread({}, mapping), repeatRequestList);
             promises = [];

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

@@ -73,7 +73,8 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
       label: _this.name,
       value: /*#__PURE__*/React.createElement(JstGoodImage, {
         list: record === null || record === void 0 ? void 0 : record[_this.id],
-        type: 1
+        type: 1,
+        componentType: _this.type
       })
     }) : null;
   });
@@ -120,7 +121,8 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
       }
     }, /*#__PURE__*/React.createElement(JstGoodImage, {
       list: list,
-      type: 1
+      type: 1,
+      componentType: _this.type
     }));
   });
   _defineProperty(this, "renderLog", function (r) {
@@ -147,6 +149,7 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
       required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
       component: /*#__PURE__*/React.createElement(JstGoods, _extends({}, _this.componentConfig, {
         type: 1,
+        componentType: _this.type,
         options: _this.expressDateInstance.getExpressData(),
         onChange: p === null || p === void 0 ? void 0 : p.onChange
       }))
@@ -201,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

@@ -15,8 +15,8 @@ export declare const showImage: ({ item, type, index, showHeader, }: {
 }) => React.JSX.Element;
 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 }: any) => any;
-export declare const BsExpressRender: ({ list, showField }: any) => any;
+export declare const JstGoodImage: ({ list, type, componentType }: 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,12 +14,12 @@ 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 } from '@kmkf-fe-packages/kmkf-utils';
+import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
 import { getAlipayBillReceipt } from "../../service/api";
 import { CopyToClipboard } from 'react-copy-to-clipboard';
+import CopyText from "../../commonComponents/CopyText";
 import styles from "./index.module.less";
 import defaultImg from "./img/default-img.png";
-import CopyText from "../../commonComponents/CopyText";
 var Paragraph = Typography.Paragraph;
 export var getFormItem = function getFormItem(_ref) {
   var name = _ref.name,
@@ -255,10 +255,13 @@ var content = function content(item, index) {
 export var JstGoodImage = function JstGoodImage(_ref6) {
   var _ref6$list = _ref6.list,
     list = _ref6$list === void 0 ? [] : _ref6$list,
-    type = _ref6.type;
+    type = _ref6.type,
+    _ref6$componentType = _ref6.componentType,
+    componentType = _ref6$componentType === void 0 ? '' : _ref6$componentType;
+  // const { getSendNameByCode } = useSendData(componentType === 'WDT_SEND_GOOD' ? 'wdt' : '');
   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: {
@@ -274,17 +277,19 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
       text: item.logisticsCode
     })) : company ? company : item.logisticsCode ? /*#__PURE__*/React.createElement(CopyText, {
       text: item.logisticsCode
-    }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyName && item.supplyId ? [item.supplyId, item.supplyName].join('/') : item.supplyId ? item.supplyId : item.supplyName) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendId, item.sendName].join('/') : item.sendId ? item.sendId : item.sendName) : null, type === 4 ? /*#__PURE__*/React.createElement("span", null, (item === null || item === void 0 ? void 0 : item.deliveryNo) || '') : null));
+    }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyName && item.supplyId ? [item.supplyId, item.supplyName].join('/') : item.supplyId ? item.supplyId : item.supplyName) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendId, item.sendName].join("/") : item.sendId ? item.sendId : item.sendName) : null, type === 4 ? /*#__PURE__*/React.createElement("span", null, (item === null || item === void 0 ? void 0 : item.deliveryNo) || '') : null));
   }) : null;
 };
 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/components/JST/JstSendGood/index.js

@@ -100,7 +100,8 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
       label: _this.name,
       value: /*#__PURE__*/React.createElement(JstGoodImage, {
         list: record === null || record === void 0 ? void 0 : record[_this.id],
-        type: 3
+        type: 3,
+        componentType: _this.type
       })
     }) : null;
   });
@@ -114,7 +115,8 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
       }
     }, /*#__PURE__*/React.createElement(JstGoodImage, {
       list: list,
-      type: 3
+      type: 3,
+      componentType: _this.type
     }));
   });
   _defineProperty(this, "renderLog", function (r) {

package/dist/esm/factory.d.ts

@@ -1,3 +1,3 @@
-import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, CommonInput, PaymentVoucherCode, WdtReissue } from "./index";
+import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, CommonInput, PaymentVoucherCode, WdtReissue } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => ActualPayment | BasicAddress | AliPay | BsExchange | BsGoods | BsLogistics | BsPosting | BsReissue | BsReturn | BsSystemOrder | BuyerNick | Calculation | BasicCascader | BasicCheckbox | CommonInput | CommonMultiStatus | CommonSystemOrder | CompletedUser | BasicDataTime | ItemEnCode | ItemId | ItemSelect | BasicInput | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | TradeId | ShopName | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ERemark | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | JstSendGood | JstSupply | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | FlowWorkOrderId | StatusSelect | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtReissue | PaymentVoucherCode;
+export declare const factory: (type: string, options: PickOption) => CommonInput | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | JstSendGood | JstSupply | BsSystemOrder | BsGoods | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | PaymentVoucherCode;

package/dist/esm/factory.js

@@ -1,6 +1,6 @@
 import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, CommonDataTime, TradeId, ShopName, ErpTradeId, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect,
 // CommonTradeId,
-CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, CommonInput, PaymentVoucherCode, WdtReissue } from "./index";
+CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, CommonInput, PaymentVoucherCode, WdtReissue } from "./index";
 export var factory = function factory(type, options) {
   var _options$componentCon;
   switch (type) {
@@ -139,6 +139,8 @@ export var factory = function factory(type, options) {
       return new BsPosting(options);
     case "BS_GOODS":
       return new BsGoods(options);
+    case "WDT_GOODS":
+      return new WdtGoods(options);
     case "BS_EXCHANGE_GOODS":
       return new BsExchange(options);
     case "BS_REISSUE_GOODS":

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": "1.0.1-rc.0",
+  "version": "1.0.1-rc.2",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -20,8 +20,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^1.0.1-rc.0",
-    "@kmkf-fe-packages/kmkf-utils": "^1.0.1-rc.0"
+    "@kmkf-fe-packages/basic-components": "^1.0.1-rc.2",
+    "@kmkf-fe-packages/kmkf-utils": "^1.0.1-rc.2"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.59.2",
@@ -37,7 +37,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ede17f45daed4f2c60dee005f0e83f5b257a4755",
+  "gitHead": "08bef10431ab0ca406a675aab12639a855185601",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }