@kmkf-fe-packages/services-components 2.10.2 → 2.10.4

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

@@ -41,7 +41,7 @@ export declare const BsGoodsTable: ({ list, showHeader, text, type, }: {
 export declare const FileRender: ({ fileList, canDownload }: any) => React.JSX.Element;
 export declare const KmVideoRender: ({ fileList, canDownload }: any) => React.JSX.Element;
 export declare const BsSystemOrderTable: ({ value, type, showHeader }: any) => React.JSX.Element;
-export declare const MsgContent: ({ horizontal, list, valueKey, failValue, options, }: any) => React.JSX.Element;
+export declare const MsgContent: ({ horizontal, list, valueKey, failValue, options, hasMoreBtn, }: any) => React.JSX.Element;
 export declare const AlipayBill: (props: any) => React.JSX.Element;
 export declare const RenderPicturePro: (props: any) => React.JSX.Element;
 export {};

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

@@ -337,15 +337,15 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
     idKey = _ref8.idKey;
   var getContentData = function getContentData(item, index) {
     if (item.platformId) return {
-      text: "平台售后单号",
+      text: item.hiddenPrefix ? undefined : "平台售后单号",
       id: item.platformId
     };
     if (item.returnLogisticsCode) return {
-      text: "物流单号",
+      text: item.hiddenPrefix ? undefined : "物流单号",
       id: item.returnLogisticsCode
     };
     return {
-      text: "\u7CFB\u7EDF\u8BA2\u5355\u53F7".concat(index + 1),
+      text: item.hiddenPrefix ? undefined : "\u7CFB\u7EDF\u8BA2\u5355\u53F7".concat(index + 1),
       id: item.systemOrderId || item.systemOrderNo || (item === null || item === void 0 ? void 0 : item[idKey])
     };
   };
@@ -355,7 +355,7 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
       style: {
         textAlign: "center"
       }
-    }, contentData.text, "\uFF1A", contentData.id));
+    }, contentData.text ? "".concat(contentData.text, "\uFF1A") : "", contentData.id));
   };
   return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
     var _options$find;
@@ -377,7 +377,7 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
     var currentOption = options.find(function (option) {
       return item[valueKey] === option.value;
     });
-    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, isShowPopover ? /*#__PURE__*/React.createElement(Popover, {
+    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, isShowPopover && getContentData(item, index).text ? /*#__PURE__*/React.createElement(Popover, {
       content: orderContent(item, index),
       overlayStyle: {
         zIndex: 1080
@@ -769,7 +769,7 @@ export var KmVideoRender = function KmVideoRender(_ref13) {
     src: fileUrl
   })));
 };
-var RADIO_TABLE_KEYS = ['PLATFORM_AFTER_SALES_ORDER'];
+var RADIO_TABLE_KEYS = ["PLATFORM_AFTER_SALES_ORDER"];
 export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
   var value = _ref14.value,
     type = _ref14.type,
@@ -803,7 +803,7 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
     PLATFORM_AFTER_SALES_ORDER: "afterSaleOrderId"
   };
   var rowSelection = {
-    type: isRadio ? 'radio' : 'checkbox',
+    type: isRadio ? "radio" : "checkbox",
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || ((value === null || value === void 0 ? void 0 : value.showOrderInfo) || []).reduce(function (prv, next) {
       if (next.select) {
         prv.push(next[rowKeyMap[type]] || "billNo");
@@ -852,7 +852,9 @@ export var MsgContent = function MsgContent(_ref15) {
     valueKey = _ref15.valueKey,
     failValue = _ref15.failValue,
     _ref15$options = _ref15.options,
-    options = _ref15$options === void 0 ? [] : _ref15$options;
+    options = _ref15$options === void 0 ? [] : _ref15$options,
+    _ref15$hasMoreBtn = _ref15.hasMoreBtn,
+    hasMoreBtn = _ref15$hasMoreBtn === void 0 ? false : _ref15$hasMoreBtn;
   var getColorByStatus = function getColorByStatus(value) {
     var _options$find2;
     return ((_options$find2 = options.find(function (innerItem) {
@@ -878,9 +880,7 @@ export var MsgContent = function MsgContent(_ref15) {
       }
     }, "\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 renderMsgItem = function renderMsgItem(item, index) {
     var _item$msgReceivers2;
     var color = getColorByStatus(item[valueKey]);
     var currentOption = options.find(function (option) {
@@ -904,6 +904,23 @@ export var MsgContent = function MsgContent(_ref15) {
         zIndex: 9999
       }
     }, formatMsgContent) : formatMsgContent);
+  };
+  return /*#__PURE__*/React.createElement(Space, {
+    direction: !horizontal ? "vertical" : "horizontal"
+  }, Array.isArray(list) && list.length > 0 ? hasMoreBtn && list.length > 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, renderMsgItem(list[0], 0), /*#__PURE__*/React.createElement(Popover, {
+    content: /*#__PURE__*/React.createElement(Space, {
+      direction: "vertical"
+    }, list.slice(1).map(function (item, index) {
+      return renderMsgItem(item, index + 1);
+    })),
+    overlayStyle: {
+      zIndex: 9999
+    }
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "link",
+    size: "small"
+  }, "\u66F4\u591A (", list.length - 1, ")"))) : list.map(function (item, index) {
+    return renderMsgItem(item, index);
   }) : null);
 };
 //获取付款凭证

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

@@ -88,7 +88,7 @@ var CommonSystemOrder = /*#__PURE__*/_createClass(function CommonSystemOrder(opt
       value: /*#__PURE__*/React.createElement(CommonOrderContent, {
         list: record === null || record === void 0 ? void 0 : record[_this.id],
         valueKey: (_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.valueKey,
-        isShowPopover: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.belongType) !== "wdt"
+        isShowPopover: !["wdt", "jst"].includes((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.belongType)
       })
     }) : null;
   });
@@ -104,7 +104,7 @@ var CommonSystemOrder = /*#__PURE__*/_createClass(function CommonSystemOrder(opt
       list: list,
       type: (_typeMap$_this$type3 = typeMap[_this.type]) === null || _typeMap$_this$type3 === void 0 ? void 0 : _typeMap$_this$type3.type,
       valueKey: (_typeMap$_this$type4 = typeMap[_this.type]) === null || _typeMap$_this$type4 === void 0 ? void 0 : _typeMap$_this$type4.valueKey,
-      isShowPopover: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.belongType) !== "wdt"
+      isShowPopover: !["wdt", "jst"].includes((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.belongType)
     }));
   });
   _defineProperty(this, "renderLog", function (r) {

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

@@ -102,6 +102,7 @@ var MsgStatus = /*#__PURE__*/_createClass(function MsgStatus(options) {
     }, /*#__PURE__*/React.createElement(MsgContent, {
       horizontal: false,
       list: list,
+      hasMoreBtn: true,
       valueKey: (_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.valueKey,
       failValue: (_typeMap$_this$type6 = typeMap[_this.type]) === null || _typeMap$_this$type6 === void 0 ? void 0 : _typeMap$_this$type6.failValue,
       options: (_typeMap$_this$type7 = typeMap[_this.type]) === null || _typeMap$_this$type7 === void 0 ? void 0 : _typeMap$_this$type7.options

package/dist/esm/components/Public/Exchange/index.js

@@ -17,6 +17,7 @@ import { SYMBOL } from "../../../constant";
 // import { BsType, BsMemo } from "../../Bs/common";
 import { CommonExchangeGoods } from '@kmkf-fe-packages/basic-components';
 import CommonHeaderGoods from "../../CommonHeaderGood";
+import { erpFormValidator } from "@kmkf-fe-packages/basic-components";
 function toNum(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
@@ -29,28 +30,11 @@ function toNum(value) {
 var CONF_MAP = {
   JST_EXCHANGE_GOODS: {
     goodsKey: 'jstExchangeGoods',
-    validator: function validator(_rule, value) {
+    validator: function validator(_rule, value, type) {
       if (!_rule.required) return Promise.resolve();
-      var goodsName = '';
-      if (((value === null || value === void 0 ? void 0 : value.jstExchangeGoods) || []).some(function (goods) {
-        var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
-        var res = typeof qty === 'number' ? qty < 1 : true;
-        if (res) {
-          goodsName = goods !== null && goods !== void 0 && goods.name ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-        }
-        return res;
-      })) {
-        return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-      }
-      if (((value === null || value === void 0 ? void 0 : value.jstExchangeGoods) || []).some(function (goods) {
-        var v = toNum(goods === null || goods === void 0 ? void 0 : goods.salePrice);
-        var res = typeof v === 'number' ? v < 0 : true;
-        if (res) {
-          goodsName = goods !== null && goods !== void 0 && goods.name ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-        }
-        return res;
-      })) {
-        return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
+      var validatorFlag = erpFormValidator(_rule, value, type);
+      if (validatorFlag) {
+        return validatorFlag;
       }
       return Promise.resolve();
     }
@@ -164,8 +148,11 @@ var Exchange = /*#__PURE__*/_createClass(function Exchange(options) {
     }
   }, {
     required: (_this$componentConfig8 = this.componentConfig) === null || _this$componentConfig8 === void 0 ? void 0 : _this$componentConfig8.required,
-    validator: this.config.validator || function () {
-      return Promise.resolve();
+    validator: function validator(_rule, value) {
+      var _CONF_MAP$options$typ, _CONF_MAP$options$typ2;
+      return ((_CONF_MAP$options$typ = CONF_MAP[options.type]) === null || _CONF_MAP$options$typ === void 0 ? void 0 : (_CONF_MAP$options$typ2 = _CONF_MAP$options$typ.validator) === null || _CONF_MAP$options$typ2 === void 0 ? void 0 : _CONF_MAP$options$typ2.call(_CONF_MAP$options$typ, _rule, value, options.type, _this.componentConfig)) || function () {
+        return Promise.resolve();
+      };
     }
   }];
   this.dataType = 'object';

package/dist/esm/components/Public/ReissueGoods/index.js

@@ -43,11 +43,11 @@ var typeMap = {
     typeName: "jstReturnType",
     remark: "jstReturnType_memo",
     systemOrderNo: "jstSystemOrderNo",
-    systemOrderBillType: "jstSystemOrderBillType",
+    // systemOrderBillType: "jstSystemOrderBillType",
     errMsg: "请选择聚水潭退货商品",
     name: "聚水潭",
     compType: "退货",
-    hasSystemOrderType: true,
+    hasSystemOrderType: false,
     validator: function validator(_rule, value, type) {
       if (!_rule.required) return Promise.resolve();
       var validatorFlag = erpFormValidator(_rule, value, type);

package/dist/esm/components/Public/SystemOrderType/index.js

@@ -15,8 +15,8 @@ import React from "react";
 import ItemView from "../../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 var componentType = {
-  JST_REISSUE_GOODS: "jstSystemOrderBillType",
-  JST_RETURN_GOODS: "jstSystemOrderBillType"
+  JST_REISSUE_GOODS: "jstSystemOrderBillType"
+  // JST_RETURN_GOODS: "jstSystemOrderBillType",
 };
 var SystemOrderType = /*#__PURE__*/_createClass(function SystemOrderType(options) {
   var _this = this;

package/dist/esm/factory.d.ts

@@ -1,3 +1,3 @@
 import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicPicturePro, 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, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption, OrderSubForm, FlowOverallStatusSelect, ReturnWarehouse, KmExchange } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => CommonMultiStatus | PublicExchange | PublicReissueGoods | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | 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 | Payment | ReissueLogistics | JstItemSelect | JstSendGood | JstSupply | BsSystemOrder | BsGoods | BsE3Goods | PublicGoods | BsE3Reissue | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | ReturnWarehouse | GyGoods | KmExchange | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
+export declare const factory: (type: string, options: PickOption) => CommonSystemOrder | MsgStatus | PublicExchange | PublicReissueGoods | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | 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 | Payment | ReissueLogistics | JstItemSelect | JstSendGood | JstSupply | BsSystemOrder | BsGoods | BsE3Goods | PublicGoods | BsE3Reissue | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | ReturnWarehouse | GyGoods | KmExchange | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;

package/dist/esm/factory.js

@@ -185,6 +185,7 @@ export var factory = function factory(type, options) {
     case "KM_RETURN_GOODS":
     case "JY_REISSUE_GOODS":
     case "JKY_REISSUE_GOODS":
+    case "JST_RETURN_GOODS":
       return new PublicReissueGoods(options);
     case "BS_E3_REISSUE_GOODS":
       return new BsE3Reissue(options);
@@ -208,8 +209,6 @@ export var factory = function factory(type, options) {
       return new WdtReturn(options);
     case "GY_RETURN_GOODS":
       return new GyReturn(options);
-    case "JST_RETURN_GOODS":
-      return new PublicReissueGoods(options);
     case "REISSUE_TRADE_ID":
     case "SWAP_OUT_TRADE_ID":
     case "ERP_AFTER_SALE_TRADE_ID":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "2.10.2",
+  "version": "2.10.4",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "2.10.2",
-    "@kmkf-fe-packages/kmkf-utils": "2.10.2",
+    "@kmkf-fe-packages/basic-components": "2.10.4",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.4",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "387ea03be973184576757f0edf49a85e9eae8ea4",
+  "gitHead": "545af3d105d59a2b0b8f92cb0dd8804f4e5631f6",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }