@kmkf-fe-packages/services-components 2.10.9-beta.3 → 2.10.9-beta.30

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 (65) hide show
  1. package/dist/esm/Hooks/useColumnsConfig.d.ts +1 -1
  2. package/dist/esm/components/BS/BsExchange/index.d.ts +7 -0
  3. package/dist/esm/components/BS/BsExchange/index.js +6 -0
  4. package/dist/esm/components/BS/BsGoods/index.d.ts +7 -0
  5. package/dist/esm/components/BS/BsGoods/index.js +6 -0
  6. package/dist/esm/components/BS/BsReissue/index.d.ts +7 -0
  7. package/dist/esm/components/BS/BsReissue/index.js +6 -0
  8. package/dist/esm/components/BS/BsReturn/index.d.ts +7 -0
  9. package/dist/esm/components/BS/BsReturn/index.js +6 -0
  10. package/dist/esm/components/BsE3/BsGoods/index.d.ts +7 -0
  11. package/dist/esm/components/BsE3/BsGoods/index.js +6 -0
  12. package/dist/esm/components/BsE3/BsReissueE3/index.d.ts +7 -0
  13. package/dist/esm/components/BsE3/BsReissueE3/index.js +6 -0
  14. package/dist/esm/components/Common/constants/columnsBaseInfoMap.d.ts +6 -0
  15. package/dist/esm/components/Common/constants/columnsBaseInfoMap.js +14 -0
  16. package/dist/esm/components/Common/index.js +1 -0
  17. package/dist/esm/components/CommonHeaderGood/index.js +38 -34
  18. package/dist/esm/components/CommonMultiStatus/index.d.ts +4 -1
  19. package/dist/esm/components/CommonMultiStatus/index.js +34 -6
  20. package/dist/esm/components/GY/GyGoods/index.d.ts +7 -0
  21. package/dist/esm/components/GY/GyGoods/index.js +6 -0
  22. package/dist/esm/components/GY/GyReissue/index.d.ts +7 -0
  23. package/dist/esm/components/GY/GyReissue/index.js +6 -0
  24. package/dist/esm/components/GY/GyReturn/index.d.ts +7 -0
  25. package/dist/esm/components/GY/GyReturn/index.js +6 -0
  26. package/dist/esm/components/JST/JstSendGood/index.d.ts +2 -1
  27. package/dist/esm/components/JST/JstSendGood/index.js +7 -1
  28. package/dist/esm/components/JST/JstSupply/index.d.ts +1 -1
  29. package/dist/esm/components/JST/JstSupply/index.js +3 -0
  30. package/dist/esm/components/KM/KmExchange/index.d.ts +7 -0
  31. package/dist/esm/components/KM/KmExchange/index.js +6 -0
  32. package/dist/esm/components/KmErpSendGood/index.d.ts +1 -1
  33. package/dist/esm/components/KmErpSendGood/index.js +3 -0
  34. package/dist/esm/components/LogisticsInterception/index.d.ts +3 -0
  35. package/dist/esm/components/LogisticsInterception/index.js +14 -7
  36. package/dist/esm/components/LogisticsInterception/interceptLogisticsCustomerCode.d.ts +39 -0
  37. package/dist/esm/components/LogisticsInterception/interceptLogisticsCustomerCode.js +103 -0
  38. package/dist/esm/components/LogisticsMoreInterception/index.d.ts +2 -0
  39. package/dist/esm/components/LogisticsMoreInterception/index.js +19 -5
  40. package/dist/esm/components/LogisticsMoreInterception/interceptLogisticsCustomerCode.d.ts +39 -0
  41. package/dist/esm/components/LogisticsMoreInterception/interceptLogisticsCustomerCode.js +108 -0
  42. package/dist/esm/components/Public/Exchange/index.d.ts +7 -0
  43. package/dist/esm/components/Public/Exchange/index.js +6 -0
  44. package/dist/esm/components/Public/Goods/index.js +2 -12
  45. package/dist/esm/components/Public/ReissueGoods/index.d.ts +7 -0
  46. package/dist/esm/components/Public/ReissueGoods/index.js +6 -0
  47. package/dist/esm/components/Public/ReturnWarehouse/index.d.ts +1 -1
  48. package/dist/esm/components/Public/ReturnWarehouse/index.js +3 -0
  49. package/dist/esm/components/Reissue/Logistics/index.d.ts +1 -1
  50. package/dist/esm/components/Reissue/Logistics/index.js +3 -0
  51. package/dist/esm/components/Remark/index.d.ts +4 -1
  52. package/dist/esm/components/Remark/index.js +36 -8
  53. package/dist/esm/components/SKX/SkxGoods/index.d.ts +7 -0
  54. package/dist/esm/components/SKX/SkxGoods/index.js +6 -0
  55. package/dist/esm/components/WDT/WdtExchange/index.d.ts +7 -0
  56. package/dist/esm/components/WDT/WdtExchange/index.js +6 -0
  57. package/dist/esm/components/WDT/WdtGoods/index.d.ts +7 -0
  58. package/dist/esm/components/WDT/WdtGoods/index.js +6 -0
  59. package/dist/esm/components/WDT/WdtRessuie/index.d.ts +7 -0
  60. package/dist/esm/components/WDT/WdtRessuie/index.js +6 -0
  61. package/dist/esm/components/WDT/WdtReturn/index.d.ts +7 -0
  62. package/dist/esm/components/WDT/WdtReturn/index.js +6 -0
  63. package/dist/esm/factory.d.ts +1 -1
  64. package/dist/esm/factory.js +5 -1
  65. package/package.json +4 -4
@@ -1,4 +1,5 @@
1
1
  function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
2
+ function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
2
3
  function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
3
4
  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
4
5
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -6,7 +7,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
6
7
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
7
8
  function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
8
9
  import React from 'react';
9
- import { Remark } from '@kmkf-fe-packages/basic-components';
10
+ import { Remark, YouzanStar } from '@kmkf-fe-packages/basic-components';
10
11
  import GetFormItem from "../GetFormItem";
11
12
  import trade0 from "./flag/trade-icon-flag-0.png";
12
13
  import trade1 from "./flag/trade-icon-flag-1.png";
@@ -16,7 +17,7 @@ import trade4 from "./flag/trade-icon-flag-4.png";
16
17
  import trade5 from "./flag/trade-icon-flag-5.png";
17
18
  import get from 'lodash/get';
18
19
  import ItemView from "../../commonComponents/ItemView";
19
- import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
20
+ import { isNull, filterFn as _filterFn, isYouzanShop, normalizeYouzanStar } from '@kmkf-fe-packages/kmkf-utils';
20
21
  import { SYMBOL, batchInput, SEARCH_OPTIONS } from "../../constant";
21
22
  var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
22
23
  var _this = this,
@@ -34,14 +35,30 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
34
35
  _defineProperty(this, "formField", void 0);
35
36
  _defineProperty(this, "canSort", void 0);
36
37
  _defineProperty(this, "children", void 0);
38
+ _defineProperty(this, "effects", void 0);
37
39
  _defineProperty(this, "dataType", void 0);
40
+ _defineProperty(this, "getShop", function (record) {
41
+ var _this$effects, _this$effects2, _this$effects2$form, _this$effects3, _this$effects3$shopLi;
42
+ var shopId = (record === null || record === void 0 ? void 0 : record.shopId) || ((_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId) || ((_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : (_this$effects2$form = _this$effects2.form) === null || _this$effects2$form === void 0 ? void 0 : _this$effects2$form.getFieldValue('shopId'));
43
+ return (_this$effects3 = _this.effects) === null || _this$effects3 === void 0 ? void 0 : (_this$effects3$shopLi = _this$effects3.shopList) === null || _this$effects3$shopLi === void 0 ? void 0 : _this$effects3$shopLi.find(function (shop) {
44
+ return shop.shopId === shopId;
45
+ });
46
+ });
47
+ _defineProperty(this, "isYouzan", function (record) {
48
+ return isYouzanShop(_this.getShop(record));
49
+ });
38
50
  _defineProperty(this, "render", function (value) {
51
+ var isYouzan = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
39
52
  var index = get(value, 'flag');
40
53
  return /*#__PURE__*/React.createElement("div", {
41
54
  style: {
42
55
  display: 'inline-block'
43
56
  }
44
- }, index !== undefined && /*#__PURE__*/React.createElement("img", {
57
+ }, isYouzan ? normalizeYouzanStar(index) ? /*#__PURE__*/React.createElement(YouzanStar, {
58
+ compact: true,
59
+ disabled: true,
60
+ value: index
61
+ }) : null : index !== undefined && /*#__PURE__*/React.createElement("img", {
45
62
  src: _this.imgList[Number(index)]
46
63
  }), /*#__PURE__*/React.createElement("span", null, get(value, 'remark')));
47
64
  });
@@ -49,7 +66,7 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
49
66
  return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
50
67
  id: _this.id,
51
68
  label: _this.name,
52
- value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id])
69
+ value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id], _this.isYouzan(record))
53
70
  }) : null;
54
71
  });
55
72
  _defineProperty(this, "renderPc", function (value, record) {
@@ -57,11 +74,16 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
57
74
  return /*#__PURE__*/React.createElement("span", null, "--");
58
75
  }
59
76
  var index = get(record, "".concat(_this.id, "_flag"));
77
+ var isYouzan = _this.isYouzan(record);
60
78
  return /*#__PURE__*/React.createElement("div", {
61
79
  style: {
62
80
  display: 'inline-block'
63
81
  }
64
- }, !isNull(get(record, "".concat(_this.id, "_flag"))) ? index !== undefined && /*#__PURE__*/React.createElement("img", {
82
+ }, !isNull(get(record, "".concat(_this.id, "_flag"))) ? isYouzan ? normalizeYouzanStar(index) && /*#__PURE__*/React.createElement(YouzanStar, {
83
+ compact: true,
84
+ disabled: true,
85
+ value: index
86
+ }) : index !== undefined && /*#__PURE__*/React.createElement("img", {
65
87
  src: _this.imgList[Number(index)]
66
88
  }) :
67
89
  // <i
@@ -94,7 +116,9 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
94
116
  display: p === null || p === void 0 ? void 0 : p.display,
95
117
  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,
96
118
  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 : '',
97
- component: /*#__PURE__*/React.createElement(Remark, _this.componentConfig)
119
+ component: /*#__PURE__*/React.createElement(Remark, _extends({}, _this.componentConfig, {
120
+ isYouzan: _this.isYouzan()
121
+ }))
98
122
  });
99
123
  });
100
124
  _defineProperty(this, "filterConfig", function (item) {
@@ -170,6 +194,7 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
170
194
  this.formField = "".concat(options.id, "_remark");
171
195
  this.type = options.type;
172
196
  this.componentConfig = options.componentConfig;
197
+ this.effects = options.effects;
173
198
  this.dataType = 'object';
174
199
  this.rules = (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
175
200
  validator: function validator(_, value) {
@@ -177,8 +202,11 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
177
202
  if (!(value !== null && value !== void 0 && value.remark)) {
178
203
  return Promise.reject(new Error('请输入备注'));
179
204
  }
180
- if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.isShowFlag && !(value !== null && value !== void 0 && value.flag) && (value === null || value === void 0 ? void 0 : value.flag) !== 0) {
181
- return Promise.reject(new Error('请选择旗帜'));
205
+ if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.isShowFlag) {
206
+ var flag = _this.isYouzan() ? normalizeYouzanStar(value === null || value === void 0 ? void 0 : value.flag) : value === null || value === void 0 ? void 0 : value.flag;
207
+ if (!flag && flag !== 0) {
208
+ return Promise.reject(new Error(_this.isYouzan() ? '请选择星标' : '请选择旗帜'));
209
+ }
182
210
  }
183
211
  return Promise.resolve();
184
212
  }
@@ -14,8 +14,15 @@ declare class SkxGoods implements ComponentInterface {
14
14
  canSort: boolean;
15
15
  children: ComponentInterface[];
16
16
  dataType: ComponentInterface["dataType"];
17
+ sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
17
18
  skxGoods: CommonHeaderGoods;
18
19
  constructor(options: PickOption);
20
+ getSortChildFields: () => {
21
+ name: any;
22
+ key: string;
23
+ dataType: string;
24
+ conditionOptionsSetting: any;
25
+ }[];
19
26
  renderClient: (record: any) => React.JSX.Element | null;
20
27
  renderPc: () => null;
21
28
  renderLog: (r: Record) => React.JSX.Element | null;
@@ -16,6 +16,7 @@ import ItemView from "../../../commonComponents/ItemView";
16
16
  import { isNull } from "@kmkf-fe-packages/kmkf-utils";
17
17
  import { SkxGoods as Goods } from "@kmkf-fe-packages/basic-components";
18
18
  import { SYMBOL } from "../../../constant";
19
+ import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
19
20
  var typeMap = {
20
21
  SKX_GOODS: {
21
22
  name: "[SKX]商品信息(ON)",
@@ -42,7 +43,11 @@ var SkxGoods = /*#__PURE__*/_createClass(function SkxGoods(options) {
42
43
  _defineProperty(this, "canSort", void 0);
43
44
  _defineProperty(this, "children", void 0);
44
45
  _defineProperty(this, "dataType", void 0);
46
+ _defineProperty(this, "sortChildField", void 0);
45
47
  _defineProperty(this, "skxGoods", void 0);
48
+ _defineProperty(this, "getSortChildFields", function () {
49
+ return getGoodsSortChildFields(_this.type, _this.id);
50
+ });
46
51
  _defineProperty(this, "renderClient", function (record) {
47
52
  var _record, _this$componentConfig;
48
53
  return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ItemView, {
@@ -131,5 +136,6 @@ var SkxGoods = /*#__PURE__*/_createClass(function SkxGoods(options) {
131
136
  }
132
137
  }] : [];
133
138
  this.dataType = "object";
139
+ this.sortChildField = this.getSortChildFields();
134
140
  });
135
141
  export default SkxGoods;
@@ -14,8 +14,15 @@ declare class WDTExchange implements ComponentInterface {
14
14
  canSort: boolean;
15
15
  children: ComponentInterface[];
16
16
  dataType: ComponentInterface["dataType"];
17
+ sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
17
18
  returnGoods: CommonHeaderGoods;
18
19
  constructor(options: PickOption);
20
+ getSortChildFields: () => {
21
+ name: any;
22
+ key: string;
23
+ dataType: string;
24
+ conditionOptionsSetting: any;
25
+ }[];
19
26
  renderClient: (record: any) => React.JSX.Element | null;
20
27
  renderPc: () => null;
21
28
  renderLog: (r: Record) => React.JSX.Element;
@@ -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 { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
20
21
  var WDTExchange = /*#__PURE__*/_createClass(
21
22
  // wdtType: BsType;
22
23
  // wdtMemo: BsMemo;
@@ -39,7 +40,11 @@ function WDTExchange(options) {
39
40
  _defineProperty(this, "canSort", void 0);
40
41
  _defineProperty(this, "children", void 0);
41
42
  _defineProperty(this, "dataType", void 0);
43
+ _defineProperty(this, "sortChildField", void 0);
42
44
  _defineProperty(this, "returnGoods", void 0);
45
+ _defineProperty(this, "getSortChildFields", function () {
46
+ return getGoodsSortChildFields(_this.type, _this.id);
47
+ });
43
48
  _defineProperty(this, "renderClient", function (record) {
44
49
  var _this$componentConfig;
45
50
  var wdtExchangeGoods = JSON.parse((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_wdtExchangeGoods")]) || "[]");
@@ -180,5 +185,6 @@ function WDTExchange(options) {
180
185
  },*/];
181
186
 
182
187
  this.dataType = "object";
188
+ this.sortChildField = this.getSortChildFields();
183
189
  });
184
190
  export default WDTExchange;
@@ -14,8 +14,15 @@ declare class WdtGoods implements ComponentInterface {
14
14
  canSort: boolean;
15
15
  children: ComponentInterface[];
16
16
  dataType: ComponentInterface["dataType"];
17
+ sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
17
18
  wdtGoods: CommonHeaderGoods;
18
19
  constructor(options: PickOption);
20
+ getSortChildFields: () => {
21
+ name: any;
22
+ key: string;
23
+ dataType: string;
24
+ conditionOptionsSetting: any;
25
+ }[];
19
26
  renderClient: (record: any) => React.JSX.Element | null;
20
27
  renderPc: () => null;
21
28
  renderLog: (r: Record) => React.JSX.Element | null;
@@ -16,6 +16,7 @@ import ItemView from "../../../commonComponents/ItemView";
16
16
  import { isNull } from "@kmkf-fe-packages/kmkf-utils";
17
17
  import { CommonGoods as Goods } from "@kmkf-fe-packages/basic-components";
18
18
  import { SYMBOL } from "../../../constant";
19
+ import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
19
20
  var WdtGoods = /*#__PURE__*/_createClass(function WdtGoods(options) {
20
21
  var _this = this,
21
22
  _this$componentConfig6;
@@ -32,7 +33,11 @@ var WdtGoods = /*#__PURE__*/_createClass(function WdtGoods(options) {
32
33
  _defineProperty(this, "canSort", void 0);
33
34
  _defineProperty(this, "children", void 0);
34
35
  _defineProperty(this, "dataType", void 0);
36
+ _defineProperty(this, "sortChildField", void 0);
35
37
  _defineProperty(this, "wdtGoods", void 0);
38
+ _defineProperty(this, "getSortChildFields", function () {
39
+ return getGoodsSortChildFields(_this.type, _this.id);
40
+ });
36
41
  _defineProperty(this, "renderClient", function (record) {
37
42
  var _record, _this$componentConfig;
38
43
  return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ItemView, {
@@ -119,5 +124,6 @@ var WdtGoods = /*#__PURE__*/_createClass(function WdtGoods(options) {
119
124
  }
120
125
  }] : [];
121
126
  this.dataType = "object";
127
+ this.sortChildField = this.getSortChildFields();
122
128
  });
123
129
  export default WdtGoods;
@@ -15,11 +15,18 @@ declare class WdtReissue implements ComponentInterface {
15
15
  canSort: boolean;
16
16
  children: ComponentInterface[];
17
17
  dataType: ComponentInterface["dataType"];
18
+ sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
18
19
  bsType: BsType;
19
20
  bsMemo: BsMemo;
20
21
  systemOrderNo: SystemOrderNo;
21
22
  reissueGoods: BsHeaderGood | CommonHeaderGoods;
22
23
  constructor(options: PickOption);
24
+ getSortChildFields: () => {
25
+ name: any;
26
+ key: string;
27
+ dataType: string;
28
+ conditionOptionsSetting: any;
29
+ }[];
23
30
  renderClient: (record: any) => React.JSX.Element | null;
24
31
  renderPc: () => null;
25
32
  renderLog: (r: Record) => React.JSX.Element;
@@ -17,6 +17,7 @@ import { SYMBOL } from "../../../constant";
17
17
  import { BsGoodsTable } from "../../Common/index";
18
18
  import { BsType, BsMemo, BsHeaderGood, SystemOrderNo } from "../../BS/common/index";
19
19
  import CommonHeaderGoods from "../../CommonHeaderGood";
20
+ import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
20
21
  var typeMap = {
21
22
  WDT_REISSUE_GOODS: {
22
23
  key: "wdtReissueGoods",
@@ -56,10 +57,14 @@ var WdtReissue = /*#__PURE__*/_createClass(function WdtReissue(options) {
56
57
  _defineProperty(this, "canSort", void 0);
57
58
  _defineProperty(this, "children", void 0);
58
59
  _defineProperty(this, "dataType", void 0);
60
+ _defineProperty(this, "sortChildField", void 0);
59
61
  _defineProperty(this, "bsType", void 0);
60
62
  _defineProperty(this, "bsMemo", void 0);
61
63
  _defineProperty(this, "systemOrderNo", void 0);
62
64
  _defineProperty(this, "reissueGoods", void 0);
65
+ _defineProperty(this, "getSortChildFields", function () {
66
+ return getGoodsSortChildFields(_this.type, _this.id);
67
+ });
63
68
  _defineProperty(this, "renderClient", function (record) {
64
69
  var _record, _typeMap$_this$type, _record2, _typeMap$_this$type2, _this$componentConfig;
65
70
  return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.bsType.renderClient(record), _this.bsMemo.renderClient(record), _this.systemOrderNo.renderClient(record), record !== null && record !== void 0 && (_record = record["".concat(_this.id)]) !== null && _record !== void 0 && _record[(_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.key].length ? /*#__PURE__*/React.createElement(ItemView, {
@@ -208,5 +213,6 @@ var WdtReissue = /*#__PURE__*/_createClass(function WdtReissue(options) {
208
213
  }
209
214
  }];
210
215
  this.dataType = "object";
216
+ this.sortChildField = this.getSortChildFields();
211
217
  });
212
218
  export default WdtReissue;
@@ -15,9 +15,16 @@ declare class WdtReturn implements ComponentInterface {
15
15
  canSort: boolean;
16
16
  children: ComponentInterface[];
17
17
  dataType: ComponentInterface["dataType"];
18
+ sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
18
19
  wdtType: BsType;
19
20
  reissueGoods: CommonHeaderGoods;
20
21
  constructor(options: PickOption);
22
+ getSortChildFields: () => {
23
+ name: any;
24
+ key: string;
25
+ dataType: string;
26
+ conditionOptionsSetting: any;
27
+ }[];
21
28
  renderClient: (record: any) => React.JSX.Element | null;
22
29
  renderPc: () => null;
23
30
  renderLog: (r: Record) => React.JSX.Element;
@@ -17,6 +17,7 @@ import { BsGoodsTable } from "../../Common";
17
17
  import { BsType } from "../../BS/common/index";
18
18
  import { CommonReturnGoods } from "@kmkf-fe-packages/basic-components";
19
19
  import CommonHeaderGoods from "../../CommonHeaderGood";
20
+ import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
20
21
  var WdtReturn = /*#__PURE__*/_createClass(function WdtReturn(options) {
21
22
  var _this = this,
22
23
  _this$componentConfig6;
@@ -33,8 +34,12 @@ var WdtReturn = /*#__PURE__*/_createClass(function WdtReturn(options) {
33
34
  _defineProperty(this, "canSort", void 0);
34
35
  _defineProperty(this, "children", void 0);
35
36
  _defineProperty(this, "dataType", void 0);
37
+ _defineProperty(this, "sortChildField", void 0);
36
38
  _defineProperty(this, "wdtType", void 0);
37
39
  _defineProperty(this, "reissueGoods", void 0);
40
+ _defineProperty(this, "getSortChildFields", function () {
41
+ return getGoodsSortChildFields(_this.type, _this.id);
42
+ });
38
43
  _defineProperty(this, "renderClient", function (record) {
39
44
  var _this$componentConfig;
40
45
  return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.wdtType.renderClient(record), record !== null && record !== void 0 && record["".concat(_this.id)].wdtReturnGoods.length ? /*#__PURE__*/React.createElement(ItemView, {
@@ -147,5 +152,6 @@ var WdtReturn = /*#__PURE__*/_createClass(function WdtReturn(options) {
147
152
  }
148
153
  }] : [];
149
154
  this.dataType = "object";
155
+ this.sortChildField = this.getSortChildFields();
150
156
  });
151
157
  export default WdtReturn;
@@ -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, DxdShopSelect, 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) => BsLogistics | BsSystemOrder | CommonMultiStatus | DxdShopSelect | JstSendGood | PublicGoods | 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 | JstSupply | BsGoods | BsE3Goods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | 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) => BsLogistics | BsSystemOrder | JstSendGood | LogisticsInterception | LogisticsMoreInterception | PublicGoods | ERemark | 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 | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | ReissueLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | DxdShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | ReturnWarehouse | GyGoods | KmExchange | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
@@ -254,14 +254,18 @@ export var factory = function factory(type, options) {
254
254
  return new StatusSelect(options);
255
255
  case "RETURN_GOODS_STATUS":
256
256
  case "EXCHANGE_STATUS":
257
+ return new CommonMultiStatus(options);
257
258
  case "WAREHOUSING_STATUS":
258
259
  case "BS_E3_WAREHOUSING_STATUS":
259
260
  case "WDT_WAREHOUSING_STATUS":
261
+ case "DXD_WAREHOUSING_STATUS":
260
262
  case "WLN_WAREHOUSING_STATUS":
261
263
  case "JKY_WAREHOUSING_STATUS":
262
264
  case "JST_WAREHOUSING_STATUS":
263
265
  case "KM_WAREHOUSING_STATUS":
264
- return new CommonMultiStatus(options);
266
+ return new CommonMultiStatus(options, {
267
+ isWarehousingStatus: true
268
+ });
265
269
  case "MSG_STATUS":
266
270
  return new MsgStatus(options);
267
271
  case "GY_PAYMENT_METHOD":
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/services-components",
3
- "version": "2.10.9-beta.3",
3
+ "version": "2.10.9-beta.30",
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.9-beta.2",
25
- "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.2",
24
+ "@kmkf-fe-packages/basic-components": "2.10.9-beta.30",
25
+ "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.29",
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": "e8f9b20e647e54a760234f67c39cbf07b6b8b463",
44
+ "gitHead": "f8f4e5108097efba6640ed81374a11c2e7eb699b",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }