@kmkf-fe-packages/services-components 0.13.0-alpha.14 → 0.13.0-alpha.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dist/esm/commonComponents/OperationLog/index.js +6 -1
  2. package/dist/esm/components/BS/BsExchange/index.js +5 -5
  3. package/dist/esm/components/BS/BsReissue/index.js +3 -3
  4. package/dist/esm/components/BS/BsReturn/index.js +3 -3
  5. package/dist/esm/components/BS/BsSystemOrder/index.js +6 -3
  6. package/dist/esm/components/Common/index.js +6 -1
  7. package/dist/esm/factory.d.ts +1 -1
  8. package/package.json +4 -4
package/dist/esm/commonComponents/OperationLog/index.js CHANGED
@@ -96,7 +96,12 @@ var OperationLog = function OperationLog(_ref) {
96
96
  style: {
97
97
  overflow: "auto"
98
98
  }
99
- }, /*#__PURE__*/React.createElement("span", null, instance.renderLog(oldContent), /*#__PURE__*/React.createElement("span", null, "=>"), instance.renderLog(currentContent))));
99
+ }, /*#__PURE__*/React.createElement("div", {
100
+ style: {
101
+ display: "flex",
102
+ flexWrap: "wrap"
103
+ }
104
+ }, instance.renderLog(oldContent), /*#__PURE__*/React.createElement("span", null, "=>"), instance.renderLog(currentContent))));
100
105
  } else if (operation !== null && operation !== void 0 && operation.startsWith("ADD") && !isNull(instance.getComponentValue(currentContent))) {
101
106
  return /*#__PURE__*/React.createElement("div", {
102
107
  style: {
package/dist/esm/components/BS/BsExchange/index.js CHANGED
@@ -67,17 +67,17 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
67
67
  return null;
68
68
  });
69
69
  _defineProperty(this, "renderLog", function (r) {
70
- var _this$componentConfig4, _this$componentConfig5, _r, _this$componentConfig6;
71
- 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, {
70
+ var _r, _r2, _this$componentConfig4, _r3, _this$componentConfig5, _r4, _this$componentConfig6;
71
+ return /*#__PURE__*/React.createElement(React.Fragment, null, r !== null && r !== void 0 && (_r = r["".concat(_this.id, "_bsExchangeType")]) !== null && _r !== void 0 && _r.length ? /*#__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))) : null, r !== null && r !== void 0 && (_r2 = r["".concat(_this.id, "_bsExchangeReturnGoods")]) !== null && _r2 !== void 0 && _r2.length ? /*#__PURE__*/React.createElement("div", null, "\u9000\u56DE\u5546\u54C1\uFF1A", /*#__PURE__*/React.createElement(BsGoodsTable, {
72
72
  list: (r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsExchangeReturnGoods")]) || [],
73
73
  showHeader: ((_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.showHeader) || []
74
- })), /*#__PURE__*/React.createElement("div", null, "\u6362\u51FA\u5546\u54C1\uFF1A", /*#__PURE__*/React.createElement(BsGoodsTable, {
74
+ })) : null, r !== null && r !== void 0 && (_r3 = r["".concat(_this.id, "_bsExchangeSwapOutGoods")]) !== null && _r3 !== void 0 && _r3.length ? /*#__PURE__*/React.createElement("div", null, "\u6362\u51FA\u5546\u54C1\uFF1A", /*#__PURE__*/React.createElement(BsGoodsTable, {
75
75
  list: (r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsExchangeSwapOutGoods")]) || [],
76
76
  showHeader: ((_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.showHeader) || []
77
- })), 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, {
77
+ })) : null, r !== null && r !== void 0 && (_r4 = r["".concat(_this.id, "_bsExchangeGiftGoods")]) !== null && _r4 !== void 0 && _r4.length ? /*#__PURE__*/React.createElement("div", null, "\u8D60\u54C1\uFF1A", /*#__PURE__*/React.createElement(BsGoodsTable, {
78
78
  list: (r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsExchangeGiftGoods")]) || [],
79
79
  showHeader: ((_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.showHeader) || []
80
- })) : null);
80
+ })) : null, r !== null && r !== void 0 && r["".concat(_this.id, "_shopCode")] ? /*#__PURE__*/React.createElement("div", null, "\u5E97\u94FAid:", r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_shopCode")]) : null);
81
81
  });
82
82
  _defineProperty(this, "getComponentValue", function (r) {
83
83
  return {
package/dist/esm/components/BS/BsReissue/index.js CHANGED
@@ -50,11 +50,11 @@ var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
50
50
  return null;
51
51
  });
52
52
  _defineProperty(this, "renderLog", function (r) {
53
- var _this$componentConfig2;
54
- 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, {
53
+ var _r, _r2, _this$componentConfig2;
54
+ return /*#__PURE__*/React.createElement(React.Fragment, null, r !== null && r !== void 0 && (_r = r["".concat(_this.id, "_bsReissueType")]) !== null && _r !== void 0 && _r.length ? /*#__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))) : null, r !== null && r !== void 0 && (_r2 = r["".concat(_this.id, "_bsReissueGoods")]) !== null && _r2 !== void 0 && _r2.length ? /*#__PURE__*/React.createElement("div", null, "\u8865\u53D1\u5546\u54C1\uFF1A", /*#__PURE__*/React.createElement(BsGoodsTable, {
55
55
  list: (r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsReissueGoods")]) || [],
56
56
  showHeader: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.showHeader) || []
57
- })));
57
+ })) : null, r !== null && r !== void 0 && r["".concat(_this.id, "_shopCode")] ? /*#__PURE__*/React.createElement("div", null, "\u5E97\u94FAid:", r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_shopCode")]) : null);
58
58
  });
59
59
  _defineProperty(this, "getComponentValue", function (r) {
60
60
  return {
package/dist/esm/components/BS/BsReturn/index.js CHANGED
@@ -50,11 +50,11 @@ var BsReturn = /*#__PURE__*/_createClass(function BsReturn(options) {
50
50
  return null;
51
51
  });
52
52
  _defineProperty(this, "renderLog", function (r) {
53
- var _this$componentConfig2;
54
- 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, {
53
+ var _r, _r2, _this$componentConfig2;
54
+ return /*#__PURE__*/React.createElement(React.Fragment, null, r !== null && r !== void 0 && (_r = r["".concat(_this.id, "_bsReturnType")]) !== null && _r !== void 0 && _r.length ? /*#__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))) : null, r !== null && r !== void 0 && (_r2 = r["".concat(_this.id, "_bsReturnGoods")]) !== null && _r2 !== void 0 && _r2.length ? /*#__PURE__*/React.createElement("div", null, "\u5546\u54C1\uFF1A", /*#__PURE__*/React.createElement(BsGoodsTable, {
55
55
  list: (r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsReturnGoods")]) || [],
56
56
  showHeader: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.showHeader) || []
57
- })));
57
+ })) : null, r !== null && r !== void 0 && r["".concat(_this.id, "_shopCode")] ? /*#__PURE__*/React.createElement("div", null, "\u5E97\u94FAid:", r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_shopCode")]) : null);
58
58
  });
59
59
  _defineProperty(this, "getComponentValue", function (r) {
60
60
  return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsReturnGoods")];
package/dist/esm/components/BS/BsSystemOrder/index.js CHANGED
@@ -21,13 +21,15 @@ var typeMap = {
21
21
  key: "bsSystemShowOrder",
22
22
  name: "bs",
23
23
  typeName: "单据类型",
24
- tagName: "标签"
24
+ tagName: "标签",
25
+ selectId: "bsSystemSelectIds"
25
26
  },
26
27
  WLN_SYSTEM_ORDER: {
27
28
  key: "wlnSystemShowOrder",
28
29
  name: "万里牛",
29
30
  typeName: "订单类型",
30
- tagName: "标记"
31
+ tagName: "标记",
32
+ selectId: "wlnSystemSelectIds"
31
33
  }
32
34
  };
33
35
  var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
@@ -63,7 +65,8 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
63
65
  if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[_this.type].key)])) return null;
64
66
  return /*#__PURE__*/React.createElement(BsSystemOrderTable, {
65
67
  value: {
66
- showOrderInfo: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[_this.type].key)]
68
+ showOrderInfo: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[_this.type].key)],
69
+ selectIds: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[_this.type].selectId)]
67
70
  },
68
71
  type: _this.type
69
72
  });
package/dist/esm/components/Common/index.js CHANGED
@@ -596,7 +596,12 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref13) {
596
596
  title: "标记"
597
597
  }];
598
598
  var rowSelection = {
599
- selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
599
+ selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || ((value === null || value === void 0 ? void 0 : value.showOrderInfo) || []).reduce(function (prv, next) {
600
+ if (next.select) {
601
+ prv.push(next.billNo);
602
+ }
603
+ return prv;
604
+ }, []),
600
605
  getCheckboxProps: function getCheckboxProps(record) {
601
606
  return {
602
607
  disabled: true,
package/dist/esm/factory.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  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, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonTradeId, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting } from "./index";
2
2
  import { PickOption } from "./type";
3
- export declare const factory: (type: string, options: PickOption) => BasicAddress | BsExchange | BsPosting | BsReissue | BsSystemOrder | BasicCascader | FlowCreator | FlowTag | BasicInput | ReceiverAddress | ERemark | Submitter | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | TradeId | ErpTradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | JstSendGood | JstSupply | BsGoods | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | PlatForm | ShopInput | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | CommonTradeId | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods;
3
+ export declare const factory: (type: string, options: PickOption) => FlowCreator | BasicInput | Submitter | 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 | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | PlatForm | ShopInput | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | CommonTradeId | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/services-components",
3
- "version": "0.13.0-alpha.14",
3
+ "version": "0.13.0-alpha.15",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -26,8 +26,8 @@
26
26
  "father": "^4.1.7"
27
27
  },
28
28
  "dependencies": {
29
- "@kmkf-fe-packages/basic-components": "^0.13.0-alpha.14",
30
- "@kmkf-fe-packages/kmkf-utils": "^0.13.0-alpha.14"
29
+ "@kmkf-fe-packages/basic-components": "^0.13.0-alpha.15",
30
+ "@kmkf-fe-packages/kmkf-utils": "^0.13.0-alpha.15"
31
31
  },
32
32
  "peerDependencies": {
33
33
  "@ant-design/icons": "^4.7.0",
@@ -40,5 +40,5 @@
40
40
  "gitHooks": {
41
41
  "pre-commit": "lint-staged"
42
42
  },
43
- "gitHead": "0a4ffe495f1eee8acdebecec2b63ee246991300e"
43
+ "gitHead": "2368727b3d40c62b438cb4946eb5e8ec00769d8e"
44
44
  }