@kmkf-fe-packages/services-components 1.22.1-beta.8 → 1.22.1-beta.9

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 (7) hide show
  1. package/dist/esm/components/BS/BsGoods/index.js +5 -1
  2. package/dist/esm/components/BS/common/BsHeaderGood.js +15 -1
  3. package/dist/esm/components/Common/index.js +81 -0
  4. package/dist/esm/components/CommonMultiStatus/index.js +29 -3
  5. package/dist/esm/factory.d.ts +1 -1
  6. package/dist/esm/factory.js +1 -0
  7. package/package.json +4 -4
package/dist/esm/components/BS/BsGoods/index.js CHANGED
@@ -39,6 +39,7 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
39
39
  id: _this.id,
40
40
  label: _this.name,
41
41
  value: /*#__PURE__*/React.createElement(BsGoodsTable, {
42
+ type: _this.type,
42
43
  list: (record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id)]) === null || _record === void 0 ? void 0 : _record.bsGoods) || [],
43
44
  showHeader: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.showHeader) || []
44
45
  })
@@ -51,6 +52,7 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
51
52
  var _this$componentConfig2;
52
53
  if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsGoods")])) return null;
53
54
  return /*#__PURE__*/React.createElement(BsGoodsTable, {
55
+ type: _this.type,
54
56
  list: (r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_bsGoods")]) || [],
55
57
  showHeader: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.showHeader) || []
56
58
  });
@@ -71,7 +73,9 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
71
73
  hidden: p === null || p === void 0 ? void 0 : p.hidden,
72
74
  display: p === null || p === void 0 ? void 0 : p.display,
73
75
  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 : '',
74
- component: /*#__PURE__*/React.createElement(Goods, _extends({}, _this.componentConfig, {
76
+ component: /*#__PURE__*/React.createElement(Goods, _extends({
77
+ type: _this.type
78
+ }, _this.componentConfig, {
75
79
  maxLength: ((_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.maxLength) || 20,
76
80
  shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
77
81
  shopList: ((_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList) || [],
package/dist/esm/components/BS/common/BsHeaderGood.js CHANGED
@@ -123,6 +123,18 @@ var HeaderMap = {
123
123
  name: "SKU 信息",
124
124
  key: "propertiesName",
125
125
  width: 140
126
+ },
127
+ batch: {
128
+ component: BsHeaderChild,
129
+ name: "批次号",
130
+ key: "batch",
131
+ width: 140
132
+ },
133
+ expireDate: {
134
+ component: BsHeaderChild,
135
+ name: "有效期",
136
+ key: "expireDate",
137
+ width: 140
126
138
  }
127
139
 
128
140
  // title: '商品名称',
@@ -220,7 +232,9 @@ var BsHeaderGods = /*#__PURE__*/_createClass(function BsHeaderGods(options) {
220
232
  money: "实付金额",
221
233
  number: "数量",
222
234
  share: "分摊价",
223
- type: "赠品类型"
235
+ type: "赠品类型",
236
+ batch: "批次号",
237
+ expireDate: "有效期"
224
238
  };
225
239
  this.children = _toConsumableArray(Object.keys(HeaderMap).reduce(function (prv, key) {
226
240
  var _options$componentCon, _options$componentCon2;
package/dist/esm/components/Common/index.js CHANGED
@@ -900,6 +900,87 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
900
900
  }];
901
901
  }
902
902
  break;
903
+ case 'BS_GOODS':
904
+ columns = [{
905
+ dataIndex: 'mark',
906
+ title: "\u5546\u54C1\u6807\u8BB0",
907
+ align: 'center',
908
+ ellipsis: true,
909
+ width: 100
910
+ }, {
911
+ dataIndex: 'skuName',
912
+ title: "".concat(text, "sku\u540D\u79F0"),
913
+ align: 'center',
914
+ ellipsis: true,
915
+ width: 200
916
+ }, {
917
+ dataIndex: 'sku',
918
+ title: "".concat(text, "sku\u7F16\u7801"),
919
+ align: 'center',
920
+ ellipsis: true,
921
+ width: 100
922
+ }, {
923
+ dataIndex: 'name',
924
+ title: "".concat(text, "\u540D\u79F0"),
925
+ align: 'center',
926
+ ellipsis: true,
927
+ width: 200
928
+ }, {
929
+ dataIndex: 'pic',
930
+ title: "\u56FE\u7247",
931
+ align: 'center',
932
+ ellipsis: true,
933
+ width: 100,
934
+ render: function render(val) {
935
+ return /*#__PURE__*/React.createElement(Image, {
936
+ width: 60,
937
+ src: val
938
+ });
939
+ }
940
+ }, {
941
+ dataIndex: 'code',
942
+ title: "".concat(text, "\u7F16\u7801"),
943
+ align: 'center',
944
+ ellipsis: true,
945
+ width: 100
946
+ }, {
947
+ dataIndex: 'money',
948
+ title: "\u5B9E\u4ED8\u91D1\u989D",
949
+ align: 'center',
950
+ ellipsis: true,
951
+ width: 100
952
+ }, {
953
+ dataIndex: 'number',
954
+ title: "".concat(text, "\u6570\u91CF"),
955
+ align: 'center',
956
+ ellipsis: true,
957
+ width: 100
958
+ }, {
959
+ dataIndex: 'share',
960
+ title: "\u5206\u644A\u4EF7",
961
+ align: 'center',
962
+ ellipsis: true,
963
+ width: 70
964
+ }, {
965
+ dataIndex: 'type',
966
+ title: "\u8D60\u54C1\u7C7B\u578B",
967
+ align: 'center',
968
+ ellipsis: true,
969
+ width: 100
970
+ }, {
971
+ dataIndex: 'batch',
972
+ title: "\u6279\u6B21\u53F7",
973
+ align: 'center',
974
+ ellipsis: true,
975
+ width: 100
976
+ }, {
977
+ dataIndex: 'expireDate',
978
+ title: "\u6709\u6548\u671F",
979
+ align: 'center',
980
+ ellipsis: true,
981
+ width: 100
982
+ }];
983
+ break;
903
984
  default:
904
985
  columns = [{
905
986
  dataIndex: 'mark',
package/dist/esm/components/CommonMultiStatus/index.js CHANGED
@@ -74,6 +74,32 @@ var typeMap = {
74
74
  valueKey: 'status',
75
75
  idKey: 'systemOrderId',
76
76
  failValue: '失败'
77
+ },
78
+ BS_E3_WAREHOUSING_STATUS: {
79
+ options: [{
80
+ value: '2',
81
+ label: '已入库',
82
+ color: '#52c41a'
83
+ }, {
84
+ value: '1',
85
+ label: '部分入库',
86
+ color: '#e7780f'
87
+ }, {
88
+ value: '0',
89
+ label: '未入库',
90
+ color: '#ff4d4f'
91
+ }, {
92
+ value: '3',
93
+ label: '已退回给客户',
94
+ color: '#1B5BF3'
95
+ }],
96
+ key: 'bsE3InStockStatusItemList',
97
+ code: 'bsE3InStockStatusList',
98
+ name: '商品入库状态',
99
+ type: 2,
100
+ valueKey: 'status',
101
+ idKey: 'systemOrderId',
102
+ failValue: '失败'
77
103
  }
78
104
  };
79
105
  var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(options) {
@@ -172,11 +198,11 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
172
198
  _defineProperty(this, "filterConfig", function (item) {
173
199
  var _typeMap$_this$type19, _item$templateConfig;
174
200
  return {
175
- searchDefaultConditions: _this.type === 'WAREHOUSING_STATUS' ? SYMBOL.in : SYMBOL.like,
201
+ searchDefaultConditions: ['BS_E3_WAREHOUSING_STATUS', 'WAREHOUSING_STATUS'].includes(_this.type) ? SYMBOL.in : SYMBOL.like,
176
202
  type: item.type,
177
203
  id: "".concat(item.id, "_").concat((_typeMap$_this$type19 = typeMap[_this.type]) === null || _typeMap$_this$type19 === void 0 ? void 0 : _typeMap$_this$type19.code),
178
204
  name: "".concat(_this.name),
179
- filterComponentType: _this.type === 'WAREHOUSING_STATUS' ? 'MultipleSelect' : 'SelectInput',
205
+ filterComponentType: ['BS_E3_WAREHOUSING_STATUS', 'WAREHOUSING_STATUS'].includes(_this.type) ? 'MultipleSelect' : 'SelectInput',
180
206
  props: {
181
207
  options: item === null || item === void 0 ? void 0 : (_item$templateConfig = item.templateConfig) === null || _item$templateConfig === void 0 ? void 0 : _item$templateConfig.reasonList,
182
208
  fieldNames: {
@@ -190,7 +216,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
190
216
  return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type20 = typeMap[_this.type]) === null || _typeMap$_this$type20 === void 0 ? void 0 : _typeMap$_this$type20.code), value);
191
217
  };
192
218
  },
193
- formatFilterValue: _this.type === 'WAREHOUSING_STATUS' ? null : function (value) {
219
+ formatFilterValue: ['BS_E3_WAREHOUSING_STATUS', 'WAREHOUSING_STATUS'].includes(_this.type) ? null : function (value) {
194
220
  if (value.type === 'keywords') {
195
221
  return value.keywords;
196
222
  } else {
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, 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, AfterSalesOrderId, BsE3Goods, BsE3Reissue } from "./index";
2
2
  import { PickOption } from "./type";
3
- export declare const factory: (type: string, options: PickOption) => BsSystemOrder | JstLogistics | JstSendGood | MsgStatus | BasicRadio | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | 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 | JstItemSelect | JstSupply | BsGoods | BsE3Goods | 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 | AfterSalesOrderId;
3
+ export declare const factory: (type: string, options: PickOption) => BsGoods | CommonMultiStatus | ItemEnCode | BasicInput | JstLogistics | MsgStatus | BasicPicture | BasicRadio | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicTextArea | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstItemSelect | JstSendGood | JstSupply | BsSystemOrder | BsE3Goods | 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 | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | Label | AfterSalesOrderId;
package/dist/esm/factory.js CHANGED
@@ -187,6 +187,7 @@ export var factory = function factory(type, options) {
187
187
  case "RETURN_GOODS_STATUS":
188
188
  case "EXCHANGE_STATUS":
189
189
  case "WAREHOUSING_STATUS":
190
+ case "BS_E3_WAREHOUSING_STATUS":
190
191
  return new CommonMultiStatus(options);
191
192
  case "MSG_STATUS":
192
193
  return new MsgStatus(options);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/services-components",
3
- "version": "1.22.1-beta.8",
3
+ "version": "1.22.1-beta.9",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -21,8 +21,8 @@
21
21
  ]
22
22
  },
23
23
  "dependencies": {
24
- "@kmkf-fe-packages/basic-components": "1.22.1-beta.7",
25
- "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.6",
24
+ "@kmkf-fe-packages/basic-components": "1.22.1-beta.9",
25
+ "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.9",
26
26
  "b64-to-blob": "^1.2.19",
27
27
  "html2canvas": "^1.4.1",
28
28
  "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
41
41
  "publishConfig": {
42
42
  "access": "public"
43
43
  },
44
- "gitHead": "9483da30b158b62a596ae225c970415bdc37865c",
44
+ "gitHead": "13dd10e5c480bf8bc57087360c4606d7fdf7fde8",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }