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

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
       }))

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

@@ -15,7 +15,7 @@ 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 JstGoodImage: ({ list, type, componentType }: any) => any;
 export declare const BsExpressRender: ({ list, showField }: any) => any;
 export declare const CommonOrderContent: ({ list, valueKey, failValue, options, }: any) => any;
 export declare const BsGoodImage: ({ item, index }: {

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 } from "@kmkf-fe-packages/kmkf-utils";
+import { ExpressData, useSendData, useLogisticsData } from "@kmkf-fe-packages/kmkf-utils";
 import { getAlipayBillReceipt } from "../../service/api";
 import { CopyToClipboard } from "react-copy-to-clipboard";
 import styles from "./index.module.less";
@@ -254,10 +254,16 @@ 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;
+  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 = ExpressData.getInstance().getExpressNameByCode(logisticsCompany);
+    var company = componentType === 'WDT_LOGISTICS' ? getNameByCode(logisticsCompany) : ExpressData.getInstance().getExpressNameByCode(logisticsCompany);
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
       content: content(item, index),
       overlayStyle: {
@@ -269,7 +275,7 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
         color: "#1890ff",
         cursor: "pointer"
       }
-    }, "\u5305\u88F9".concat(index + 1), ":")), type === 1 ? /*#__PURE__*/React.createElement("span", null, company && item.logisticsCode ? [company, item.logisticsCode].join("/") : company ? company : item.logisticsCode) : 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));
+    }, "\u5305\u88F9".concat(index + 1), ":")), type === 1 ? /*#__PURE__*/React.createElement("span", null, company && item.logisticsCode ? [company, item.logisticsCode].join("/") : company ? company : item.logisticsCode) : 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, componentType === 'WDT_SEND_GOOD' ? getSendNameByCode(item.sendName) : item.sendName].join("/") : item.sendId ? item.sendId : componentType === 'WDT_SEND_GOOD' ? getSendNameByCode(item.sendName) : 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) {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.27.1-test.4",
+  "version": "0.27.1-test.7",
   "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.4",
-    "@kmkf-fe-packages/kmkf-utils": "^0.27.1-test.4"
+    "@kmkf-fe-packages/basic-components": "^0.27.1-test.7",
+    "@kmkf-fe-packages/kmkf-utils": "^0.27.1-test.7"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.59.2",
@@ -37,7 +37,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "156d314130701c3e3fd39a375bea1456b569591e",
+  "gitHead": "8d75e5eeca6c2b783dd065d893e62731da836488",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }