@kmkf-fe-packages/services-components 2.6.0-rc.0 → 2.6.0

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

@@ -13,6 +13,7 @@ import { LogisticsInterception } from "@kmkf-fe-packages/basic-components";
 import { ExpressData, ExpressInterceptData, LogisticsAddressData, isNull } from "@kmkf-fe-packages/kmkf-utils";
 import GetFormItem from "../GetFormItem";
 import InterceptSenderMobile from "./interceptSenderMobile";
+import InterceptApiStatusReason from "./interceptApiStatusReason";
 import InterceptSnapshot from "./interceptSnapshot";
 import InterceptAddress from "./InterceptAddress";
 import InterceptType from "./InterceptType";
@@ -44,6 +45,7 @@ function Logistics(options) {
   _defineProperty(this, "interceptLogisticsStatus", void 0);
   _defineProperty(this, "interceptApiStatus", void 0);
   _defineProperty(this, "interceptSenderMobile", void 0);
+  _defineProperty(this, "interceptApiStatusReason", void 0);
   _defineProperty(this, "interceptSnapshot", void 0);
   _defineProperty(this, "interceptState", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
@@ -58,10 +60,10 @@ function Logistics(options) {
   _defineProperty(this, "effects", void 0);
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "renderClient", function (record) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, _this.express.renderClient(record), _this.expressCode.renderClient(record), _this.interceptSenderMobile.renderClient(record), _this.interceptType.renderClient(record), _this.interceptAddress.renderClient(record), _this.interceptLogisticsStatus.renderClient(record), _this.interceptApiStatus.renderClient(record), _this.interceptSnapshot.renderClient(record), _this.interceptState.renderClient(record));
+    return /*#__PURE__*/React.createElement(React.Fragment, null, _this.express.renderClient(record), _this.expressCode.renderClient(record), _this.interceptSenderMobile.renderClient(record), _this.interceptType.renderClient(record), _this.interceptAddress.renderClient(record), _this.interceptLogisticsStatus.renderClient(record), _this.interceptApiStatus.renderClient(record), _this.interceptApiStatusReason.renderClient(record), _this.interceptSnapshot.renderClient(record), _this.interceptState.renderClient(record));
   });
   _defineProperty(this, "renderLog", function (record) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, !isNull(_this.express.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.express.name, ": ", _this.express.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.expressCode.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.expressCode.name, ": ", _this.expressCode.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptSenderMobile.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptSenderMobile.name, ":", " ", _this.interceptSenderMobile.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptType.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptType.name, ": ", _this.interceptType.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptAddress.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptAddress.name, ":", " ", _this.interceptAddress.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptLogisticsStatus.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptLogisticsStatus.name, ":", " ", _this.interceptLogisticsStatus.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptApiStatus.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptApiStatus.name, ":", " ", _this.interceptApiStatus.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptSnapshot.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptSnapshot.name, ":", " ", _this.interceptSnapshot.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptState.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptState.name, ":", " ", _this.interceptState.renderLog(record))));
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, !isNull(_this.express.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.express.name, ": ", _this.express.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.expressCode.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.expressCode.name, ": ", _this.expressCode.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptSenderMobile.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptSenderMobile.name, ":", " ", _this.interceptSenderMobile.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptType.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptType.name, ": ", _this.interceptType.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptAddress.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptAddress.name, ":", " ", _this.interceptAddress.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptLogisticsStatus.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptLogisticsStatus.name, ":", " ", _this.interceptLogisticsStatus.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptApiStatus.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptApiStatus.name, ":", " ", _this.interceptApiStatus.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptApiStatusReason.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptApiStatusReason.name, ":", " ", _this.interceptApiStatusReason.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptSnapshot.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptSnapshot.name, ":", " ", _this.interceptSnapshot.renderLog(record))), /*#__PURE__*/React.createElement("div", null, !isNull(_this.interceptState.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptState.name, ":", " ", _this.interceptState.renderLog(record))));
   });
   _defineProperty(this, "getComponentValue", function (r) {
     return {
@@ -73,7 +75,8 @@ function Logistics(options) {
       interceptApiStatus: _this.interceptApiStatus.getComponentValue(r),
       interceptRedirectTo: _this.interceptAddress.getComponentValue(r),
       interceptSnapshot: _this.interceptSnapshot.getComponentValue(r),
-      interceptState: _this.interceptState.getComponentValue(r)
+      interceptState: _this.interceptState.getComponentValue(r),
+      interceptApiStatusReason: _this.interceptApiStatusReason.getComponentValue(r)
       // interceptLogisticsUserKCode:
       //   this.interceptLogisticsUserKCode.getComponentValue(r),
       // interceptLogisticsUserSecretKey:
@@ -100,6 +103,7 @@ function Logistics(options) {
         platform: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.env,
         onJumpPage: (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.onJumpPage
       }, _this.componentConfig, {
+        showReason: true,
         logisticsOptions: _this.expressDateInstance.getExpressData(),
         expressInterceptData: _this.expressInterceptData.getExpressData(),
         logisticsAddressData: _this.logisticsAddressData.getAddressData(),
@@ -112,7 +116,7 @@ function Logistics(options) {
       subKey: "interceptCompany"
     })), _this.expressCode.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
       subKey: "interceptCode"
-    })), _this.interceptSenderMobile.filterConfig(item), _this.interceptLogisticsStatus.filterConfig(item), _this.interceptApiStatus.filterConfig(item), _this.interceptType.filterConfig(item), _this.interceptSnapshot.filterConfig(item), _this.interceptState.filterConfig(item)
+    })), _this.interceptSenderMobile.filterConfig(item), _this.interceptLogisticsStatus.filterConfig(item), _this.interceptApiStatus.filterConfig(item), _this.interceptApiStatusReason.filterConfig(item), _this.interceptType.filterConfig(item), _this.interceptSnapshot.filterConfig(item), _this.interceptState.filterConfig(item)
     // this.interceptLogisticsUserKCode.filterConfig(item),
     // this.interceptLogisticsUserSecretKey.filterConfig(item),
     ];
@@ -137,6 +141,7 @@ function Logistics(options) {
   this.interceptSenderMobile = new InterceptSenderMobile(options);
   this.interceptSnapshot = new InterceptSnapshot(options);
   this.interceptState = new InterceptState(options);
+  this.interceptApiStatusReason = new InterceptApiStatusReason(options);
   // this.interceptLogisticsUserSecretKey = new InterceptLogisticsUserSecretKey(
   //   options,
   // );
@@ -152,7 +157,7 @@ function Logistics(options) {
   this.isCombinationComponent = true;
   this.canSort = false;
   this.dataType = "object";
-  this.children = [this.express, this.expressCode, this.interceptType, this.interceptAddress, this.interceptLogisticsStatus, this.interceptApiStatus, this.interceptSnapshot, this.interceptState
+  this.children = [this.express, this.expressCode, this.interceptType, this.interceptAddress, this.interceptLogisticsStatus, this.interceptApiStatus, this.interceptApiStatusReason, this.interceptSnapshot, this.interceptState
   // this.interceptLogisticsUserKCode,
   // this.interceptLogisticsUserSecretKey,
   ];

package/dist/esm/components/LogisticsInterception/interceptApiStatusReason.d.ts

@@ -0,0 +1,45 @@
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from "../../type";
+import React from "react";
+declare class InterceptApiStatusReason implements ComponentInterface {
+    name: string;
+    id: string;
+    companyId: string;
+    type: string;
+    rules: any[];
+    componentConfig: ComponentInterface["componentConfig"];
+    effects: ComponentInterface["effects"];
+    align: ALignType;
+    width: number;
+    isCombinationComponent: boolean;
+    sortField: string;
+    formField: string;
+    canSort: boolean;
+    dataType: ComponentInterface["dataType"];
+    children: ComponentInterface[];
+    constructor(options: PickOption);
+    getComponentValue: (r: Record) => any;
+    renderClient: (record: any) => React.JSX.Element | null;
+    renderPc: (value: any, record: Record) => any;
+    renderLog: (r: Record) => any;
+    renderExport: (value: any, record: Record) => any;
+    editRender: () => null;
+    filterConfig: (item: ColumnConfig) => {
+        searchDefaultConditions: {
+            in: "in";
+            anylike: "anylike";
+        };
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "SelectInput";
+        props: {
+            filterOptions: {
+                label: string;
+                value: string;
+            }[];
+        };
+        filterFn: (value: string) => (i: Record) => boolean;
+        formatFilterValue: (value: any) => any;
+    };
+}
+export default InterceptApiStatusReason;

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

@@ -0,0 +1,97 @@
+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 _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 ItemView from "../../commonComponents/ItemView";
+import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
+import { SYMBOL, batchInput, SEARCH_OPTIONS } from "../../constant";
+var InterceptApiStatusReason = /*#__PURE__*/_createClass(function InterceptApiStatusReason(options) {
+  var _this = this;
+  _classCallCheck(this, InterceptApiStatusReason);
+  _defineProperty(this, "name", void 0);
+  _defineProperty(this, "id", void 0);
+  _defineProperty(this, "companyId", void 0);
+  _defineProperty(this, "type", void 0);
+  _defineProperty(this, "rules", void 0);
+  _defineProperty(this, "componentConfig", void 0);
+  _defineProperty(this, "effects", void 0);
+  _defineProperty(this, "align", void 0);
+  _defineProperty(this, "width", void 0);
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "sortField", void 0);
+  _defineProperty(this, "formField", void 0);
+  _defineProperty(this, "canSort", void 0);
+  _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "children", void 0);
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r[_this.id];
+  });
+  _defineProperty(this, "renderClient", function (record) {
+    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]
+    }) : null;
+  });
+  _defineProperty(this, "renderPc", function (value, record) {
+    return record === null || record === void 0 ? void 0 : record[_this.id];
+  });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id)])) return null;
+    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, "editRender", function () {
+    return null;
+  });
+  _defineProperty(this, "filterConfig", function (item) {
+    return {
+      searchDefaultConditions: {
+        in: SYMBOL.in,
+        anylike: SYMBOL.anylike
+      },
+      type: _this.type,
+      id: "".concat(item.id, "_interceptLogisticsApiStatusReason"),
+      name: "".concat(item.name, "-\u63A5\u53E3\u72B6\u6001\u539F\u56E0"),
+      filterComponentType: "SelectInput",
+      props: {
+        filterOptions: SEARCH_OPTIONS
+      },
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return "".concat(_filterFn.filterTableListItemColumnValue(i, item.id, 'interceptLogisticsApiStatusReason')).includes(value);
+        };
+      },
+      formatFilterValue: function formatFilterValue(value) {
+        if (['in', 'anylike'].includes(value.type)) {
+          return batchInput(value.keywords);
+        } else {
+          return value;
+        }
+      }
+    };
+  });
+  this.name = "接口状态原因";
+  this.id = "".concat(options.id, "_interceptLogisticsApiStatusReason");
+  this.companyId = "".concat(options.id, "_interceptCompany");
+  this.formField = "".concat(options.id, "_interceptLogisticsApiStatusReason");
+  this.sortField = "".concat(options.id, "_interceptLogisticsApiStatusReason");
+  this.dataType = "string";
+  this.type = options.type + '_API_STATUS_REASON';
+  this.componentConfig = options.componentConfig;
+  this.rules = [];
+  this.align = "left";
+  this.width = 200;
+  this.isCombinationComponent = false;
+  this.canSort = true;
+  this.children = [];
+  this.effects = options === null || options === void 0 ? void 0 : options.effects;
+});
+export default InterceptApiStatusReason;

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

@@ -31,9 +31,10 @@ var InterceptSenderMobile = /*#__PURE__*/_createClass(function InterceptSenderMo
     return r === null || r === void 0 ? void 0 : r[_this.id];
   });
   _defineProperty(this, "renderClient", function (record) {
+    var name = (record === null || record === void 0 ? void 0 : record[_this.companyId]) === "ZTO" ? "发件人/收件人手机号" : _this.name;
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
-      label: _this.name,
+      label: name,
       value: record === null || record === void 0 ? void 0 : record[_this.id]
     }) : null;
   });
@@ -56,7 +57,7 @@ var InterceptSenderMobile = /*#__PURE__*/_createClass(function InterceptSenderMo
       searchDefaultConditions: SYMBOL.like,
       type: item.type,
       id: "".concat(item.id, "_interceptSenderMobile"),
-      name: "".concat(item.name, "-\u53D1\u4EF6\u4EBA\u624B\u673A\u53F7"),
+      name: "".concat(item.name, "-\u53D1\u4EF6\u4EBA/\u6536\u4EF6\u4EBA\u624B\u673A\u53F7"),
       filterComponentType: "Input",
       filterFn: function filterFn(value) {
         return function (i) {

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

@@ -8,6 +8,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import React from "react";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { AddressData } from "@kmkf-fe-packages/kmkf-utils";
+import { isEmpty } from "lodash";
 var PaymentTid = /*#__PURE__*/_createClass(function PaymentTid(options) {
   var _this = this;
   _classCallCheck(this, PaymentTid);
@@ -52,9 +53,10 @@ 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) {
+    return logisticsInterceptList === null || logisticsInterceptList === void 0 ? void 0 : logisticsInterceptList.reduce(function (prv, item) {
       var _item$interceptAddres2;
+      // item 若为空对象，则跳过
+      if (isEmpty(item)) return prv;
       var addressText = (_item$interceptAddres2 = item.interceptAddress) === null || _item$interceptAddres2 === void 0 ? void 0 : _item$interceptAddres2.map(function (suffix) {
         return _this.addressDateInstance.getNameByCode(suffix);
       }).join("");

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

@@ -30,7 +30,7 @@ var InterceptApiStatus = /*#__PURE__*/_createClass(function InterceptApiStatus(o
   _defineProperty(this, "getComponentValue", function (r) {
     var _ref;
     return (_ref = (r === null || r === void 0 ? void 0 : r[_this.id]) || []) === null || _ref === void 0 ? void 0 : _ref.map(function (item) {
-      return "".concat(item === null || item === void 0 ? void 0 : item.status).concat(item !== null && item !== void 0 && item.reason ? ",".concat(item === null || item === void 0 ? void 0 : item.reason) : "");
+      return "".concat((item === null || item === void 0 ? void 0 : item.status) || "").concat(item !== null && item !== void 0 && item.reason ? ",".concat(item === null || item === void 0 ? void 0 : item.reason) : "");
     }).join(";");
   });
   _defineProperty(this, "renderStatus", function (record) {

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

@@ -113,6 +113,7 @@ function Logistics(options) {
       name: _this.id,
       rules: _this.rules,
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
+      display: p === null || p === void 0 ? void 0 : p.display,
       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,
       tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : "",
       component: /*#__PURE__*/React.createElement(LogisticsMoreInterception, _extends({}, _this.componentConfig, {

package/dist/esm/components/LogisticsMoreInterception/interceptSenderMobile.d.ts

@@ -1,20 +1,20 @@
-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 InterceptSenderMobile implements ComponentInterface {
     name: string;
     id: string;
     companyId: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface['componentConfig'];
-    effects: ComponentInterface['effects'];
+    componentConfig: ComponentInterface["componentConfig"];
+    effects: ComponentInterface["effects"];
     align: ALignType;
     width: number;
     isCombinationComponent: boolean;
     sortField: string;
     formField: string;
     canSort: boolean;
-    dataType: ComponentInterface['dataType'];
+    dataType: ComponentInterface["dataType"];
     children: ComponentInterface[];
     constructor(options: PickOption);
     renderMobile: (record: any) => React.JSX.Element;

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

@@ -5,8 +5,8 @@ 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 { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import React from "react";
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { SYMBOL } from "../../constant";
 var InterceptSenderMobile = /*#__PURE__*/_createClass(function InterceptSenderMobile(options) {
   var _this = this;
@@ -35,7 +35,7 @@ var InterceptSenderMobile = /*#__PURE__*/_createClass(function InterceptSenderMo
   _defineProperty(this, "getComponentValue", function (r) {
     return ((r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_logisticsInterceptList")]) || []).map(function (t) {
       return t.interceptSenderMobile;
-    }).join(',');
+    }).join(",");
   });
   _defineProperty(this, "renderClient", function () {
     return null;
@@ -49,7 +49,7 @@ var InterceptSenderMobile = /*#__PURE__*/_createClass(function InterceptSenderMo
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var _this$getComponentVal;
-    return (_this$getComponentVal = _this.getComponentValue(record)) !== null && _this$getComponentVal !== void 0 ? _this$getComponentVal : '--';
+    return (_this$getComponentVal = _this.getComponentValue(record)) !== null && _this$getComponentVal !== void 0 ? _this$getComponentVal : "--";
   });
   _defineProperty(this, "editRender", function () {
     return null;
@@ -59,20 +59,20 @@ var InterceptSenderMobile = /*#__PURE__*/_createClass(function InterceptSenderMo
       searchDefaultConditions: SYMBOL.like,
       type: item.type,
       id: "".concat(item.id, "_logisticsInterceptList"),
-      name: "".concat(item.name, "-\u53D1\u4EF6\u4EBA\u624B\u673A\u53F7"),
-      filterComponentType: 'Input'
+      name: "".concat(item.name, "-\u53D1\u4EF6\u4EBA/\u6536\u4EF6\u4EBA\u624B\u673A\u53F7"),
+      filterComponentType: "Input"
     };
   });
-  this.name = '发件人手机号';
+  this.name = "发件人手机号";
   this.id = "".concat(options.id, "_interceptMobileList");
   this.companyId = "".concat(options.id);
   this.formField = "".concat(options.id);
   this.sortField = "".concat(options.id);
-  this.dataType = 'string';
+  this.dataType = "string";
   this.type = options.type;
   this.componentConfig = options.componentConfig;
   this.rules = [];
-  this.align = 'left';
+  this.align = "left";
   this.width = 200;
   this.isCombinationComponent = false;
   this.canSort = false;

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

@@ -28,7 +28,14 @@ declare class OrderSubForm implements ComponentInterface {
     expressDateInstance: InstanceType<typeof ExpressData>;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
+    sortChildField: {
+        name: string;
+        key: string;
+        dataType: string;
+        [key: string]: any;
+    }[];
     constructor(options: PickOption);
+    getSortChildFields: () => any;
     renderTransformItem: (item: subConfigType, val: any) => any;
     getNewTableHeader: () => any;
     renderTabel: (list: any) => React.JSX.Element;

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

@@ -48,6 +48,19 @@ function OrderSubForm(options) {
   _defineProperty(this, "expressDateInstance", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    var orderSubformColumns = getOrderSubformColumns();
+    return orderSubformColumns.filter(function (item) {
+      return !["picUrl"].includes(item.dataIndex);
+    }).map(function (item) {
+      return {
+        name: item.title,
+        key: "".concat(_this.id, "_").concat(item.dataIndex),
+        dataType: "arrayObject"
+      };
+    });
+  });
   _defineProperty(this, "renderTransformItem", function (item, val) {
     var _getSelectWidgetMap;
     var mapValue = (_getSelectWidgetMap = getSelectWidgetMap(_this.expressDateInstance)) === null || _getSelectWidgetMap === void 0 ? void 0 : _getSelectWidgetMap[item.dataIndex];
@@ -80,7 +93,7 @@ function OrderSubForm(options) {
         isShow: true,
         isEdit: false,
         isRequired: false,
-        width: Number(item === null || item === void 0 ? void 0 : item.width) || 150
+        width: item !== null && item !== void 0 && item.width ? Number(item === null || item === void 0 ? void 0 : item.width) : 150
       };
       if (t.isShow) {
         prv.push(_objectSpread(_objectSpread({}, item), t));
@@ -230,10 +243,12 @@ function OrderSubForm(options) {
     if (item.widget === "upload") {
       return new BsHeaderPic(_objectSpread(_objectSpread({}, options), {}, {
         name: item.title,
+        width: (item === null || item === void 0 ? void 0 : item.width) || 150,
         id: "".concat(options.id, "_subOrderList_").concat(item.dataIndex)
       }));
     } else if (item.widget === "select") {
       return new BsHeaderChild(_objectSpread(_objectSpread({}, options), {}, {
+        width: (item === null || item === void 0 ? void 0 : item.width) || 150,
         name: item.title,
         id: "".concat(options.id, "_subOrderList_").concat(item.dataIndex),
         transformValue: function transformValue(val) {
@@ -245,6 +260,7 @@ function OrderSubForm(options) {
       }));
     } else if (item.widget === "datePicker") {
       return new BsHeaderChild(_objectSpread(_objectSpread({}, options), {}, {
+        width: (item === null || item === void 0 ? void 0 : item.width) || 150,
         name: item.title,
         id: "".concat(options.id, "_subOrderList_").concat(item.dataIndex),
         transformValue: function transformValue(val) {
@@ -256,6 +272,7 @@ function OrderSubForm(options) {
       }));
     } else {
       return new BsHeaderChild(_objectSpread(_objectSpread({}, options), {}, {
+        width: (item === null || item === void 0 ? void 0 : item.width) || 150,
         name: item.title,
         id: "".concat(options.id, "_subOrderList_").concat(item.dataIndex)
       }));
@@ -263,6 +280,6 @@ function OrderSubForm(options) {
   });
   this.dataType = "object";
   this.expressDateInstance = ExpressData.getInstance();
-  console.log("componentConfig", this.componentConfig);
+  this.sortChildField = this.getSortChildFields();
 });
 export default OrderSubForm;

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

@@ -1,19 +1,19 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../type";
-import React from "react";
-import AlipayNick from "./AlipayNick";
-import AlipayNo from "./AlipayNo";
-import AlipayTime from "./AlipayTime";
-import BuyerNick from "./BuyerNick";
-import PaymentAmount from "./PaymentAmount";
-import PaymentStatus from "./PaymentStatus";
-import PaymentTid from "./PaymentTid";
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
+import React from 'react';
+import AlipayNick from './AlipayNick';
+import AlipayNo from './AlipayNo';
+import AlipayTime from './AlipayTime';
+import BuyerNick from './BuyerNick';
+import PaymentAmount from './PaymentAmount';
+import PaymentStatus from './PaymentStatus';
+import PaymentTid from './PaymentTid';
 declare class Logistics implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface["componentConfig"];
+    componentConfig: ComponentInterface['componentConfig'];
     paymentTid: PaymentTid;
     paymentStatus: PaymentStatus;
     paymentAmount: PaymentAmount;
@@ -25,8 +25,9 @@ declare class Logistics implements ComponentInterface {
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface["dataType"];
-    effects: ComponentInterface["effects"];
+    dataType: ComponentInterface['dataType'];
+    effects: ComponentInterface['effects'];
+    compoundConfig: ComponentInterface['compoundConfig'];
     constructor(options: PickOption);
     renderClient: (record: any, params: any) => React.JSX.Element;
     renderPc: () => null;

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

@@ -8,8 +8,8 @@ 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 { Payment as ApaasPayment } from "@kmkf-fe-packages/basic-components";
+import React from 'react';
+import { Payment as ApaasPayment } from '@kmkf-fe-packages/basic-components';
 import GetFormItem from "../GetFormItem";
 import AlipayNick from "./AlipayNick";
 import AlipayNo from "./AlipayNo";
@@ -40,6 +40,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "effects", void 0);
+  _defineProperty(this, "compoundConfig", void 0);
   _defineProperty(this, "renderClient", function (record, params) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, _this.alipayNick.renderClient(record), _this.paymentAmount.renderClient(record), _this.alipayNo.renderClient(record), _this.buyerNick.renderClient(record, params), _this.paymentTid.renderClient(record), _this.paymentStatus.renderClient(record), _this.payTime.renderClient(record));
   });
@@ -104,32 +105,51 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
     validator: function validator(_, value) {
       var _this$componentConfig6, _this$componentConfig7, _this$componentConfig8, _this$componentConfig9;
       if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required && !(value !== null && value !== void 0 && value.enterprisePaymentRefundFee)) {
-        return Promise.reject(new Error("请输入打款金额"));
+        return Promise.reject(new Error('请输入打款金额'));
       } else if (value !== null && value !== void 0 && value.enterprisePaymentRefundFee && !/^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/.test(value === null || value === void 0 ? void 0 : value.enterprisePaymentRefundFee)) {
-        return Promise.reject(new Error("打款金额最多2位小数"));
+        return Promise.reject(new Error('打款金额最多2位小数'));
       }
       if ((_this$componentConfig7 = _this.componentConfig) !== null && _this$componentConfig7 !== void 0 && _this$componentConfig7.required && !(value !== null && value !== void 0 && value.enterprisePaymentTid)) {
-        return Promise.reject(new Error("请输入订单编号"));
+        return Promise.reject(new Error('请输入订单编号'));
       } else if (value.enterprisePaymentTid && !/^[0-9a-zA-Z_-]{1,}$/.test(value.enterprisePaymentTid)) {
-        return Promise.reject(new Error("请输入正确的订单编号"));
+        return Promise.reject(new Error('请输入正确的订单编号'));
       }
       if ((_this$componentConfig8 = _this.componentConfig) !== null && _this$componentConfig8 !== void 0 && _this$componentConfig8.zhiFubaoRequired && !(value !== null && value !== void 0 && value.enterprisePaymentAlipayNick)) {
-        return Promise.reject(new Error("请输入支付宝名称"));
+        return Promise.reject(new Error('请输入支付宝名称'));
       }
       if ((_this$componentConfig9 = _this.componentConfig) !== null && _this$componentConfig9 !== void 0 && _this$componentConfig9.zhiFubaoRequired && !(value !== null && value !== void 0 && value.enterprisePaymentAlipayNo)) {
-        return Promise.reject(new Error("请输入支付宝账号"));
+        return Promise.reject(new Error('请输入支付宝账号'));
       } else if (value.enterprisePaymentAlipayNo && !/^(?:1[3-9]\d{9}|[a-zA-Z\d._-]*\@[a-zA-Z\d.-]{1,10}\.[a-zA-Z\d]{1,20})$/.test(value.enterprisePaymentAlipayNo)) {
-        return Promise.reject(new Error("请输入正确的支付宝账号格式"));
+        return Promise.reject(new Error('请输入正确的支付宝账号格式'));
       }
       //支付宝信息不能只填一个，否则不能打款
       if (value !== null && value !== void 0 && value.enterprisePaymentAlipayNick || value !== null && value !== void 0 && value.enterprisePaymentAlipayNo) {
         if (!(value !== null && value !== void 0 && value.enterprisePaymentAlipayNick && value !== null && value !== void 0 && value.enterprisePaymentAlipayNo)) {
-          return Promise.reject(new Error("支付宝姓名/账号都要填写"));
+          return Promise.reject(new Error('支付宝姓名/账号都要填写'));
         }
       }
       return Promise.resolve();
     }
   }];
-  this.dataType = "object";
+  this.dataType = 'object';
+  this.compoundConfig = [{
+    name: "\u8BA2\u5355\u7F16\u53F7",
+    id: "".concat(options.id, "_enterprisePaymentTid")
+  }, {
+    name: "\u6253\u6B3E\u91D1\u989D",
+    id: "".concat(options.id, "_enterprisePaymentRefundFee")
+  }, {
+    name: "\u4E70\u5BB6\u6635\u79F0",
+    id: "".concat(options.id, "_enterprisePaymentBuyerNick")
+  }, {
+    name: "\u652F\u4ED8\u5B9D\u59D3\u540D",
+    id: "".concat(options.id, "_enterprisePaymentAlipayNick")
+  }, {
+    name: "\u652F\u4ED8\u5B9D\u8D26\u53F7",
+    id: "".concat(options.id, "_enterprisePaymentAlipayNo")
+  }, {
+    name: "\u6253\u6B3E\u72B6\u6001",
+    id: "".concat(options.id, "_enterprisePaymentStatus")
+  }];
 });
 export default Logistics;