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

package/dist/esm/components/BS/common/BsHeaderChild.d.ts

@@ -1,18 +1,18 @@
-import { ComponentInterface, PickOption, ALignType, Record } from '../../../type';
-import React from 'react';
+import { ComponentInterface, PickOption, ALignType, Record } from "../../../type";
+import React from "react";
 declare class BsHeaderChild implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
-    componentConfig: ComponentInterface['componentConfig'];
+    componentConfig: ComponentInterface["componentConfig"];
     align: ALignType;
     width: number;
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface['dataType'];
+    dataType: ComponentInterface["dataType"];
     parentName?: string;
     transformValue: (val: any, record?: any, parentName?: string) => any;
     export: (val: any, record?: any, parentName?: string) => any;

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

@@ -11,9 +11,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 React from "react";
 import ItemView from "../../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
   var _this = this;
   _classCallCheck(this, BsHeaderChild);
@@ -37,7 +37,7 @@ var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
     return val;
   });
   _defineProperty(this, "getParentId", function () {
-    var _this$id$split = _this.id.split('_'),
+    var _this$id$split = _this.id.split("_"),
       _this$id$split2 = _slicedToArray(_this$id$split, 3),
       key = _this$id$split2[0],
       name = _this$id$split2[1],
@@ -53,7 +53,7 @@ var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
   });
   _defineProperty(this, "renderPc", function (value, record) {
     var _this$getComponentVal;
-    return /*#__PURE__*/React.createElement("span", null, (_this$getComponentVal = _this.getComponentValue(record)) !== null && _this$getComponentVal !== void 0 ? _this$getComponentVal : '--');
+    return /*#__PURE__*/React.createElement("span", null, (_this$getComponentVal = _this.getComponentValue(record)) !== null && _this$getComponentVal !== void 0 ? _this$getComponentVal : "--");
   });
   _defineProperty(this, "renderLog", function (r) {
     var id = _this.getParentId();
@@ -68,8 +68,8 @@ var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var _this$getComponentExp;
-    var val = (_this$getComponentExp = _this.getComponentExport(record)) !== null && _this$getComponentExp !== void 0 ? _this$getComponentExp : '--';
-    return typeof val === 'number' ? val + '' : val;
+    var val = (_this$getComponentExp = _this.getComponentExport(record)) !== null && _this$getComponentExp !== void 0 ? _this$getComponentExp : "--";
+    return typeof val === "number" ? val + "" : val;
   });
   _defineProperty(this, "editRender", function () {
     return null;
@@ -86,11 +86,11 @@ var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
     this.parentName = options.parentName;
   }
   this.componentConfig = options.componentConfig;
-  this.align = 'left';
+  this.align = "left";
   this.width = (options === null || options === void 0 ? void 0 : options.width) || 100;
   this.isCombinationComponent = false;
   this.canSort = false;
-  this.dataType = 'string';
+  this.dataType = "string";
   this.children = [];
   if (options.transformValue) {
     this.transformValue = options.transformValue;

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

@@ -12,8 +12,8 @@ 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 { Image } from "antd";
 import ItemView from "../../../commonComponents/ItemView";
+import { BsGoodPic } from "../../Common";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 var BsChildPic = /*#__PURE__*/_createClass(function BsChildPic(options) {
   var _this = this;
@@ -46,14 +46,9 @@ var BsChildPic = /*#__PURE__*/_createClass(function BsChildPic(options) {
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
-    return /*#__PURE__*/React.createElement("span", {
-      onClick: function onClick(e) {
-        return e.stopPropagation();
-      }
-    }, /*#__PURE__*/React.createElement(Image, {
-      width: 60,
-      src: _this.getComponentValue(record)
-    }));
+    var picValue = _this.getComponentValue(record);
+    var imgList = picValue ? picValue === null || picValue === void 0 ? void 0 : picValue.split(",") : [];
+    return BsGoodPic(imgList);
   });
   _defineProperty(this, "renderLog", function (r) {
     var id = _this.getParentId();

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

@@ -31,7 +31,7 @@ export declare const BsGoodImage: ({ item, index }: {
     index: number;
 }) => React.JSX.Element;
 export declare const BsExchangeList: ({ list, showHeader }: any) => React.JSX.Element;
-export declare const BsGoodPic: (list: string[]) => React.JSX.Element[];
+export declare const BsGoodPic: (list: string[]) => React.JSX.Element;
 export declare const BsGoodsTable: ({ list, showHeader, text, type, }: {
     list: any[];
     showHeader: (string | ShowHeaderObjType)[];

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

@@ -448,12 +448,17 @@ export var BsExchangeList = function BsExchangeList(_ref10) {
 };
 //bs图片展示
 export var BsGoodPic = function BsGoodPic(list) {
-  return list.map(function (t) {
-    return /*#__PURE__*/React.createElement(Image, {
+  return /*#__PURE__*/React.createElement(Image.PreviewGroup, null, list.map(function (t) {
+    var finalSrc = t !== null && t !== void 0 && t.startsWith("http") ? t : "https://kefu.kuaimai.com/".concat(t);
+    return /*#__PURE__*/React.createElement("span", {
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      }
+    }, /*#__PURE__*/React.createElement(Image, {
       width: 60,
-      src: t
-    });
-  });
+      src: finalSrc
+    }));
+  }));
 };
 export var BsGoodsTable = function BsGoodsTable(_ref11) {
   var list = _ref11.list,

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

@@ -0,0 +1,49 @@
+import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../type";
+import React from "react";
+import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
+declare type subConfigType = {
+    isEdit: boolean;
+    isRequired: boolean;
+    isShow: boolean;
+    key: string;
+    name: string;
+    workOrderComponentType: string;
+    width: number;
+    dataIndex: string;
+    title: string;
+    widget: string;
+    settingName?: string;
+};
+declare class OrderSubForm implements ComponentInterface {
+    name: string;
+    id: string;
+    sortField: string;
+    type: string;
+    rules: any[];
+    componentConfig: ComponentInterface["componentConfig"];
+    effects: ComponentInterface["effects"];
+    isCombinationComponent: boolean;
+    formField: string;
+    canSort: boolean;
+    expressDateInstance: InstanceType<typeof ExpressData>;
+    children: ComponentInterface[];
+    dataType: ComponentInterface["dataType"];
+    constructor(options: PickOption);
+    renderTransformItem: (item: subConfigType, val: any) => any;
+    getNewTableHeader: () => any;
+    renderTabel: (list: any) => React.JSX.Element;
+    renderPc: () => null;
+    renderLog: (r: Record) => React.JSX.Element | null;
+    getComponentValue: (r: Record) => any;
+    renderExport: () => null;
+    renderClient: (record: Record) => React.JSX.Element | null;
+    editRender: (p: any) => React.JSX.Element;
+    filterConfig: (item: ColumnConfig) => {
+        searchDefaultConditions: "like";
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+    }[];
+}
+export default OrderSubForm;

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

@@ -0,0 +1,268 @@
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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 moment from "moment";
+import React from "react";
+import { Table } from "antd";
+import { OrderSubForm as SubFormComponent } from "@kmkf-fe-packages/basic-components";
+import BsHeaderChild from "../BS/common/BsHeaderChild";
+import BsHeaderPic from "../BS/common/BsHeaderPic";
+import GetFormItem from "../GetFormItem";
+import ItemView from "../../commonComponents/ItemView";
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
+import { difference } from "lodash";
+import { SYMBOL } from "../../constant";
+import { OrderSubFormUtils, orderSubFormConstants } from "@kmkf-fe-packages/basic-components";
+import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
+var renderDetailItem = OrderSubFormUtils.renderDetailItem;
+var getSelectWidgetMap = orderSubFormConstants.getSelectWidgetMap,
+  getOrderSubformColumns = orderSubFormConstants.getOrderSubformColumns;
+var OrderSubForm = /*#__PURE__*/_createClass(
+// workOrderUniqueKey?: string;
+function OrderSubForm(options) {
+  var _this = this;
+  _classCallCheck(this, OrderSubForm);
+  _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, "expressDateInstance", void 0);
+  _defineProperty(this, "children", void 0);
+  _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "renderTransformItem", function (item, val) {
+    var _getSelectWidgetMap;
+    var mapValue = (_getSelectWidgetMap = getSelectWidgetMap(_this.expressDateInstance)) === null || _getSelectWidgetMap === void 0 ? void 0 : _getSelectWidgetMap[item.dataIndex];
+    var selectValue;
+    if (mapValue && typeof mapValue === "function") {
+      selectValue = mapValue === null || mapValue === void 0 ? void 0 : mapValue(val);
+    } else {
+      selectValue = mapValue === null || mapValue === void 0 ? void 0 : mapValue[val];
+    }
+    return selectValue;
+  });
+  _defineProperty(this, "getNewTableHeader", function () {
+    var _this$componentConfig, _ref2;
+    var orderSubformColumns = getOrderSubformColumns();
+    var orderSubformColumnMap = orderSubformColumns.reduce(function (prv, next) {
+      prv[next.dataIndex] = next;
+      return prv;
+    }, {});
+    var _ref = ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.subConfig) || {},
+      _ref$correlationList = _ref.correlationList,
+      correlationList = _ref$correlationList === void 0 ? [] : _ref$correlationList;
+    var columns = correlationList && correlationList !== null && correlationList !== void 0 && correlationList.length ? correlationList.map(function (t) {
+      return orderSubformColumnMap[t.dataIndex];
+    }) : orderSubformColumns;
+    return (_ref2 = columns || []) === null || _ref2 === void 0 ? void 0 : _ref2.reduce(function (prv, item) {
+      var _this$componentConfig2, _this$componentConfig3;
+      var t = ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : (_this$componentConfig3 = _this$componentConfig2.tableHeader) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.find(function (v) {
+        return v.key === item.dataIndex;
+      })) || {
+        isShow: true,
+        isEdit: false,
+        isRequired: false,
+        width: Number(item === null || item === void 0 ? void 0 : item.width) || 150
+      };
+      if (t.isShow) {
+        prv.push(_objectSpread(_objectSpread({}, item), t));
+      }
+      return prv;
+    }, []);
+  });
+  _defineProperty(this, "renderTabel", function (list) {
+    var _ref3, _ref3$filter;
+    var columns = [{
+      dataIndex: "",
+      title: "序号",
+      align: "center",
+      ellipsis: true,
+      width: 50,
+      render: function render(val, record, index) {
+        return /*#__PURE__*/React.createElement("span", null, index + 1);
+      }
+    }].concat(_toConsumableArray(((_ref3 = _this.getNewTableHeader() || []) === null || _ref3 === void 0 ? void 0 : (_ref3$filter = _ref3.filter(function (t) {
+      return t.isShow;
+    })) === null || _ref3$filter === void 0 ? void 0 : _ref3$filter.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        align: "center",
+        ellipsis: true,
+        title: (item === null || item === void 0 ? void 0 : item.settingName) || item.title,
+        render: function render(val) {
+          return renderDetailItem({
+            item: item,
+            val: val
+          });
+        }
+      });
+    })) || []));
+    return /*#__PURE__*/React.createElement(Table, {
+      columns: columns,
+      dataSource: list,
+      rowKey: "uuid",
+      size: "small",
+      pagination: false,
+      scroll: {
+        x: "100%"
+      },
+      locale: {
+        emptyText: "暂无数据"
+      }
+    });
+  });
+  _defineProperty(this, "renderPc", function () {
+    return null;
+  });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_subOrderList")])) return null;
+    return _this.renderTabel(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_subOrderList")]);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_subOrderList")];
+  });
+  _defineProperty(this, "renderExport", function () {
+    return null;
+  });
+  _defineProperty(this, "renderClient", function (record) {
+    var _record;
+    return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
+      id: _this.id,
+      label: _this.name,
+      value: _this.renderTabel(record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id)]) === null || _record === void 0 ? void 0 : _record.subOrderList)
+    }) : null;
+  });
+  _defineProperty(this, "editRender", function (p) {
+    var _this$componentConfig4, _this$componentConfig5, _this$componentConfig6, _this$componentConfig7;
+    return /*#__PURE__*/React.createElement(GetFormItem, {
+      title: _this.name,
+      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$componentConfig4 = (_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.required) !== null && _this$componentConfig4 !== void 0 ? _this$componentConfig4 : false,
+      tooltip: (_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.showTooltip ? (_this$componentConfig7 = _this.componentConfig) === null || _this$componentConfig7 === void 0 ? void 0 : _this$componentConfig7.tooltip : "",
+      component: /*#__PURE__*/React.createElement(SubFormComponent, _extends({
+        effects: _this.effects
+      }, _this.componentConfig, {
+        platform: p === null || p === void 0 ? void 0 : p.platform
+      }))
+    });
+  });
+  _defineProperty(this, "filterConfig", function (item) {
+    return [{
+      searchDefaultConditions: SYMBOL.like,
+      type: item.type,
+      id: "".concat(item.id, "_subOrderList"),
+      // 过滤组件id
+      name: item.name,
+      // 过滤组件名称
+      filterComponentType: "Input"
+    }];
+  });
+  this.name = options.name;
+  this.id = options.id;
+  this.sortField = "".concat(options.id, "_subOrderList");
+  this.formField = "".concat(options.id, "_subOrderList");
+  this.type = options.type;
+  this.effects = options === null || options === void 0 ? void 0 : options.effects;
+  this.componentConfig = options.componentConfig;
+  // this.workOrderUniqueKey = options?.workOrderUniqueKey;
+  this.rules = [{
+    validator: function validator(_, value) {
+      var _value$subOrderList, _this$componentConfig8, _this$componentConfig9, _value$subOrderList2;
+      if (!(value !== null && value !== void 0 && (_value$subOrderList = value.subOrderList) !== null && _value$subOrderList !== void 0 && _value$subOrderList.length)) {
+        return Promise.reject(new Error("请填写子订单"));
+      }
+      var result = (_this$componentConfig8 = _this.componentConfig) === null || _this$componentConfig8 === void 0 ? void 0 : (_this$componentConfig9 = _this$componentConfig8.tableHeader) === null || _this$componentConfig9 === void 0 ? void 0 : _this$componentConfig9.reduce(function (prv, next) {
+        if (next.isRequired && next.isShow && !next.isEdit) {
+          prv[next.key] = "".concat(next.name, "\u5FC5\u586B");
+        }
+        return prv;
+      }, {});
+      // TODO: 补充确省字段
+      var fillKeysValue = value === null || value === void 0 ? void 0 : (_value$subOrderList2 = value.subOrderList) === null || _value$subOrderList2 === void 0 ? void 0 : _value$subOrderList2.map(function (item) {
+        var _this$componentConfig10, _this$componentConfig11;
+        var lostKeys = difference((_this$componentConfig10 = _this.componentConfig) === null || _this$componentConfig10 === void 0 ? void 0 : (_this$componentConfig11 = _this$componentConfig10.tableHeader) === null || _this$componentConfig11 === void 0 ? void 0 : _this$componentConfig11.map(function (item) {
+          return item.key;
+        }), Object.keys(item));
+        if (!isNull(lostKeys)) {
+          return lostKeys.reduce(function (prv, next) {
+            return _objectSpread(_objectSpread({}, prv), {}, _defineProperty({}, next, undefined));
+          }, item);
+        }
+        return item;
+      });
+      var msg = (fillKeysValue || []).reduce(function (prv, next) {
+        Object.keys(next).forEach(function (key) {
+          if (result[key] && isNull(next[key])) {
+            prv = result[key];
+          }
+        });
+        return prv;
+      }, "");
+      if (msg) {
+        return Promise.reject(new Error(msg));
+      }
+      return Promise.resolve();
+    }
+  }];
+  this.isCombinationComponent = true;
+  this.canSort = false;
+  this.children = (this.getNewTableHeader() || []).map(function (item) {
+    if (item.widget === "upload") {
+      return new BsHeaderPic(_objectSpread(_objectSpread({}, options), {}, {
+        name: item.title,
+        id: "".concat(options.id, "_subOrderList_").concat(item.dataIndex)
+      }));
+    } else if (item.widget === "select") {
+      return new BsHeaderChild(_objectSpread(_objectSpread({}, options), {}, {
+        name: item.title,
+        id: "".concat(options.id, "_subOrderList_").concat(item.dataIndex),
+        transformValue: function transformValue(val) {
+          return _this.renderTransformItem(item, val);
+        },
+        renderExport: function renderExport(val) {
+          return _this.renderTransformItem(item, val);
+        }
+      }));
+    } else if (item.widget === "datePicker") {
+      return new BsHeaderChild(_objectSpread(_objectSpread({}, options), {}, {
+        name: item.title,
+        id: "".concat(options.id, "_subOrderList_").concat(item.dataIndex),
+        transformValue: function transformValue(val) {
+          return val ? moment(val).format("YYYY-MM-DD HH:mm:ss") : "";
+        },
+        renderExport: function renderExport(val) {
+          return val ? moment(val).format("YYYY-MM-DD HH:mm:ss") : "";
+        }
+      }));
+    } else {
+      return new BsHeaderChild(_objectSpread(_objectSpread({}, options), {}, {
+        name: item.title,
+        id: "".concat(options.id, "_subOrderList_").concat(item.dataIndex)
+      }));
+    }
+  });
+  this.dataType = "object";
+  this.expressDateInstance = ExpressData.getInstance();
+  console.log("componentConfig", this.componentConfig);
+});
+export default OrderSubForm;

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

@@ -31,6 +31,9 @@ var typeMap = {
   },
   EXECUTE_ACTION_TYPE: {
     key: "executeActionType"
+  },
+  ERP_ORDER_STATUS: {
+    key: "erpOrderStatus"
   }
 };
 var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {

package/dist/esm/factory.d.ts

@@ -1,3 +1,3 @@
-import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicPicturePro, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption } from "./index";
+import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicPicturePro, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption, OrderSubForm } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => ActualPayment | AfterSalesOrderId | BsGoods | BsLogistics | BsSystemOrder | BsE3Goods | BsE3Reissue | BuyerNick | BasicCascader | BasicCheckbox | CommonMultiStatus | CommonSystemOrder | ItemEnCode | BasicFile | FlowStatusSelect | FlowTag | FlowWorkOrderId | FlowWorkOrderStatus | GyGoods | GyReissue | GyReturn | BasicInput | JstItemSelect | JstSendGood | JstSupply | KmVideo | Label | Logistics | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | MemberLevel | MsgStatus | BasicMultSelect | BasicPicture | BasicPicturePro | BasicPosting | AsyncSelect | PublicExchange | PublicGoods | PublicReissueGoods | BasicRadio | ReceiverAddress | ReceiverName | ReissueLogistics | ERemark | BasicSelect | BasicSelectOption | ShopName | SkxGoods | SkxIdInputSelect | StatusSelect | SubForm | BasicTextArea | ThirdItemSelect | BasicDataTime | TradeDateTime | TradeId | BasicTypeInput | WdtShopSelect | WlnGoods | BasicAddress | BasicGrade | BasicRate | CommonDataTime | ReceiverMobile | ReturnLogistics | AliPay | ItemSelect | ItemId | SystemOrderNo | Ordinary | Payment | BsExchange | BsReissue | BsReturn | FlowMarkSelect | TemplateSelect | WorkOrderId | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | Calculation | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode;
+export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | FlowTag | GyGoods | GyReissue | GyReturn | JstSendGood | MsgStatus | OrderSubForm | PublicGoods | BasicSelect | SkxGoods | SkxIdInputSelect | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | ReissueLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | AsyncSelect;

package/dist/esm/factory.js

@@ -1,6 +1,6 @@
 import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicPicturePro, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, ErpTradeId, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect,
 // CommonTradeId,
-CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption } from "./index";
+CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption, OrderSubForm } from "./index";
 export var factory = function factory(type, options) {
   var _options$componentCon;
   switch (type) {
@@ -34,6 +34,7 @@ export var factory = function factory(type, options) {
     case "ORDER_TYPE":
     case "REFUND_TYPE":
     case "EXECUTE_ACTION_TYPE":
+    case "ERP_ORDER_STATUS":
       return new BasicSelect(options);
     case "PICTURE":
       return new BasicPicture(options);
@@ -286,6 +287,8 @@ export var factory = function factory(type, options) {
       return new BasicTypeInput(options);
     case "SKX_GOODS":
       return new SkxGoods(options);
+    case "ORDER_SUBFORM":
+      return new OrderSubForm(options);
     default:
       return new BasicInput(options);
   }

package/dist/esm/index.d.ts

@@ -100,6 +100,7 @@ export { default as GyReturn } from "./components/GY/GyReturn";
 export { default as AsyncSelect } from "./components/Public/AsyncSelect";
 export { default as SkxIdInputSelect } from "./components/SKX/SkxIdInputSelect";
 export { default as SkxGoods } from "./components/SKX/SkxGoods";
+export { default as OrderSubForm } from "./components/OrderSubForm";
 export { default as KmErpOrderNum } from "./components/ErpTradeId/components/OrderNum";
 export { factory } from "./factory";
 export { default as PlatformAvatar } from "./commonComponents/PlatformAvatar";
@@ -111,3 +112,4 @@ export { default as GetFormItem } from "./components/GetFormItem";
 export { default as Global } from "./commonComponents/GlobalContext";
 export * as ErpScenes from "./commonComponents/ErpContext";
 export * as servers from "./service/api";
+export { default as QueryLogisticsTrack } from "./commonComponents/QueryLogisticsTrack";

package/dist/esm/index.js

@@ -100,6 +100,7 @@ export { default as GyReturn } from "./components/GY/GyReturn";
 export { default as AsyncSelect } from "./components/Public/AsyncSelect";
 export { default as SkxIdInputSelect } from "./components/SKX/SkxIdInputSelect";
 export { default as SkxGoods } from "./components/SKX/SkxGoods";
+export { default as OrderSubForm } from "./components/OrderSubForm";
 // TODO: ERP 打款工单使用
 export { default as KmErpOrderNum } from "./components/ErpTradeId/components/OrderNum";
 export { factory } from "./factory";
@@ -113,4 +114,5 @@ export { default as Global } from "./commonComponents/GlobalContext";
 import * as _ErpScenes from "./commonComponents/ErpContext";
 export { _ErpScenes as ErpScenes };
 import * as _servers from "./service/api";
-export { _servers as servers };
+export { _servers as servers };
+export { default as QueryLogisticsTrack } from "./commonComponents/QueryLogisticsTrack";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "2.3.0-rc.0",
+  "version": "2.5.0-rc.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "2.3.0-rc.0",
-    "@kmkf-fe-packages/kmkf-utils": "2.3.0-rc.0",
+    "@kmkf-fe-packages/basic-components": "2.5.0-rc.0",
+    "@kmkf-fe-packages/kmkf-utils": "2.5.0-rc.0",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b9e1cb4129ec1a4874fbd5db7bc9f6d026badd2c",
+  "gitHead": "dd823f96804157434b7aee9febe5b37f9ab6bea7",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }