@kmkf-fe-packages/services-components 0.8.21-alpha.4 → 0.9.1-alpha.0

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

@@ -27,6 +27,6 @@ declare class CommonMultiStatus implements ComponentInterface {
         name: string;
         filterComponentType: "Input";
         filterFn: (value: string) => (i: Record) => boolean;
-    };
+    }[];
 }
 export default CommonMultiStatus;

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

@@ -78,7 +78,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
         return e.stopPropagation();
       }
     }, /*#__PURE__*/React.createElement(CommonOrderContent, {
-      list: list,
+      list: record === null || record === void 0 ? void 0 : record[_this.id],
       valueKey: (_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.valueKey,
       failValue: (_typeMap$_this$type6 = typeMap[_this.type]) === null || _typeMap$_this$type6 === void 0 ? void 0 : _typeMap$_this$type6.failValue,
       options: (_typeMap$_this$type7 = typeMap[_this.type]) === null || _typeMap$_this$type7 === void 0 ? void 0 : _typeMap$_this$type7.options
@@ -118,7 +118,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
   });
   _defineProperty(this, "filterConfig", function (item) {
     var _typeMap$_this$type13;
-    return {
+    return [{
       searchDefaultConditions: SYMBOL.like,
       type: item.type,
       id: "".concat(item.id, "_").concat((_typeMap$_this$type13 = typeMap[_this.type]) === null || _typeMap$_this$type13 === void 0 ? void 0 : _typeMap$_this$type13.code),
@@ -130,7 +130,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
           return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type14 = typeMap[_this.type]) === null || _typeMap$_this$type14 === void 0 ? void 0 : _typeMap$_this$type14.code), value);
         };
       }
-    };
+    }];
   });
   this.name = options.name;
   this.id = options.id;

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

@@ -27,6 +27,6 @@ declare class CommonSystemOrder implements ComponentInterface {
         name: string;
         filterComponentType: "Input";
         filterFn: (value: string) => (i: Record) => boolean;
-    };
+    }[];
 }
 export default CommonSystemOrder;

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

@@ -23,8 +23,8 @@ var typeMap = {
     valueKey: "deliveryNo"
   },
   RETURN_GOODS_TRADE_ID: {
-    key: "returnGoodsTradeItemList",
-    code: "returnGoodsTradeIdList",
+    key: "returnGoodsTradeIdList",
+    code: "returnGoodsTradeIds",
     name: "退货单id",
     type: 2,
     valueKey: "returnGoodsTradeId"
@@ -109,7 +109,7 @@ var CommonSystemOrder = /*#__PURE__*/_createClass(function CommonSystemOrder(opt
   });
   _defineProperty(this, "filterConfig", function (item) {
     var _typeMap$_this$type10;
-    return {
+    return [{
       searchDefaultConditions: SYMBOL.like,
       type: item.type,
       id: "".concat(item.id, "_").concat((_typeMap$_this$type10 = typeMap[_this.type]) === null || _typeMap$_this$type10 === void 0 ? void 0 : _typeMap$_this$type10.code),
@@ -121,7 +121,7 @@ var CommonSystemOrder = /*#__PURE__*/_createClass(function CommonSystemOrder(opt
           return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type11 = typeMap[_this.type]) === null || _typeMap$_this$type11 === void 0 ? void 0 : _typeMap$_this$type11.code), value);
         };
       }
-    };
+    }];
   });
   this.name = options.name;
   this.id = options.id;

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

@@ -1,20 +1,22 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
-import React from 'react';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../type";
+import React from "react";
+import "./icon/iconfont.css";
 declare class FlowMarkSelect implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface['componentConfig'];
-    effects: ComponentInterface['effects'];
+    componentConfig: ComponentInterface["componentConfig"];
+    effects: ComponentInterface["effects"];
     workOrderMark: any[];
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface['dataType'];
+    dataType: ComponentInterface["dataType"];
     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/FlowMarkSelect/index.js

@@ -8,14 +8,14 @@ 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 { Dropdown, Menu } from "antd";
 import ItemView from "../../commonComponents/ItemView";
-import SelectMark from "../../commonComponents/SelectMark";
-import { ApaasSelect } from '@kmkf-fe-packages/basic-components';
-import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { ApaasSelect } from "@kmkf-fe-packages/basic-components";
+import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
 import GetFormItem from "../GetFormItem";
 import { SYMBOL } from "../../constant";
-// import "./icon/iconfont.css";
+import "./icon/iconfont.css";
 var FlowMarkSelect = /*#__PURE__*/_createClass(function FlowMarkSelect(options) {
   var _this = this;
   _classCallCheck(this, FlowMarkSelect);
@@ -32,15 +32,33 @@ var FlowMarkSelect = /*#__PURE__*/_createClass(function FlowMarkSelect(options)
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", 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,
+          domEvent = _ref.domEvent;
+        domEvent.stopPropagation();
+        typeof (_this === null || _this === void 0 ? void 0 : (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.handleChangeSingleWorkOrderMark) === "function" && (_this === null || _this === void 0 ? void 0 : (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.handleChangeSingleWorkOrderMark(key, record));
+      }
+    }, _this.workOrderMark.map(function (item) {
+      return /*#__PURE__*/React.createElement(Menu.Item, {
+        key: item.value
+      }, item.label);
+    }));
+    return menu;
+  });
   _defineProperty(this, "renderPc", function (value, record) {
-    var changeMarkHandle = function changeMarkHandle(key) {
-      var _this$effects, _this$effects2;
-      typeof (_this === null || _this === void 0 ? void 0 : (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.handleChangeSingleWorkOrderMark) === 'function' && (_this === null || _this === void 0 ? void 0 : (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.handleChangeSingleWorkOrderMark(key, record));
-    };
-    return /*#__PURE__*/React.createElement(SelectMark, {
-      value: record === null || record === void 0 ? void 0 : record["".concat(_this.id)],
-      onChange: changeMarkHandle
+    var mark = _this.workOrderMark.find(function (item) {
+      return item.value === (record === null || record === void 0 ? void 0 : record["".concat(_this.id)]);
     });
+    return /*#__PURE__*/React.createElement(Dropdown, {
+      overlay: _this.renderMenu(record)
+    }, /*#__PURE__*/React.createElement("span", {
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      }
+    }, (mark === null || mark === void 0 ? void 0 : mark.label) || "--"));
   });
   _defineProperty(this, "renderLog", function (r) {
     var mark = _this.workOrderMark.find(function (item) {
@@ -57,23 +75,23 @@ var FlowMarkSelect = /*#__PURE__*/_createClass(function FlowMarkSelect(options)
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var MARK_MAP = {
-      1: '白色',
-      2: '红色',
-      3: '黄色',
-      4: '蓝色',
-      5: '绿色',
-      6: '紫色'
+      1: "白色",
+      2: "红色",
+      3: "黄色",
+      4: "蓝色",
+      5: "绿色",
+      6: "紫色"
     };
     var mark = _this.workOrderMark.find(function (item) {
       return item.value === (record === null || record === void 0 ? void 0 : record["".concat(_this.id)]);
     });
-    return mark ? MARK_MAP[mark === null || mark === void 0 ? void 0 : mark.value] : '--';
+    return mark ? MARK_MAP[mark === null || mark === void 0 ? void 0 : mark.value] : "--";
   });
   _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]) || ''
+      value: (record === null || record === void 0 ? void 0 : record[_this.id]) || ""
     }) : null;
   });
   _defineProperty(this, "editRender", function (p) {
@@ -97,41 +115,41 @@ var FlowMarkSelect = /*#__PURE__*/_createClass(function FlowMarkSelect(options)
       // 过滤组件id
       name: item.name,
       // 过滤组件名称
-      filterComponentType: 'MultipleSelect',
+      filterComponentType: "MultipleSelect",
       props: {
         //不使用workOrderMark的数据，筛选会深拷贝
         options: [{
-          label: '空白',
-          value: '1'
+          label: "空白",
+          value: "1"
         }, {
-          label: '红色',
-          value: '2'
+          label: "红色",
+          value: "2"
         }, {
-          label: '黄色',
-          value: '3'
+          label: "黄色",
+          value: "3"
         }, {
-          label: '蓝色',
-          value: '4'
+          label: "蓝色",
+          value: "4"
         }, {
-          label: '绿色',
-          value: '5'
+          label: "绿色",
+          value: "5"
         }, {
-          label: '紫色',
-          value: '6'
+          label: "紫色",
+          value: "6"
         }]
       },
       filterFn: function filterFn(value) {
         return function (i) {
-          return value === null || value === void 0 ? void 0 : value.includes(_filterFn.filterTableListItemColumnValue(i, item.id, ''));
+          return value === null || value === void 0 ? void 0 : value.includes(_filterFn.filterTableListItemColumnValue(i, item.id, ""));
         };
       }
     };
   });
-  this.name = '标记';
-  this.id = 'markFlag';
-  this.sortField = 'markFlag';
-  this.formField = 'markFlag';
-  this.type = 'FLOW_MARK_SELECT';
+  this.name = "标记";
+  this.id = "markFlag";
+  this.sortField = "markFlag";
+  this.formField = "markFlag";
+  this.type = "FLOW_MARK_SELECT";
   this.effects = options.effects;
   this.rules = [];
   this.isCombinationComponent = false;
@@ -141,51 +159,51 @@ var FlowMarkSelect = /*#__PURE__*/_createClass(function FlowMarkSelect(options)
     label: /*#__PURE__*/React.createElement("span", {
       className: "iconfont icon-xingxing"
     }),
-    value: '1'
+    value: "1"
   }, {
     label: /*#__PURE__*/React.createElement("span", {
       className: "iconfont icon-xingxing1",
       style: {
-        color: '#ff0000'
+        color: "#ff0000"
       }
     }),
-    value: '2'
+    value: "2"
   }, {
     label: /*#__PURE__*/React.createElement("span", {
       className: "iconfont icon-xingxing1",
       style: {
-        color: '#f6b343'
+        color: "#f6b343"
       }
     }),
-    value: '3'
+    value: "3"
   }, {
     label: /*#__PURE__*/React.createElement("span", {
       className: "iconfont icon-xingxing1",
       style: {
-        color: '#4d90f7'
+        color: "#4d90f7"
       }
     }),
-    value: '4'
+    value: "4"
   }, {
     label: /*#__PURE__*/React.createElement("span", {
       className: "iconfont icon-xingxing1",
       style: {
-        color: '#6ed86c'
+        color: "#6ed86c"
       }
     }),
-    value: '5'
+    value: "5"
   }, {
     label: /*#__PURE__*/React.createElement("span", {
       className: "iconfont icon-xingxing1",
       style: {
-        color: '#be4ed1'
+        color: "#be4ed1"
       }
     }),
-    value: '6'
+    value: "6"
   }];
   this.componentConfig = _objectSpread(_objectSpread({}, options.componentConfig), {}, {
     options: this.workOrderMark
   });
-  this.dataType = 'string';
+  this.dataType = "string";
 });
 export default FlowMarkSelect;

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

@@ -2,7 +2,6 @@ import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../type
 import React from "react";
 import { ExpressData, ExpressInterceptData, LogisticsAddressData } from "@kmkf-fe-packages/kmkf-utils";
 import InterceptSenderMobile from "./interceptSenderMobile";
-import InterceptSnapshot from "./interceptSnapshot";
 import InterceptAddress from "./InterceptAddress";
 import InterceptType from "./InterceptType";
 import InterceptStatus from "./InterceptStatus";
@@ -20,7 +19,6 @@ declare class Logistics implements ComponentInterface {
     interceptType: InterceptType;
     interceptLogisticsStatus: InterceptStatus;
     interceptSenderMobile: InterceptSenderMobile;
-    interceptSnapshot: InterceptSnapshot;
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
@@ -31,7 +29,7 @@ declare class Logistics implements ComponentInterface {
     expressInterceptData: InstanceType<typeof ExpressInterceptData>;
     logisticsAddressData: InstanceType<typeof LogisticsAddressData>;
     effects: ComponentInterface["effects"];
-    dataType: ComponentInterface["dataType"];
+    dataType: ComponentInterface['dataType'];
     constructor(options: PickOption);
     renderClient: (record: any) => React.JSX.Element;
     renderLog: (record: any) => React.JSX.Element;
@@ -49,7 +47,6 @@ declare class Logistics implements ComponentInterface {
             name: any;
             mobile: any;
         };
-        interceptSnapshot: any;
     };
     renderPc: () => null;
     renderExport: () => null;

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

@@ -13,7 +13,6 @@ 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 InterceptSnapshot from "./interceptSnapshot";
 import InterceptAddress from "./InterceptAddress";
 import InterceptType from "./InterceptType";
 import InterceptStatus from "./InterceptStatus";
@@ -34,7 +33,6 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
   _defineProperty(this, "interceptType", void 0);
   _defineProperty(this, "interceptLogisticsStatus", void 0);
   _defineProperty(this, "interceptSenderMobile", void 0);
-  _defineProperty(this, "interceptSnapshot", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
   _defineProperty(this, "formField", void 0);
   _defineProperty(this, "canSort", void 0);
@@ -47,10 +45,10 @@ var Logistics = /*#__PURE__*/_createClass(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.interceptSnapshot.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));
   });
   _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.interceptSnapshot.getComponentValue(record)) && /*#__PURE__*/React.createElement(React.Fragment, null, _this.interceptSnapshot.name, ":", " ", _this.interceptSnapshot.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))));
   });
   _defineProperty(this, "getComponentValue", function (r) {
     return {
@@ -59,8 +57,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
       interceptSenderMobile: _this.interceptSenderMobile.getComponentValue(r),
       interceptType: _this.interceptType.getComponentValue(r),
       interceptLogisticsStatus: _this.interceptLogisticsStatus.getComponentValue(r),
-      interceptRedirectTo: _this.interceptAddress.getComponentValue(r),
-      interceptSnapshot: _this.interceptSnapshot.getComponentValue(r)
+      interceptRedirectTo: _this.interceptAddress.getComponentValue(r)
     };
   });
   _defineProperty(this, "renderPc", function () {
@@ -109,7 +106,6 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
   this.interceptType = new InterceptType(options);
   this.interceptLogisticsStatus = new InterceptStatus(options);
   this.interceptSenderMobile = new InterceptSenderMobile(options);
-  this.interceptSnapshot = new InterceptSnapshot(options);
   this.express = new Express(_objectSpread(_objectSpread({}, options), {}, {
     id: "".concat(options.id, "_interceptCompany"),
     name: "物流信息"
@@ -120,8 +116,8 @@ var Logistics = /*#__PURE__*/_createClass(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.interceptSnapshot];
+  this.dataType = 'object';
+  this.children = [this.express, this.expressCode, this.interceptType, this.interceptAddress, this.interceptLogisticsStatus];
   this.rules = [{
     validator: function validator(_, value) {
       var _this$componentConfig3, _this$componentConfig4, _value$interceptAddre, _value$interceptSende;

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

@@ -14,7 +14,7 @@ declare class InterceptSenderMobile implements ComponentInterface {
     sortField: string;
     formField: string;
     canSort: boolean;
-    dataType: ComponentInterface["dataType"];
+    dataType: ComponentInterface['dataType'];
     children: ComponentInterface[];
     constructor(options: PickOption);
     getComponentValue: (r: Record) => any;

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

@@ -68,9 +68,9 @@ var InterceptSenderMobile = /*#__PURE__*/_createClass(function InterceptSenderMo
   this.name = "发件人手机号";
   this.id = "".concat(options.id, "_interceptSenderMobile");
   this.companyId = "".concat(options.id, "_interceptCompany");
-  this.formField = "".concat(options.id, "_interceptSenderMobile");
-  this.sortField = "".concat(options.id, "_interceptSenderMobile");
-  this.dataType = "string";
+  this.formField = "".concat(options.id, "_interceptCompany");
+  this.sortField = "".concat(options.id, "_interceptCompany");
+  this.dataType = 'string';
   this.type = options.type;
   this.componentConfig = options.componentConfig;
   this.rules = [];

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

@@ -109,7 +109,7 @@ var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
         };
       },
       formatFilterValue: function formatFilterValue(input) {
-        return input.split(/[,|，|\s|\n|\rn]/);
+        return input.split(/[,|，]/);
       }
     };
   });

package/dist/esm/factory.d.ts

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

package/dist/esm/index.d.ts

@@ -65,7 +65,6 @@ export { default as HandlerDeadLine } from "./components/HandlerDeadLine";
 export { default as NodeStayDuration } from "./components/NodeStayDuration";
 export { factory } from "./factory";
 export { default as PlatformAvatar } from "./commonComponents/PlatformAvatar";
-export { default as SelectMark } from "./commonComponents/SelectMark";
 export { default as PlatBuyer } from "./commonComponents/PlatBuyer";
 export { default as ShopList } from "./commonComponents/ShopList";
 export { default as OperationLog } from "./commonComponents/OperationLog";

package/dist/esm/index.js

@@ -65,7 +65,6 @@ export { default as HandlerDeadLine } from "./components/HandlerDeadLine";
 export { default as NodeStayDuration } from "./components/NodeStayDuration";
 export { factory } from "./factory";
 export { default as PlatformAvatar } from "./commonComponents/PlatformAvatar";
-export { default as SelectMark } from "./commonComponents/SelectMark";
 export { default as PlatBuyer } from "./commonComponents/PlatBuyer";
 export { default as ShopList } from "./commonComponents/ShopList";
 export { default as OperationLog } from "./commonComponents/OperationLog";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.8.21-alpha.4",
+  "version": "0.9.1-alpha.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -26,8 +26,8 @@
     "father": "^4.1.7"
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^0.8.21-alpha.3",
-    "@kmkf-fe-packages/kmkf-utils": "^0.8.21-alpha.1"
+    "@kmkf-fe-packages/basic-components": "^0.9.1-alpha.0",
+    "@kmkf-fe-packages/kmkf-utils": "^0.8.19"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "f82d3aeff6b7f7ca756505cb87b7c34e0a75d8ce"
+  "gitHead": "8f6cf7363cbff3615cb4017dc316eb18c7f07739"
 }

package/dist/esm/commonComponents/SelectMark/index.d.ts

@@ -1,8 +0,0 @@
-import React from 'react';
-import './icon/iconfont.css';
-interface SelectMarkProps {
-    value: string;
-    onChange: (val: string) => void;
-}
-declare const _default: (props: SelectMarkProps) => React.JSX.Element;
-export default _default;

package/dist/esm/commonComponents/SelectMark/index.js

@@ -1,81 +0,0 @@
-import React, { useMemo } from 'react';
-import { Menu, Dropdown } from 'antd';
-import "./icon/iconfont.css";
-var workOrderMark = [{
-  label: /*#__PURE__*/React.createElement("span", {
-    className: "iconfont icon-xingxing"
-  }),
-  value: '1'
-}, {
-  label: /*#__PURE__*/React.createElement("span", {
-    className: "iconfont icon-xingxing1",
-    style: {
-      color: '#ff0000'
-    }
-  }),
-  value: '2'
-}, {
-  label: /*#__PURE__*/React.createElement("span", {
-    className: "iconfont icon-xingxing1",
-    style: {
-      color: '#f6b343'
-    }
-  }),
-  value: '3'
-}, {
-  label: /*#__PURE__*/React.createElement("span", {
-    className: "iconfont icon-xingxing1",
-    style: {
-      color: '#4d90f7'
-    }
-  }),
-  value: '4'
-}, {
-  label: /*#__PURE__*/React.createElement("span", {
-    className: "iconfont icon-xingxing1",
-    style: {
-      color: '#6ed86c'
-    }
-  }),
-  value: '5'
-}, {
-  label: /*#__PURE__*/React.createElement("span", {
-    className: "iconfont icon-xingxing1",
-    style: {
-      color: '#be4ed1'
-    }
-  }),
-  value: '6'
-}];
-export default (function (props) {
-  var value = props.value,
-    onChange = props.onChange;
-  var renderMenu = function renderMenu() {
-    var menu = /*#__PURE__*/React.createElement(Menu, {
-      onClick: function onClick(_ref) {
-        var key = _ref.key,
-          domEvent = _ref.domEvent;
-        domEvent.stopPropagation();
-        onChange === null || onChange === void 0 ? void 0 : onChange(key);
-      }
-    }, workOrderMark.map(function (item) {
-      return /*#__PURE__*/React.createElement(Menu.Item, {
-        key: item.value
-      }, item.label);
-    }));
-    return menu;
-  };
-  var markLabel = useMemo(function () {
-    var _workOrderMark$find;
-    return (_workOrderMark$find = workOrderMark.find(function (item) {
-      return item.value === value;
-    })) === null || _workOrderMark$find === void 0 ? void 0 : _workOrderMark$find.label;
-  }, [value]);
-  return /*#__PURE__*/React.createElement(Dropdown, {
-    overlay: renderMenu()
-  }, /*#__PURE__*/React.createElement("span", {
-    onClick: function onClick(e) {
-      return e.stopPropagation();
-    }
-  }, markLabel || '--'));
-});

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

@@ -1,35 +0,0 @@
-import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from "../../type";
-import React from "react";
-declare class InterceptSnapshot 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: "like";
-        type: string;
-        id: string;
-        name: string;
-        filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => boolean;
-    };
-}
-export default InterceptSnapshot;

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

@@ -1,84 +0,0 @@
-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 } from "../../constant";
-var InterceptSnapshot = /*#__PURE__*/_createClass(function InterceptSnapshot(options) {
-  var _this = this;
-  _classCallCheck(this, InterceptSnapshot);
-  _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: SYMBOL.like,
-      type: item.type,
-      id: "".concat(item.id, "_interceptLogisticsSnapshot"),
-      name: "".concat(item.name, "-\u5FEB\u7167"),
-      filterComponentType: "Input",
-      filterFn: function filterFn(value) {
-        return function (i) {
-          return "".concat(_filterFn.filterTableListItemColumnValue(i, item.id, "interceptLogisticsSnapshot")).includes(value);
-        };
-      }
-    };
-  });
-  this.name = "快照";
-  this.id = "".concat(options.id, "_interceptLogisticsSnapshot");
-  this.companyId = "".concat(options.id, "_interceptCompany");
-  this.formField = "".concat(options.id, "_interceptLogisticsSnapshot");
-  this.sortField = "".concat(options.id, "_interceptLogisticsSnapshot");
-  this.dataType = "string";
-  this.type = options.type;
-  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 InterceptSnapshot;