@kmkf-fe-packages/services-components 2.7.7-beta.11 → 2.7.7-beta.12

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) => BsSystemOrder | CommonSystemOrder | LogisticsInterception | StatusSelect | TradeId | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | ReissueLogistics | JstItemSelect | JstSendGood | JstSupply | BsGoods | BsE3Goods | PublicGoods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | Calculation | CommonMultiStatus | 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) => BsSystemOrder | CommonSystemOrder | LogisticsInterception | PublicExchange | PublicReissueGoods | StatusSelect | TradeId | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | ReissueLogistics | JstItemSelect | JstSendGood | JstSupply | BsGoods | BsE3Goods | PublicGoods | BsE3Reissue | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | Calculation | CommonMultiStatus | 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;

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.7.7-beta.11",
+  "version": "2.7.7-beta.12",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "2.7.7-beta.11",
-    "@kmkf-fe-packages/kmkf-utils": "2.7.7-beta.9",
+    "@kmkf-fe-packages/basic-components": "2.7.7-beta.12",
+    "@kmkf-fe-packages/kmkf-utils": "2.7.7-beta.12",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f4be4364c58551b9abe6211a3c661456f7c8770e",
+  "gitHead": "8d0c1e9dd97c19700b86a22e901524cf6393e9df",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }