@kmkf-fe-packages/services-components 2.10.9-beta.6 → 2.10.9-beta.60

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 (80) hide show
  1. package/dist/esm/Hooks/useColumnsConfig.d.ts +1 -1
  2. package/dist/esm/Hooks/useColumnsConfig.js +1 -1
  3. package/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.d.ts +1 -1
  4. package/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.js +3 -2
  5. package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpLogisticsCompany.js +13 -12
  6. package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpSendData.js +12 -9
  7. package/dist/esm/components/BS/BsExchange/index.d.ts +7 -0
  8. package/dist/esm/components/BS/BsExchange/index.js +6 -0
  9. package/dist/esm/components/BS/BsGoods/index.d.ts +7 -0
  10. package/dist/esm/components/BS/BsGoods/index.js +6 -0
  11. package/dist/esm/components/BS/BsLogistics/index.js +9 -0
  12. package/dist/esm/components/BS/BsReissue/index.d.ts +7 -0
  13. package/dist/esm/components/BS/BsReissue/index.js +6 -0
  14. package/dist/esm/components/BS/BsReturn/index.d.ts +7 -0
  15. package/dist/esm/components/BS/BsReturn/index.js +6 -0
  16. package/dist/esm/components/BS/BsSystemOrder/index.js +3 -2
  17. package/dist/esm/components/BS/common/expressCode.js +3 -0
  18. package/dist/esm/components/BS/common/expressCompany.js +3 -0
  19. package/dist/esm/components/BsE3/BsGoods/index.d.ts +7 -0
  20. package/dist/esm/components/BsE3/BsGoods/index.js +6 -0
  21. package/dist/esm/components/BsE3/BsReissueE3/index.d.ts +7 -0
  22. package/dist/esm/components/BsE3/BsReissueE3/index.js +6 -0
  23. package/dist/esm/components/Common/constants/columnsBaseInfoMap.d.ts +6 -0
  24. package/dist/esm/components/Common/constants/columnsBaseInfoMap.js +18 -2
  25. package/dist/esm/components/Common/constants/wdt.js +13 -3
  26. package/dist/esm/components/Common/index.js +21 -6
  27. package/dist/esm/components/CommonHeaderGood/index.js +81 -42
  28. package/dist/esm/components/CommonMultiStatus/index.d.ts +4 -1
  29. package/dist/esm/components/CommonMultiStatus/index.js +123 -6
  30. package/dist/esm/components/GY/GyGoods/index.d.ts +7 -0
  31. package/dist/esm/components/GY/GyGoods/index.js +6 -0
  32. package/dist/esm/components/GY/GyReissue/index.d.ts +7 -0
  33. package/dist/esm/components/GY/GyReissue/index.js +6 -0
  34. package/dist/esm/components/GY/GyReturn/index.d.ts +7 -0
  35. package/dist/esm/components/GY/GyReturn/index.js +6 -0
  36. package/dist/esm/components/JST/JstSendGood/index.d.ts +2 -1
  37. package/dist/esm/components/JST/JstSendGood/index.js +16 -2
  38. package/dist/esm/components/JST/JstSupply/index.d.ts +1 -1
  39. package/dist/esm/components/JST/JstSupply/index.js +3 -0
  40. package/dist/esm/components/KM/KmExchange/index.d.ts +7 -0
  41. package/dist/esm/components/KM/KmExchange/index.js +6 -0
  42. package/dist/esm/components/KmErpSendGood/index.d.ts +1 -1
  43. package/dist/esm/components/KmErpSendGood/index.js +3 -0
  44. package/dist/esm/components/LogisticsInterception/index.d.ts +3 -0
  45. package/dist/esm/components/LogisticsInterception/index.js +14 -7
  46. package/dist/esm/components/LogisticsInterception/interceptLogisticsCustomerCode.d.ts +42 -0
  47. package/dist/esm/components/LogisticsInterception/interceptLogisticsCustomerCode.js +102 -0
  48. package/dist/esm/components/LogisticsMoreInterception/index.d.ts +2 -0
  49. package/dist/esm/components/LogisticsMoreInterception/index.js +19 -5
  50. package/dist/esm/components/LogisticsMoreInterception/interceptLogisticsCustomerCode.d.ts +39 -0
  51. package/dist/esm/components/LogisticsMoreInterception/interceptLogisticsCustomerCode.js +101 -0
  52. package/dist/esm/components/Public/AsyncSelect/index.js +23 -22
  53. package/dist/esm/components/Public/Exchange/index.d.ts +7 -0
  54. package/dist/esm/components/Public/Exchange/index.js +6 -0
  55. package/dist/esm/components/Public/Goods/index.js +6 -12
  56. package/dist/esm/components/Public/ReissueGoods/index.d.ts +7 -0
  57. package/dist/esm/components/Public/ReissueGoods/index.js +6 -0
  58. package/dist/esm/components/Public/ReturnWarehouse/index.d.ts +1 -1
  59. package/dist/esm/components/Public/ReturnWarehouse/index.js +3 -0
  60. package/dist/esm/components/Reissue/Logistics/index.d.ts +1 -1
  61. package/dist/esm/components/Reissue/Logistics/index.js +3 -0
  62. package/dist/esm/components/Remark/index.d.ts +4 -1
  63. package/dist/esm/components/Remark/index.js +46 -9
  64. package/dist/esm/components/SKX/SkxGoods/index.d.ts +7 -0
  65. package/dist/esm/components/SKX/SkxGoods/index.js +6 -0
  66. package/dist/esm/components/WDT/WdtExchange/index.d.ts +7 -0
  67. package/dist/esm/components/WDT/WdtExchange/index.js +6 -0
  68. package/dist/esm/components/WDT/WdtGoods/index.d.ts +7 -0
  69. package/dist/esm/components/WDT/WdtGoods/index.js +6 -0
  70. package/dist/esm/components/WDT/WdtRessuie/index.d.ts +7 -0
  71. package/dist/esm/components/WDT/WdtRessuie/index.js +6 -0
  72. package/dist/esm/components/WDT/WdtReturn/index.d.ts +7 -0
  73. package/dist/esm/components/WDT/WdtReturn/index.js +6 -0
  74. package/dist/esm/constant.js +0 -3
  75. package/dist/esm/factory.d.ts +1 -1
  76. package/dist/esm/factory.js +12 -1
  77. package/dist/esm/service/api.d.ts +1 -0
  78. package/dist/esm/service/api.js +6 -0
  79. package/dist/esm/type.d.ts +1 -0
  80. package/package.json +4 -4
@@ -110,6 +110,9 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(_options) {
110
110
  _defineProperty(this, "renderExport", function (value, record) {
111
111
  var _typeMap$_this$type4;
112
112
  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)];
113
+ if (!Array.isArray(list)) {
114
+ return '';
115
+ }
113
116
  return (list || []).map(function (item) {
114
117
  var _this$componentConfig3, _ref;
115
118
  return [["gy", "jy"].includes(((_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.logistics) || "") ? (_ref = _this.expressDateInstance.getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCompany, false) || (item === null || item === void 0 ? void 0 : item.logisticsCompanyName)) !== null && _ref !== void 0 ? _ref : "" : _this.expressDateInstance.getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCompany), item === null || item === void 0 ? void 0 : item.logisticsCode].join("/");
@@ -17,9 +17,12 @@ declare class ERemark implements ComponentInterface {
17
17
  formField: string;
18
18
  canSort: boolean;
19
19
  children: ComponentInterface[];
20
+ effects: ComponentInterface['effects'];
20
21
  dataType: ComponentInterface['dataType'];
21
22
  constructor(options: PickOption);
22
- render: (value: Value) => React.JSX.Element;
23
+ getShop: (record?: Record) => any;
24
+ isYouzan: (record?: Record) => boolean;
25
+ render: (value: Value, isYouzan?: boolean) => React.JSX.Element;
23
26
  renderClient: (record: Record) => React.JSX.Element | null;
24
27
  renderPc: (value: unknown, record: Record) => React.JSX.Element;
25
28
  renderLog: (r: Record) => React.JSX.Element | null;
@@ -1,4 +1,11 @@
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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
3
+ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
4
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
5
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
6
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
7
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
8
+ 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
9
  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
10
  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
11
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -6,7 +13,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
6
13
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
7
14
  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
15
  import React from 'react';
9
- import { Remark } from '@kmkf-fe-packages/basic-components';
16
+ import { Remark, YouzanStar } from '@kmkf-fe-packages/basic-components';
10
17
  import GetFormItem from "../GetFormItem";
11
18
  import trade0 from "./flag/trade-icon-flag-0.png";
12
19
  import trade1 from "./flag/trade-icon-flag-1.png";
@@ -16,7 +23,7 @@ import trade4 from "./flag/trade-icon-flag-4.png";
16
23
  import trade5 from "./flag/trade-icon-flag-5.png";
17
24
  import get from 'lodash/get';
18
25
  import ItemView from "../../commonComponents/ItemView";
19
- import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
26
+ import { isNull, filterFn as _filterFn, isYouzanShop, normalizeYouzanStar } from '@kmkf-fe-packages/kmkf-utils';
20
27
  import { SYMBOL, batchInput, SEARCH_OPTIONS } from "../../constant";
21
28
  var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
22
29
  var _this = this,
@@ -34,14 +41,30 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
34
41
  _defineProperty(this, "formField", void 0);
35
42
  _defineProperty(this, "canSort", void 0);
36
43
  _defineProperty(this, "children", void 0);
44
+ _defineProperty(this, "effects", void 0);
37
45
  _defineProperty(this, "dataType", void 0);
46
+ _defineProperty(this, "getShop", function (record) {
47
+ var _this$effects, _this$effects2, _this$effects2$form, _this$effects3, _this$effects3$shopLi;
48
+ 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'));
49
+ 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) {
50
+ return shop.shopId === shopId;
51
+ });
52
+ });
53
+ _defineProperty(this, "isYouzan", function (record) {
54
+ return isYouzanShop(_this.getShop(record));
55
+ });
38
56
  _defineProperty(this, "render", function (value) {
57
+ var isYouzan = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
39
58
  var index = get(value, 'flag');
40
59
  return /*#__PURE__*/React.createElement("div", {
41
60
  style: {
42
61
  display: 'inline-block'
43
62
  }
44
- }, index !== undefined && /*#__PURE__*/React.createElement("img", {
63
+ }, isYouzan ? normalizeYouzanStar(index) ? /*#__PURE__*/React.createElement(YouzanStar, {
64
+ compact: true,
65
+ disabled: true,
66
+ value: index
67
+ }) : null : index !== undefined && /*#__PURE__*/React.createElement("img", {
45
68
  src: _this.imgList[Number(index)]
46
69
  }), /*#__PURE__*/React.createElement("span", null, get(value, 'remark')));
47
70
  });
@@ -49,7 +72,7 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
49
72
  return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
50
73
  id: _this.id,
51
74
  label: _this.name,
52
- value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id])
75
+ value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id], _this.isYouzan(record))
53
76
  }) : null;
54
77
  });
55
78
  _defineProperty(this, "renderPc", function (value, record) {
@@ -57,11 +80,16 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
57
80
  return /*#__PURE__*/React.createElement("span", null, "--");
58
81
  }
59
82
  var index = get(record, "".concat(_this.id, "_flag"));
83
+ var isYouzan = _this.isYouzan(record);
60
84
  return /*#__PURE__*/React.createElement("div", {
61
85
  style: {
62
86
  display: 'inline-block'
63
87
  }
64
- }, !isNull(get(record, "".concat(_this.id, "_flag"))) ? index !== undefined && /*#__PURE__*/React.createElement("img", {
88
+ }, !isNull(get(record, "".concat(_this.id, "_flag"))) ? isYouzan ? normalizeYouzanStar(index) && /*#__PURE__*/React.createElement(YouzanStar, {
89
+ compact: true,
90
+ disabled: true,
91
+ value: index
92
+ }) : index !== undefined && /*#__PURE__*/React.createElement("img", {
65
93
  src: _this.imgList[Number(index)]
66
94
  }) :
67
95
  // <i
@@ -94,7 +122,9 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
94
122
  display: p === null || p === void 0 ? void 0 : p.display,
95
123
  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
124
  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)
125
+ component: /*#__PURE__*/React.createElement(Remark, _extends({}, _this.componentConfig, {
126
+ isYouzan: _this.isYouzan()
127
+ }))
98
128
  });
99
129
  });
100
130
  _defineProperty(this, "filterConfig", function (item) {
@@ -111,7 +141,10 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
111
141
  // 过滤组件名称
112
142
  filterComponentType: 'SelectInput',
113
143
  props: {
114
- filterOptions: SEARCH_OPTIONS
144
+ filterOptions: [].concat(_toConsumableArray(SEARCH_OPTIONS), [{
145
+ label: "关键词不包含",
146
+ value: "nincludeLike"
147
+ }])
115
148
  },
116
149
  filterFn: function filterFn(value) {
117
150
  return function (i) {
@@ -170,6 +203,7 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
170
203
  this.formField = "".concat(options.id, "_remark");
171
204
  this.type = options.type;
172
205
  this.componentConfig = options.componentConfig;
206
+ this.effects = options.effects;
173
207
  this.dataType = 'object';
174
208
  this.rules = (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
175
209
  validator: function validator(_, value) {
@@ -177,8 +211,11 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
177
211
  if (!(value !== null && value !== void 0 && value.remark)) {
178
212
  return Promise.reject(new Error('请输入备注'));
179
213
  }
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('请选择旗帜'));
214
+ if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.isShowFlag) {
215
+ var flag = _this.isYouzan() ? normalizeYouzanStar(value === null || value === void 0 ? void 0 : value.flag) : value === null || value === void 0 ? void 0 : value.flag;
216
+ if (!flag && flag !== 0) {
217
+ return Promise.reject(new Error(_this.isYouzan() ? '请选择星标' : '请选择旗帜'));
218
+ }
182
219
  }
183
220
  return Promise.resolve();
184
221
  }
@@ -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;
@@ -28,9 +28,6 @@ export var SEARCH_OPTIONS = [{
28
28
  }, {
29
29
  label: "关键词模糊匹配",
30
30
  value: "anylike"
31
- }, {
32
- label: "关键词不包含",
33
- value: "nincludeLike"
34
31
  }, {
35
32
  label: "为空查询",
36
33
  value: "isNull"
@@ -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) => CommonMultiStatus | CommonSystemOrder | JstSendGood | MsgStatus | 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 | 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 | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | DxdShopSelect | 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 | LogisticsInterception | LogisticsMoreInterception | AsyncSelect | 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 | 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 | DxdShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | ReturnWarehouse | GyGoods | KmExchange | GyReissue | GyReturn | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
@@ -142,6 +142,7 @@ export var factory = function factory(type, options) {
142
142
  case "BS_SYSTEM_ORDER":
143
143
  case "KM_SYSTEM_ORDER":
144
144
  case "DXD_SYSTEM_ORDER":
145
+ case "TTX_SYSTEM_ORDER":
145
146
  case "WLN_SYSTEM_ORDER":
146
147
  case "WDT_SYSTEM_ORDER":
147
148
  case "BS_E3_SYSTEM_ORDER":
@@ -162,6 +163,7 @@ export var factory = function factory(type, options) {
162
163
  case "JY_SEND_GOOD":
163
164
  case "JKY_SEND_GOOD":
164
165
  case "DXD_SEND_GOOD":
166
+ case "TTX_SEND_GOOD":
165
167
  return new JstSendGood(options);
166
168
  case "KM_RETURN_WAREHOUSE":
167
169
  return new ReturnWarehouse(options);
@@ -182,6 +184,7 @@ export var factory = function factory(type, options) {
182
184
  case "JST_AFTERSALE_GOODS":
183
185
  case "DXD_GOODS":
184
186
  case "DXD_SUPPLIERS":
187
+ case "TTX_GOODS":
185
188
  return new PublicGoods(options);
186
189
  case "WLN_REISSUE_GOODS":
187
190
  case "JST_REISSUE_GOODS":
@@ -232,6 +235,7 @@ export var factory = function factory(type, options) {
232
235
  case "SKX_LOGISTICS":
233
236
  case "SKX_RETURN_LOGISTICS":
234
237
  case "DXD_LOGISTICS":
238
+ case "TTX_LOGISTICS":
235
239
  return new BsLogistics(options);
236
240
  case "FLOW_WORK_ORDER_ID_INPUT":
237
241
  return new FlowWorkOrderId(options);
@@ -254,14 +258,21 @@ export var factory = function factory(type, options) {
254
258
  return new StatusSelect(options);
255
259
  case "RETURN_GOODS_STATUS":
256
260
  case "EXCHANGE_STATUS":
261
+ return new CommonMultiStatus(options);
257
262
  case "WAREHOUSING_STATUS":
258
263
  case "BS_E3_WAREHOUSING_STATUS":
259
264
  case "WDT_WAREHOUSING_STATUS":
265
+ case "WDT_WAREHOUSING_STATUS_V2":
266
+ case "DXD_WAREHOUSING_STATUS":
260
267
  case "WLN_WAREHOUSING_STATUS":
261
268
  case "JKY_WAREHOUSING_STATUS":
262
269
  case "JST_WAREHOUSING_STATUS":
263
270
  case "KM_WAREHOUSING_STATUS":
264
- return new CommonMultiStatus(options);
271
+ case "TTX_WAREHOUSING_STATUS":
272
+ case "JY_WAREHOUSING_STATUS":
273
+ return new CommonMultiStatus(options, {
274
+ isWarehousingStatus: true
275
+ });
265
276
  case "MSG_STATUS":
266
277
  return new MsgStatus(options);
267
278
  case "GY_PAYMENT_METHOD":
@@ -16,6 +16,7 @@ export declare const queryJKYLogisticsCompany: () => Promise<void>;
16
16
  export declare const queryWLNLogisticsCompany: () => Promise<void>;
17
17
  export declare const queryKMLogisticsCompany: () => Promise<void>;
18
18
  export declare const queryDXDLogisticsCompany: () => Promise<void>;
19
+ export declare const queryTTXLogisticsCompany: () => Promise<void>;
19
20
  export declare const getAlipayBillReceipt: (data: any) => Promise<any>;
20
21
  export declare const queryLabel: () => Promise<any>;
21
22
  export declare const queryWorkOrderDetail: (data: any) => Promise<any>;
@@ -329,6 +329,12 @@ export var queryDXDLogisticsCompany = function queryDXDLogisticsCompany() {
329
329
  instance.expressData = data;
330
330
  }).catch(console.log);
331
331
  };
332
+ export var queryTTXLogisticsCompany = function queryTTXLogisticsCompany() {
333
+ var instance = ExpressData.getInstance("ttx");
334
+ return servers.TTX.getLogisticsDataAsync().then(function (data) {
335
+ instance.expressData = data;
336
+ }).catch(console.log);
337
+ };
332
338
  // 获取支付宝电子回单
333
339
  export var getAlipayBillReceipt = function getAlipayBillReceipt(data) {
334
340
  return request({
@@ -5,6 +5,7 @@ export declare type ShowHeaderObjType = {
5
5
  title: string;
6
6
  dataIndex: string;
7
7
  show?: boolean;
8
+ width?: number;
8
9
  };
9
10
  export declare type DataType = "string" | "number" | "array" | "dateArray" | "date" | "tradeId";
10
11
  export declare type ALignType = "left" | "right" | "center";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/services-components",
3
- "version": "2.10.9-beta.6",
3
+ "version": "2.10.9-beta.60",
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.6",
25
- "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.6",
24
+ "@kmkf-fe-packages/basic-components": "2.10.9-beta.60",
25
+ "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.58",
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": "a114400ea3b0788d00a456f7a8b8e49a18612a8e",
44
+ "gitHead": "96b8ed8cb3d5448525037bc521c43f403f0ca4cb",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }