@kmkf-fe-packages/services-components 1.0.4 → 1.0.5-rc.0

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.
package/README.md CHANGED
@@ -2,5 +2,4 @@
2
2
 
3
3
  - 针对于自定义组件的后缀,在提交的时候是以组件类型的驼峰式来命名的
4
4
 
5
- ---
6
-
5
+ ---
@@ -1,5 +1,5 @@
1
1
  import React from "react";
2
- declare type RequestType = "queryAddressData" | "queryBsAddressData" | "queryExpressInterceptData" | "queryLogisticsAddressData" | "queryPlatData" | "queryWdtAddressData" | "queryAllLogisticsCompany";
2
+ declare type RequestType = "queryAddressData" | "queryBsAddressData" | "queryExpressInterceptData" | "queryLogisticsAddressData" | "queryPlatData" | "queryWdtAddressData" | "queryAllLogisticsCompany" | "queryWdtLogisticsCompany" | "queryWdtSendData" | "queryLabel";
3
3
  declare const Global: ({ children, requestList, repeatRequestList }: React.PropsWithChildren<{
4
4
  requestList?: RequestType[] | undefined;
5
5
  repeatRequestList?: Record<string, () => Promise<any>> | undefined;
@@ -15,7 +15,8 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
15
15
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
16
16
  import React, { useEffect, useState } from "react";
17
17
  import { Skeleton, Result, Button } from "antd";
18
- import { queryAddressData, queryBsAddressData, queryExpressInterceptData, queryLogisticsAddressData, queryPlatData, queryWdtAddressData, queryAllLogisticsCompany } from "../../service/api";
18
+ import { queryExpressInterceptData, queryLogisticsAddressData, queryPlatData, queryWdtLogisticsCompany, queryWdtSendData, queryAllLogisticsCompany, queryLabel } from "../../service/api";
19
+ import { servers } from '@kmkf-fe-packages/kmkf-utils';
19
20
  var Global = function Global(_ref) {
20
21
  var children = _ref.children,
21
22
  _ref$requestList = _ref.requestList,
@@ -33,13 +34,16 @@ var Global = function Global(_ref) {
33
34
  while (1) switch (_context.prev = _context.next) {
34
35
  case 0:
35
36
  mapping = {
36
- queryAddressData: queryAddressData,
37
- queryBsAddressData: queryBsAddressData,
37
+ queryAddressData: servers.queryAddressData,
38
+ queryBsAddressData: servers.queryBsAddressData,
38
39
  queryExpressInterceptData: queryExpressInterceptData,
39
40
  queryLogisticsAddressData: queryLogisticsAddressData,
40
41
  queryPlatData: queryPlatData,
41
- queryWdtAddressData: queryWdtAddressData,
42
- queryAllLogisticsCompany: queryAllLogisticsCompany
42
+ queryWdtAddressData: servers.queryWdtAddressData,
43
+ queryAllLogisticsCompany: queryAllLogisticsCompany,
44
+ queryWdtLogisticsCompany: queryWdtLogisticsCompany,
45
+ queryWdtSendData: queryWdtSendData,
46
+ queryLabel: queryLabel
43
47
  };
44
48
  mergeMapping = _objectSpread(_objectSpread({}, mapping), repeatRequestList);
45
49
  promises = [];
@@ -47,7 +47,7 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
47
47
  _typeMap$_options$typ5,
48
48
  _typeMap$_options$typ6,
49
49
  _this$componentConfig3,
50
- _this$componentConfig4;
50
+ _this$componentConfig5;
51
51
  _classCallCheck(this, BsLogistics);
52
52
  _defineProperty(this, "name", void 0);
53
53
  _defineProperty(this, "id", void 0);
@@ -73,7 +73,8 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
73
73
  label: _this.name,
74
74
  value: /*#__PURE__*/React.createElement(JstGoodImage, {
75
75
  list: record === null || record === void 0 ? void 0 : record[_this.id],
76
- type: 1
76
+ type: 1,
77
+ platformType: _this.type === 'WDT_LOGISTICS' ? 'wdt' : 'default'
77
78
  })
78
79
  }) : null;
79
80
  });
@@ -120,7 +121,8 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
120
121
  }
121
122
  }, /*#__PURE__*/React.createElement(JstGoodImage, {
122
123
  list: list,
123
- type: 1
124
+ type: 1,
125
+ platformType: _this.type === 'WDT_LOGISTICS' ? 'wdt' : 'default'
124
126
  }));
125
127
  });
126
128
  _defineProperty(this, "renderLog", function (r) {
@@ -147,6 +149,7 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
147
149
  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,
148
150
  component: /*#__PURE__*/React.createElement(JstGoods, _extends({}, _this.componentConfig, {
149
151
  type: 1,
152
+ platformType: _this.type === 'WDT_LOGISTICS' ? 'wdt' : 'default',
150
153
  options: _this.expressDateInstance.getExpressData(),
151
154
  onChange: p === null || p === void 0 ? void 0 : p.onChange
152
155
  }))
@@ -172,7 +175,8 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
172
175
  name: "物流公司",
173
176
  parentName: this.name,
174
177
  id: "".concat(_options.id, "_").concat((_typeMap$_options$typ3 = typeMap[_options.type]) === null || _typeMap$_options$typ3 === void 0 ? void 0 : _typeMap$_options$typ3.key, "_").concat((_typeMap$_options$typ4 = typeMap[_options.type]) === null || _typeMap$_options$typ4 === void 0 ? void 0 : _typeMap$_options$typ4.company),
175
- width: 200
178
+ width: 200,
179
+ platformType: this.type === 'WDT_LOGISTICS' ? 'wdt' : 'default'
176
180
  }));
177
181
  this.expressCode = new ExpressCode(_objectSpread(_objectSpread({}, _options), {}, {
178
182
  name: "物流单号",
@@ -185,7 +189,8 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
185
189
  this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
186
190
  required: true,
187
191
  validator: function validator(_, value) {
188
- var showField = _this.componentConfig.showField;
192
+ var _this$componentConfig4;
193
+ var showField = (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.showField;
189
194
  var hasNo = (value || []).some(function (item) {
190
195
  if (showField === "logisticsCompany") {
191
196
  return item.logisticsCompany;
@@ -201,7 +206,7 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
201
206
  return Promise.resolve();
202
207
  }
203
208
  }] : [];
204
- this.expressDateInstance = ExpressData.getInstance();
205
- this.sortChildField = this.getSortChildFields(((_this$componentConfig4 = this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.showField) || "", _options);
209
+ this.expressDateInstance = ExpressData.getInstance(this.type === 'WDT_LOGISTICS' ? 'wdt' : 'default');
210
+ this.sortChildField = this.getSortChildFields(((_this$componentConfig5 = this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.showField) || "", _options);
206
211
  });
207
212
  export default BsLogistics;
@@ -24,14 +24,14 @@ var typeMap = {
24
24
  typeName: 'bsReissueType',
25
25
  remark: 'bsReissueType_memo',
26
26
  errMsg: '请选择bs补发商品'
27
- },
28
- WDT_REISSUE_GOODS: {
29
- key: 'wdtReissueGoods',
30
- name: '旺店通',
31
- typeName: 'wdtReissueType',
32
- remark: 'wdtReissueType_memo',
33
- errMsg: '请选择旺店通补发商品'
34
27
  }
28
+ // WDT_REISSUE_GOODS: {
29
+ // key: 'wdtReissueGoods',
30
+ // name: '旺店通',
31
+ // typeName: 'wdtReissueType',
32
+ // remark: 'wdtReissueType_memo',
33
+ // errMsg: '请选择旺店通补发商品',
34
+ // },
35
35
  };
36
36
  var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
37
37
  var _this = this,
@@ -0,0 +1,26 @@
1
+ import { ComponentInterface, PickOption, ALignType, Record } from "../../../type";
2
+ import React from "react";
3
+ declare class SystemOrderNo implements ComponentInterface {
4
+ name: string;
5
+ id: string;
6
+ sortField: string;
7
+ type: string;
8
+ componentConfig: ComponentInterface["componentConfig"];
9
+ align: ALignType;
10
+ width: number;
11
+ isCombinationComponent: boolean;
12
+ formField: string;
13
+ canSort: boolean;
14
+ children: ComponentInterface[];
15
+ dataType: ComponentInterface["dataType"];
16
+ constructor(options: PickOption);
17
+ getParentId: () => string;
18
+ renderClient: (r: any) => React.JSX.Element | null;
19
+ renderPc: (value: unknown, record: Record) => React.JSX.Element;
20
+ renderLog: (r: Record) => React.JSX.Element | null;
21
+ getComponentValue: (r: Record) => any;
22
+ renderExport: (value: string, record: Record) => any;
23
+ editRender: () => null;
24
+ filterConfig: () => never[];
25
+ }
26
+ export default SystemOrderNo;
@@ -0,0 +1,94 @@
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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
3
+ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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; }
6
+ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
7
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
8
+ 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); } }
9
+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
10
+ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
11
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
12
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
13
+ 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); }
14
+ import React from "react";
15
+ import ItemView from "../../../commonComponents/ItemView";
16
+ import { isNull } from "@kmkf-fe-packages/kmkf-utils";
17
+ var componentType = {
18
+ WDT_REISSUE_GOODS: "wdtSystemOrderNo"
19
+ };
20
+ var SystemOrderNo = /*#__PURE__*/_createClass(function SystemOrderNo(options) {
21
+ var _this = this;
22
+ _classCallCheck(this, SystemOrderNo);
23
+ _defineProperty(this, "name", void 0);
24
+ _defineProperty(this, "id", void 0);
25
+ _defineProperty(this, "sortField", void 0);
26
+ _defineProperty(this, "type", void 0);
27
+ _defineProperty(this, "componentConfig", void 0);
28
+ _defineProperty(this, "align", void 0);
29
+ _defineProperty(this, "width", void 0);
30
+ _defineProperty(this, "isCombinationComponent", void 0);
31
+ _defineProperty(this, "formField", void 0);
32
+ _defineProperty(this, "canSort", void 0);
33
+ _defineProperty(this, "children", void 0);
34
+ _defineProperty(this, "dataType", void 0);
35
+ _defineProperty(this, "getParentId", function () {
36
+ var _this$id$split = _this.id.split("_"),
37
+ _this$id$split2 = _slicedToArray(_this$id$split, 2),
38
+ key = _this$id$split2[0],
39
+ name = _this$id$split2[1];
40
+ return "".concat(key, "_").concat(name);
41
+ });
42
+ _defineProperty(this, "renderClient", function (r) {
43
+ var _r$key;
44
+ var _this$getParentId$spl = _this.getParentId().split("_"),
45
+ _this$getParentId$spl2 = _slicedToArray(_this$getParentId$spl, 1),
46
+ key = _this$getParentId$spl2[0];
47
+ if (!(r !== null && r !== void 0 && r[key][componentType[_this.type]])) {
48
+ return null;
49
+ }
50
+ var text = r !== null && r !== void 0 && r[key] ? r === null || r === void 0 ? void 0 : (_r$key = r[key]) === null || _r$key === void 0 ? void 0 : _r$key[componentType[_this.type]] : "";
51
+ return !isNull(r === null || r === void 0 ? void 0 : r[key]) ? /*#__PURE__*/React.createElement(ItemView, {
52
+ id: _this.id,
53
+ label: _this.name,
54
+ value: text
55
+ }) : null;
56
+ });
57
+ _defineProperty(this, "renderPc", function (value, record) {
58
+ var _this$getComponentVal;
59
+ return /*#__PURE__*/React.createElement("span", null, (_this$getComponentVal = _this.getComponentValue(record)) !== null && _this$getComponentVal !== void 0 ? _this$getComponentVal : "--");
60
+ });
61
+ _defineProperty(this, "renderLog", function (r) {
62
+ var id = _this.getParentId();
63
+ if (isNull(r === null || r === void 0 ? void 0 : r[id])) return null;
64
+ return _this.renderPc(undefined, r);
65
+ });
66
+ _defineProperty(this, "getComponentValue", function (r) {
67
+ var id = _this.getParentId();
68
+ var text = r !== null && r !== void 0 && r[id] ? r === null || r === void 0 ? void 0 : r[id] : "";
69
+ return text;
70
+ });
71
+ _defineProperty(this, "renderExport", function (value, record) {
72
+ var _this$getComponentVal2;
73
+ return (_this$getComponentVal2 = _this.getComponentValue(record)) !== null && _this$getComponentVal2 !== void 0 ? _this$getComponentVal2 : "--";
74
+ });
75
+ _defineProperty(this, "editRender", function () {
76
+ return null;
77
+ });
78
+ _defineProperty(this, "filterConfig", function () {
79
+ return [];
80
+ });
81
+ this.name = options.name;
82
+ this.id = options.id;
83
+ this.sortField = options.id;
84
+ this.formField = options.id;
85
+ this.type = options.type;
86
+ this.componentConfig = options.componentConfig;
87
+ this.align = "left";
88
+ this.width = 140;
89
+ this.isCombinationComponent = false;
90
+ this.canSort = false;
91
+ this.dataType = "string";
92
+ this.children = [];
93
+ });
94
+ export default SystemOrderNo;
@@ -18,7 +18,10 @@ declare class Express implements ComponentInterface {
18
18
  dataType: ComponentInterface["dataType"];
19
19
  options: ComponentInterface["options"];
20
20
  parentName: string;
21
- constructor(options: PickOption);
21
+ platformType?: string;
22
+ constructor(options: PickOption & {
23
+ platformType: string;
24
+ });
22
25
  renderClient: () => null;
23
26
  renderPc: (value: unknown, record: Record) => React.JSX.Element;
24
27
  renderLog: (r: Record) => React.JSX.Element | null;
@@ -46,6 +46,7 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
46
46
  _defineProperty(this, "dataType", void 0);
47
47
  _defineProperty(this, "options", void 0);
48
48
  _defineProperty(this, "parentName", void 0);
49
+ _defineProperty(this, "platformType", void 0);
49
50
  _defineProperty(this, "renderClient", function () {
50
51
  return null;
51
52
  });
@@ -61,7 +62,8 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
61
62
  }
62
63
  return /*#__PURE__*/React.createElement(BsExpressRender, {
63
64
  list: record === null || record === void 0 ? void 0 : record["".concat(key, "_").concat(parentKey, "_").concat((_typeMap$_this$type2 = typeMap[_this.type]) === null || _typeMap$_this$type2 === void 0 ? void 0 : _typeMap$_this$type2.key)],
64
- showField: "company"
65
+ showField: "company",
66
+ platformType: _this.platformType
65
67
  });
66
68
  });
67
69
  _defineProperty(this, "renderLog", function (r) {
@@ -108,7 +110,8 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
108
110
  this.componentConfig = options.componentConfig;
109
111
  this.rules = [];
110
112
  this.align = "left";
111
- this.expressDateInstance = ExpressData.getInstance();
113
+ this.platformType = options.platformType;
114
+ this.expressDateInstance = ExpressData.getInstance(this.platformType);
112
115
  this.width = (options === null || options === void 0 ? void 0 : options.width) || 150;
113
116
  this.isCombinationComponent = false;
114
117
  this.canSort = false;
@@ -4,3 +4,4 @@ export { default as BsHeaderPic } from "./BsHeaderPic";
4
4
  export { default as BsHeaderGoodPic } from "./BsHeaderGoodPic";
5
5
  export { default as BsHeaderChild } from "./BsHeaderChild";
6
6
  export { default as BsHeaderGood } from "./BsHeaderGood";
7
+ export { default as SystemOrderNo } from "./SystemOrderNo";
@@ -3,4 +3,5 @@ export { default as BsMemo } from "./BsMemo";
3
3
  export { default as BsHeaderPic } from "./BsHeaderPic";
4
4
  export { default as BsHeaderGoodPic } from "./BsHeaderGoodPic";
5
5
  export { default as BsHeaderChild } from "./BsHeaderChild";
6
- export { default as BsHeaderGood } from "./BsHeaderGood";
6
+ export { default as BsHeaderGood } from "./BsHeaderGood";
7
+ export { default as SystemOrderNo } from "./SystemOrderNo";
@@ -1,4 +1,4 @@
1
- import React from 'react';
1
+ import React from "react";
2
2
  declare type getFormItemProps = {
3
3
  name: string;
4
4
  title: string;
@@ -15,8 +15,8 @@ export declare const showImage: ({ item, type, index, showHeader, }: {
15
15
  }) => React.JSX.Element;
16
16
  export declare const ShowTotalImage: ({ total, allImage, type, showHeader, }: any) => React.JSX.Element;
17
17
  export declare const GoodImage: ({ list, type, showHeader }: any) => React.JSX.Element | null;
18
- export declare const JstGoodImage: ({ list, type }: any) => any;
19
- export declare const BsExpressRender: ({ list, showField }: any) => any;
18
+ export declare const JstGoodImage: ({ list, type, platformType }: any) => any;
19
+ export declare const BsExpressRender: ({ list, showField, platformType }: any) => any;
20
20
  export declare const CommonOrderContent: ({ list, valueKey, failValue, options, }: any) => any;
21
21
  export declare const BsGoodImage: ({ item, index }: {
22
22
  item: any;
@@ -12,14 +12,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
12
12
  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; }
13
13
  function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
14
14
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
15
- import { Form, Button, Modal, Tooltip, Space, Image, Popover, Table, message, Typography } from 'antd';
16
- import React, { useState, useMemo } from 'react';
17
- import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
15
+ import { Form, Button, Modal, Tooltip, Space, Image, Popover, Table, message, Typography } from "antd";
16
+ import React, { useState, useMemo } from "react";
17
+ import { ExpressData, WdtSendData } from "@kmkf-fe-packages/kmkf-utils";
18
18
  import { getAlipayBillReceipt } from "../../service/api";
19
- import { CopyToClipboard } from 'react-copy-to-clipboard';
19
+ import { CopyToClipboard } from "react-copy-to-clipboard";
20
+ import CopyText from "../../commonComponents/CopyText";
20
21
  import styles from "./index.module.less";
21
22
  import defaultImg from "./img/default-img.png";
22
- import CopyText from "../../commonComponents/CopyText";
23
23
  var Paragraph = Typography.Paragraph;
24
24
  export var getFormItem = function getFormItem(_ref) {
25
25
  var name = _ref.name,
@@ -255,10 +255,12 @@ var content = function content(item, index) {
255
255
  export var JstGoodImage = function JstGoodImage(_ref6) {
256
256
  var _ref6$list = _ref6.list,
257
257
  list = _ref6$list === void 0 ? [] : _ref6$list,
258
- type = _ref6.type;
258
+ type = _ref6.type,
259
+ _ref6$platformType = _ref6.platformType,
260
+ platformType = _ref6$platformType === void 0 ? 'default' : _ref6$platformType;
259
261
  return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
260
262
  var logisticsCompany = item.logisticsCompany;
261
- var company = ExpressData.getInstance().getExpressNameByCode(logisticsCompany);
263
+ var company = ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany);
262
264
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
263
265
  content: content(item, index),
264
266
  overlayStyle: {
@@ -274,17 +276,19 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
274
276
  text: item.logisticsCode
275
277
  })) : company ? company : item.logisticsCode ? /*#__PURE__*/React.createElement(CopyText, {
276
278
  text: item.logisticsCode
277
- }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyName && item.supplyId ? [item.supplyId, item.supplyName].join('/') : item.supplyId ? item.supplyId : item.supplyName) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendId, item.sendName].join('/') : item.sendId ? item.sendId : item.sendName) : null, type === 4 ? /*#__PURE__*/React.createElement("span", null, (item === null || item === void 0 ? void 0 : item.deliveryNo) || '') : null));
279
+ }) : null) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyName && item.supplyId ? [item.supplyId, item.supplyName].join('/') : item.supplyId ? item.supplyId : item.supplyName) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendId, platformType === 'wdt' ? WdtSendData.getInstance().getWdtSendNameByCode(item.sendName) : item.sendName].join("/") : item.sendId ? item.sendId : platformType === 'wdt' ? WdtSendData.getInstance().getWdtSendNameByCode(item.sendName) : item.sendName) : null, type === 4 ? /*#__PURE__*/React.createElement("span", null, (item === null || item === void 0 ? void 0 : item.deliveryNo) || '') : null));
278
280
  }) : null;
279
281
  };
280
282
  export var BsExpressRender = function BsExpressRender(_ref7) {
281
283
  var _ref7$list = _ref7.list,
282
284
  list = _ref7$list === void 0 ? [] : _ref7$list,
283
285
  _ref7$showField = _ref7.showField,
284
- showField = _ref7$showField === void 0 ? '' : _ref7$showField;
286
+ showField = _ref7$showField === void 0 ? "" : _ref7$showField,
287
+ _ref7$platformType = _ref7.platformType,
288
+ platformType = _ref7$platformType === void 0 ? "default" : _ref7$platformType;
285
289
  return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
286
290
  var logisticsCompany = item.logisticsCompany;
287
- var company = ExpressData.getInstance().getExpressNameByCode(logisticsCompany);
291
+ var company = ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany);
288
292
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
289
293
  content: content(item, index),
290
294
  overlayStyle: {
@@ -33,8 +33,9 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
33
33
  var _this = this,
34
34
  _typeMap$_options$typ,
35
35
  _typeMap$_options$typ2,
36
- _this$componentConfig3,
37
- _this$componentConfig4;
36
+ _this$componentConfig6,
37
+ _this$componentConfig7,
38
+ _this$componentConfig8;
38
39
  _classCallCheck(this, JstLogistics);
39
40
  _defineProperty(this, "name", void 0);
40
41
  _defineProperty(this, "id", void 0);
@@ -84,6 +85,7 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
84
85
  return [];
85
86
  });
86
87
  _defineProperty(this, "renderClient", function (record) {
88
+ var _this$componentConfig;
87
89
  var isShow = Array.isArray(record === null || record === void 0 ? void 0 : record[_this.id]) ? some(record === null || record === void 0 ? void 0 : record[_this.id], function (item) {
88
90
  return !isNull(item);
89
91
  }) : false;
@@ -92,12 +94,13 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
92
94
  label: _this.name,
93
95
  value: /*#__PURE__*/React.createElement(JstGoodImage, {
94
96
  list: record === null || record === void 0 ? void 0 : record[_this.id],
95
- type: 1
97
+ type: 1,
98
+ platformType: (_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.logistics
96
99
  })
97
100
  }) : null;
98
101
  });
99
102
  _defineProperty(this, "renderPc", function (value, record) {
100
- var _typeMap$_this$type;
103
+ var _typeMap$_this$type, _this$componentConfig2;
101
104
  var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.key)];
102
105
  //兼容多个商品
103
106
  return /*#__PURE__*/React.createElement("span", {
@@ -106,7 +109,8 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
106
109
  }
107
110
  }, /*#__PURE__*/React.createElement(JstGoodImage, {
108
111
  list: list,
109
- type: 1
112
+ type: 1,
113
+ platformType: (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.logistics
110
114
  }));
111
115
  });
112
116
  _defineProperty(this, "renderLog", function (r) {
@@ -127,17 +131,18 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
127
131
  }).join(",");
128
132
  });
129
133
  _defineProperty(this, "editRender", function (p) {
130
- var _this$componentConfig, _this$componentConfig2;
134
+ var _this$componentConfig3, _this$componentConfig4, _this$componentConfig5;
131
135
  return /*#__PURE__*/React.createElement(GetFormItem, {
132
136
  title: _this.name,
133
137
  name: _this.id,
134
138
  rules: _this.rules,
135
139
  hidden: p === null || p === void 0 ? void 0 : p.hidden,
136
140
  display: p === null || p === void 0 ? void 0 : p.display,
137
- 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,
141
+ required: (_this$componentConfig3 = (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.required) !== null && _this$componentConfig3 !== void 0 ? _this$componentConfig3 : false,
138
142
  component: /*#__PURE__*/React.createElement(JstGoods, _extends({}, _this.componentConfig, {
139
143
  type: 1,
140
- options: _this.expressDateInstance.getExpressData()
144
+ options: _this.expressDateInstance.getExpressData(),
145
+ platformType: (_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.logistics
141
146
  }))
142
147
  });
143
148
  });
@@ -199,7 +204,7 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
199
204
  this.canSort = false;
200
205
  this.children = [];
201
206
  this.dataType = "object";
202
- this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
207
+ this.rules = (_this$componentConfig6 = this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required ? [{
203
208
  required: true,
204
209
  validator: function validator(_, value) {
205
210
  var hasNo = (value || []).some(function (item) {
@@ -212,7 +217,7 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
212
217
  }
213
218
  }] : [];
214
219
  this.align = "left";
215
- this.expressDateInstance = ExpressData.getInstance();
216
- this.sortChildField = this.getSortChildFields(((_this$componentConfig4 = this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.showField) || "", _options);
220
+ this.expressDateInstance = ExpressData.getInstance((_this$componentConfig7 = this.componentConfig) === null || _this$componentConfig7 === void 0 ? void 0 : _this$componentConfig7.logistics);
221
+ this.sortChildField = this.getSortChildFields(((_this$componentConfig8 = this.componentConfig) === null || _this$componentConfig8 === void 0 ? void 0 : _this$componentConfig8.showField) || "", _options);
217
222
  });
218
223
  export default JstLogistics;
@@ -27,13 +27,24 @@ declare class JstSendGood implements ComponentInterface {
27
27
  getComponentValue: (r: Record) => any;
28
28
  renderExport: (value: any, record: any) => any;
29
29
  editRender: (p: any) => React.JSX.Element;
30
- filterConfig: (item: ColumnConfig) => {
30
+ filterConfig: (item: ColumnConfig) => ({
31
+ searchDefaultConditions: "in";
32
+ type: string;
33
+ id: string;
34
+ name: string;
35
+ filterComponentType: "MultipleSelect";
36
+ props: {
37
+ options: any[];
38
+ };
39
+ filterFn: (value: string) => (i: Record) => any;
40
+ } | {
31
41
  searchDefaultConditions: "like";
32
42
  type: string;
33
43
  id: string;
34
44
  name: string;
35
45
  filterComponentType: "Input";
36
46
  filterFn: (value: string) => (i: Record) => any;
37
- }[];
47
+ props?: undefined;
48
+ })[];
38
49
  }
39
50
  export default JstSendGood;
@@ -12,7 +12,7 @@ import GetFormItem from "../../GetFormItem";
12
12
  import { JstGoodImage } from "../../Common";
13
13
  import { JstGoods } from "@kmkf-fe-packages/basic-components";
14
14
  import ItemView from "../../../commonComponents/ItemView";
15
- import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
15
+ import { isNull, filterFn as _filterFn, WdtSendData } from "@kmkf-fe-packages/kmkf-utils";
16
16
  import { SYMBOL } from "../../../constant";
17
17
  var typeMap = {
18
18
  JST_SEND_GOOD: {
@@ -100,7 +100,8 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
100
100
  label: _this.name,
101
101
  value: /*#__PURE__*/React.createElement(JstGoodImage, {
102
102
  list: record === null || record === void 0 ? void 0 : record[_this.id],
103
- type: 3
103
+ type: 3,
104
+ platformType: _this.type === 'WDT_SEND_GOOD' ? 'wdt' : 'default'
104
105
  })
105
106
  }) : null;
106
107
  });
@@ -114,7 +115,8 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
114
115
  }
115
116
  }, /*#__PURE__*/React.createElement(JstGoodImage, {
116
117
  list: list,
117
- type: 3
118
+ type: 3,
119
+ platformType: _this.type === 'WDT_SEND_GOOD' ? 'wdt' : 'default'
118
120
  }));
119
121
  });
120
122
  _defineProperty(this, "renderLog", function (r) {
@@ -131,7 +133,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
131
133
  var _typeMap$_this$type4;
132
134
  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)];
133
135
  return (list || []).map(function (item) {
134
- return [item === null || item === void 0 ? void 0 : item.sendId, item === null || item === void 0 ? void 0 : item.sendName].join("/");
136
+ return [item === null || item === void 0 ? void 0 : item.sendId, _this.type === 'WDT_SEND_GOOD' ? WdtSendData.getInstance().getWdtSendNameByCode(item === null || item === void 0 ? void 0 : item.sendName) : item === null || item === void 0 ? void 0 : item.sendName].join("/");
135
137
  }).join(",");
136
138
  });
137
139
  _defineProperty(this, "editRender", function (p) {
@@ -143,24 +145,44 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
143
145
  hidden: p === null || p === void 0 ? void 0 : p.hidden,
144
146
  display: p === null || p === void 0 ? void 0 : p.display,
145
147
  component: /*#__PURE__*/React.createElement(JstGoods, _extends({}, _this.componentConfig, {
146
- type: 3
148
+ type: 3,
149
+ platformType: _this.type === 'WDT_SEND_GOOD' ? 'wdt' : 'default'
147
150
  }))
148
151
  });
149
152
  });
150
153
  _defineProperty(this, "filterConfig", function (item) {
151
- var _typeMap$_this$type5, _typeMap$_this$type7;
152
- return [{
153
- searchDefaultConditions: SYMBOL.like,
154
+ var _typeMap$_this$type5, _typeMap$_this$type6, _typeMap$_this$type8;
155
+ return [_this.type === 'WDT_SEND_GOOD' ? {
156
+ searchDefaultConditions: SYMBOL.in,
154
157
  type: item.type,
155
158
  id: "".concat(item.id, "_").concat((_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.sendName),
156
159
  name: "".concat(_this.name, "\u540D\u79F0"),
157
- filterComponentType: "Input",
160
+ filterComponentType: "MultipleSelect",
161
+ props: {
162
+ options: WdtSendData.getInstance().getWdtSendData() || []
163
+ },
158
164
  filterFn: function filterFn(value) {
159
165
  return function (i) {
160
- var _ref, _typeMap$_this$type6;
161
- return (_ref = _filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type6 = typeMap[_this.type]) === null || _typeMap$_this$type6 === void 0 ? void 0 : _typeMap$_this$type6.key) || []) === null || _ref === void 0 ? void 0 : _ref.some(function (item) {
166
+ var _ref;
167
+ return (_ref = _filterFn.filterTableListItemColumnValue(i, item.id, "sendName").split(",") || []) === null || _ref === void 0 ? void 0 : _ref.some(function (item) {
162
168
  var _String;
163
- var name = item !== null && item !== void 0 && item.sendName ? (_String = String(item === null || item === void 0 ? void 0 : item.sendName)) === null || _String === void 0 ? void 0 : _String.includes(value) : false;
169
+ var sendName = item ? (_String = String(item)) === null || _String === void 0 ? void 0 : _String.includes(value) : false;
170
+ return sendName;
171
+ });
172
+ };
173
+ }
174
+ } : {
175
+ searchDefaultConditions: SYMBOL.like,
176
+ type: item.type,
177
+ id: "".concat(item.id, "_").concat((_typeMap$_this$type6 = typeMap[_this.type]) === null || _typeMap$_this$type6 === void 0 ? void 0 : _typeMap$_this$type6.sendName),
178
+ name: "".concat(_this.name, "\u540D\u79F0"),
179
+ filterComponentType: "Input",
180
+ filterFn: function filterFn(value) {
181
+ return function (i) {
182
+ var _ref2, _typeMap$_this$type7;
183
+ return (_ref2 = _filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type7 = typeMap[_this.type]) === null || _typeMap$_this$type7 === void 0 ? void 0 : _typeMap$_this$type7.key) || []) === null || _ref2 === void 0 ? void 0 : _ref2.some(function (item) {
184
+ var _String2;
185
+ var name = item !== null && item !== void 0 && item.sendName ? (_String2 = String(item === null || item === void 0 ? void 0 : item.sendName)) === null || _String2 === void 0 ? void 0 : _String2.includes(value) : false;
164
186
  return name;
165
187
  });
166
188
  };
@@ -168,15 +190,15 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
168
190
  }, {
169
191
  searchDefaultConditions: SYMBOL.like,
170
192
  type: item.type,
171
- id: "".concat(item.id, "_").concat((_typeMap$_this$type7 = typeMap[_this.type]) === null || _typeMap$_this$type7 === void 0 ? void 0 : _typeMap$_this$type7.sendId),
193
+ id: "".concat(item.id, "_").concat((_typeMap$_this$type8 = typeMap[_this.type]) === null || _typeMap$_this$type8 === void 0 ? void 0 : _typeMap$_this$type8.sendId),
172
194
  name: "".concat(_this.name, "\u7F16\u7801"),
173
195
  filterComponentType: "Input",
174
196
  filterFn: function filterFn(value) {
175
197
  return function (i) {
176
- var _ref2, _typeMap$_this$type8;
177
- return (_ref2 = _filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type8 = typeMap[_this.type]) === null || _typeMap$_this$type8 === void 0 ? void 0 : _typeMap$_this$type8.key) || []) === null || _ref2 === void 0 ? void 0 : _ref2.some(function (item) {
178
- var _String2;
179
- var id = item !== null && item !== void 0 && item.sendId ? (_String2 = String(item === null || item === void 0 ? void 0 : item.sendId)) === null || _String2 === void 0 ? void 0 : _String2.includes(value) : false;
198
+ var _ref3, _typeMap$_this$type9;
199
+ return (_ref3 = _filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type9 = typeMap[_this.type]) === null || _typeMap$_this$type9 === void 0 ? void 0 : _typeMap$_this$type9.key) || []) === null || _ref3 === void 0 ? void 0 : _ref3.some(function (item) {
200
+ var _String3;
201
+ var id = item !== null && item !== void 0 && item.sendId ? (_String3 = String(item === null || item === void 0 ? void 0 : item.sendId)) === null || _String3 === void 0 ? void 0 : _String3.includes(value) : false;
180
202
  return id;
181
203
  });
182
204
  };