@kmkf-fe-packages/services-components 2.2.13-beta.26 → 2.2.13-beta.28

package/dist/esm/components/BS/common/expressCompany.js

@@ -101,7 +101,20 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var _this$expressDateInst, _this$expressDateInst2;
-    return ((_this$expressDateInst = _this.expressDateInstance) === null || _this$expressDateInst === void 0 ? void 0 : (_this$expressDateInst2 = _this$expressDateInst.getExpressNameByCode) === null || _this$expressDateInst2 === void 0 ? void 0 : _this$expressDateInst2.call(_this$expressDateInst, record === null || record === void 0 ? void 0 : record["".concat(_this.id)])) || (record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) || "--";
+    var name = (_this$expressDateInst = _this.expressDateInstance) === null || _this$expressDateInst === void 0 ? void 0 : (_this$expressDateInst2 = _this$expressDateInst.getExpressNameByCode) === null || _this$expressDateInst2 === void 0 ? void 0 : _this$expressDateInst2.call(_this$expressDateInst, record === null || record === void 0 ? void 0 : record["".concat(_this.id)], false);
+    if (!name) {
+      var _typeMap$_this$type3, _items$find;
+      var _this$id$split3 = _this.id.split("_"),
+        _this$id$split4 = _slicedToArray(_this$id$split3, 3),
+        key = _this$id$split4[0],
+        parentKey = _this$id$split4[1],
+        childKey = _this$id$split4[2];
+      var items = record === null || record === void 0 ? void 0 : record["".concat(key, "_").concat(parentKey, "_").concat((_typeMap$_this$type3 = typeMap[_this.type]) === null || _typeMap$_this$type3 === void 0 ? void 0 : _typeMap$_this$type3.key)];
+      name = items === null || items === void 0 ? void 0 : (_items$find = items.find(function (item) {
+        return item.logisticsCompany === (record === null || record === void 0 ? void 0 : record["".concat(_this.id)]);
+      })) === null || _items$find === void 0 ? void 0 : _items$find.logisticsCompanyName;
+    }
+    return name || (record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) || "--";
   });
   _defineProperty(this, "editRender", function () {
     return null;

package/dist/esm/components/Common/index.js

@@ -307,7 +307,7 @@ export var BsExpressRender = function BsExpressRender(_ref7) {
   return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
     var logisticsCompany = item.logisticsCompany,
       logisticsCompanyName = item.logisticsCompanyName;
-    var company = logisticsCompanyFormType === "input" ? logisticsCompany : ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany, false) || logisticsCompanyName;
+    var company = logisticsCompanyFormType === "input" ? logisticsCompany : ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany, false) || logisticsCompanyName || logisticsCompany;
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
       content: content(item, index),
       overlayStyle: {

package/dist/esm/components/Public/Goods/index.d.ts

@@ -3,12 +3,15 @@ import React from "react";
 import CommonHeaderGoods from "../../CommonHeaderGood";
 declare const CONFIG_MAP: {
     JST_GOODS: {
+        name: string;
         key: string;
     };
     KM_GOODS: {
+        name: string;
         key: string;
     };
     JY_GOODS: {
+        name: string;
         key: string;
     };
 };

package/dist/esm/components/Public/Goods/index.js

@@ -18,12 +18,15 @@ import { CommonGoods as Goods } from "@kmkf-fe-packages/basic-components";
 import { SYMBOL } from "../../../constant";
 var CONFIG_MAP = {
   JST_GOODS: {
+    name: "聚水潭",
     key: "jstGoods"
   },
   KM_GOODS: {
+    name: "快麦ERP",
     key: "kmGoods"
   },
   JY_GOODS: {
+    name: "巨益",
     key: "jyGoods"
   }
 };
@@ -128,7 +131,8 @@ var PublicGoods = /*#__PURE__*/_createClass(function PublicGoods(options) {
     validator: function validator(_, value) {
       var _value$key;
       if (!value || !(value !== null && value !== void 0 && (_value$key = value[key]) !== null && _value$key !== void 0 && _value$key.length)) {
-        return Promise.reject(new Error("请选择聚水潭商品"));
+        var _CONFIG_MAP$_this$typ6;
+        return Promise.reject(new Error("\u8BF7\u9009\u62E9".concat((_CONFIG_MAP$_this$typ6 = CONFIG_MAP[_this.type]) === null || _CONFIG_MAP$_this$typ6 === void 0 ? void 0 : _CONFIG_MAP$_this$typ6.name, "\u5546\u54C1")));
       }
       return Promise.resolve();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "2.2.13-beta.26",
+  "version": "2.2.13-beta.28",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3968788e060fede72cd7a10c97d03893530a9c96",
+  "gitHead": "c1c13d4dc64fc9343b6ffebf966b2bae17a63a46",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }