@kmkf-fe-packages/services-components 0.26.1-beta.5 → 0.26.1-beta.7

package/dist/esm/components/LogisticsMoreInterception/InterceptAddress.js

@@ -52,12 +52,13 @@ var PaymentTid = /*#__PURE__*/_createClass(function PaymentTid(options) {
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var logisticsInterceptList = record["".concat(_this.originId, "_logisticsInterceptList")] || [];
+    console.log('renderExport', record["".concat(_this.originId, "_logisticsInterceptList")]);
     return logisticsInterceptList.reduce(function (prv, item) {
       var _item$interceptAddres2;
       var addressText = (_item$interceptAddres2 = item.interceptAddress) === null || _item$interceptAddres2 === void 0 ? void 0 : _item$interceptAddres2.map(function (suffix) {
         return _this.addressDateInstance.getNameByCode(suffix);
       }).join('');
-      prv.push("".concat(addressText).concat(item.interceptDetail, "\n              ").concat(item.interceptReceiverName, "\n              ").concat(item.interceptReceiverMobile));
+      prv.push("".concat(addressText).concat(item.interceptDetail || '', "\n              ").concat((item === null || item === void 0 ? void 0 : item.interceptReceiverName) || '', "\n              ").concat((item === null || item === void 0 ? void 0 : item.interceptReceiverMobile) || ''));
       return prv;
     }, []).join(',');
   });

package/dist/esm/components/LogisticsMoreInterception/InterceptStatus.js

@@ -38,19 +38,21 @@ var InterceptStatus = /*#__PURE__*/_createClass(function InterceptStatus(options
   });
   _defineProperty(this, "renderStatus", function (record) {
     var w = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 500;
-    var statusList = record[_this.id] || [];
+    var statusList = record["".concat(_this.parentId, "_logisticsInterceptList")] || [];
     if (isNull(statusList)) return '--';
     return /*#__PURE__*/React.createElement("div", null, statusList.map(function (item, index) {
+      var _this$expressIntercep;
+      var value = (_this$expressIntercep = _this.expressInterceptInstance.getStatusNameMap()) === null || _this$expressIntercep === void 0 ? void 0 : _this$expressIntercep[item.interceptLogisticsStatus];
       return /*#__PURE__*/React.createElement("div", {
         onClick: function onClick(e) {
           return e.stopPropagation();
         }
-      }, "\u5305\u88F9".concat(index + 1, ":"), /*#__PURE__*/React.createElement(QueryLogisticsTrack, {
+      }, "\u5305\u88F9".concat(index + 1, ":"), value ? /*#__PURE__*/React.createElement(React.Fragment, null, value, /*#__PURE__*/React.createElement(QueryLogisticsTrack, {
         modelWidth: w,
         interceptCompany: item.interceptCompany,
         interceptCode: item.interceptCode,
         interceptSenderMobile: item.interceptSenderMobile
-      }));
+      })) : '--');
     }));
   });
   _defineProperty(this, "renderClient", function () {

package/dist/esm/components/MultSelect/index.d.ts

@@ -1,5 +1,5 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
-import React from 'react';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../type";
+import React from "react";
 declare class BasicMultSelect implements ComponentInterface {
     name: string;
     id: string;
@@ -11,8 +11,8 @@ declare class BasicMultSelect implements ComponentInterface {
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface['dataType'];
-    options: ComponentInterface['options'];
+    dataType: ComponentInterface["dataType"];
+    options: ComponentInterface["options"];
     constructor(options: PickOption);
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: (value: any, record: Record) => React.JSX.Element;

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

@@ -6,12 +6,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 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; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 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); }
-import React from 'react';
-import intersection from 'lodash/intersection';
-import { ApaasMultipleSelect } from '@kmkf-fe-packages/basic-components';
+import React from "react";
+import intersection from "lodash/intersection";
+import { ApaasMultipleSelect } from "@kmkf-fe-packages/basic-components";
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
 import { SYMBOL } from "../../constant";
 var BasicMultSelect = /*#__PURE__*/_createClass(function BasicMultSelect(options) {
   var _this = this,
@@ -34,15 +34,15 @@ var BasicMultSelect = /*#__PURE__*/_createClass(function BasicMultSelect(options
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: record === null || record === void 0 ? void 0 : (_record$_this$id = record[_this.id]) === null || _record$_this$id === void 0 ? void 0 : _record$_this$id.join(',')
+      value: record === null || record === void 0 ? void 0 : (_record$_this$id = record[_this.id]) === null || _record$_this$id === void 0 ? void 0 : _record$_this$id.join(",")
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
     var _record;
-    if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_basicMultSelect")]) === undefined) {
+    if (isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_basicMultSelect")])) {
       return /*#__PURE__*/React.createElement("span", null, "--");
     }
-    return /*#__PURE__*/React.createElement("span", null, record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id, "_basicMultSelect")]) === null || _record === void 0 ? void 0 : _record.join(','));
+    return /*#__PURE__*/React.createElement("span", null, record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id, "_basicMultSelect")]) === null || _record === void 0 ? void 0 : _record.join(","));
   });
   _defineProperty(this, "renderLog", function (r) {
     if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_basicMultSelect")])) return null;
@@ -53,10 +53,10 @@ var BasicMultSelect = /*#__PURE__*/_createClass(function BasicMultSelect(options
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var _record2;
-    if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_basicMultSelect")]) === undefined) {
-      return '--';
+    if (isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_basicMultSelect")])) {
+      return "--";
     }
-    return record === null || record === void 0 ? void 0 : (_record2 = record["".concat(_this.id, "_basicMultSelect")]) === null || _record2 === void 0 ? void 0 : _record2.join(',');
+    return record === null || record === void 0 ? void 0 : (_record2 = record["".concat(_this.id, "_basicMultSelect")]) === null || _record2 === void 0 ? void 0 : _record2.join(",");
   });
   _defineProperty(this, "editRender", function (p) {
     var _this$componentConfig, _this$componentConfig2;
@@ -81,13 +81,13 @@ var BasicMultSelect = /*#__PURE__*/_createClass(function BasicMultSelect(options
       // 过滤组件id
       name: item.name,
       // 过滤组件名称
-      filterComponentType: 'MultipleSelect',
+      filterComponentType: "MultipleSelect",
       props: {
         options: (item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.options) || []
       },
       filterFn: function filterFn(value) {
         return function (i) {
-          return intersection(value, _filterFn.filterTableListItemColumnValue(i, item.id, 'basicMultSelect')).length > 0;
+          return intersection(value, _filterFn.filterTableListItemColumnValue(i, item.id, "basicMultSelect")).length > 0;
         };
       }
     };
@@ -102,7 +102,7 @@ var BasicMultSelect = /*#__PURE__*/_createClass(function BasicMultSelect(options
   this.isCombinationComponent = false;
   this.canSort = true;
   this.children = [];
-  this.dataType = 'array';
+  this.dataType = "array";
   this.options = ((_this$componentConfig3 = this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.options) || [];
 });
 export default BasicMultSelect;

package/dist/esm/factory.d.ts

@@ -1,3 +1,3 @@
 import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, CommonDataTime, TradeId, ShopName, ErpTradeId, 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, WlnGoods, BsPosting, MsgStatus, WdtGoods, CommonInput, PaymentVoucherCode } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => ActualPayment | BasicAddress | AliPay | BsExchange | BsGoods | BsLogistics | BsPosting | BsReissue | BsReturn | BsSystemOrder | BuyerNick | Calculation | BasicCascader | BasicCheckbox | CommonInput | CommonMultiStatus | CommonSystemOrder | BasicDataTime | ItemEnCode | ItemId | ItemSelect | ErpTradeId | BasicFile | FlowMarkSelect | FlowStatusSelect | FlowTag | FlowWorkOrderId | BasicGrade | BasicInput | JstItemSelect | JstLogistics | JstSendGood | JstSupply | Logistics | LogisticsInterception | LogisticsMoreTrajectory | LogisticsTrajectory | MsgStatus | BasicMultSelect | Ordinary | Payment | PaymentVoucherCode | BasicPicture | BasicPosting | BasicRadio | BasicRate | ReceiverAddress | ReceiverMobile | ReceiverName | ERemark | ReturnLogistics | BasicSelect | ShopName | StatusSelect | SystemOrderNo | BasicTextArea | ThirdItemSelect | TradeDateTime | TradeId | WdtGoods | WlnGoods | WorkOrderId | CommonDataTime | TemplateSelect | LogisticsMoreInterception | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | NodeDeadLine | HandlerDeadLine | NodeStayDuration;
+export declare const factory: (type: string, options: PickOption) => ActualPayment | BasicAddress | AliPay | BsExchange | BsGoods | BsLogistics | BsPosting | BsReissue | BsReturn | BsSystemOrder | BuyerNick | Calculation | BasicCascader | BasicCheckbox | CommonDataTime | CommonInput | CommonMultiStatus | CommonSystemOrder | CompletedUser | BasicDataTime | ItemEnCode | ItemId | ItemSelect | ErpTradeId | BasicFile | FlowCreator | FlowMarkSelect | FlowStatusSelect | FlowTag | FlowWorkOrderId | BasicGrade | Handler | HandlerDeadLine | BasicInput | JstItemSelect | JstLogistics | JstSendGood | JstSupply | Logistics | LogisticsInterception | LogisticsMoreInterception | LogisticsMoreTrajectory | LogisticsTrajectory | MsgStatus | BasicMultSelect | NodeDeadLine | NodeStayDuration | Ordinary | Payment | PaymentVoucherCode | BasicPicture | PlatForm | BasicPosting | PrevSubmitter | BasicRadio | BasicRate | ReceiverAddress | ReceiverMobile | ReceiverName | ERemark | ReturnLogistics | BasicSelect | ShopInput | ShopName | StatusSelect | Submitter | SystemOrderNo | TemplateSelect | BasicTextArea | ThirdItemSelect | TradeDateTime | TradeId | WdtGoods | WlnGoods | WorkOrderId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.26.1-beta.5",
+  "version": "0.26.1-beta.7",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -37,7 +37,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fb2288483d4d13d31f57568a7fec4d76c6f660ab",
+  "gitHead": "ec452fe9d0962f96df9d12e7ff56fb507fca583a",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }