@kmkf-fe-packages/services-components 0.11.1 → 0.12.0-alpha.1

package/dist/esm/commonComponents/OperationLog/index.js

@@ -8,7 +8,7 @@ import React from "react";
 import { factory } from "@kmkf-fe-packages/services-components";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 export var unTransField = function unTransField(key) {
-  return ["itemList", "jstItemList", "dateTime", "basicMultSelect", "checkbox", "multSelect", "rate", "picture"].reduce(function (cur, nxt) {
+  return ["itemList", "jstItemList", "dateTime", "basicMultSelect", "checkbox", "multSelect", "rate", "picture", "file", "bsSendGood", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsSystemShowOrder", "bsSystemSelectIds", "reissueLogisticsList", "deliveryNoList", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "wlnLogisticsList", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "bsExchangeReason"].reduce(function (cur, nxt) {
     return cur || (key === null || key === void 0 ? void 0 : key.includes(nxt));
   }, false);
 };
@@ -92,6 +92,7 @@ var OperationLog = function OperationLog(_ref) {
             }, /*#__PURE__*/React.createElement("span", {
               style: {
                 maxWidth: "66px",
+                minWidth: "50px",
                 marginRight: "8px",
                 flexShrink: 1
               }

package/dist/esm/components/BS/BsExchange/index.d.ts

@@ -22,7 +22,7 @@ declare class BsExchange implements ComponentInterface {
     constructor(options: PickOption);
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: () => null;
-    renderLog: (r: Record) => null;
+    renderLog: (r: Record) => React.JSX.Element;
     getComponentValue: (r: Record) => any;
     renderExport: (value: any, record: any) => null;
     editRender: (p: any) => React.JSX.Element;

package/dist/esm/components/BS/BsExchange/index.js

@@ -67,7 +67,17 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
     return null;
   });
   _defineProperty(this, "renderLog", function (r) {
-    return null;
+    var _this$componentConfig4, _this$componentConfig5, _r, _this$componentConfig6;
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\u5907\u6CE8\u7C7B\u578B:", _this.bsType.renderLog(r)), /*#__PURE__*/React.createElement("div", null, "\u5907\u6CE8\u4FE1\u606F:", _this.bsMemo.renderLog(r)), /*#__PURE__*/React.createElement("div", null, "\u9000\u56DE\u5546\u54C1\uFF1A", /*#__PURE__*/React.createElement(BsGoodsTable, {
+      list: (r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsExchangeReturnGoods")]) || [],
+      showHeader: ((_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.showHeader) || []
+    })), /*#__PURE__*/React.createElement("div", null, "\u6362\u51FA\u5546\u54C1\uFF1A", /*#__PURE__*/React.createElement(BsGoodsTable, {
+      list: (r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsExchangeSwapOutGoods")]) || [],
+      showHeader: ((_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.showHeader) || []
+    })), r !== null && r !== void 0 && (_r = r["".concat(_this.id, "_bsExchangeGiftGoods")]) !== null && _r !== void 0 && _r.length ? /*#__PURE__*/React.createElement("div", null, "\u8D60\u54C1\uFF1A", /*#__PURE__*/React.createElement(BsGoodsTable, {
+      list: (r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsExchangeGiftGoods")]) || [],
+      showHeader: ((_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.showHeader) || []
+    })) : null);
   });
   _defineProperty(this, "getComponentValue", function (r) {
     return r === null || r === void 0 ? void 0 : r["".concat(_this.id)];
@@ -76,7 +86,7 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
     return null;
   });
   _defineProperty(this, "editRender", function (p) {
-    var _this$componentConfig4, _this$effects, _this$effects2, _this$effects3;
+    var _this$componentConfig7, _this$effects, _this$effects2, _this$effects3;
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
       name: _this.id,
@@ -84,7 +94,7 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
       required: false,
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       component: /*#__PURE__*/React.createElement(Exchange, _extends({}, _this.componentConfig, {
-        maxLength: ((_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.maxLength) || 20,
+        maxLength: ((_this$componentConfig7 = _this.componentConfig) === null || _this$componentConfig7 === void 0 ? void 0 : _this$componentConfig7.maxLength) || 20,
         shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
         shopList: ((_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList) || [],
         companyKey: (_this$effects3 = _this.effects) === null || _this$effects3 === void 0 ? void 0 : _this$effects3.companyKey,
@@ -165,8 +175,8 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
   this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
   this.rules = [{
     validator: function validator(_, value) {
-      var _this$componentConfig5, _value$bsExchangeRetu;
-      if ((_this$componentConfig5 = _this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required && !(value !== null && value !== void 0 && (_value$bsExchangeRetu = value.bsExchangeReturnGoods) !== null && _value$bsExchangeRetu !== void 0 && _value$bsExchangeRetu.length)) {
+      var _this$componentConfig8, _value$bsExchangeRetu;
+      if ((_this$componentConfig8 = _this.componentConfig) !== null && _this$componentConfig8 !== void 0 && _this$componentConfig8.required && !(value !== null && value !== void 0 && (_value$bsExchangeRetu = value.bsExchangeReturnGoods) !== null && _value$bsExchangeRetu !== void 0 && _value$bsExchangeRetu.length)) {
         return Promise.reject(new Error("请选择bs换货商品"));
       }
       return Promise.resolve();

package/dist/esm/components/BS/BsReissue/index.js

@@ -51,7 +51,7 @@ var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
   });
   _defineProperty(this, "renderLog", function (r) {
     var _this$componentConfig2;
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\u5907\u6CE8\u7C7B\u578B:", _this.bsType.renderLog(r)), /*#__PURE__*/React.createElement("div", null, "\u5907\u6CE8\u4FE1\u606F:", _this.bsMemo.renderLog(r)), /*#__PURE__*/React.createElement("div", null, "\u5546\u54C1\uFF1A", /*#__PURE__*/React.createElement(BsGoodsTable, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\u5907\u6CE8\u7C7B\u578B:", _this.bsType.renderLog(r)), /*#__PURE__*/React.createElement("div", null, "\u5907\u6CE8\u4FE1\u606F:", _this.bsMemo.renderLog(r)), /*#__PURE__*/React.createElement("div", null, "\u8865\u53D1\u5546\u54C1\uFF1A", /*#__PURE__*/React.createElement(BsGoodsTable, {
       list: (r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsReissueGoods")]) || [],
       showHeader: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.showHeader) || []
     })));

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

@@ -86,7 +86,7 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
   this.componentConfig = options.componentConfig;
   this.rules = [{
     validator: function validator(_, value) {
-      var _this$componentConfig3, _this$componentConfig4, _this$componentConfig5;
+      var _this$componentConfig3, _this$componentConfig4, _this$componentConfig5, _this$componentConfig6, _this$componentConfig7;
       if (!value) {
         return Promise.resolve();
       }
@@ -103,24 +103,24 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
       if (testList.length && !isTest) {
         return Promise.reject(new Error("请填写正确的格式"));
       }
-      // if (this.componentConfig?.rulesOptions?.length) {
-      //   const rulesList = this.componentConfig?.rulesOptions.filter(
-      //     (item: any) =>
-      //       (this.componentConfig?.selectRules || []).includes(item.id)
-      //   );
-
-      //   const hasRule = rulesList.some((item) => {
-      //     const reg = new RegExp(item.value);
-      //     return reg.test(value);
-      //   });
-      //   if (rulesList.length && !hasRule) {
-      //     const rulesItem = rulesList.find((item) => {
-      //       const reg = new RegExp(item.value);
-      //       return !reg.test(value);
-      //     });
-      //     return Promise.reject(new Error(rulesItem?.errorText));
-      //   }
-      // }
+      if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && (_this$componentConfig7 = _this$componentConfig6.rulesOptions) !== null && _this$componentConfig7 !== void 0 && _this$componentConfig7.length) {
+        var _this$componentConfig8;
+        var rulesList = (_this$componentConfig8 = _this.componentConfig) === null || _this$componentConfig8 === void 0 ? void 0 : _this$componentConfig8.rulesOptions.filter(function (item) {
+          var _this$componentConfig9;
+          return (((_this$componentConfig9 = _this.componentConfig) === null || _this$componentConfig9 === void 0 ? void 0 : _this$componentConfig9.selectRules) || []).includes(item.id);
+        });
+        var hasRule = rulesList.some(function (item) {
+          var reg = new RegExp(item.value);
+          return reg.test(value);
+        });
+        if (rulesList.length && !hasRule) {
+          var rulesItem = rulesList.find(function (item) {
+            var reg = new RegExp(item.value);
+            return !reg.test(value);
+          });
+          return Promise.reject(new Error(rulesItem === null || rulesItem === void 0 ? void 0 : rulesItem.errorText));
+        }
+      }
       return Promise.resolve();
     }
   }];

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, CommonDataTime, TradeId, ShopName, ErpTradeId, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, Handler, CompletedUser, LogisticsInterception, LogisticsTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonTradeId, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods } from './index';
+import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, CommonDataTime, TradeId, ShopName, ErpTradeId, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, Handler, CompletedUser, LogisticsInterception, LogisticsTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods } from './index';
 import { PickOption } from './type';
-export declare const factory: (type: string, options: PickOption) => BsExchange | BsLogistics | BsReissue | BsSystemOrder | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | TradeId | ErpTradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | JstSendGood | JstSupply | BsGoods | BsReturn | FlowStatusSelect | FlowMarkSelect | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | PlatForm | ShopInput | Submitter | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | CommonTradeId | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods;
+export declare const factory: (type: string, options: PickOption) => BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | TradeId | ErpTradeId | 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 | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | PlatForm | ShopInput | Submitter | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods;

package/dist/esm/factory.js

@@ -1,4 +1,6 @@
-import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, CommonDataTime, TradeId, ShopName, ErpTradeId, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, Handler, CompletedUser, LogisticsInterception, LogisticsTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonTradeId, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods } from "./index";
+import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, CommonDataTime, TradeId, ShopName, ErpTradeId, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, Handler, CompletedUser, LogisticsInterception, LogisticsTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect,
+// CommonTradeId,
+CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods } from "./index";
 export var factory = function factory(type, options) {
   var _options$componentCon;
   switch (type) {
@@ -130,9 +132,9 @@ export var factory = function factory(type, options) {
       return new BsReissue(options);
     case 'BS_RETURN_GOODS':
       return new BsReturn(options);
-    // case 'REISSUE_TRADE_ID':
     case 'BS_DELIVERY_NO':
     case 'RETURN_GOODS_TRADE_ID':
+    case 'REISSUE_TRADE_ID':
     case 'EXCHANGE_TRADE_ID':
       return new CommonSystemOrder(options);
     case 'BS_LOGISTICS':
@@ -150,9 +152,9 @@ export var factory = function factory(type, options) {
     case 'RETURN_GOODS_STATUS':
     case 'EXCHANGE_STATUS':
       return new CommonMultiStatus(options);
-    case 'REISSUE_TRADE_ID':
-      // case 'EXCHANGE_TRADE_ID':
-      return new CommonTradeId(options);
+    // case 'REISSUE_TRADE_ID':
+    // case 'EXCHANGE_TRADE_ID':
+    //   return new CommonTradeId(options)
     case 'NUMERICAL_CALCULATION':
       return new Calculation(options);
     case 'NODE_DEAD_LINE_INPUT':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.11.1",
+  "version": "0.12.0-alpha.1",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -26,8 +26,8 @@
     "father": "^4.1.7"
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^0.11.1",
-    "@kmkf-fe-packages/kmkf-utils": "^0.11.1"
+    "@kmkf-fe-packages/basic-components": "^0.12.0-alpha.0",
+    "@kmkf-fe-packages/kmkf-utils": "^0.12.0-alpha.0"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "de6620e377524975bf58e2eed4de23c464c87e83"
+  "gitHead": "dacb2b0d1a63e567725fefa01677383a21678756"
 }