@kmkf-fe-packages/services-components 2.2.13-beta.23 → 2.2.13-beta.25
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.
|
@@ -272,7 +272,7 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
|
|
|
272
272
|
var company = "";
|
|
273
273
|
if (logisticsCompanyFormType === "input") {
|
|
274
274
|
company = logisticsCompany;
|
|
275
|
-
} else if (
|
|
275
|
+
} else if (["gy", "jy"].includes(platformType)) {
|
|
276
276
|
// 管易为了兼容之前的补发物流信息，若不存在logisticsCompanyName值则去匹配物流映射列表展示物流公司名称
|
|
277
277
|
company = ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany, false) || logisticsCompanyName;
|
|
278
278
|
} else {
|
|
@@ -305,8 +305,9 @@ export var BsExpressRender = function BsExpressRender(_ref7) {
|
|
|
305
305
|
platformType = _ref7$platformType === void 0 ? "default" : _ref7$platformType,
|
|
306
306
|
logisticsCompanyFormType = _ref7.logisticsCompanyFormType;
|
|
307
307
|
return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
|
|
308
|
-
var logisticsCompany = item.logisticsCompany
|
|
309
|
-
|
|
308
|
+
var logisticsCompany = item.logisticsCompany,
|
|
309
|
+
logisticsCompanyName = item.logisticsCompanyName;
|
|
310
|
+
var company = logisticsCompanyFormType === "input" ? logisticsCompany : ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany, false) || logisticsCompanyName;
|
|
310
311
|
return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
|
|
311
312
|
content: content(item, index),
|
|
312
313
|
overlayStyle: {
|
|
@@ -112,7 +112,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(_options) {
|
|
|
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
113
|
return (list || []).map(function (item) {
|
|
114
114
|
var _this$componentConfig3, _ref;
|
|
115
|
-
return [((_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.logistics)
|
|
115
|
+
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("/");
|
|
116
116
|
}).join(",");
|
|
117
117
|
});
|
|
118
118
|
_defineProperty(this, "editRender", function (p) {
|
|
@@ -195,7 +195,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(_options) {
|
|
|
195
195
|
validator: function validator(_, value) {
|
|
196
196
|
var hasNo = (value || []).some(function (item) {
|
|
197
197
|
var _this$componentConfig10;
|
|
198
|
-
if (((_this$componentConfig10 = _this.componentConfig) === null || _this$componentConfig10 === void 0 ? void 0 : _this$componentConfig10.logistics)
|
|
198
|
+
if (["gy", "jy"].includes(((_this$componentConfig10 = _this.componentConfig) === null || _this$componentConfig10 === void 0 ? void 0 : _this$componentConfig10.logistics) || "")) {
|
|
199
199
|
return (item.logisticsCompany || item.logisticsCompanyName) && item.logisticsCode;
|
|
200
200
|
}
|
|
201
201
|
return item.logisticsCompany && item.logisticsCode;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/services-components",
|
|
3
|
-
"version": "2.2.13-beta.
|
|
3
|
+
"version": "2.2.13-beta.25",
|
|
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.2.13-beta.
|
|
25
|
-
"@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.
|
|
24
|
+
"@kmkf-fe-packages/basic-components": "2.2.13-beta.25",
|
|
25
|
+
"@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.25",
|
|
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": "
|
|
44
|
+
"gitHead": "1eaef1f475e9a409c5869afbdd15233df186b4e2",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|