@kmkf-fe-packages/services-components 2.0.40 → 2.0.42

package/dist/esm/components/GY/GyReissue/index.js

@@ -17,6 +17,15 @@ import { SYMBOL } from "../../../constant";
 import { BsGoodsTable } from "../../Common/index";
 import { BsType, BsMemo, SystemOrderNo } from "../../BS/common/index";
 import CommonHeaderGoods from "../../CommonHeaderGood";
+function toNum(value) {
+  if (typeof value === "string") {
+    return value ? +value : void 0;
+  }
+  if (typeof value === "number") {
+    return value;
+  }
+  return void 0;
+}
 var typeMap = {
   GY_REISSUE_GOODS: {
     key: "gyReissueGoods",
@@ -24,7 +33,22 @@ var typeMap = {
     typeName: "gyReissueType",
     remark: "gyReissueType_memo",
     systemOrderNo: "gySystemOrderNo",
-    errMsg: "请选择管易补发商品"
+    errMsg: "请选择管易补发商品",
+    validator: function validator(_rule, value) {
+      if (!_rule.required) return Promise.resolve();
+      var goodsName = "";
+      if (((value === null || value === void 0 ? void 0 : value.gyReissueGoods) || []).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.goodName ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : "";
+        }
+        return res;
+      })) {
+        return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+      }
+      return Promise.resolve();
+    }
   }
 };
 var GyReissue = /*#__PURE__*/_createClass(function GyReissue(options) {
@@ -33,7 +57,8 @@ var GyReissue = /*#__PURE__*/_createClass(function GyReissue(options) {
     _typeMap$options$type2,
     _typeMap$options$type3,
     _typeMap$options$type4,
-    _this$componentConfig6;
+    _this$componentConfig6,
+    _typeMap$options$type7;
   _classCallCheck(this, GyReissue);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
@@ -173,8 +198,9 @@ var GyReissue = /*#__PURE__*/_createClass(function GyReissue(options) {
   }));
   this.children = [this.bsType, this.systemOrderNo, this.bsMemo, this.reissueGoods];
   this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
-  this.rules = this !== null && this !== void 0 && (_this$componentConfig6 = this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required ? [{
-    required: true,
+  var isRequired = this === null || this === void 0 ? void 0 : (_this$componentConfig6 = this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.required;
+  this.rules = [{
+    required: isRequired,
     validator: function validator(_, value) {
       var _value, _typeMap$options$type5;
       if (!value || !(value !== null && value !== void 0 && (_value = value["".concat((_typeMap$options$type5 = typeMap[options.type]) === null || _typeMap$options$type5 === void 0 ? void 0 : _typeMap$options$type5.key)]) !== null && _value !== void 0 && _value.length)) {
@@ -183,7 +209,12 @@ var GyReissue = /*#__PURE__*/_createClass(function GyReissue(options) {
       }
       return Promise.resolve();
     }
-  }] : [];
+  }, {
+    required: isRequired,
+    validator: ((_typeMap$options$type7 = typeMap[options.type]) === null || _typeMap$options$type7 === void 0 ? void 0 : _typeMap$options$type7.validator) || function () {
+      return Promise.resolve();
+    }
+  }];
   this.dataType = "object";
 });
 export default GyReissue;

package/dist/esm/components/GY/GyReturn/index.js

@@ -17,13 +17,37 @@ import { BsGoodsTable } from "../../Common";
 import CommonHeaderGoods from "../../CommonHeaderGood";
 import { GyReturn as Return } from "@kmkf-fe-packages/basic-components";
 import { BsType, SystemOrderNo } from "../../BS/common/index";
+function toNum(value) {
+  if (typeof value === "string") {
+    return value ? +value : void 0;
+  }
+  if (typeof value === "number") {
+    return value;
+  }
+  return void 0;
+}
 var typeMap = {
   GY_RETURN_GOODS: {
     key: "gyReturnGoods",
     name: "管易",
     typeName: "gyReturnType",
     systemOrderNo: "gySystemOrderNo",
-    errMsg: "请选择管易退货商品"
+    errMsg: "请选择管易退货商品",
+    validator: function validator(_rule, value) {
+      if (!_rule.required) return Promise.resolve();
+      var goodsName = "";
+      if (((value === null || value === void 0 ? void 0 : value.gyReturnGoods) || []).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.goodName ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : "";
+        }
+        return res;
+      })) {
+        return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+      }
+      return Promise.resolve();
+    }
   }
 };
 var GyReturn = /*#__PURE__*/_createClass(function GyReturn(options) {
@@ -31,7 +55,8 @@ var GyReturn = /*#__PURE__*/_createClass(function GyReturn(options) {
     _typeMap$options$type,
     _typeMap$options$type2,
     _typeMap$options$type3,
-    _this$componentConfig6;
+    _this$componentConfig6,
+    _typeMap$options$type6;
   _classCallCheck(this, GyReturn);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
@@ -165,8 +190,9 @@ var GyReturn = /*#__PURE__*/_createClass(function GyReturn(options) {
   }));
   this.children = [this.gyType, this.systemOrderNo, this.returnGoods];
   this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
-  this.rules = this !== null && this !== void 0 && (_this$componentConfig6 = this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required ? [{
-    required: true,
+  var isRequired = this === null || this === void 0 ? void 0 : (_this$componentConfig6 = this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.required;
+  this.rules = [{
+    required: isRequired,
     validator: function validator(_, value) {
       var _value, _typeMap$options$type4;
       if (!value || !(value !== null && value !== void 0 && (_value = value["".concat((_typeMap$options$type4 = typeMap[options.type]) === null || _typeMap$options$type4 === void 0 ? void 0 : _typeMap$options$type4.key)]) !== null && _value !== void 0 && _value.length)) {
@@ -175,7 +201,12 @@ var GyReturn = /*#__PURE__*/_createClass(function GyReturn(options) {
       }
       return Promise.resolve();
     }
-  }] : [];
+  }, {
+    required: isRequired,
+    validator: ((_typeMap$options$type6 = typeMap[options.type]) === null || _typeMap$options$type6 === void 0 ? void 0 : _typeMap$options$type6.validator) || function () {
+      return Promise.resolve();
+    }
+  }];
   this.dataType = "object";
 });
 export default GyReturn;

package/dist/esm/factory.d.ts

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

package/package.json

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