@kmkf-fe-packages/services-components 2.0.54-beta.4 → 2.0.54

package/dist/esm/components/Public/ReissueGoods/index.d.ts

@@ -1,7 +1,7 @@
 import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../../type";
 import React from "react";
 import { BsType, BsMemo, BsHeaderGood, SystemOrderNo } from "../../BS/common/index";
-import SystemOrderType from "../SystemOrderType";
+import SystemOrderType from '../SystemOrderType';
 import CommonHeaderGoods from "../../CommonHeaderGood";
 declare class PublicReissue implements ComponentInterface {
     name: string;

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

@@ -12,27 +12,53 @@ import React from "react";
 import GetFormItem from "../../GetFormItem";
 import ItemView from "../../../commonComponents/ItemView";
 import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
-import { PublicReissue as Reissue, erpFormValidator } from "@kmkf-fe-packages/basic-components";
+import { PublicReissue as Reissue } from "@kmkf-fe-packages/basic-components";
 import { SYMBOL } from "../../../constant";
 import { BsGoodsTable } from "../../Common/index";
 import { BsType, BsMemo, SystemOrderNo } from "../../BS/common/index";
 import SystemOrderType from "../SystemOrderType";
 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 = {
   JST_REISSUE_GOODS: {
     key: "jstReissueGoods",
     typeName: "jstReissueType",
     remark: "jstReissueType_memo",
     systemOrderNo: "jstSystemOrderNo",
-    systemOrderBillType: "jstSystemOrderBillType",
+    systemOrderBillType: 'jstSystemOrderBillType',
     errMsg: "请选择聚水潭补发商品",
     name: "聚水潭",
-    compType: "补发",
-    validator: function validator(_rule, value, type) {
+    compType: '补发',
+    validator: function validator(_rule, value) {
       if (!_rule.required) return Promise.resolve();
-      var validatorFlag = erpFormValidator(_rule, value, type);
-      if (validatorFlag) {
-        return validatorFlag;
+      var goodsName = "";
+      if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).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.jstReissueGoods) || []).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"));
       }
       return Promise.resolve();
     }
@@ -42,15 +68,32 @@ var typeMap = {
     typeName: "jstReturnType",
     remark: "jstReturnType_memo",
     systemOrderNo: "jstSystemOrderNo",
-    systemOrderBillType: "jstSystemOrderBillType",
+    systemOrderBillType: 'jstSystemOrderBillType',
     errMsg: "请选择聚水潭退货商品",
     name: "聚水潭",
-    compType: "退货",
-    validator: function validator(_rule, value, type) {
+    compType: '退货',
+    validator: function validator(_rule, value) {
       if (!_rule.required) return Promise.resolve();
-      var validatorFlag = erpFormValidator(_rule, value, type);
-      if (validatorFlag) {
-        return validatorFlag;
+      var goodsName = "";
+      if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).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.jstReturnGoods) || []).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"));
       }
       return Promise.resolve();
     }
@@ -70,7 +113,8 @@ var PublicReissue = /*#__PURE__*/_createClass(function PublicReissue(options) {
     _typeMap$options$type10,
     _typeMap$options$type11,
     _typeMap$options$type12,
-    _this$componentConfig6;
+    _this$componentConfig6,
+    _typeMap$options$type15;
   _classCallCheck(this, PublicReissue);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
@@ -228,11 +272,8 @@ var PublicReissue = /*#__PURE__*/_createClass(function PublicReissue(options) {
     }
   }, {
     required: isRequired,
-    validator: function validator(_rule, value) {
-      var _typeMap$options$type15, _typeMap$options$type16;
-      return ((_typeMap$options$type15 = typeMap[options.type]) === null || _typeMap$options$type15 === void 0 ? void 0 : (_typeMap$options$type16 = _typeMap$options$type15.validator) === null || _typeMap$options$type16 === void 0 ? void 0 : _typeMap$options$type16.call(_typeMap$options$type15, _rule, value, options.type)) || function () {
-        return Promise.resolve();
-      };
+    validator: ((_typeMap$options$type15 = typeMap[options.type]) === null || _typeMap$options$type15 === void 0 ? void 0 : _typeMap$options$type15.validator) || function () {
+      return Promise.resolve();
     }
   }];
   this.dataType = "object";

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

@@ -1,5 +1,5 @@
-import { ComponentInterface, PickOption, Record, ColumnConfig } from "../../type";
-import React from "react";
+import { ComponentInterface, PickOption, Record, ColumnConfig } from '../../type';
+import React from 'react';
 declare type Value = string | string[] | undefined;
 declare class BasicDataTime implements ComponentInterface {
     name: string;
@@ -8,14 +8,14 @@ declare class BasicDataTime implements ComponentInterface {
     type: string;
     rules: any[];
     showContains: boolean;
-    componentConfig: ComponentInterface["componentConfig"];
+    componentConfig: ComponentInterface['componentConfig'];
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
     dataMap: Record;
-    dataType: ComponentInterface["dataType"];
-    format: ComponentInterface["format"];
+    dataType: ComponentInterface['dataType'];
+    format: ComponentInterface['format'];
     constructor(options: PickOption);
     render: (value: Value) => React.JSX.Element;
     renderClient: (record: any) => React.JSX.Element | null;

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

@@ -6,22 +6,21 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import React from "react";
-import moment from "moment";
+import React from 'react';
+import moment from 'moment';
 import { DateTime } from "../DataTime";
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 import { SYMBOL } from "../../constant";
 var typeMap = {
-  TRADE_CREATE_DATETIME: "tradeCreateDateTime",
-  TRADE_PAYMENT_DATETIME: "tradePaymentDateTime",
-  TRADE_DELIVERY_DATETIME: "tradeDeliveryDateTime",
-  TRADE_CLOSING_DATETIME: "tradeClosingDateTime",
-  TRADE_SIGNING_DATETIME: "tradeSigningDateTime",
-  BS_SIGNING_TIME: "bsSigningTime",
-  BS_SEND_TIME: "bsSendTime",
-  BS_TRADE_PAYMENT_TIME: "bsTradePaymentTime"
+  TRADE_CREATE_DATETIME: 'tradeCreateDateTime',
+  TRADE_PAYMENT_DATETIME: 'tradePaymentDateTime',
+  TRADE_DELIVERY_DATETIME: 'tradeDeliveryDateTime',
+  TRADE_CLOSING_DATETIME: 'tradeClosingDateTime',
+  BS_SIGNING_TIME: 'bsSigningTime',
+  BS_SEND_TIME: 'bsSendTime',
+  BS_TRADE_PAYMENT_TIME: 'bsTradePaymentTime'
 };
 var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
   var _this = this;
@@ -41,7 +40,7 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "format", void 0);
   _defineProperty(this, "render", function (value) {
-    return /*#__PURE__*/React.createElement("span", null, Array.isArray(value) ? value.join("~") : /*#__PURE__*/React.createElement("span", null, value));
+    return /*#__PURE__*/React.createElement("span", null, Array.isArray(value) ? value.join('~') : /*#__PURE__*/React.createElement("span", null, value));
   });
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
@@ -53,7 +52,7 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
   _defineProperty(this, "renderPc", function (value, record) {
     var _record;
     var type = _this.type;
-    return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(_this.dataMap[type])]) !== null && _record !== void 0 ? _record : "--");
+    return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(_this.dataMap[type])]) !== null && _record !== void 0 ? _record : '--');
   });
   _defineProperty(this, "renderLog", function (r) {
     var type = _this.type;
@@ -67,7 +66,7 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
   _defineProperty(this, "renderExport", function (value, record) {
     var _record2;
     var type = _this.type;
-    return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]) !== null && _record2 !== void 0 ? _record2 : "--";
+    return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]) !== null && _record2 !== void 0 ? _record2 : '--';
   });
   _defineProperty(this, "editRender", function (p) {
     var _this$componentConfig, _this$componentConfig2, _this$componentConfig3, _this$componentConfig4;
@@ -78,7 +77,7 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       display: p === null || p === void 0 ? void 0 : p.display,
       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,
-      tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : "",
+      tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : '',
       component: /*#__PURE__*/React.createElement(DateTime, _extends({}, _this.componentConfig, {
         dateType: "DATE_TIME"
       }))
@@ -97,7 +96,7 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
       // 过滤组件id
       name: item.name,
       // 过滤组件名称
-      filterComponentType: "Date",
+      filterComponentType: 'Date',
       filterFn: function filterFn(value) {
         return function (i) {
           var recordDateTime = _filterFn.filterTableListItemColumnValue(i, item.id, key);
@@ -107,13 +106,13 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
       formatFilterValue: function formatFilterValue(val) {
         if ((val === null || val === void 0 ? void 0 : val.length) > 0) {
           return val === null || val === void 0 ? void 0 : val.map(function (v) {
-            return moment(v).startOf("second").valueOf();
+            return moment(v).startOf('second').valueOf();
           });
         }
       }
     };
-    if ((_ref = ["BS_SIGNING_TIME", "BS_SEND_TIME", "BS_TRADE_PAYMENT_TIME"]) !== null && _ref !== void 0 && _ref.includes(item.type)) {
-      params.componentDataType = "dateTime";
+    if ((_ref = ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME']) !== null && _ref !== void 0 && _ref.includes(item.type)) {
+      params.componentDataType = 'dateTime';
     }
     return params;
   });
@@ -123,22 +122,21 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
   this.formField = "".concat(options.id, "_").concat(this.getKeyByComponentType(options.type));
   this.type = options.type;
   this.showContains = false;
-  this.dataType = "string";
-  this.format = "dateTime";
+  this.dataType = 'string';
+  this.format = 'dateTime';
   this.componentConfig = options.componentConfig;
   this.rules = [];
   this.isCombinationComponent = false;
   this.canSort = true;
   this.children = [];
   this.dataMap = {
-    TRADE_CREATE_DATETIME: "tradeCreateDateTime",
-    TRADE_PAYMENT_DATETIME: "tradePaymentDateTime",
-    TRADE_DELIVERY_DATETIME: "tradeDeliveryDateTime",
-    TRADE_CLOSING_DATETIME: "tradeClosingDateTime",
-    TRADE_SIGNING_DATETIME: "tradeSigningDateTime",
-    BS_SIGNING_TIME: "bsSigningTime",
-    BS_SEND_TIME: "bsSendTime",
-    BS_TRADE_PAYMENT_TIME: "bsTradePaymentTime"
+    TRADE_CREATE_DATETIME: 'tradeCreateDateTime',
+    TRADE_PAYMENT_DATETIME: 'tradePaymentDateTime',
+    TRADE_DELIVERY_DATETIME: 'tradeDeliveryDateTime',
+    TRADE_CLOSING_DATETIME: 'tradeClosingDateTime',
+    BS_SIGNING_TIME: 'bsSigningTime',
+    BS_SEND_TIME: 'bsSendTime',
+    BS_TRADE_PAYMENT_TIME: 'bsTradePaymentTime'
   };
 });
 export default BasicDataTime;

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, 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 | JstSendGood | MsgStatus | PublicReissueGoods | BasicDataTime | TradeDateTime | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | ReissueLogistics | JstItemSelect | JstSupply | BsSystemOrder | BsGoods | BsE3Goods | PublicGoods | PublicExchange | 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 | 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) => GyReissue | GyReturn | JstSendGood | MsgStatus | BasicPicture | BasicPicturePro | PublicExchange | PublicReissueGoods | ReissueLogistics | BasicSelect | StatusSelect | BasicDataTime | TradeDateTime | TradeId | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicRadio | BasicTextArea | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstItemSelect | 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 | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | GyGoods;

package/dist/esm/factory.js

@@ -70,7 +70,6 @@ export var factory = function factory(type, options) {
     case "TRADE_PAYMENT_DATETIME":
     case "TRADE_DELIVERY_DATETIME":
     case "TRADE_CLOSING_DATETIME":
-    case "TRADE_SIGNING_DATETIME":
     case "BS_SIGNING_TIME":
     case "BS_SEND_TIME":
     case "BS_TRADE_PAYMENT_TIME":

package/package.json

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