@kmkf-fe-packages/services-components 0.7.15-alpha.57 → 0.7.15-alpha.59

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

@@ -1,5 +1,5 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../type";
-import React from "react";
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
+import React from 'react';
 declare class ActualPayment implements ComponentInterface {
     name: string;
     id: string;
@@ -10,8 +10,8 @@ declare class ActualPayment implements ComponentInterface {
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    componentConfig: ComponentInterface["componentConfig"];
-    dataType: ComponentInterface["dataType"];
+    componentConfig: ComponentInterface['componentConfig'];
+    dataType: ComponentInterface['dataType'];
     dataMap: Record;
     constructor(options: PickOption);
     getKeyByComponentType: (type: string) => any;

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

@@ -9,17 +9,17 @@ 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 { ApaasInput } from "@kmkf-fe-packages/basic-components";
+import React from 'react';
+import { ApaasInput } from '@kmkf-fe-packages/basic-components';
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 import { SYMBOL } from "../../constant";
 var typeMap = {
-  ACTUAL_PAYMENT: "actualPayment",
-  BS_NET_RECEIPTS: "bsNetReceipts",
-  BS_DEPOSIT: "bsDeposit",
-  BS_PACKAGE_WEIGHT: "bsPackageWeight"
+  ACTUAL_PAYMENT: 'actualPayment',
+  BS_NET_RECEIPTS: 'bsNetReceipts',
+  BS_DEPOSIT: 'bsDeposit',
+  BS_PACKAGE_WEIGHT: 'bsPackageWeight'
 };
 var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
   var _this = this;
@@ -37,7 +37,7 @@ var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "dataMap", void 0);
   _defineProperty(this, "getKeyByComponentType", function (type) {
-    return typeMap[type] || "";
+    return typeMap[type] || '';
   });
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
@@ -49,7 +49,7 @@ var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
   _defineProperty(this, "renderPc", function (value, record) {
     var _record;
     var type = _this.type;
-    return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]) !== null && _record !== void 0 ? _record : "--");
+    return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]) !== null && _record !== void 0 ? _record : '--');
   });
   _defineProperty(this, "renderLog", function (r) {
     var type = _this.type;
@@ -63,7 +63,7 @@ var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
   _defineProperty(this, "renderExport", function (value, record) {
     var _record2;
     var type = _this.type;
-    return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]) !== null && _record2 !== void 0 ? _record2 : "--";
+    return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]) !== null && _record2 !== void 0 ? _record2 : '--';
   });
   _defineProperty(this, "editRender", function (p) {
     var _this$componentConfig, _this$componentConfig2;
@@ -87,7 +87,7 @@ var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
       // 过滤组件id
       name: item.name,
       // 过滤组件名称
-      filterComponentType: "Rate",
+      filterComponentType: 'Rate',
       rules: [{
         validator: function () {
           var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_, value) {
@@ -112,13 +112,13 @@ var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
                     _context.next = 5;
                     break;
                   }
-                  return _context.abrupt("return", Promise.reject(new Error("请输入正确的金额区间范围")));
+                  return _context.abrupt("return", Promise.reject(new Error('请输入正确的金额区间范围')));
                 case 5:
                   if (!(value[0] > value[1])) {
                     _context.next = 7;
                     break;
                   }
-                  return _context.abrupt("return", Promise.reject(new Error("开始金额必须小于结束金额")));
+                  return _context.abrupt("return", Promise.reject(new Error('开始金额必须小于结束金额')));
                 case 7:
                 case "end":
                   return _context.stop();
@@ -132,7 +132,7 @@ var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
         }()
       }],
       props: {
-        placeholder: ["始-实付金额", "终-实付金额"]
+        placeholder: ["\u59CB-".concat(item.name), "\u7EC8-".concat(item.name)]
       },
       formatFilterValue: function formatFilterValue(val) {
         if (val !== null && val !== void 0 && val.some(function (v) {
@@ -154,23 +154,23 @@ var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
   this.formField = "".concat(options.id, "_").concat(this.getKeyByComponentType(options.type));
   this.name = options.name;
   this.type = options.type;
-  this.dataType = "number";
+  this.dataType = 'number';
   this.isCombinationComponent = false;
   this.canSort = true;
   this.children = [];
   this.componentConfig = options.componentConfig;
-  this.rules = options.type === "ACTUAL_PAYMENT" ? [{
+  this.rules = options.type === 'ACTUAL_PAYMENT' ? [{
     pattern: /^\d+(\.\d{1,2})?$/,
-    message: "字段为正数或最多两位小数"
+    message: '字段为正数或最多两位小数'
   }] : [{
     pattern: /^(([0-9]*(\.[0-9]{1,})$)|([0-9]+$))/,
-    message: "请输入数字"
+    message: '请输入数字'
   }];
   this.dataMap = {
-    ACTUAL_PAYMENT: "actualPayment",
-    BS_NET_RECEIPTS: "bsNetReceipts",
-    BS_DEPOSIT: "bsDeposit",
-    BS_PACKAGE_WEIGHT: "bsPackageWeight"
+    ACTUAL_PAYMENT: 'actualPayment',
+    BS_NET_RECEIPTS: 'bsNetReceipts',
+    BS_DEPOSIT: 'bsDeposit',
+    BS_PACKAGE_WEIGHT: 'bsPackageWeight'
   };
 });
 export default ActualPayment;

package/dist/esm/components/BS/BsExchange/index.d.ts

@@ -1,19 +1,19 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../../type";
-import React from "react";
-import { BsType, BsMemo } from "../common/index";
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../../type';
+import React from 'react';
+import { BsType, BsMemo } from '../common/index';
 declare class BsExchange implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface["componentConfig"];
-    effects: ComponentInterface["effects"];
+    componentConfig: ComponentInterface['componentConfig'];
+    effects: ComponentInterface['effects'];
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface["dataType"];
+    dataType: ComponentInterface['dataType'];
     bsType: BsType;
     bsMemo: BsMemo;
     constructor(options: PickOption);
@@ -24,15 +24,20 @@ declare class BsExchange implements ComponentInterface {
     renderExport: (value: any, record: any) => null;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => ({
-        searchDefaultConditions: "eq";
+        searchDefaultConditions: "in";
         type: string;
         id: string;
         name: string;
         filterComponentType: "Cascader";
         props: {
             options: any[] | undefined;
+            fieldNames: {
+                label: string;
+                value: string;
+                children: string;
+            };
         };
-        filterFn: (value: string) => (i: Record) => boolean;
+        formatFilterValue: (val: Array<string>) => string[] | undefined;
     } | {
         searchDefaultConditions: "like";
         type: string;
@@ -40,7 +45,7 @@ declare class BsExchange implements ComponentInterface {
         name: string;
         filterComponentType: "Input";
         props?: undefined;
-        filterFn?: undefined;
+        formatFilterValue?: undefined;
     })[];
 }
 export default BsExchange;

package/dist/esm/components/BS/BsExchange/index.js

@@ -14,138 +14,138 @@ 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 GetFormItem from "../../GetFormItem";
 import { BsGoodsTable, BsExchangeList } from "../../Common";
 import ItemView from "../../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
-import { BsExchange as Exchange } from "@kmkf-fe-packages/basic-components";
+import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { BsExchange as Exchange } from '@kmkf-fe-packages/basic-components';
 import { SYMBOL } from "../../../constant";
 import { BsType, BsMemo, BsHeaderPic, BsHeaderName, BsHeaderCode, BsHeaderSku, BsHeaderMoney, BsHeaderNumber, BsHeaderShare, BsHeaderType } from "../common/index";
 var returnHeaderMap = {
   pic: {
     component: BsHeaderPic,
-    name: "退回图片",
-    key: "pic"
+    name: '退回图片',
+    key: 'pic'
   },
   name: {
     component: BsHeaderName,
-    name: "退回名称",
-    key: "name"
+    name: '退回名称',
+    key: 'name'
   },
   code: {
     component: BsHeaderCode,
-    name: "退回编码",
-    key: "code"
+    name: '退回编码',
+    key: 'code'
   },
   sku: {
     component: BsHeaderSku,
-    name: "退回sku编码",
-    key: "sku"
+    name: '退回sku编码',
+    key: 'sku'
   },
   money: {
     component: BsHeaderMoney,
-    name: "退回实付金额",
-    key: "money"
+    name: '退回实付金额',
+    key: 'money'
   },
   number: {
     component: BsHeaderNumber,
-    name: "退回数量",
-    key: "number"
+    name: '退回数量',
+    key: 'number'
   },
   share: {
     component: BsHeaderShare,
-    name: "退回分摊价",
-    key: "share"
+    name: '退回分摊价',
+    key: 'share'
   },
   type: {
     component: BsHeaderType,
-    name: "退回赠品类型",
-    key: "giftType"
+    name: '退回赠品类型',
+    key: 'giftType'
   }
 };
 var swapOutHeaderMap = {
   pic: {
     component: BsHeaderPic,
-    name: "换出图片",
-    key: "pic"
+    name: '换出图片',
+    key: 'pic'
   },
   name: {
     component: BsHeaderName,
-    name: "换出名称",
-    key: "name"
+    name: '换出名称',
+    key: 'name'
   },
   code: {
     component: BsHeaderCode,
-    name: "换出编码",
-    key: "code"
+    name: '换出编码',
+    key: 'code'
   },
   sku: {
     component: BsHeaderSku,
-    name: "换出sku编码",
-    key: "sku"
+    name: '换出sku编码',
+    key: 'sku'
   },
   money: {
     component: BsHeaderMoney,
-    name: "换出实付金额",
-    key: "money"
+    name: '换出实付金额',
+    key: 'money'
   },
   number: {
     component: BsHeaderNumber,
-    name: "换出数量",
-    key: "number"
+    name: '换出数量',
+    key: 'number'
   },
   share: {
     component: BsHeaderShare,
-    name: "换出分摊价",
-    key: "share"
+    name: '换出分摊价',
+    key: 'share'
   },
   type: {
     component: BsHeaderType,
-    name: "换出赠品类型",
-    key: "type"
+    name: '换出赠品类型',
+    key: 'type'
   }
 };
 var giftHeaderMap = {
   pic: {
     component: BsHeaderPic,
-    name: "赠品图片",
-    key: "pic"
+    name: '赠品图片',
+    key: 'pic'
   },
   name: {
     component: BsHeaderName,
-    name: "赠品名称",
-    key: "name"
+    name: '赠品名称',
+    key: 'name'
   },
   code: {
     component: BsHeaderCode,
-    name: "赠品编码",
-    key: "code"
+    name: '赠品编码',
+    key: 'code'
   },
   sku: {
     component: BsHeaderSku,
-    name: "赠品sku编码",
-    key: "sku"
+    name: '赠品sku编码',
+    key: 'sku'
   },
   money: {
     component: BsHeaderMoney,
-    name: "赠品实付金额",
-    key: "money"
+    name: '赠品实付金额',
+    key: 'money'
   },
   number: {
     component: BsHeaderNumber,
-    name: "赠品数量",
-    key: "number"
+    name: '赠品数量',
+    key: 'number'
   },
   share: {
     component: BsHeaderShare,
-    name: "赠品分摊价",
-    key: "share"
+    name: '赠品分摊价',
+    key: 'share'
   },
   type: {
     component: BsHeaderType,
-    name: "赠品赠品类型",
-    key: "giftType"
+    name: '赠品赠品类型',
+    key: 'giftType'
   }
 };
 var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
@@ -170,21 +170,21 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
   _defineProperty(this, "bsMemo", void 0);
   _defineProperty(this, "renderClient", function (record) {
     var _record, _record$bsExchangeTyp, _this$componentConfig, _record2, _record2$bsExchangeTy, _this$componentConfig2, _record3, _record3$bsExchangeTy, _this$componentConfig3;
-    return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.bsType.renderClient(record), _this.bsMemo.renderClient(record), ["1", "3"].includes(record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id)]) === null || _record === void 0 ? void 0 : (_record$bsExchangeTyp = _record.bsExchangeType) === null || _record$bsExchangeTyp === void 0 ? void 0 : _record$bsExchangeTyp[0]) ? /*#__PURE__*/React.createElement(ItemView, {
+    return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.bsType.renderClient(record), _this.bsMemo.renderClient(record), ['1', '3'].includes(record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id)]) === null || _record === void 0 ? void 0 : (_record$bsExchangeTyp = _record.bsExchangeType) === null || _record$bsExchangeTyp === void 0 ? void 0 : _record$bsExchangeTyp[0]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: "".concat(_this.name),
       value: /*#__PURE__*/React.createElement(BsGoodsTable, {
         list: (record === null || record === void 0 ? void 0 : record["".concat(_this.id)].bsExchangeReturnGoods) || [],
         showHeader: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.showHeader) || []
       })
-    }) : null, ["2", "4"].includes(record === null || record === void 0 ? void 0 : (_record2 = record["".concat(_this.id)]) === null || _record2 === void 0 ? void 0 : (_record2$bsExchangeTy = _record2.bsExchangeType) === null || _record2$bsExchangeTy === void 0 ? void 0 : _record2$bsExchangeTy[0]) ? /*#__PURE__*/React.createElement(ItemView, {
+    }) : null, ['2', '4'].includes(record === null || record === void 0 ? void 0 : (_record2 = record["".concat(_this.id)]) === null || _record2 === void 0 ? void 0 : (_record2$bsExchangeTy = _record2.bsExchangeType) === null || _record2$bsExchangeTy === void 0 ? void 0 : _record2$bsExchangeTy[0]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: "".concat(_this.name),
       value: /*#__PURE__*/React.createElement(BsExchangeList, {
         list: (record === null || record === void 0 ? void 0 : record["".concat(_this.id)].bsExchangeSwapOutGoods) || [],
         showHeader: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.showHeader) || []
       })
-    }) : null, ["3", "4"].includes(record === null || record === void 0 ? void 0 : (_record3 = record["".concat(_this.id)]) === null || _record3 === void 0 ? void 0 : (_record3$bsExchangeTy = _record3.bsExchangeType) === null || _record3$bsExchangeTy === void 0 ? void 0 : _record3$bsExchangeTy[0]) ? /*#__PURE__*/React.createElement(ItemView, {
+    }) : null, ['3', '4'].includes(record === null || record === void 0 ? void 0 : (_record3 = record["".concat(_this.id)]) === null || _record3 === void 0 ? void 0 : (_record3$bsExchangeTy = _record3.bsExchangeType) === null || _record3$bsExchangeTy === void 0 ? void 0 : _record3$bsExchangeTy[0]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: "".concat(_this.name, "-\u8D60\u54C1"),
       value: /*#__PURE__*/React.createElement(BsGoodsTable, {
@@ -222,39 +222,44 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
-    var _item$config;
+    var _item$templateConfig;
     return [{
-      searchDefaultConditions: SYMBOL.eq,
+      searchDefaultConditions: SYMBOL.in,
       type: item.type,
-      id: "".concat(item.id, "_bsReissueType"),
+      id: "".concat(item.id, "_bsExchangeType"),
       name: "".concat(item.name, "-\u6362\u8D27\u7C7B\u578B"),
-      filterComponentType: "Cascader",
+      filterComponentType: 'Cascader',
       props: {
-        options: item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.reasonList
+        options: item === null || item === void 0 ? void 0 : (_item$templateConfig = item.templateConfig) === null || _item$templateConfig === void 0 ? void 0 : _item$templateConfig.reasonList,
+        fieldNames: {
+          label: 'label',
+          value: 'value',
+          children: 'children'
+        }
       },
-      filterFn: function filterFn(value) {
-        return function (i) {
-          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, "bsReissueType"), value);
-        };
+      formatFilterValue: function formatFilterValue(val) {
+        if ((val === null || val === void 0 ? void 0 : val.length) > 0) {
+          return [val[val.length - 1]];
+        }
       }
     }, {
       searchDefaultConditions: SYMBOL.like,
       type: item.type,
       id: "".concat(item.id, "_bsExchangeReturnGoods"),
       name: "".concat(_this.name, "-\u9000\u56DE"),
-      filterComponentType: "Input"
+      filterComponentType: 'Input'
     }, {
       searchDefaultConditions: SYMBOL.like,
       type: item.type,
       id: "".concat(item.id, "_bsExchangeSwapOutGoods"),
       name: "".concat(_this.name, "-\u6362\u51FA"),
-      filterComponentType: "Input"
+      filterComponentType: 'Input'
     }, {
       searchDefaultConditions: SYMBOL.like,
       type: item.type,
       id: "".concat(item.id, "_bsExchangeGiftGoods"),
       name: "".concat(_this.name, "-\u8D60\u54C1"),
-      filterComponentType: "Input"
+      filterComponentType: 'Input'
     }];
   });
   this.name = options.name;
@@ -267,11 +272,11 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
   this.canSort = false;
   this.bsType = new BsType(_objectSpread(_objectSpread({}, options), {}, {
     id: "".concat(options.id, "_bsExchangeType_type"),
-    name: "换货类型"
+    name: '换货类型'
   }));
   this.bsMemo = new BsMemo(_objectSpread(_objectSpread({}, options), {}, {
     id: "".concat(options.id, "_bsExchangeType_memo"),
-    name: "换货备注"
+    name: '换货备注'
   }));
   this.children = [this.bsType, this.bsMemo].concat(_toConsumableArray(((options === null || options === void 0 ? void 0 : (_options$componentCon = options.componentConfig) === null || _options$componentCon === void 0 ? void 0 : _options$componentCon.showHeader) || []).reduce(function (prv, next) {
     if (returnHeaderMap[next]) {
@@ -303,19 +308,19 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
     validator: function validator(_, value) {
       var _this$componentConfig5, _value$bsExchangeRetu;
       if ((_this$componentConfig5 = _this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required && !(value !== null && value !== void 0 && (_value$bsExchangeRetu = value.bsExchangeReturnGoods) !== null && _value$bsExchangeRetu !== void 0 && _value$bsExchangeRetu.length)) {
-        return Promise.reject(new Error("请选择bs换货商品"));
+        return Promise.reject(new Error('请选择bs换货商品'));
       }
       return Promise.resolve();
     }
   }, {
     validator: function validator(_, value) {
       var _value$bsExchangeType;
-      if (value && ["2", "4"].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType = value.bsExchangeType) === null || _value$bsExchangeType === void 0 ? void 0 : _value$bsExchangeType[0])) {
+      if (value && ['2', '4'].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType = value.bsExchangeType) === null || _value$bsExchangeType === void 0 ? void 0 : _value$bsExchangeType[0])) {
         var hasNoGood = ((value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods) || []).some(function (item) {
           return !(item !== null && item !== void 0 && item.bsExchangeReturnGoods.length);
         });
         if (hasNoGood) {
-          return Promise.reject(new Error("请选择退回商品后再提交工单"));
+          return Promise.reject(new Error('请选择退回商品后再提交工单'));
         }
         var hasMore = ((value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods) || []).some(function (item) {
           var returnMoney = ((item === null || item === void 0 ? void 0 : item.bsExchangeReturnGoods) || []).reduce(function (prv, next) {
@@ -329,18 +334,18 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
           return returnMoney < swapOutMoney;
         });
         if (hasMore) {
-          return Promise.reject(new Error("换货商品的金额不能大于退回商品的金额"));
+          return Promise.reject(new Error('换货商品的金额不能大于退回商品的金额'));
         }
         var hasLen = ((value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods) || []).some(function (item) {
           return (item === null || item === void 0 ? void 0 : item.bsExchangeReturnGoods.length) !== (item === null || item === void 0 ? void 0 : item.bsExchangeSwapOutGoods.length);
         });
         if (hasLen) {
-          return Promise.reject(new Error("请核对商品数据，再提交工单"));
+          return Promise.reject(new Error('请核对商品数据，再提交工单'));
         }
       }
       return Promise.resolve();
     }
   }];
-  this.dataType = "object";
+  this.dataType = 'object';
 });
 export default BsExchange;

package/dist/esm/components/BS/BsReissue/index.d.ts

@@ -1,19 +1,19 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../../type";
-import React from "react";
-import { BsType, BsMemo } from "../common/index";
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../../type';
+import React from 'react';
+import { BsType, BsMemo } from '../common/index';
 declare class BsReissue implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface["componentConfig"];
-    effects: ComponentInterface["effects"];
+    componentConfig: ComponentInterface['componentConfig'];
+    effects: ComponentInterface['effects'];
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface["dataType"];
+    dataType: ComponentInterface['dataType'];
     bsType: BsType;
     bsMemo: BsMemo;
     constructor(options: PickOption);
@@ -24,14 +24,20 @@ declare class BsReissue implements ComponentInterface {
     renderExport: () => null;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => ({
-        searchDefaultConditions: "eq";
+        searchDefaultConditions: "in";
         type: string;
         id: string;
         name: string;
         filterComponentType: "Cascader";
         props: {
             options: any[] | undefined;
+            fieldNames: {
+                label: string;
+                value: string;
+                children: string;
+            };
         };
+        formatFilterValue: (val: Array<string>) => string[] | undefined;
         filterFn: (value: string) => (i: Record) => boolean;
     } | {
         searchDefaultConditions: "like";
@@ -40,6 +46,7 @@ declare class BsReissue implements ComponentInterface {
         name: string;
         filterComponentType: "Input";
         props?: undefined;
+        formatFilterValue?: undefined;
         filterFn?: undefined;
     })[];
 }

package/dist/esm/components/BS/BsReissue/index.js

@@ -14,54 +14,54 @@ 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 GetFormItem from "../../GetFormItem";
 import ItemView from "../../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
-import { BsReissue as Reissue } from "@kmkf-fe-packages/basic-components";
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { BsReissue as Reissue } from '@kmkf-fe-packages/basic-components';
 import { SYMBOL } from "../../../constant";
 import { BsGoodsTable } from "../../Common";
 import { BsType, BsMemo, BsHeaderPic, BsHeaderName, BsHeaderCode, BsHeaderSku, BsHeaderMoney, BsHeaderNumber, BsHeaderShare, BsHeaderType } from "../common/index";
 var childHeaderMap = {
   pic: {
     component: BsHeaderPic,
-    name: "图片",
-    key: "pic"
+    name: '图片',
+    key: 'pic'
   },
   name: {
     component: BsHeaderName,
-    name: "名称",
-    key: "name"
+    name: '名称',
+    key: 'name'
   },
   code: {
     component: BsHeaderCode,
-    name: "编码",
-    key: "code"
+    name: '编码',
+    key: 'code'
   },
   sku: {
     component: BsHeaderSku,
-    name: "sku编码",
-    key: "sku"
+    name: 'sku编码',
+    key: 'sku'
   },
   money: {
     component: BsHeaderMoney,
-    name: "实付金额",
-    key: "money"
+    name: '实付金额',
+    key: 'money'
   },
   number: {
     component: BsHeaderNumber,
-    name: "数量",
-    key: "number"
+    name: '数量',
+    key: 'number'
   },
   share: {
     component: BsHeaderShare,
-    name: "分摊价",
-    key: "share"
+    name: '分摊价',
+    key: 'share'
   },
   type: {
     component: BsHeaderType,
-    name: "赠品类型",
-    key: "giftType"
+    name: '赠品类型',
+    key: 'giftType'
   }
 };
 var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
@@ -85,7 +85,7 @@ var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
   _defineProperty(this, "bsMemo", void 0);
   _defineProperty(this, "renderClient", function (record) {
     var _this$componentConfig;
-    console.log("bsreissue", record);
+    console.log('bsreissue', record);
     return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.bsType.renderClient(record), _this.bsMemo.renderClient(record), /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
@@ -124,15 +124,25 @@ var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
-    var _item$config;
+    var _item$templateConfig;
     return [{
-      searchDefaultConditions: SYMBOL.eq,
+      searchDefaultConditions: SYMBOL.in,
       type: item.type,
       id: "".concat(item.id, "_bsReissueType"),
       name: "".concat(item.name, "-\u8865\u53D1\u7C7B\u578B"),
-      filterComponentType: "Cascader",
+      filterComponentType: 'Cascader',
       props: {
-        options: item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.reasonList
+        options: item === null || item === void 0 ? void 0 : (_item$templateConfig = item.templateConfig) === null || _item$templateConfig === void 0 ? void 0 : _item$templateConfig.reasonList,
+        fieldNames: {
+          label: 'label',
+          value: 'value',
+          children: 'children'
+        }
+      },
+      formatFilterValue: function formatFilterValue(val) {
+        if ((val === null || val === void 0 ? void 0 : val.length) > 0) {
+          return [val[val.length - 1]];
+        }
       },
       filterFn: function filterFn(value) {
         return function (i) {
@@ -144,7 +154,7 @@ var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
       type: item.type,
       id: "".concat(item.id, "_bsReissueGoods"),
       name: "".concat(_this.name),
-      filterComponentType: "Input"
+      filterComponentType: 'Input'
     }];
   });
   this.name = options.name;
@@ -157,11 +167,11 @@ var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
   this.canSort = false;
   this.bsType = new BsType(_objectSpread(_objectSpread({}, options), {}, {
     id: "".concat(options.id, "_bsReissueType_type"),
-    name: "补发类型"
+    name: '补发类型'
   }));
   this.bsMemo = new BsMemo(_objectSpread(_objectSpread({}, options), {}, {
     id: "".concat(options.id, "_bsReissueType_memo"),
-    name: "补发备注"
+    name: '补发备注'
   }));
   this.children = [this.bsType, this.bsMemo].concat(_toConsumableArray(((options === null || options === void 0 ? void 0 : (_options$componentCon = options.componentConfig) === null || _options$componentCon === void 0 ? void 0 : _options$componentCon.showHeader) || []).reduce(function (prv, next) {
     if (childHeaderMap[next]) {
@@ -178,11 +188,11 @@ var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
     validator: function validator(_, value) {
       var _value$bsReissueGoods;
       if (!value || !(value !== null && value !== void 0 && (_value$bsReissueGoods = value.bsReissueGoods) !== null && _value$bsReissueGoods !== void 0 && _value$bsReissueGoods.length)) {
-        return Promise.reject(new Error("请选择bs补发商品"));
+        return Promise.reject(new Error('请选择bs补发商品'));
       }
       return Promise.resolve();
     }
   }] : [];
-  this.dataType = "object";
+  this.dataType = 'object';
 });
 export default BsReissue;

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

@@ -22,14 +22,15 @@ declare class BsType implements ComponentInterface {
     renderExport: (value: string, record: Record) => any;
     editRender: () => null;
     filterConfig: (item: ColumnConfig) => {
-        searchDefaultConditions: "eq";
+        searchDefaultConditions: "in";
         type: string;
         id: string;
         name: string;
         filterComponentType: "Cascader";
         props: {
-            options: any[] | undefined;
+            options: any[];
         };
+        formatFilterValue: (val: Array<string>) => string | undefined;
         filterFn: (value: string) => (i: Record) => boolean;
     };
 }

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

@@ -87,14 +87,20 @@ var BsType = /*#__PURE__*/_createClass(function BsType(options) {
   _defineProperty(this, "filterConfig", function (item) {
     var _item$config;
     var subKey = item.subKey;
+    console.log('bsTypefilterConfig', item);
     return {
-      searchDefaultConditions: SYMBOL.eq,
+      searchDefaultConditions: SYMBOL.in,
       type: item.type,
       id: item.id,
       name: "".concat(item.name, "-\u7C7B\u578B"),
       filterComponentType: 'Cascader',
       props: {
-        options: item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.reasonList
+        options: (item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.reasonList) || []
+      },
+      formatFilterValue: function formatFilterValue(val) {
+        if ((val === null || val === void 0 ? void 0 : val.length) > 0) {
+          return val[val.length - 1];
+        }
       },
       filterFn: function filterFn(value) {
         return function (i) {

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

@@ -25,14 +25,6 @@ declare class BasicDataTime implements ComponentInterface {
     renderExport: (value: unknown, record: Record) => any;
     editRender: (p: any) => React.JSX.Element;
     getKeyByComponentType: (type: string) => any;
-    filterConfig: (item: ColumnConfig) => {
-        searchDefaultConditions: "between";
-        type: string;
-        id: string;
-        name: string;
-        filterComponentType: "Date";
-        filterFn: (value: string[]) => (i: Record) => boolean;
-        formatFilterValue: (val: Array<any>) => number[] | undefined;
-    };
+    filterConfig: (item: ColumnConfig) => any;
 }
 export default BasicDataTime;

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

@@ -85,8 +85,9 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
     return typeMap[type];
   });
   _defineProperty(this, "filterConfig", function (item) {
+    var _ref;
     var key = _this.getKeyByComponentType(item.type);
-    return {
+    var params = {
       searchDefaultConditions: SYMBOL.between,
       type: item.type,
       id: "".concat(item.id, "_").concat(key),
@@ -108,6 +109,10 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
         }
       }
     };
+    if ((_ref = ["BS_SIGNING_TIME", "BS_SEND_TIME", "BS_TRADE_PAYMENT_TIME"]) !== null && _ref !== void 0 && _ref.includes(item.type)) {
+      params.componentDataType = "dataTime";
+    }
+    return params;
   });
   this.name = options.name;
   this.id = options.id;

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, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, Handler, CompletedUser, LogisticsInterception, LogisticsTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => ActualPayment | BasicAddress | AliPay | BsExchange | BsGoods | BsReissue | BuyerNick | BasicCascader | BasicCheckbox | CommonDataTime | CompletedUser | BasicDataTime | ItemEnCode | ItemId | ItemSelect | ErpTradeId | BasicFile | FlowStatusSelect | FlowWorkOrderId | BasicGrade | Handler | BasicInput | JstItemSelect | JstLogistics | JstSendGood | JstSupply | Logistics | LogisticsInterception | LogisticsTrajectory | BasicMultSelect | Ordinary | Payment | BasicPicture | PlatForm | BasicPosting | BasicRadio | BasicRate | ReceiverAddress | ReceiverMobile | ReceiverName | ERemark | ReturnLogistics | BasicSelect | ShopInput | ShopName | Submitter | SystemOrderNo | TemplateSelect | BasicTextArea | ThirdItemSelect | TradeDateTime | TradeId | WorkOrderId;
+export declare const factory: (type: string, options: PickOption) => ShopInput | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | TradeId | ErpTradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | JstSendGood | JstSupply | BsGoods | BsExchange | BsReissue | FlowStatusSelect | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | PlatForm | Submitter | Handler | CompletedUser | FlowWorkOrderId;

package/dist/esm/type.d.ts

@@ -220,4 +220,5 @@ export declare type ColumnConfig = {
     subKey?: string;
     mode?: 'multiple';
     config?: ComponentInterface['componentConfig'];
+    templateConfig?: ComponentInterface['componentConfig'];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.7.15-alpha.57",
+  "version": "0.7.15-alpha.59",
   "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.7.15-alpha.57",
-    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.57"
+    "@kmkf-fe-packages/basic-components": "^0.7.15-alpha.59",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.59"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "f99147791d4b1ab930c7fbc4a401cd9ce49a19e2"
+  "gitHead": "ef98dc4d8d95dde163615b0127589766b2d0f36a"
 }