@kmkf-fe-packages/services-components 1.8.0-beta.6 → 1.8.0-beta.8

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

@@ -1072,37 +1072,47 @@ export var MsgContent = function MsgContent(_ref14) {
     var _item$msgReceivers;
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
       style: {
-        textAlign: 'left'
+        textAlign: "left"
       }
-    }, ((_item$msgReceivers = item.msgReceivers) === null || _item$msgReceivers === void 0 ? void 0 : _item$msgReceivers.length) && item.msgReceivers.map(function (msgItem) {
+    }, (_item$msgReceivers = item.msgReceivers) !== null && _item$msgReceivers !== void 0 && _item$msgReceivers.length ? item.msgReceivers.map(function (msgItem, index) {
       return /*#__PURE__*/React.createElement("div", {
+        key: index,
         style: {
           color: getColorByStatus(msgItem.status)
         }
       }, msgItem.failReason ? "".concat(msgItem.name, "\uFF0C").concat(msgItem.status, "\uFF0C\u5931\u8D25\u539F\u56E0\uFF1A").concat(msgItem.failReason) : "".concat(msgItem.name, "\uFF0C").concat(msgItem.status, ";"));
-    })));
+    }) : item.failReason && /*#__PURE__*/React.createElement("div", {
+      style: {
+        color: getColorByStatus(item.status)
+      }
+    }, "\u5931\u8D25\u539F\u56E0\uFF1A", item.failReason)));
   };
   return /*#__PURE__*/React.createElement(Space, {
     direction: !horizontal ? 'vertical' : 'horizontal'
   }, Array.isArray(list) ? (list || []).map(function (item, index) {
+    var _item$msgReceivers2;
     var color = getColorByStatus(item[valueKey]);
     var currentOption = options.find(function (option) {
       return item[valueKey] === option.value;
     });
     var key = item.msgType || 'ding';
+    var formatMsgContent = /*#__PURE__*/React.createElement("span", {
+      key: index
+    }, msgTypeCh[key], "-", item.ruleName, "-", currentOption ? currentOption.label : (item === null || item === void 0 ? void 0 : item[valueKey]) || "");
     return /*#__PURE__*/React.createElement("div", {
+      key: "wrap_".concat(index),
       style: {
         color: color,
-        cursor: 'pointer'
+        cursor: "pointer"
       }
-    }, /*#__PURE__*/React.createElement(Popover, {
+    }, (_item$msgReceivers2 = item.msgReceivers) !== null && _item$msgReceivers2 !== void 0 && _item$msgReceivers2.some(function (msgItem) {
+      return (msgItem === null || msgItem === void 0 ? void 0 : msgItem.status) === failValue;
+    }) || item.failReason ? /*#__PURE__*/React.createElement(Popover, {
       content: detailContent(item),
       overlayStyle: {
         zIndex: 9999
       }
-    }, /*#__PURE__*/React.createElement("span", {
-      key: index
-    }, msgTypeCh[key], "-", item.ruleName, "-", currentOption ? currentOption.label : (item === null || item === void 0 ? void 0 : item[valueKey]) || '')));
+    }, formatMsgContent) : formatMsgContent);
   }) : null);
 };
 //获取付款凭证

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, SubForm, 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, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, KmErpSendGood, AfterSalesOrderId } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => ActualPayment | BasicAddress | AfterSalesOrderId | AliPay | BsExchange | BsGoods | BsLogistics | BsPosting | BsReissue | BsReturn | BsSystemOrder | BuyerNick | Calculation | BasicCascader | BasicCheckbox | CommonInput | CommonMultiStatus | CommonSystemOrder | BasicDataTime | ItemEnCode | ItemId | ItemSelect | TradeId | BasicInput | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | 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 | CompletedUser | FlowWorkOrderId | StatusSelect | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | PaymentVoucherCode | Label | KmErpSendGood;
+export declare const factory: (type: string, options: PickOption) => PaymentVoucherCode | SubForm | 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 | WdtReturn | WdtExchange | CommonInput | Label | KmErpSendGood | AfterSalesOrderId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "1.8.0-beta.6",
+  "version": "1.8.0-beta.8",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -39,7 +39,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "04b97d0e42072c5fe31ec0cf0a7751768ff13aa9",
+  "gitHead": "8c26ba1cf0927ea9ef615cab934852aa76298223",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }