@kmkf-fe-packages/services-components 1.22.1-beta.0 → 1.22.1-beta.11

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 (11) hide show
  1. package/dist/esm/components/BS/BsGoods/index.js +5 -1
  2. package/dist/esm/components/BS/BsSystemOrder/index.js +1 -1
  3. package/dist/esm/components/BS/common/BsHeaderGood.js +15 -1
  4. package/dist/esm/components/Common/index.js +83 -2
  5. package/dist/esm/components/CommonMultiStatus/index.d.ts +1 -0
  6. package/dist/esm/components/CommonMultiStatus/index.js +43 -14
  7. package/dist/esm/components/JST/JstLogistics/index.js +3 -3
  8. package/dist/esm/components/Radio/index.js +3 -2
  9. package/dist/esm/factory.d.ts +1 -1
  10. package/dist/esm/factory.js +1 -0
  11. package/package.json +6 -6
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/BsSystemOrder/index.js CHANGED
@@ -19,7 +19,7 @@ import { SYMBOL, batchInput } from "../../../constant";
19
19
  var typeMap = {
20
20
  BS_SYSTEM_ORDER: {
21
21
  key: 'bsSystemShowOrder',
22
- name: 'bs',
22
+ name: '百胜',
23
23
  selectId: 'bsSystemSelectIds',
24
24
  columns: [{
25
25
  title: "单据类型",
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
@@ -259,7 +259,7 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
259
259
  type = _ref6.type,
260
260
  _ref6$platformType = _ref6.platformType,
261
261
  platformType = _ref6$platformType === void 0 ? 'default' : _ref6$platformType;
262
- var getSendName = function getSendName(item, platformType) {
262
+ var getSendName = function getSendName(item) {
263
263
  return SendDataCenter.getInstance(platformType).getSendNameByCode(item.sendName);
264
264
  };
265
265
  return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
@@ -280,7 +280,7 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
280
280
  text: item.logisticsCode
281
281
  })) : company ? company : item.logisticsCode ? /*#__PURE__*/React.createElement(CopyText, {
282
282
  text: item.logisticsCode
283
- }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyName && item.supplyId ? [item.supplyId, item.supplyName].join('/') : item.supplyId ? item.supplyId : item.supplyName) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendId, getSendName(item, 'platformType')].join("/") : item.sendId ? item.sendId : getSendName(item, 'platformType')) : null, type === 4 ? /*#__PURE__*/React.createElement("span", null, (item === null || item === void 0 ? void 0 : item.deliveryNo) || '') : null));
283
+ }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyName && item.supplyId ? [item.supplyId, item.supplyName].join('/') : item.supplyId ? item.supplyId : item.supplyName) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendId, getSendName(item)].join("/") : item.sendId ? item.sendId : getSendName(item)) : null, type === 4 ? /*#__PURE__*/React.createElement("span", null, (item === null || item === void 0 ? void 0 : item.deliveryNo) || '') : null));
284
284
  }) : null;
285
285
  };
286
286
  export var BsExpressRender = function BsExpressRender(_ref7) {
@@ -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.d.ts CHANGED
@@ -13,6 +13,7 @@ declare class CommonMultiStatus implements ComponentInterface {
13
13
  canSort: boolean;
14
14
  children: ComponentInterface[];
15
15
  dataType: ComponentInterface['dataType'];
16
+ isSingleValue: boolean;
16
17
  constructor(options: PickOption);
17
18
  renderClient: (record: any) => React.JSX.Element | null;
18
19
  renderPc: (value: any, record: Record) => React.JSX.Element;
package/dist/esm/components/CommonMultiStatus/index.js CHANGED
@@ -74,13 +74,40 @@ 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) {
80
106
  var _this = this,
81
107
  _typeMap$options$type,
82
108
  _typeMap$options$type2,
83
- _this$componentConfig8;
109
+ _this$componentConfig5,
110
+ _this$componentConfig6;
84
111
  _classCallCheck(this, CommonMultiStatus);
85
112
  _defineProperty(this, "name", void 0);
86
113
  _defineProperty(this, "id", void 0);
@@ -94,8 +121,9 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
94
121
  _defineProperty(this, "canSort", void 0);
95
122
  _defineProperty(this, "children", void 0);
96
123
  _defineProperty(this, "dataType", void 0);
124
+ _defineProperty(this, "isSingleValue", void 0);
97
125
  _defineProperty(this, "renderClient", function (record) {
98
- var _typeMap$_this$type, _typeMap$_this$type2, _typeMap$_this$type3, _this$componentConfig;
126
+ var _typeMap$_this$type, _typeMap$_this$type2, _typeMap$_this$type3;
99
127
  var isShow = Array.isArray(record === null || record === void 0 ? void 0 : record[_this.id]) ? some(record === null || record === void 0 ? void 0 : record[_this.id], function (item) {
100
128
  return !isNull(item);
101
129
  }) : false;
@@ -107,12 +135,12 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
107
135
  valueKey: (_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.valueKey,
108
136
  failValue: (_typeMap$_this$type2 = typeMap[_this.type]) === null || _typeMap$_this$type2 === void 0 ? void 0 : _typeMap$_this$type2.failValue,
109
137
  options: (_typeMap$_this$type3 = typeMap[_this.type]) === null || _typeMap$_this$type3 === void 0 ? void 0 : _typeMap$_this$type3.options,
110
- isShowPopover: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.belongType) !== "wdt"
138
+ isShowPopover: !_this.isSingleValue
111
139
  })
112
140
  }) : null;
113
141
  });
114
142
  _defineProperty(this, "renderPc", function (value, record) {
115
- var _typeMap$_this$type4, _typeMap$_this$type5, _typeMap$_this$type6, _typeMap$_this$type7, _this$componentConfig2;
143
+ var _typeMap$_this$type4, _typeMap$_this$type5, _typeMap$_this$type6, _typeMap$_this$type7;
116
144
  var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type4 = typeMap[_this.type]) === null || _typeMap$_this$type4 === void 0 ? void 0 : _typeMap$_this$type4.key)];
117
145
  //兼容多个商品
118
146
  return /*#__PURE__*/React.createElement("span", {
@@ -124,7 +152,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
124
152
  valueKey: (_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.valueKey,
125
153
  failValue: (_typeMap$_this$type6 = typeMap[_this.type]) === null || _typeMap$_this$type6 === void 0 ? void 0 : _typeMap$_this$type6.failValue,
126
154
  options: (_typeMap$_this$type7 = typeMap[_this.type]) === null || _typeMap$_this$type7 === void 0 ? void 0 : _typeMap$_this$type7.options,
127
- isShowPopover: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.belongType) !== "wdt"
155
+ isShowPopover: !_this.isSingleValue
128
156
  }));
129
157
  });
130
158
  _defineProperty(this, "renderLog", function (r) {
@@ -141,12 +169,12 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
141
169
  var _typeMap$_this$type10;
142
170
  var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type10 = typeMap[_this.type]) === null || _typeMap$_this$type10 === void 0 ? void 0 : _typeMap$_this$type10.key)];
143
171
  return (list || []).map(function (item) {
144
- var _typeMap$_this$type11, _typeMap$_this$type12, _typeMap$_this$type13, _this$componentConfig3, _typeMap$_this$type16, _typeMap$_this$type17;
172
+ var _typeMap$_this$type11, _typeMap$_this$type12, _typeMap$_this$type13, _typeMap$_this$type16, _typeMap$_this$type17;
145
173
  var currentOption = (_typeMap$_this$type11 = typeMap[_this.type]) === null || _typeMap$_this$type11 === void 0 ? void 0 : (_typeMap$_this$type12 = _typeMap$_this$type11.options) === null || _typeMap$_this$type12 === void 0 ? void 0 : (_typeMap$_this$type13 = _typeMap$_this$type12.find) === null || _typeMap$_this$type13 === void 0 ? void 0 : _typeMap$_this$type13.call(_typeMap$_this$type12, function (option) {
146
174
  var _typeMap$_this$type14;
147
175
  return item[(_typeMap$_this$type14 = typeMap[_this.type]) === null || _typeMap$_this$type14 === void 0 ? void 0 : _typeMap$_this$type14.valueKey] === option.value;
148
176
  });
149
- if (((_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.belongType) === "wdt") {
177
+ if (_this.isSingleValue) {
150
178
  var _typeMap$_this$type15;
151
179
  return currentOption ? (currentOption === null || currentOption === void 0 ? void 0 : currentOption.label) || '' : (item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type15 = typeMap[_this.type]) === null || _typeMap$_this$type15 === void 0 ? void 0 : _typeMap$_this$type15.valueKey]) || '';
152
180
  }
@@ -154,15 +182,15 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
154
182
  }).join(',');
155
183
  });
156
184
  _defineProperty(this, "editRender", function (p) {
157
- var _this$componentConfig4, _this$componentConfig5, _this$componentConfig6, _this$componentConfig7, _typeMap$_this$type18;
185
+ var _this$componentConfig, _this$componentConfig2, _this$componentConfig3, _this$componentConfig4, _typeMap$_this$type18;
158
186
  return /*#__PURE__*/React.createElement(GetFormItem, {
159
187
  title: _this.name,
160
188
  name: _this.id,
161
189
  rules: _this.rules,
162
190
  hidden: p === null || p === void 0 ? void 0 : p.hidden,
163
191
  display: p === null || p === void 0 ? void 0 : p.display,
164
- required: (_this$componentConfig4 = (_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.required) !== null && _this$componentConfig4 !== void 0 ? _this$componentConfig4 : false,
165
- tooltip: (_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.showTooltip ? (_this$componentConfig7 = _this.componentConfig) === null || _this$componentConfig7 === void 0 ? void 0 : _this$componentConfig7.tooltip : '',
192
+ 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,
193
+ 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 : '',
166
194
  component: /*#__PURE__*/React.createElement(Status, _extends({}, _this.componentConfig, {
167
195
  type: (_typeMap$_this$type18 = typeMap[_this.type]) === null || _typeMap$_this$type18 === void 0 ? void 0 : _typeMap$_this$type18.type,
168
196
  failValue: typeMap[_this.type].failValue
@@ -172,11 +200,11 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
172
200
  _defineProperty(this, "filterConfig", function (item) {
173
201
  var _typeMap$_this$type19, _item$templateConfig;
174
202
  return {
175
- searchDefaultConditions: _this.type === 'WAREHOUSING_STATUS' ? SYMBOL.in : SYMBOL.like,
203
+ searchDefaultConditions: ['BS_E3_WAREHOUSING_STATUS', 'WAREHOUSING_STATUS'].includes(_this.type) ? SYMBOL.in : SYMBOL.like,
176
204
  type: item.type,
177
205
  id: "".concat(item.id, "_").concat((_typeMap$_this$type19 = typeMap[_this.type]) === null || _typeMap$_this$type19 === void 0 ? void 0 : _typeMap$_this$type19.code),
178
206
  name: "".concat(_this.name),
179
- filterComponentType: _this.type === 'WAREHOUSING_STATUS' ? 'MultipleSelect' : 'SelectInput',
207
+ filterComponentType: ['BS_E3_WAREHOUSING_STATUS', 'WAREHOUSING_STATUS'].includes(_this.type) ? 'MultipleSelect' : 'SelectInput',
180
208
  props: {
181
209
  options: item === null || item === void 0 ? void 0 : (_item$templateConfig = item.templateConfig) === null || _item$templateConfig === void 0 ? void 0 : _item$templateConfig.reasonList,
182
210
  fieldNames: {
@@ -190,7 +218,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
190
218
  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
219
  };
192
220
  },
193
- formatFilterValue: _this.type === 'WAREHOUSING_STATUS' ? null : function (value) {
221
+ formatFilterValue: ['BS_E3_WAREHOUSING_STATUS', 'WAREHOUSING_STATUS'].includes(_this.type) ? null : function (value) {
194
222
  if (value.type === 'keywords') {
195
223
  return value.keywords;
196
224
  } else {
@@ -211,7 +239,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
211
239
  this.canSort = false;
212
240
  this.children = [];
213
241
  this.dataType = 'object';
214
- this.rules = (_this$componentConfig8 = this.componentConfig) !== null && _this$componentConfig8 !== void 0 && _this$componentConfig8.required ? [{
242
+ this.rules = (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
215
243
  required: true,
216
244
  validator: function validator(_, value) {
217
245
  var hasNo = (value || []).some(function (item) {
@@ -226,5 +254,6 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
226
254
  }
227
255
  }] : [];
228
256
  this.align = 'left';
257
+ this.isSingleValue = ((_this$componentConfig6 = this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.belongType) === "wdt" || this.type === 'BS_E3_WAREHOUSING_STATUS';
229
258
  });
230
259
  export default CommonMultiStatus;
package/dist/esm/components/JST/JstLogistics/index.js CHANGED
@@ -57,12 +57,12 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
57
57
  name: "物流公司",
58
58
  key: "".concat(options.id, "_").concat((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.company),
59
59
  options: _this.expressDateInstance.getExpressData(),
60
- dataType: "string",
60
+ dataType: "arrayObject",
61
61
  disabled: type === "logisticsCode"
62
62
  }, {
63
63
  name: "物流单号",
64
64
  key: "".concat(options.id, "_").concat((_typeMap$options$type2 = typeMap[options.type]) === null || _typeMap$options$type2 === void 0 ? void 0 : _typeMap$options$type2.code),
65
- dataType: "string",
65
+ dataType: "arrayObject",
66
66
  disabled: type === "logisticsCompany"
67
67
  }];
68
68
  });
@@ -121,7 +121,7 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
121
121
  hidden: p === null || p === void 0 ? void 0 : p.hidden,
122
122
  display: p === null || p === void 0 ? void 0 : p.display,
123
123
  required: (_this$componentConfig3 = (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.required) !== null && _this$componentConfig3 !== void 0 ? _this$componentConfig3 : false,
124
- tooltip: (_this$componentConfig5 = _this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.showTooltip ? (_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.tooltip : '',
124
+ tooltip: (_this$componentConfig5 = _this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.showTooltip ? (_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.tooltip : "",
125
125
  component: /*#__PURE__*/React.createElement(JstGoods, _extends({}, _this.componentConfig, {
126
126
  type: 1,
127
127
  options: _this.expressDateInstance.getExpressData(),
package/dist/esm/components/Radio/index.js CHANGED
@@ -61,7 +61,8 @@ var BasicRadio = /*#__PURE__*/_createClass(function BasicRadio(options) {
61
61
  if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]) === undefined) {
62
62
  return "--";
63
63
  }
64
- return "".concat(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])], " ").concat(get(record, "".concat(_this.id, "_").concat(typeMap[type], "Other"), ""));
64
+ var other = get(record, "".concat(_this.id, "_").concat(typeMap[type], "Other"), "");
65
+ return "".concat(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]).concat(other ? " " + other : "");
65
66
  });
66
67
  _defineProperty(this, "getKeyByComponentType", function (type) {
67
68
  return typeMap[type] || "";
@@ -82,7 +83,7 @@ var BasicRadio = /*#__PURE__*/_createClass(function BasicRadio(options) {
82
83
  hidden: p === null || p === void 0 ? void 0 : p.hidden,
83
84
  display: p === null || p === void 0 ? void 0 : p.display,
84
85
  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,
85
- 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 : '',
86
+ 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 : "",
86
87
  component: /*#__PURE__*/React.createElement(ApaasRadio, _extends({}, _this.componentConfig, {
87
88
  onChange: p === null || p === void 0 ? void 0 : p.onChange
88
89
  }))
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 | JstSendGood | MsgStatus | BasicPicture | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | 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 | JstLogistics | 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 | BsSystemOrder | CommonMultiStatus | 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 | 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,16 +1,16 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/services-components",
3
- "version": "1.22.1-beta.0",
3
+ "version": "1.22.1-beta.11",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
7
7
  "dist"
8
8
  ],
9
9
  "scripts": {
10
- "sync": "yarn build && yalc push",
11
10
  "build": "yarn run lint && father build",
12
11
  "lint": "eslint '**/*.{ts,tsx}'",
13
- "lint:fix": "eslint --fix '**/*.{ts,tsx}'"
12
+ "lint:fix": "eslint --fix '**/*.{ts,tsx}'",
13
+ "sync": "yarn build && yalc push"
14
14
  },
15
15
  "lint-staged": {
16
16
  "*.{js,jsx,less,md,json}": [
@@ -21,8 +21,8 @@
21
21
  ]
22
22
  },
23
23
  "dependencies": {
24
- "@kmkf-fe-packages/basic-components": "1.22.1-beta.0",
25
- "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.0",
24
+ "@kmkf-fe-packages/basic-components": "1.22.1-beta.11",
25
+ "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.10",
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": "0fe6eb2f00f1a864386cb87e5a1494cb6564fcae",
44
+ "gitHead": "6b9f366cb76af0cd000e4308e8da01d789b38981",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }