@kmkf-fe-packages/services-components 0.7.15-alpha.7 → 0.7.15-alpha.70

package/dist/esm/components/JST/JstLogistics/index.js

@@ -6,22 +6,41 @@ 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 { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
-import some from "lodash/some";
+import React from 'react';
+import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
+import some from 'lodash/some';
 import GetFormItem from "../../GetFormItem";
 import { JstGoodImage } from "../../Common";
-import { JstGoods } from "@kmkf-fe-packages/basic-components";
+import { JstGoods } from '@kmkf-fe-packages/basic-components';
 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 typeMap = {
+  JST_LOGISTICS: {
+    key: 'jstItemList',
+    name: 'jst',
+    company: 'logisticsCompany',
+    code: 'logisticsCode'
+  },
+  BS_LOGISTICS: {
+    key: 'bsLogisticsList',
+    name: 'bs',
+    company: 'bsLogisticsCompany',
+    code: 'bsLogisticsCode'
+  }
+};
 var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(options) {
   var _this = this,
-    _this$componentConfig3;
+    _typeMap$options$type,
+    _typeMap$options$type2,
+    _this$componentConfig3,
+    _typeMap$options$type3,
+    _typeMap$options$type4;
   _classCallCheck(this, JstLogistics);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
   _defineProperty(this, "sortField", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "type", void 0);
   _defineProperty(this, "rules", void 0);
   _defineProperty(this, "componentConfig", void 0);
@@ -46,26 +65,34 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(options) {
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
-    var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_jstItemList")];
+    var _typeMap$_this$type;
+    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)];
     //兼容多个商品
-    return /*#__PURE__*/React.createElement(JstGoodImage, {
+    return /*#__PURE__*/React.createElement("span", {
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      }
+    }, /*#__PURE__*/React.createElement(JstGoodImage, {
       list: list,
       type: 1
-    });
+    }));
   });
   _defineProperty(this, "renderLog", function (r) {
-    var list = r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_jstItemList")];
+    var _typeMap$_this$type2;
+    var list = r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat((_typeMap$_this$type2 = typeMap[_this.type]) === null || _typeMap$_this$type2 === void 0 ? void 0 : _typeMap$_this$type2.key)];
     if (isNull(list)) return null;
     return _this.renderPc(undefined, r);
   });
   _defineProperty(this, "getComponentValue", function (r) {
-    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_jstItemList")];
+    var _typeMap$_this$type3;
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat((_typeMap$_this$type3 = typeMap[_this.type]) === null || _typeMap$_this$type3 === void 0 ? void 0 : _typeMap$_this$type3.key)];
   });
   _defineProperty(this, "renderExport", function (value, record) {
-    var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_jstItemList")];
+    var _typeMap$_this$type4;
+    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)];
     return (list || []).map(function (item) {
-      return [_this.expressDateInstance.getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCompany), item === null || item === void 0 ? void 0 : item.logisticsCode].join("/");
-    }).join(",");
+      return [_this.expressDateInstance.getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCompany), item === null || item === void 0 ? void 0 : item.logisticsCode].join('/');
+    }).join(',');
   });
   _defineProperty(this, "editRender", function (p) {
     var _this$componentConfig, _this$componentConfig2;
@@ -82,48 +109,49 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(options) {
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
+    var _typeMap$_this$type5, _typeMap$_this$type6, _typeMap$_this$type7, _typeMap$_this$type8;
     return [{
-      searchDefaultConditions: SYMBOL.like,
-      type: item.type,
-      id: "".concat(item.id, "_logisticsCode"),
-      name: "jst\u7269\u6D41\u5355\u53F7",
-      filterComponentType: "Input",
-      filterFn: function filterFn(value) {
-        return function (i) {
-          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, "logisticsCode"), value);
-        };
-      }
-    }, {
       searchDefaultConditions: SYMBOL.in,
       type: item.type,
-      id: "".concat(item.id, "_logisticsCompany"),
-      name: "jst\u7269\u6D41\u516C\u53F8",
-      filterComponentType: "MultipleSelect",
+      id: "".concat(item.id, "_").concat((_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.company),
+      name: "".concat((_typeMap$_this$type6 = typeMap[_this.type]) === null || _typeMap$_this$type6 === void 0 ? void 0 : _typeMap$_this$type6.name, "\u7269\u6D41\u516C\u53F8"),
+      filterComponentType: 'MultipleSelect',
       props: {
         options: _this.expressDateInstance.getExpressData() || []
       },
       filterFn: function filterFn(value) {
         return function (i) {
           var _ref;
-          return (_ref = _filterFn.filterTableListItemColumnValue(i, item.id, "logisticsCompany").split(",") || []) === null || _ref === void 0 ? void 0 : _ref.some(function (item) {
+          return (_ref = _filterFn.filterTableListItemColumnValue(i, item.id, 'logisticsCompany').split(',') || []) === null || _ref === void 0 ? void 0 : _ref.some(function (item) {
             var _String;
             var logisticsCompany = item ? (_String = String(item)) === null || _String === void 0 ? void 0 : _String.includes(value) : false;
             return logisticsCompany;
           });
         };
       }
+    }, {
+      searchDefaultConditions: SYMBOL.like,
+      type: item.type,
+      id: "".concat(item.id, "_").concat((_typeMap$_this$type7 = typeMap[_this.type]) === null || _typeMap$_this$type7 === void 0 ? void 0 : _typeMap$_this$type7.code),
+      name: "".concat((_typeMap$_this$type8 = typeMap[_this.type]) === null || _typeMap$_this$type8 === void 0 ? void 0 : _typeMap$_this$type8.name, "\u7269\u6D41\u5355\u53F7"),
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, 'logisticsCode'), value);
+        };
+      }
     }];
   });
   this.name = options.name;
   this.id = options.id;
-  this.sortField = "".concat(options.id, "_jstItemList");
-  this.formField = "".concat(options.id, "_jstItemList");
+  this.sortField = "".concat(options.id, "_").concat((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.key);
+  this.formField = "".concat(options.id, "_").concat((_typeMap$options$type2 = typeMap[options.type]) === null || _typeMap$options$type2 === void 0 ? void 0 : _typeMap$options$type2.key);
   this.type = options.type;
   this.componentConfig = options.componentConfig;
   this.isCombinationComponent = false;
   this.canSort = false;
   this.children = [];
-  this.dataType = "object";
+  this.dataType = 'object';
   this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
     required: true,
     validator: function validator(_, value) {
@@ -136,7 +164,17 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(options) {
       return Promise.resolve();
     }
   }] : [];
-  this.align = "left";
+  this.align = 'left';
   this.expressDateInstance = ExpressData.getInstance();
+  this.sortChildField = [{
+    name: '物流公司',
+    key: "".concat(options.id, "_").concat((_typeMap$options$type3 = typeMap[options.type]) === null || _typeMap$options$type3 === void 0 ? void 0 : _typeMap$options$type3.company),
+    options: this.expressDateInstance.getExpressData(),
+    dataType: 'string'
+  }, {
+    name: '物流单号',
+    key: "".concat(options.id, "_").concat((_typeMap$options$type4 = typeMap[options.type]) === null || _typeMap$options$type4 === void 0 ? void 0 : _typeMap$options$type4.code),
+    dataType: 'string'
+  }];
 });
 export default JstLogistics;

package/dist/esm/components/JST/JstSendGood/index.d.ts

@@ -1,18 +1,24 @@
-import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from "../../../type";
-import React from "react";
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../../type';
+import React from 'react';
 declare class JstSendGood implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
+    sortChildField: {
+        name: string;
+        key: string;
+        dataType: string;
+        [key: string]: any;
+    }[];
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface["componentConfig"];
+    componentConfig: ComponentInterface['componentConfig'];
     align: ALignType;
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface["dataType"];
+    dataType: ComponentInterface['dataType'];
     constructor(options: PickOption);
     renderClient: (record: Record) => React.JSX.Element | null;
     renderPc: (value: any, record: Record) => React.JSX.Element;

package/dist/esm/components/JST/JstSendGood/index.js

@@ -6,22 +6,22 @@ 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 some from "lodash/some";
+import React from 'react';
+import some from 'lodash/some';
 import GetFormItem from "../../GetFormItem";
 import { JstGoodImage } from "../../Common";
-import { JstGoods } from "@kmkf-fe-packages/basic-components";
+import { JstGoods } from '@kmkf-fe-packages/basic-components';
 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 typeMap = {
   JST_SEND_GOOD: {
-    key: "jstItemList",
-    name: "jst"
+    key: 'jstItemList',
+    name: 'jst'
   },
   BS_SEND_GOOD: {
-    key: "bsSendGood",
-    name: "bs"
+    key: 'bsSendGood',
+    name: 'bs'
   }
 };
 var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(options) {
@@ -33,6 +33,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(options) {
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
   _defineProperty(this, "sortField", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "type", void 0);
   _defineProperty(this, "rules", void 0);
   _defineProperty(this, "componentConfig", void 0);
@@ -59,10 +60,14 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(options) {
     var _typeMap$_this$type;
     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)];
     //兼容多个商品
-    return /*#__PURE__*/React.createElement(JstGoodImage, {
+    return /*#__PURE__*/React.createElement("span", {
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      }
+    }, /*#__PURE__*/React.createElement(JstGoodImage, {
       list: list,
       type: 3
-    });
+    }));
   });
   _defineProperty(this, "renderLog", function (r) {
     var _typeMap$_this$type2;
@@ -78,8 +83,8 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(options) {
     var _typeMap$_this$type4;
     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)];
     return (list || []).map(function (item) {
-      return [item === null || item === void 0 ? void 0 : item.sendId, item === null || item === void 0 ? void 0 : item.sendName].join("/");
-    }).join(",");
+      return [item === null || item === void 0 ? void 0 : item.sendId, item === null || item === void 0 ? void 0 : item.sendName].join('/');
+    }).join(',');
   });
   _defineProperty(this, "editRender", function (p) {
     return /*#__PURE__*/React.createElement(GetFormItem, {
@@ -100,7 +105,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(options) {
       type: item.type,
       id: "".concat(item.id, "_sendName"),
       name: "".concat((_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.name, "\u53D1\u8D27\u4ED3\u540D\u79F0"),
-      filterComponentType: "Input",
+      filterComponentType: 'Input',
       filterFn: function filterFn(value) {
         return function (i) {
           var _ref, _typeMap$_this$type6;
@@ -116,7 +121,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(options) {
       type: item.type,
       id: "".concat(item.id, "_sendId"),
       name: "".concat((_typeMap$_this$type7 = typeMap[_this.type]) === null || _typeMap$_this$type7 === void 0 ? void 0 : _typeMap$_this$type7.name, "\u53D1\u8D27\u4ED3\u7F16\u7801"),
-      filterComponentType: "Input",
+      filterComponentType: 'Input',
       filterFn: function filterFn(value) {
         return function (i) {
           var _ref2, _typeMap$_this$type8;
@@ -133,20 +138,29 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(options) {
   this.id = options.id;
   this.sortField = "".concat(options.id, "_").concat((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.key);
   this.formField = "".concat(options.id, "_").concat((_typeMap$options$type2 = typeMap[options.type]) === null || _typeMap$options$type2 === void 0 ? void 0 : _typeMap$options$type2.key);
+  this.sortChildField = [{
+    name: '发货仓名称',
+    key: "".concat(options.id, "_sendName"),
+    dataType: 'string'
+  }, {
+    name: '发货仓编码',
+    key: "".concat(options.id, "_sendId"),
+    dataType: 'string'
+  }];
   this.type = options.type;
   this.componentConfig = options.componentConfig;
-  this.dataType = "object";
+  this.dataType = 'object';
   this.rules = (_this$componentConfig = this.componentConfig) !== null && _this$componentConfig !== void 0 && _this$componentConfig.required ? [{
     required: true,
     validator: function validator(_, value) {
       if (!value || !value.length) {
-        return Promise.reject(new Error("请选择宝贝"));
+        return Promise.reject(new Error('请选择宝贝'));
       }
       var hasNo = (value || []).some(function (item) {
         var _this$componentConfig2, _this$componentConfig3;
-        if (["sendName"].includes((_this === null || _this === void 0 ? void 0 : (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.showField) || "")) {
+        if (['sendName'].includes((_this === null || _this === void 0 ? void 0 : (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.showField) || '')) {
           return item.sendName;
-        } else if (["sendId"].includes((_this === null || _this === void 0 ? void 0 : (_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.showField) || "")) {
+        } else if (['sendId'].includes((_this === null || _this === void 0 ? void 0 : (_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.showField) || '')) {
           return item.sendId;
         } else {
           return item.sendId && item.sendName;
@@ -158,7 +172,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(options) {
       return Promise.resolve();
     }
   }] : [];
-  this.align = "left";
+  this.align = 'left';
   this.isCombinationComponent = false;
   this.canSort = false;
   this.children = [];

package/dist/esm/components/JST/JstSupply/index.js

@@ -46,10 +46,14 @@ var JstSupply = /*#__PURE__*/_createClass(function JstSupply(options) {
   _defineProperty(this, "renderPc", function (value, record) {
     var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_jstItemList")];
     //兼容多个商品
-    return /*#__PURE__*/React.createElement(JstGoodImage, {
+    return /*#__PURE__*/React.createElement("span", {
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      }
+    }, /*#__PURE__*/React.createElement(JstGoodImage, {
       list: list,
       type: 2
-    });
+    }));
   });
   _defineProperty(this, "renderLog", function (r) {
     var list = r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_jstItemList")];

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

@@ -41,7 +41,11 @@ var InterceptStatus = /*#__PURE__*/_createClass(function InterceptStatus(options
     var interceptCode = "".concat(_this.parentId, "_interceptCode");
     var interceptSenderMobile = "".concat(_this.parentId, "_interceptSenderMobile");
     var value = (_this$expressIntercep = _this.expressInterceptInstance.getStatusNameMap()) === null || _this$expressIntercep === void 0 ? void 0 : _this$expressIntercep["".concat(record === null || record === void 0 ? void 0 : record[_this.id])];
-    return /*#__PURE__*/React.createElement("div", null, value !== null && value !== void 0 ? value : "--", value ? /*#__PURE__*/React.createElement(QueryLogisticsTrack, {
+    return /*#__PURE__*/React.createElement("div", {
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      }
+    }, value !== null && value !== void 0 ? value : "--", value ? /*#__PURE__*/React.createElement(QueryLogisticsTrack, {
       modelWidth: w,
       interceptCompany: record[_this.companyId],
       interceptCode: record[interceptCode],

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

@@ -1,16 +1,16 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../type";
-import React from "react";
-import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
-import TrajectoryCompany from "./trajectoryCompany";
-import TrajectoryCode from "./trajectoryCode";
-import TrajectorySnapshot from "./trajectorySnapshot";
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
+import React from 'react';
+import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
+import TrajectoryCompany from './trajectoryCompany';
+import TrajectoryCode from './trajectoryCode';
+import TrajectorySnapshot from './trajectorySnapshot';
 declare class LogisticsTrajectory implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface["componentConfig"];
+    componentConfig: ComponentInterface['componentConfig'];
     expressDateInstance: InstanceType<typeof ExpressData>;
     express: TrajectoryCompany;
     expressCode: TrajectoryCode;
@@ -19,7 +19,7 @@ declare class LogisticsTrajectory implements ComponentInterface {
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface["dataType"];
+    dataType: ComponentInterface['dataType'];
     constructor(options: PickOption);
     editRender: (p: any) => React.JSX.Element;
     renderClient: (record: Record) => React.JSX.Element;
@@ -47,7 +47,6 @@ declare class LogisticsTrajectory implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => boolean;
     })[];
 }
 export default LogisticsTrajectory;

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

@@ -8,9 +8,9 @@ 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 { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
-import { LogisticsTrajectory as Trajectory } from "@kmkf-fe-packages/basic-components";
+import React from 'react';
+import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
+import { LogisticsTrajectory as Trajectory } from '@kmkf-fe-packages/basic-components';
 import TrajectoryCompany from "./trajectoryCompany";
 import TrajectoryCode from "./trajectoryCode";
 import TrajectorySnapshot from "./trajectorySnapshot";
@@ -67,7 +67,9 @@ var LogisticsTrajectory = /*#__PURE__*/_createClass(function LogisticsTrajectory
     return null;
   });
   _defineProperty(this, "filterConfig", function (item) {
-    return [_this.express.filterConfig(item), _this.expressCode.filterConfig(item), _this.expressSnapshot.filterConfig(item)];
+    return [_this.express.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
+      subKey: 'trajectoryCompany'
+    })), _this.expressCode.filterConfig(item), _this.expressSnapshot.filterConfig(item)];
   });
   this.name = options.name;
   this.id = options.id;
@@ -77,28 +79,28 @@ var LogisticsTrajectory = /*#__PURE__*/_createClass(function LogisticsTrajectory
   this.componentConfig = options.componentConfig;
   this.expressDateInstance = ExpressData.getInstance();
   this.express = new TrajectoryCompany(_objectSpread(_objectSpread({}, options), {}, {
-    name: "物流公司",
+    name: "".concat(this.name, "-\u516C\u53F8"),
     id: "".concat(this.id, "_trajectoryCompany")
   }));
   this.expressCode = new TrajectoryCode(_objectSpread(_objectSpread({}, options), {}, {
-    name: "物流单号",
+    name: "".concat(this.name, "-\u5355\u53F7"),
     id: "".concat(this.id)
   }));
   this.expressSnapshot = new TrajectorySnapshot(_objectSpread(_objectSpread({}, options), {}, {
-    name: "物流快照",
+    name: "".concat(this.name, "-\u5FEB\u7167"),
     id: "".concat(this.id, "_trajectorySnapshot")
   }));
   this.isCombinationComponent = true;
   this.canSort = false;
-  this.dataType = "object";
+  this.dataType = 'object';
   this.children = [this.express, this.expressCode, this.expressSnapshot];
   this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
     validator: function validator(_, value) {
       if (!value.trajectoryCompany) {
-        return Promise.reject(new Error("请选择物流公司"));
+        return Promise.reject(new Error('请选择物流公司'));
       }
       if (!value.trajectoryCode) {
-        return Promise.reject(new Error("请输入物流单号"));
+        return Promise.reject(new Error('请输入物流单号'));
       }
       return Promise.resolve();
     }

package/dist/esm/components/LogisticsTrajectory/trajectoryCode.js

@@ -31,12 +31,18 @@ var TrajectoryCode = /*#__PURE__*/_createClass(function TrajectoryCode(options)
   _defineProperty(this, "renderCode", function (record) {
     var w = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 500;
     var company = record === null || record === void 0 ? void 0 : record["".concat(_this.parentId, "_trajectoryCompany")];
+    var mobile = record === null || record === void 0 ? void 0 : record["".concat(_this.parentId, "_trajectoryPhone")];
     var code = record === null || record === void 0 ? void 0 : record[_this.id];
-    return /*#__PURE__*/React.createElement("div", null, code ? /*#__PURE__*/React.createElement(QueryLogisticsTrack, {
+    return /*#__PURE__*/React.createElement("div", {
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      }
+    }, code ? /*#__PURE__*/React.createElement(QueryLogisticsTrack, {
+      title: code,
       modelWidth: w,
       interceptCompany: company,
       interceptCode: code,
-      interceptSenderMobile: ""
+      interceptSenderMobile: mobile
     }) : "--");
   });
   _defineProperty(this, "renderClient", function (record) {
@@ -64,16 +70,15 @@ var TrajectoryCode = /*#__PURE__*/_createClass(function TrajectoryCode(options)
     return null;
   });
   _defineProperty(this, "filterConfig", function (item) {
-    var subKey = item.subKey;
     return {
       searchDefaultConditions: SYMBOL.like,
       type: item.type,
-      id: subKey ? "".concat(item.id, "_").concat(subKey) : item.id,
+      id: "".concat(item.id, "_trajectoryCode"),
       name: "".concat(item.name, "-\u7269\u6D41\u5355\u53F7"),
       filterComponentType: "Input",
       filterFn: function filterFn(value) {
         return function (i) {
-          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, "".concat(subKey)), value);
+          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, "trajectoryCode"), value);
         };
       }
     };
@@ -96,7 +101,7 @@ var TrajectoryCode = /*#__PURE__*/_createClass(function TrajectoryCode(options)
   this.align = "left";
   this.width = 200;
   this.isCombinationComponent = false;
-  this.canSort = true;
+  this.canSort = false;
   this.dataType = "string";
   this.children = [];
 });

package/dist/esm/components/LogisticsTrajectory/trajectoryCompany.d.ts

@@ -1,13 +1,13 @@
-import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from "../../type";
-import React from "react";
-import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../type';
+import React from 'react';
+import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
 declare class TrajectoryCompany implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface["componentConfig"];
+    componentConfig: ComponentInterface['componentConfig'];
     align: ALignType;
     expressDateInstance: InstanceType<typeof ExpressData>;
     width: number;
@@ -15,8 +15,8 @@ declare class TrajectoryCompany 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: unknown, record: Record) => React.JSX.Element;

package/dist/esm/components/LogisticsTrajectory/trajectoryCompany.js

@@ -5,10 +5,10 @@ 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 { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
+import React from 'react';
+import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
 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 TrajectoryCompany = /*#__PURE__*/_createClass(function TrajectoryCompany(options) {
   var _this = this;
@@ -61,13 +61,13 @@ var TrajectoryCompany = /*#__PURE__*/_createClass(function TrajectoryCompany(opt
       type: item.type,
       id: subKey ? "".concat(item.id, "_").concat(subKey) : item.id,
       name: "".concat(item.name, "-\u7269\u6D41\u516C\u53F8"),
-      filterComponentType: "MultipleSelect",
+      filterComponentType: 'MultipleSelect',
       props: {
         options: _this.expressDateInstance.getExpressData() || []
       },
       filterFn: function filterFn(value) {
         return function (i) {
-          return value === null || value === void 0 ? void 0 : value.includes(_filterFn.filterTableListItemColumnValue(i, item.id, "".concat(subKey)));
+          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, "".concat(subKey)), value);
         };
       }
     };
@@ -79,13 +79,13 @@ var TrajectoryCompany = /*#__PURE__*/_createClass(function TrajectoryCompany(opt
   this.type = options.type;
   this.componentConfig = options.componentConfig;
   this.rules = [];
-  this.align = "left";
+  this.align = 'left';
   this.expressDateInstance = ExpressData.getInstance();
   this.width = 200;
   this.isCombinationComponent = false;
-  this.canSort = true;
+  this.canSort = false;
   this.children = [];
-  this.dataType = "string";
+  this.dataType = 'string';
   this.options = this.expressDateInstance.getExpressData() || [];
 });
 export default TrajectoryCompany;

package/dist/esm/components/LogisticsTrajectory/trajectorySnapshot.d.ts

@@ -26,7 +26,6 @@ declare class TrajectorySnapshot implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default TrajectorySnapshot;