@kmkf-fe-packages/services-components 2.10.3 → 2.10.5

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 (31) hide show
  1. package/dist/esm/Hooks/useColumnsConfig.d.ts +1 -1
  2. package/dist/esm/Hooks/useGoodsSourceFormat.js +5 -9
  3. package/dist/esm/commonComponents/GlobalContext/hook/dist/useGetHasErpData.js +49 -0
  4. package/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.js +0 -1
  5. package/dist/esm/commonComponents/GlobalContext/index.js +1 -3
  6. package/dist/esm/commonComponents/GlobalContext/orderQuery/dist/useGetErpAddressData.js +180 -0
  7. package/dist/esm/commonComponents/GlobalContext/orderQuery/dist/useGetErpLogisticsCompany.js +186 -0
  8. package/dist/esm/commonComponents/OperationLog/index.js +0 -2
  9. package/dist/esm/components/BS/BsGoods/dist/index.js +110 -0
  10. package/dist/esm/components/BS/BsGoods/index.js +0 -1
  11. package/dist/esm/components/Common/dist/index.js +1017 -0
  12. package/dist/esm/components/Common/index.d.ts +1 -1
  13. package/dist/esm/components/Common/index.js +28 -11
  14. package/dist/esm/components/CommonMultiStatus/index.js +31 -4
  15. package/dist/esm/components/CommonSystemOrder/index.js +2 -2
  16. package/dist/esm/components/ErpTradeId/components/OrderNum/communication.js +0 -2
  17. package/dist/esm/components/MsgStatus/index.js +1 -0
  18. package/dist/esm/components/PicturePro/PictureName.js +1 -3
  19. package/dist/esm/components/PicturePro/index.js +1 -3
  20. package/dist/esm/components/PostIng/index.d.ts +1 -1
  21. package/dist/esm/components/Public/AsyncSelect/index.js +4 -7
  22. package/dist/esm/components/Public/Exchange/index.js +10 -23
  23. package/dist/esm/components/Public/ReissueGoods/index.js +2 -2
  24. package/dist/esm/components/Public/SystemOrderType/index.js +2 -2
  25. package/dist/esm/components/ReceiverAddress/index.js +2 -3
  26. package/dist/esm/components/Select/index.js +0 -1
  27. package/dist/esm/factory.d.ts +1 -1
  28. package/dist/esm/factory.js +2 -2
  29. package/dist/esm/service/api.js +10 -16
  30. package/dist/esm/service/request.js +1 -4
  31. package/package.json +4 -4
@@ -41,7 +41,7 @@ export declare const BsGoodsTable: ({ list, showHeader, text, type, }: {
41
41
  export declare const FileRender: ({ fileList, canDownload }: any) => React.JSX.Element;
42
42
  export declare const KmVideoRender: ({ fileList, canDownload }: any) => React.JSX.Element;
43
43
  export declare const BsSystemOrderTable: ({ value, type, showHeader }: any) => React.JSX.Element;
44
- export declare const MsgContent: ({ horizontal, list, valueKey, failValue, options, }: any) => React.JSX.Element;
44
+ export declare const MsgContent: ({ horizontal, list, valueKey, failValue, options, hasMoreBtn, }: any) => React.JSX.Element;
45
45
  export declare const AlipayBill: (props: any) => React.JSX.Element;
46
46
  export declare const RenderPicturePro: (props: any) => React.JSX.Element;
47
47
  export {};
@@ -337,15 +337,15 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
337
337
  idKey = _ref8.idKey;
338
338
  var getContentData = function getContentData(item, index) {
339
339
  if (item.platformId) return {
340
- text: "平台售后单号",
340
+ text: item.hiddenPrefix ? undefined : "平台售后单号",
341
341
  id: item.platformId
342
342
  };
343
343
  if (item.returnLogisticsCode) return {
344
- text: "物流单号",
344
+ text: item.hiddenPrefix ? undefined : "物流单号",
345
345
  id: item.returnLogisticsCode
346
346
  };
347
347
  return {
348
- text: "\u7CFB\u7EDF\u8BA2\u5355\u53F7".concat(index + 1),
348
+ text: item.hiddenPrefix ? undefined : "\u7CFB\u7EDF\u8BA2\u5355\u53F7".concat(index + 1),
349
349
  id: item.systemOrderId || item.systemOrderNo || (item === null || item === void 0 ? void 0 : item[idKey])
350
350
  };
351
351
  };
@@ -355,7 +355,7 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
355
355
  style: {
356
356
  textAlign: "center"
357
357
  }
358
- }, contentData.text, "\uFF1A", contentData.id));
358
+ }, contentData.text ? "".concat(contentData.text, "\uFF1A") : "", contentData.id));
359
359
  };
360
360
  return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
361
361
  var _options$find;
@@ -377,7 +377,7 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
377
377
  var currentOption = options.find(function (option) {
378
378
  return item[valueKey] === option.value;
379
379
  });
380
- return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, isShowPopover ? /*#__PURE__*/React.createElement(Popover, {
380
+ return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, isShowPopover && getContentData(item, index).text ? /*#__PURE__*/React.createElement(Popover, {
381
381
  content: orderContent(item, index),
382
382
  overlayStyle: {
383
383
  zIndex: 1080
@@ -769,7 +769,7 @@ export var KmVideoRender = function KmVideoRender(_ref13) {
769
769
  src: fileUrl
770
770
  })));
771
771
  };
772
- var RADIO_TABLE_KEYS = ['PLATFORM_AFTER_SALES_ORDER'];
772
+ var RADIO_TABLE_KEYS = ["PLATFORM_AFTER_SALES_ORDER"];
773
773
  export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
774
774
  var value = _ref14.value,
775
775
  type = _ref14.type,
@@ -803,7 +803,7 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
803
803
  PLATFORM_AFTER_SALES_ORDER: "afterSaleOrderId"
804
804
  };
805
805
  var rowSelection = {
806
- type: isRadio ? 'radio' : 'checkbox',
806
+ type: isRadio ? "radio" : "checkbox",
807
807
  selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || ((value === null || value === void 0 ? void 0 : value.showOrderInfo) || []).reduce(function (prv, next) {
808
808
  if (next.select) {
809
809
  prv.push(next[rowKeyMap[type]] || "billNo");
@@ -852,7 +852,9 @@ export var MsgContent = function MsgContent(_ref15) {
852
852
  valueKey = _ref15.valueKey,
853
853
  failValue = _ref15.failValue,
854
854
  _ref15$options = _ref15.options,
855
- options = _ref15$options === void 0 ? [] : _ref15$options;
855
+ options = _ref15$options === void 0 ? [] : _ref15$options,
856
+ _ref15$hasMoreBtn = _ref15.hasMoreBtn,
857
+ hasMoreBtn = _ref15$hasMoreBtn === void 0 ? false : _ref15$hasMoreBtn;
856
858
  var getColorByStatus = function getColorByStatus(value) {
857
859
  var _options$find2;
858
860
  return ((_options$find2 = options.find(function (innerItem) {
@@ -878,9 +880,7 @@ export var MsgContent = function MsgContent(_ref15) {
878
880
  }
879
881
  }, "\u5931\u8D25\u539F\u56E0\uFF1A", item.failReason)));
880
882
  };
881
- return /*#__PURE__*/React.createElement(Space, {
882
- direction: !horizontal ? "vertical" : "horizontal"
883
- }, Array.isArray(list) ? (list || []).map(function (item, index) {
883
+ var renderMsgItem = function renderMsgItem(item, index) {
884
884
  var _item$msgReceivers2;
885
885
  var color = getColorByStatus(item[valueKey]);
886
886
  var currentOption = options.find(function (option) {
@@ -904,6 +904,23 @@ export var MsgContent = function MsgContent(_ref15) {
904
904
  zIndex: 9999
905
905
  }
906
906
  }, formatMsgContent) : formatMsgContent);
907
+ };
908
+ return /*#__PURE__*/React.createElement(Space, {
909
+ direction: !horizontal ? "vertical" : "horizontal"
910
+ }, Array.isArray(list) && list.length > 0 ? hasMoreBtn && list.length > 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, renderMsgItem(list[0], 0), /*#__PURE__*/React.createElement(Popover, {
911
+ content: /*#__PURE__*/React.createElement(Space, {
912
+ direction: "vertical"
913
+ }, list.slice(1).map(function (item, index) {
914
+ return renderMsgItem(item, index + 1);
915
+ })),
916
+ overlayStyle: {
917
+ zIndex: 9999
918
+ }
919
+ }, /*#__PURE__*/React.createElement(Button, {
920
+ type: "link",
921
+ size: "small"
922
+ }, "\u66F4\u591A (", list.length - 1, ")"))) : list.map(function (item, index) {
923
+ return renderMsgItem(item, index);
907
924
  }) : null);
908
925
  };
909
926
  //获取付款凭证
@@ -191,6 +191,33 @@ var typeMap = {
191
191
  idKey: "sourceTradeNo",
192
192
  failValue: "失败",
193
193
  dataType: "array_object"
194
+ },
195
+ JST_WAREHOUSING_STATUS: {
196
+ options: [{
197
+ value: "1",
198
+ label: "未入库",
199
+ color: "#ff4d4f"
200
+ }, {
201
+ value: "2",
202
+ label: "部分入库",
203
+ color: "#e7780f"
204
+ }, {
205
+ value: "3",
206
+ label: "已入库",
207
+ color: "#52c41a"
208
+ }, {
209
+ label: "已入库-多收",
210
+ value: "4",
211
+ color: "#e7780f"
212
+ }],
213
+ key: "jstInStockStatusItemList",
214
+ code: "jstInStockStatusList",
215
+ name: "聚水潭商品入库状态",
216
+ type: 2,
217
+ valueKey: "status",
218
+ idKey: "sourceTradeNo",
219
+ failValue: "失败",
220
+ dataType: "array_object"
194
221
  }
195
222
  };
196
223
  var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(options) {
@@ -295,11 +322,11 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
295
322
  _defineProperty(this, "filterConfig", function (item) {
296
323
  var _typeMap$_this$type21, _item$templateConfig;
297
324
  return {
298
- searchDefaultConditions: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "WLN_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS"].includes(_this.type) ? SYMBOL.in : SYMBOL.like,
325
+ searchDefaultConditions: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "WLN_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS", "JST_WAREHOUSING_STATUS"].includes(_this.type) ? SYMBOL.in : SYMBOL.like,
299
326
  type: item.type,
300
327
  id: "".concat(item.id, "_").concat((_typeMap$_this$type21 = typeMap[_this.type]) === null || _typeMap$_this$type21 === void 0 ? void 0 : _typeMap$_this$type21.code),
301
328
  name: "".concat(_this.name),
302
- filterComponentType: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "WLN_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS"].includes(_this.type) ? "MultipleSelect" : "SelectInput",
329
+ filterComponentType: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "WLN_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS", "JST_WAREHOUSING_STATUS"].includes(_this.type) ? "MultipleSelect" : "SelectInput",
303
330
  props: {
304
331
  options: item === null || item === void 0 ? void 0 : (_item$templateConfig = item.templateConfig) === null || _item$templateConfig === void 0 ? void 0 : _item$templateConfig.reasonList,
305
332
  fieldNames: {
@@ -314,7 +341,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
314
341
  return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type22 = typeMap[_this.type]) === null || _typeMap$_this$type22 === void 0 ? void 0 : _typeMap$_this$type22.code), value);
315
342
  };
316
343
  },
317
- formatFilterValue: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "WLN_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS"].includes(_this.type) ? null : function (value) {
344
+ formatFilterValue: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "WLN_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS", "JST_WAREHOUSING_STATUS"].includes(_this.type) ? null : function (value) {
318
345
  if (value.type === "in") {
319
346
  return value.keywords;
320
347
  } else {
@@ -350,6 +377,6 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
350
377
  }
351
378
  }] : [];
352
379
  this.align = "left";
353
- this.isSingleValue = ((_this$componentConfig6 = this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.belongType) === "wdt" || this.type === "BS_E3_WAREHOUSING_STATUS" || this.type === "WDT_WAREHOUSING_STATUS" || this.type === "WLN_WAREHOUSING_STATUS" || this.type === "JKY_WAREHOUSING_STATUS";
380
+ this.isSingleValue = ((_this$componentConfig6 = this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.belongType) === "wdt" || this.type === "BS_E3_WAREHOUSING_STATUS" || this.type === "WDT_WAREHOUSING_STATUS" || this.type === "WLN_WAREHOUSING_STATUS" || this.type === "JST_WAREHOUSING_STATUS" || this.type === "JKY_WAREHOUSING_STATUS";
354
381
  });
355
382
  export default CommonMultiStatus;
@@ -88,7 +88,7 @@ var CommonSystemOrder = /*#__PURE__*/_createClass(function CommonSystemOrder(opt
88
88
  value: /*#__PURE__*/React.createElement(CommonOrderContent, {
89
89
  list: record === null || record === void 0 ? void 0 : record[_this.id],
90
90
  valueKey: (_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.valueKey,
91
- isShowPopover: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.belongType) !== "wdt"
91
+ isShowPopover: !["wdt", "jst"].includes((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.belongType)
92
92
  })
93
93
  }) : null;
94
94
  });
@@ -104,7 +104,7 @@ var CommonSystemOrder = /*#__PURE__*/_createClass(function CommonSystemOrder(opt
104
104
  list: list,
105
105
  type: (_typeMap$_this$type3 = typeMap[_this.type]) === null || _typeMap$_this$type3 === void 0 ? void 0 : _typeMap$_this$type3.type,
106
106
  valueKey: (_typeMap$_this$type4 = typeMap[_this.type]) === null || _typeMap$_this$type4 === void 0 ? void 0 : _typeMap$_this$type4.valueKey,
107
- isShowPopover: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.belongType) !== "wdt"
107
+ isShowPopover: !["wdt", "jst"].includes((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.belongType)
108
108
  }));
109
109
  });
110
110
  _defineProperty(this, "renderLog", function (r) {
@@ -1,7 +1,6 @@
1
1
  // 查询订单详情
2
2
  export var queryOrderDetail = function queryOrderDetail(tid) {
3
3
  var _window, _window$parent;
4
- console.log('请求ERP订单详情', tid);
5
4
  (_window = window) === null || _window === void 0 ? void 0 : (_window$parent = _window.parent) === null || _window$parent === void 0 ? void 0 : _window$parent.postMessage({
6
5
  method: 'queryOrder',
7
6
  data: {
@@ -13,7 +12,6 @@ export var queryOrderDetail = function queryOrderDetail(tid) {
13
12
  // 查询抖店openId
14
13
  export var queryDouDianOpenId = function queryDouDianOpenId(originTid) {
15
14
  var _window2, _window2$parent;
16
- console.log('查询抖音店铺买家id', originTid);
17
15
  (_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$parent = _window2.parent) === null || _window2$parent === void 0 ? void 0 : _window2$parent.postMessage({
18
16
  method: 'queryDouDianOpenId',
19
17
  data: {
@@ -102,6 +102,7 @@ var MsgStatus = /*#__PURE__*/_createClass(function MsgStatus(options) {
102
102
  }, /*#__PURE__*/React.createElement(MsgContent, {
103
103
  horizontal: false,
104
104
  list: list,
105
+ hasMoreBtn: true,
105
106
  valueKey: (_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.valueKey,
106
107
  failValue: (_typeMap$_this$type6 = typeMap[_this.type]) === null || _typeMap$_this$type6 === void 0 ? void 0 : _typeMap$_this$type6.failValue,
107
108
  options: (_typeMap$_this$type7 = typeMap[_this.type]) === null || _typeMap$_this$type7 === void 0 ? void 0 : _typeMap$_this$type7.options
@@ -74,9 +74,7 @@ var PictureName = /*#__PURE__*/_createClass(function PictureName(options) {
74
74
  document.body.removeChild(a);
75
75
  window.URL.revokeObjectURL(url);
76
76
  });
77
- } catch (error) {
78
- console.error(error);
79
- }
77
+ } catch (error) {}
80
78
  };
81
79
  return /*#__PURE__*/React.createElement(Space, {
82
80
  className: "pictruePc"
@@ -92,9 +92,7 @@ var BasicPicturePro = /*#__PURE__*/_createClass(function BasicPicturePro(options
92
92
  document.body.removeChild(a);
93
93
  window.URL.revokeObjectURL(url);
94
94
  });
95
- } catch (error) {
96
- console.error(error);
97
- }
95
+ } catch (error) {}
98
96
  } else {
99
97
  copy("".concat(hostUrl, "/").concat(item.url));
100
98
  message.success('图片链接复制成功');
@@ -31,7 +31,7 @@ declare class BasicPosting implements ComponentInterface {
31
31
  sortColumns: SortColumnsField;
32
32
  headerProvince: boolean;
33
33
  constructor(options: PickOption);
34
- getChildren: () => (City | Detail | District | Province | ReceiverMobile | ReceiverName | undefined)[];
34
+ getChildren: () => (Province | City | District | Detail | ReceiverName | ReceiverMobile | undefined)[];
35
35
  getSortColumns: (sortColumns: string | undefined) => SortColumnsField;
36
36
  renderPc: (value: any, record: Record) => React.JSX.Element | null;
37
37
  renderLog: (r: Record) => React.JSX.Element | null;
@@ -45,9 +45,7 @@ var typeMap = {
45
45
  }
46
46
  version = ((_companyUserConfig = companyUserConfig) === null || _companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl = _companyUserConfig.plugins) === null || _companyUserConfig$pl === void 0 ? void 0 : (_companyUserConfig$pl2 = _companyUserConfig$pl.wdt) === null || _companyUserConfig$pl2 === void 0 ? void 0 : _companyUserConfig$pl2.version) || "flagship";
47
47
  }
48
- } catch (error) {
49
- console.error(error);
50
- }
48
+ } catch (error) {}
51
49
  if (version === "flagship") return 1;
52
50
  },
53
51
  handleOptions: function handleOptions(options) {
@@ -229,15 +227,14 @@ var AsyncSelect = /*#__PURE__*/function () {
229
227
  componentConfig: this.componentConfig
230
228
  });
231
229
  }
232
- _context.next = 14;
230
+ _context.next = 13;
233
231
  break;
234
232
  case 11:
235
233
  _context.prev = 11;
236
234
  _context.t1 = _context["catch"](1);
237
- console.debug("api error", _context.t1);
238
- case 14:
235
+ case 13:
239
236
  return _context.abrupt("return", options);
240
- case 15:
237
+ case 14:
241
238
  case "end":
242
239
  return _context.stop();
243
240
  }
@@ -17,6 +17,7 @@ import { SYMBOL } from "../../../constant";
17
17
  // import { BsType, BsMemo } from "../../Bs/common";
18
18
  import { CommonExchangeGoods } from '@kmkf-fe-packages/basic-components';
19
19
  import CommonHeaderGoods from "../../CommonHeaderGood";
20
+ import { erpFormValidator } from "@kmkf-fe-packages/basic-components";
20
21
  function toNum(value) {
21
22
  if (typeof value === 'string') {
22
23
  return value ? +value : void 0;
@@ -29,28 +30,11 @@ function toNum(value) {
29
30
  var CONF_MAP = {
30
31
  JST_EXCHANGE_GOODS: {
31
32
  goodsKey: 'jstExchangeGoods',
32
- validator: function validator(_rule, value) {
33
+ validator: function validator(_rule, value, type) {
33
34
  if (!_rule.required) return Promise.resolve();
34
- var goodsName = '';
35
- if (((value === null || value === void 0 ? void 0 : value.jstExchangeGoods) || []).some(function (goods) {
36
- var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
37
- var res = typeof qty === 'number' ? qty < 1 : true;
38
- if (res) {
39
- goodsName = goods !== null && goods !== void 0 && goods.name ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
40
- }
41
- return res;
42
- })) {
43
- return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
44
- }
45
- if (((value === null || value === void 0 ? void 0 : value.jstExchangeGoods) || []).some(function (goods) {
46
- var v = toNum(goods === null || goods === void 0 ? void 0 : goods.salePrice);
47
- var res = typeof v === 'number' ? v < 0 : true;
48
- if (res) {
49
- goodsName = goods !== null && goods !== void 0 && goods.name ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
50
- }
51
- return res;
52
- })) {
53
- return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
35
+ var validatorFlag = erpFormValidator(_rule, value, type);
36
+ if (validatorFlag) {
37
+ return validatorFlag;
54
38
  }
55
39
  return Promise.resolve();
56
40
  }
@@ -164,8 +148,11 @@ var Exchange = /*#__PURE__*/_createClass(function Exchange(options) {
164
148
  }
165
149
  }, {
166
150
  required: (_this$componentConfig8 = this.componentConfig) === null || _this$componentConfig8 === void 0 ? void 0 : _this$componentConfig8.required,
167
- validator: this.config.validator || function () {
168
- return Promise.resolve();
151
+ validator: function validator(_rule, value) {
152
+ var _CONF_MAP$options$typ, _CONF_MAP$options$typ2;
153
+ return ((_CONF_MAP$options$typ = CONF_MAP[options.type]) === null || _CONF_MAP$options$typ === void 0 ? void 0 : (_CONF_MAP$options$typ2 = _CONF_MAP$options$typ.validator) === null || _CONF_MAP$options$typ2 === void 0 ? void 0 : _CONF_MAP$options$typ2.call(_CONF_MAP$options$typ, _rule, value, options.type, _this.componentConfig)) || function () {
154
+ return Promise.resolve();
155
+ };
169
156
  }
170
157
  }];
171
158
  this.dataType = 'object';
@@ -43,11 +43,11 @@ var typeMap = {
43
43
  typeName: "jstReturnType",
44
44
  remark: "jstReturnType_memo",
45
45
  systemOrderNo: "jstSystemOrderNo",
46
- systemOrderBillType: "jstSystemOrderBillType",
46
+ // systemOrderBillType: "jstSystemOrderBillType",
47
47
  errMsg: "请选择聚水潭退货商品",
48
48
  name: "聚水潭",
49
49
  compType: "退货",
50
- hasSystemOrderType: true,
50
+ hasSystemOrderType: false,
51
51
  validator: function validator(_rule, value, type) {
52
52
  if (!_rule.required) return Promise.resolve();
53
53
  var validatorFlag = erpFormValidator(_rule, value, type);
@@ -15,8 +15,8 @@ import React from "react";
15
15
  import ItemView from "../../../commonComponents/ItemView";
16
16
  import { isNull } from "@kmkf-fe-packages/kmkf-utils";
17
17
  var componentType = {
18
- JST_REISSUE_GOODS: "jstSystemOrderBillType",
19
- JST_RETURN_GOODS: "jstSystemOrderBillType"
18
+ JST_REISSUE_GOODS: "jstSystemOrderBillType"
19
+ // JST_RETURN_GOODS: "jstSystemOrderBillType",
20
20
  };
21
21
  var SystemOrderType = /*#__PURE__*/_createClass(function SystemOrderType(options) {
22
22
  var _this = this;
@@ -94,13 +94,12 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
94
94
  copy("".concat(addressText).concat(detail));
95
95
  message.success('复制成功');
96
96
  case 14:
97
- _context.next = 19;
97
+ _context.next = 18;
98
98
  break;
99
99
  case 16:
100
100
  _context.prev = 16;
101
101
  _context.t0 = _context["catch"](1);
102
- console.log(_context.t0);
103
- case 19:
102
+ case 18:
104
103
  case "end":
105
104
  return _context.stop();
106
105
  }
@@ -83,7 +83,6 @@ var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {
83
83
  });
84
84
  _defineProperty(this, "renderClient", function (record) {
85
85
  var _this$optionsMap;
86
- console.log("renderClient", record, _this.getIsValue());
87
86
  // 特殊自定义组件为平台状态时匹配出label
88
87
  var label = _this.getIsValue() ? (_this$optionsMap = _this.optionsMap) === null || _this$optionsMap === void 0 ? void 0 : _this$optionsMap[record === null || record === void 0 ? void 0 : record[_this.id]] : record === null || record === void 0 ? void 0 : record[_this.id];
89
88
  return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
@@ -1,3 +1,3 @@
1
1
  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, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption, OrderSubForm, FlowOverallStatusSelect, ReturnWarehouse, KmExchange } from "./index";
2
2
  import { PickOption } from "./type";
3
- export declare const factory: (type: string, options: PickOption) => CommonMultiStatus | PublicExchange | PublicReissueGoods | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | 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 | Payment | ReissueLogistics | JstItemSelect | JstSendGood | 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 | StatusSelect | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | ReturnWarehouse | GyGoods | KmExchange | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
3
+ export declare const factory: (type: string, options: PickOption) => CommonMultiStatus | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | 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 | Payment | ReissueLogistics | JstItemSelect | JstSendGood | JstSupply | BsSystemOrder | BsGoods | BsE3Goods | PublicGoods | PublicReissueGoods | 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 | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | ReturnWarehouse | GyGoods | KmExchange | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
@@ -185,6 +185,7 @@ export var factory = function factory(type, options) {
185
185
  case "KM_RETURN_GOODS":
186
186
  case "JY_REISSUE_GOODS":
187
187
  case "JKY_REISSUE_GOODS":
188
+ case "JST_RETURN_GOODS":
188
189
  return new PublicReissueGoods(options);
189
190
  case "BS_E3_REISSUE_GOODS":
190
191
  return new BsE3Reissue(options);
@@ -208,8 +209,6 @@ export var factory = function factory(type, options) {
208
209
  return new WdtReturn(options);
209
210
  case "GY_RETURN_GOODS":
210
211
  return new GyReturn(options);
211
- case "JST_RETURN_GOODS":
212
- return new PublicReissueGoods(options);
213
212
  case "REISSUE_TRADE_ID":
214
213
  case "SWAP_OUT_TRADE_ID":
215
214
  case "ERP_AFTER_SALE_TRADE_ID":
@@ -255,6 +254,7 @@ export var factory = function factory(type, options) {
255
254
  case "WDT_WAREHOUSING_STATUS":
256
255
  case "WLN_WAREHOUSING_STATUS":
257
256
  case "JKY_WAREHOUSING_STATUS":
257
+ case "JST_WAREHOUSING_STATUS":
258
258
  return new CommonMultiStatus(options);
259
259
  case "MSG_STATUS":
260
260
  return new MsgStatus(options);
@@ -237,9 +237,7 @@ export var queryExpressInterceptData = function queryExpressInterceptData() {
237
237
  }
238
238
  });
239
239
  instance.statusConditionOptions = tempList;
240
- }).catch(function (e) {
241
- console.log(e);
242
- });
240
+ }).catch(function (e) {});
243
241
  };
244
242
  export var queryLogisticsAddressData = function queryLogisticsAddressData() {
245
243
  return request({
@@ -250,9 +248,7 @@ export var queryLogisticsAddressData = function queryLogisticsAddressData() {
250
248
  var data = res.data;
251
249
  var instance = LogisticsAddressData.getInstance();
252
250
  instance.addressData = data;
253
- }).catch(function (e) {
254
- console.log(e);
255
- });
251
+ }).catch(function (e) {});
256
252
  };
257
253
  export var queryAllLogisticsCompany = function queryAllLogisticsCompany() {
258
254
  return request({
@@ -275,50 +271,49 @@ export var queryWdtLogisticsCompany = function queryWdtLogisticsCompany() {
275
271
  var instance = ExpressData.getInstance("wdt");
276
272
  return servers.getWdtSellerLogisticsCompanyRelation().then(function (data) {
277
273
  instance.expressData = data;
278
- }).catch(console.log);
274
+ }).catch(function () {});
279
275
  };
280
276
  export var queryBsE3LogisticsCompany = function queryBsE3LogisticsCompany() {
281
277
  var instance = ExpressData.getInstance("bsE3");
282
278
  return servers.BSE3.getLogisticsDataAsync().then(function (data) {
283
279
  instance.expressData = data;
284
- }).catch(console.log);
280
+ }).catch(function () {});
285
281
  };
286
282
  export var queryJSTLogisticsCompany = function queryJSTLogisticsCompany() {
287
283
  var instance = ExpressData.getInstance("jst");
288
284
  return servers.JST.getLogisticsDataAsync().then(function (data) {
289
285
  instance.expressData = data;
290
- }).catch(console.log);
286
+ }).catch(function () {});
291
287
  };
292
288
  export var queryGYLogisticsCompany = function queryGYLogisticsCompany() {
293
289
  var instance = ExpressData.getInstance("gy");
294
290
  return servers.GY.getLogisticsDataAsync().then(function (data) {
295
291
  instance.expressData = data;
296
- }).catch(console.log);
292
+ }).catch(function () {});
297
293
  };
298
294
  export var queryJYLogisticsCompany = function queryJYLogisticsCompany() {
299
295
  var instance = ExpressData.getInstance("jy");
300
296
  return servers.JY.getLogisticsDataAsync().then(function (data) {
301
297
  instance.expressData = data;
302
- }).catch(console.log);
298
+ }).catch(function () {});
303
299
  };
304
300
  export var queryJKYLogisticsCompany = function queryJKYLogisticsCompany() {
305
301
  var instance = ExpressData.getInstance("jky");
306
- console.log("queryJKYLogisticsCompany");
307
302
  return servers.JKY.getLogisticsDataAsync().then(function (data) {
308
303
  instance.expressData = data;
309
- }).catch(console.log);
304
+ }).catch(function () {});
310
305
  };
311
306
  export var queryWLNLogisticsCompany = function queryWLNLogisticsCompany() {
312
307
  var instance = ExpressData.getInstance("wln");
313
308
  return servers.WLN.getLogisticsDataAsync().then(function (data) {
314
309
  instance.expressData = data;
315
- }).catch(console.log);
310
+ }).catch(function () {});
316
311
  };
317
312
  export var queryKMLogisticsCompany = function queryKMLogisticsCompany() {
318
313
  var instance = ExpressData.getInstance("km");
319
314
  return servers.KM.getLogisticsDataAsync().then(function (data) {
320
315
  instance.expressData = data;
321
- }).catch(console.log);
316
+ }).catch(function () {});
322
317
  };
323
318
  // 获取支付宝电子回单
324
319
  export var getAlipayBillReceipt = function getAlipayBillReceipt(data) {
@@ -342,7 +337,6 @@ export var queryLabel = function queryLabel() {
342
337
  var finalData = JSON.parse(data);
343
338
  instance.labelData = finalData;
344
339
  } catch (e) {
345
- console.error("转换标签数据数据异常");
346
340
  instance.labelData = [];
347
341
  }
348
342
  });
@@ -52,13 +52,10 @@ var requestApi = function requestApi(_ref) {
52
52
  message.warn(res.message);
53
53
  } else if (infoLevel === 'error') {
54
54
  message.error(res.message);
55
- } else {
56
- console.log(res.message);
57
- }
55
+ } else {}
58
56
  reject(res);
59
57
  }
60
58
  }).catch(function (e) {
61
- console.error('请求错误', e);
62
59
  reject(e);
63
60
  });
64
61
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/services-components",
3
- "version": "2.10.3",
3
+ "version": "2.10.5",
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": "2.10.3",
25
- "@kmkf-fe-packages/kmkf-utils": "2.10.3",
24
+ "@kmkf-fe-packages/basic-components": "2.10.5",
25
+ "@kmkf-fe-packages/kmkf-utils": "2.10.5",
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": "9de8ccc40cd591ee7d1d8692497008cf8fc98db3",
44
+ "gitHead": "bb8d17f40a7854b3d3a494c4c90233386a81c15c",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }