@kmkf-fe-packages/services-components 0.7.15-alpha.6 → 0.7.15-alpha.60

package/dist/esm/components/EItemSelect/ItemSelect.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import { GoodsProps } from '@kmkf-fe-packages/basic-components/dist/common/Goods';
-declare const ItemSelect: (props: JSX.IntrinsicAttributes & GoodsProps) => JSX.Element;
+declare const ItemSelect: (props: JSX.IntrinsicAttributes & GoodsProps) => React.JSX.Element;
 export default ItemSelect;

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

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const ExpressCompany: (props: any) => JSX.Element;
+import React from 'react';
+declare const ExpressCompany: (props: any) => React.JSX.Element;
 export default ExpressCompany;

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

@@ -1,5 +1,5 @@
-import { ComponentInterface, PickOption, Record } from "../../type";
-import React from "react";
+import { ComponentInterface, PickOption, Record } from '../../type';
+import React from 'react';
 declare class BasicFile implements ComponentInterface {
     name: string;
     id: string;
@@ -7,11 +7,11 @@ declare class BasicFile implements ComponentInterface {
     formField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface["componentConfig"];
+    componentConfig: ComponentInterface['componentConfig'];
     isCombinationComponent: boolean;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface["dataType"];
+    dataType: ComponentInterface['dataType'];
     constructor(options: PickOption);
     renderPc: (value: any, record: Record) => any;
     renderLog: (r: Record) => any;

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

@@ -1,16 +1,22 @@
 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); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+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."); }
+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); }
+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; }
+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; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 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 { ApaasUploadFile } from "@kmkf-fe-packages/basic-components";
+import React from 'react';
+import { ApaasUploadFile } from '@kmkf-fe-packages/basic-components';
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull } from "@kmkf-fe-packages/kmkf-utils";
+import { isNull } from '@kmkf-fe-packages/kmkf-utils';
 var BasicFile = /*#__PURE__*/_createClass(function BasicFile(options) {
   var _this = this;
   _classCallCheck(this, BasicFile);
@@ -32,7 +38,10 @@ var BasicFile = /*#__PURE__*/_createClass(function BasicFile(options) {
     }
     return fileList === null || fileList === void 0 ? void 0 : fileList.map(function (file) {
       return /*#__PURE__*/React.createElement("a", {
-        href: file.url
+        href: file.url,
+        style: {
+          display: 'block'
+        }
       }, file.name);
     });
   });
@@ -44,10 +53,21 @@ var BasicFile = /*#__PURE__*/_createClass(function BasicFile(options) {
     return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_file")];
   });
   _defineProperty(this, "renderClient", function (record) {
-    return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_file")]) ? /*#__PURE__*/React.createElement(ItemView, {
+    var _record$id;
+    var _this$id$split = _this.id.split('_'),
+      _this$id$split2 = _slicedToArray(_this$id$split, 1),
+      id = _this$id$split2[0];
+    return !isNull(record === null || record === void 0 ? void 0 : record[id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: _this.renderPc(null, record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_file")])
+      value: record === null || record === void 0 ? void 0 : (_record$id = record[id]) === null || _record$id === void 0 ? void 0 : _record$id.map(function (file) {
+        return /*#__PURE__*/React.createElement("a", {
+          href: file.url,
+          style: {
+            display: 'block'
+          }
+        }, file.name);
+      })
     }) : null;
   });
   _defineProperty(this, "editRender", function () {
@@ -64,11 +84,11 @@ var BasicFile = /*#__PURE__*/_createClass(function BasicFile(options) {
     });
   });
   _defineProperty(this, "renderExport", function (value, record) {
-    var textArr = ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_rate")]) || []).reduce(function (prv, next) {
+    var textArr = ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_file")]) || []).reduce(function (prv, next) {
       prv.push(next.url);
       return prv;
     }, []);
-    return textArr === null || textArr === void 0 ? void 0 : textArr.join(",");
+    return textArr === null || textArr === void 0 ? void 0 : textArr.join(',');
   });
   _defineProperty(this, "filterConfig", function () {
     return [];
@@ -83,6 +103,6 @@ var BasicFile = /*#__PURE__*/_createClass(function BasicFile(options) {
   this.isCombinationComponent = false;
   this.canSort = false;
   this.children = [];
-  this.dataType = "array";
+  this.dataType = 'array';
 });
 export default BasicFile;

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

@@ -16,7 +16,6 @@ declare class WorkOrderId implements ComponentInterface {
     dataType: ComponentInterface['dataType'];
     options: ComponentInterface['options'];
     constructor(options: PickOption);
-    renderMenu: (record: Record) => React.JSX.Element;
     renderPc: (value: any, record: Record) => React.JSX.Element;
     renderLog: (r: Record) => React.JSX.Element | null;
     getComponentValue: (r: Record) => any;

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

@@ -7,7 +7,6 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { Dropdown, Menu } from 'antd';
 import { ApaasSelect } from '@kmkf-fe-packages/basic-components';
 import { filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 import GetFormItem from "../GetFormItem";
@@ -31,33 +30,18 @@ var WorkOrderId = /*#__PURE__*/_createClass(function WorkOrderId(options) {
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "options", void 0);
-  _defineProperty(this, "renderMenu", function (record) {
-    var menu = /*#__PURE__*/React.createElement(Menu, {
-      onClick: function onClick(_ref) {
-        var _this$effects, _this$effects2;
-        var key = _ref.key;
-        typeof (_this === null || _this === void 0 ? void 0 : (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.handleChangeSingleWorkOrderStatus) === 'function' && (_this === null || _this === void 0 ? void 0 : (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.handleChangeSingleWorkOrderStatus(key, record));
-      }
-    }, /*#__PURE__*/React.createElement(Menu.Item, {
-      key: "HANDLING"
-    }, "\u5904\u7406\u4E2D"), /*#__PURE__*/React.createElement(Menu.Item, {
-      key: "STOPPING"
-    }, "\u6682\u505C\u4E2D"), /*#__PURE__*/React.createElement(Menu.Item, {
-      key: "COMPLETED"
-    }, "\u5DF2\u5B8C\u6210"), /*#__PURE__*/React.createElement(Menu.Item, {
-      key: "WAITING"
-    }, "\u5F85\u5904\u7406"));
-    return menu;
-  });
   _defineProperty(this, "renderPc", function (value, record) {
     var status = get(_this.workOrderStatus, record === null || record === void 0 ? void 0 : record["".concat(_this.id)]);
-    return status ? /*#__PURE__*/React.createElement(Dropdown, {
-      overlay: _this.renderMenu(record)
-    }, /*#__PURE__*/React.createElement("span", {
+    return status ?
+    /*#__PURE__*/
+    // <Dropdown overlay={this.renderMenu(record)}>
+    React.createElement("span", {
       style: {
         color: status.color
       }
-    }, status === null || status === void 0 ? void 0 : status.label)) : /*#__PURE__*/React.createElement("span", null, "--");
+    }, status === null || status === void 0 ? void 0 : status.label)
+    // </Dropdown>
+    : /*#__PURE__*/React.createElement("span", null, "--");
   });
   _defineProperty(this, "renderLog", function (r) {
     var status = get(_this.workOrderStatus, r === null || r === void 0 ? void 0 : r["".concat(_this.id)]);
@@ -145,6 +129,11 @@ var WorkOrderId = /*#__PURE__*/_createClass(function WorkOrderId(options) {
       label: '已完成',
       color: '#73d13d',
       bgColor: '#73d13d'
+    },
+    "CLOSED": {
+      label: '已关闭',
+      color: 'rgba(0, 0, 0, 0.65)',
+      bgColor: 'rgba(0, 0, 0, 0.04);'
     }
   };
   this.dataType = 'string';
@@ -154,5 +143,22 @@ var WorkOrderId = /*#__PURE__*/_createClass(function WorkOrderId(options) {
       value: item
     };
   });
-});
+}
+// renderMenu = (record: Record) => {
+//   const menu = (
+//     <Menu
+//       onClick={({ key }) => {
+//         typeof this?.effects?.handleChangeSingleWorkOrderStatus === 'function' && this?.effects?.handleChangeSingleWorkOrderStatus(key, record)
+//       }}
+//     >
+//       <Menu.Item key="HANDLING">处理中</Menu.Item>
+//       <Menu.Item key="STOPPING">暂停中</Menu.Item>
+//       <Menu.Item key="COMPLETED">已完成</Menu.Item>
+//       <Menu.Item key="WAITING">待处理</Menu.Item>
+//     </Menu>
+//   );
+//   return menu;
+// };
+);
+
 export default WorkOrderId;

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

@@ -0,0 +1,33 @@
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
+import React from 'react';
+declare class FlowWorkOrderId implements ComponentInterface {
+    name: string;
+    id: string;
+    sortField: string;
+    type: string;
+    rules: any[];
+    componentConfig: ComponentInterface["componentConfig"];
+    effects: ComponentInterface["effects"];
+    isCombinationComponent: boolean;
+    formField: string;
+    canSort: boolean;
+    children: ComponentInterface[];
+    dataType: ComponentInterface['dataType'];
+    constructor(options: PickOption);
+    copyHandle: (text: string) => void;
+    renderPc: (value: any, record: any) => React.JSX.Element;
+    renderLog: (r: Record) => React.JSX.Element | null;
+    getComponentValue: (r: Record) => any;
+    renderExport: (value: any, record: any) => any;
+    renderClient: () => null;
+    editRender: (p: any) => React.JSX.Element;
+    filterConfig: (item: ColumnConfig) => {
+        searchDefaultConditions: "like";
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
+    };
+}
+export default FlowWorkOrderId;

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

@@ -0,0 +1,107 @@
+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); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+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); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+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 { message } from 'antd';
+import { CopyOutlined } from '@ant-design/icons';
+import { ApaasInput } from '@kmkf-fe-packages/basic-components';
+import { filterFn as _filterFn, isNull } from '@kmkf-fe-packages/kmkf-utils';
+import GetFormItem from "../GetFormItem";
+import copy from 'copy-to-clipboard';
+import { SYMBOL } from "../../constant";
+var FlowWorkOrderId = /*#__PURE__*/_createClass(function FlowWorkOrderId(options) {
+  var _this = this;
+  _classCallCheck(this, FlowWorkOrderId);
+  _defineProperty(this, "name", void 0);
+  _defineProperty(this, "id", void 0);
+  _defineProperty(this, "sortField", void 0);
+  _defineProperty(this, "type", void 0);
+  _defineProperty(this, "rules", void 0);
+  _defineProperty(this, "componentConfig", void 0);
+  _defineProperty(this, "effects", void 0);
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "formField", void 0);
+  _defineProperty(this, "canSort", void 0);
+  _defineProperty(this, "children", void 0);
+  _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "copyHandle", function (text) {
+    copy(text);
+    message.success('复制成功');
+  });
+  _defineProperty(this, "renderPc", function (value, record) {
+    if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) === undefined) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, "--");
+    }
+    return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(React.Fragment, null, record === null || record === void 0 ? void 0 : record["".concat(_this.id)], /*#__PURE__*/React.createElement("span", {
+      onClick: function onClick() {
+        return _this.copyHandle(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]);
+      }
+    }, /*#__PURE__*/React.createElement("span", {
+      style: {
+        paddingLeft: '4px',
+        cursor: 'pointer'
+      }
+    }, /*#__PURE__*/React.createElement(CopyOutlined, null)))));
+  });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id)])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id)];
+  });
+  _defineProperty(this, "renderExport", function (value, record) {
+    var _record;
+    return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record !== void 0 ? _record : '--';
+  });
+  _defineProperty(this, "renderClient", function () {
+    return null;
+  });
+  _defineProperty(this, "editRender", function (p) {
+    var _this$componentConfig, _this$componentConfig2;
+    return /*#__PURE__*/React.createElement(GetFormItem, {
+      title: _this.name,
+      name: _this.id,
+      rules: _this.rules,
+      hidden: p === null || p === void 0 ? void 0 : p.hidden,
+      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,
+      component: /*#__PURE__*/React.createElement(ApaasInput, _extends({}, _this.componentConfig, {
+        placeholder: "\u8BF7\u8F93\u5165".concat(_this.name)
+      }))
+    });
+  });
+  _defineProperty(this, "filterConfig", function (item) {
+    return {
+      searchDefaultConditions: SYMBOL.like,
+      type: item.type,
+      id: item.id,
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return "".concat(_filterFn.filterTableListItemColumnValue(i, item.id, '')).includes(value);
+        };
+      }
+    };
+  });
+  this.name = options.name;
+  this.id = options.id;
+  this.sortField = options.id;
+  this.formField = options.id;
+  this.type = options.type;
+  this.componentConfig = options.componentConfig;
+  this.effects = options.effects;
+  this.dataType = 'string';
+  this.rules = [];
+  this.isCombinationComponent = false;
+  this.canSort = true;
+  this.children = [];
+});
+export default FlowWorkOrderId;

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

@@ -1,20 +1,26 @@
-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 JstLogistics 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;
     expressDateInstance: InstanceType<typeof ExpressData>;
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface["dataType"];
+    dataType: ComponentInterface['dataType'];
     constructor(options: PickOption);
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: (value: any, record: Record) => React.JSX.Element;

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

@@ -6,22 +6,35 @@ 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'
+  },
+  BS_LOGISTICS: {
+    key: 'bsLogisticsList',
+    name: 'bs'
+  }
+};
 var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(options) {
   var _this = this,
+    _typeMap$options$type,
+    _typeMap$options$type2,
     _this$componentConfig3;
   _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,7 +59,8 @@ 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, {
       list: list,
@@ -54,18 +68,21 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(options) {
     });
   });
   _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,30 +99,31 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(options) {
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
+    var _typeMap$_this$type5, _typeMap$_this$type6;
     return [{
       searchDefaultConditions: SYMBOL.like,
       type: item.type,
       id: "".concat(item.id, "_logisticsCode"),
-      name: "jst\u7269\u6D41\u5355\u53F7",
-      filterComponentType: "Input",
+      name: "".concat((_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.name, "\u7269\u6D41\u5355\u53F7"),
+      filterComponentType: 'Input',
       filterFn: function filterFn(value) {
         return function (i) {
-          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, "logisticsCode"), value);
+          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",
+      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;
@@ -116,14 +134,14 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(options) {
   });
   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 +154,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, "_logisticsCompany"),
+    options: this.expressDateInstance.getExpressData(),
+    dataType: 'string'
+  }, {
+    name: '物流单号',
+    key: "".concat(options.id, "_logisticsCode"),
+    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;