@kmkf-fe-packages/services-components 0.23.1-beta.11 → 0.23.1-beta.13

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

@@ -43,12 +43,13 @@ declare class BsLogistics implements ComponentInterface {
         };
         filterFn: (value: string) => (i: Record) => any;
     } | {
-        searchDefaultConditions: "like";
+        searchDefaultConditions: "in";
         type: string;
         id: string;
         name: string;
-        filterComponentType: "Input";
+        filterComponentType: "SelectInput";
         filterFn: (value: string) => (i: Record) => boolean;
+        formatFilterValue: (value: any) => any;
     })[];
 }
 export default BsLogistics;

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

@@ -1,19 +1,19 @@
-import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../../type';
-import React from 'react';
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from "../../../type";
+import React from "react";
 declare class ExpressCode implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
     rules: any[];
-    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;
     constructor(options: PickOption);
     renderClient: () => null;
@@ -23,12 +23,13 @@ declare class ExpressCode implements ComponentInterface {
     renderExport: (value: string, record: Record) => any;
     editRender: () => null;
     filterConfig: (item: ColumnConfig) => {
-        searchDefaultConditions: "like";
+        searchDefaultConditions: "in";
         type: string;
         id: string;
         name: string;
-        filterComponentType: "Input";
+        filterComponentType: "SelectInput";
         filterFn: (value: string) => (i: Record) => boolean;
+        formatFilterValue: (value: any) => any;
     };
 }
 export default ExpressCode;

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

@@ -11,16 +11,16 @@ 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 { BsExpressRender } from "../../Common";
-import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
-import { SYMBOL } from "../../../constant";
+import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
+import { SYMBOL, batchInput } from "../../../constant";
 var typeMap = {
   BS_LOGISTICS: {
-    key: 'bsLogisticsItem'
+    key: "bsLogisticsItem"
   },
   WLN_LOGISTICS: {
-    key: 'wlnLogisticsItem'
+    key: "wlnLogisticsItem"
   },
   WDT_LOGISTICS: {
     key: 'wdtLogisticsItem'
@@ -48,7 +48,7 @@ var ExpressCode = /*#__PURE__*/_createClass(function ExpressCode(options) {
     return null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
-    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],
       parentKey = _this$id$split2[1],
@@ -58,7 +58,7 @@ var ExpressCode = /*#__PURE__*/_createClass(function ExpressCode(options) {
     }
     return /*#__PURE__*/React.createElement(BsExpressRender, {
       list: record === null || record === void 0 ? void 0 : record["".concat(key, "_").concat(parentKey, "_").concat(typeMap[_this.type].key)],
-      showField: 'code'
+      showField: "code"
     });
   });
   _defineProperty(this, "renderLog", function (r) {
@@ -70,7 +70,7 @@ var ExpressCode = /*#__PURE__*/_createClass(function ExpressCode(options) {
   });
   _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 : '--';
+    return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record !== void 0 ? _record : "--";
   });
   _defineProperty(this, "editRender", function () {
     return null;
@@ -78,15 +78,22 @@ var ExpressCode = /*#__PURE__*/_createClass(function ExpressCode(options) {
   _defineProperty(this, "filterConfig", function (item) {
     var subKey = item.subKey;
     return {
-      searchDefaultConditions: SYMBOL.like,
+      searchDefaultConditions: SYMBOL.in,
       type: item.type,
       id: "".concat(item.id, "_").concat(subKey),
       name: "".concat(_this.parentName, "\u7269\u6D41\u5355\u53F7"),
-      filterComponentType: 'Input',
+      filterComponentType: "SelectInput",
       filterFn: function filterFn(value) {
         return function (i) {
-          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, 'logisticsCode'), value);
+          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, "logisticsCode"), value);
         };
+      },
+      formatFilterValue: function formatFilterValue(value) {
+        if (value.type === "keywords") {
+          return batchInput(value.keywords);
+        } else {
+          return value;
+        }
       }
     };
   });
@@ -101,14 +108,14 @@ var ExpressCode = /*#__PURE__*/_createClass(function ExpressCode(options) {
       if (/^[0-9a-zA-Z]*$/.test(value)) {
         return Promise.resolve();
       }
-      return Promise.reject(new Error('只能输入数字和字母'));
+      return Promise.reject(new Error("只能输入数字和字母"));
     }
   }] : [];
-  this.align = 'left';
+  this.align = "left";
   this.width = (options === null || options === void 0 ? void 0 : options.width) || 150;
   this.isCombinationComponent = false;
   this.canSort = false;
-  this.dataType = 'string';
+  this.dataType = "string";
   this.children = [];
   this.parentName = options === null || options === void 0 ? void 0 : options.parentName;
 });

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

@@ -64,7 +64,7 @@ var CompletedUser = /*#__PURE__*/_createClass(function CompletedUser(options) {
       }
     };
   });
-  this.name = "完成人";
+  this.name = this.name = (options === null || options === void 0 ? void 0 : options.name) || "完成人";
   this.id = (options === null || options === void 0 ? void 0 : options.id) || "completedUserName";
   this.sortField = "completedUserName";
   this.formField = "completedUserName";

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

@@ -74,7 +74,7 @@ var Handler = /*#__PURE__*/_createClass(function Handler(options) {
       }
     };
   });
-  this.name = "处理人";
+  this.name = (options === null || options === void 0 ? void 0 : options.name) || "处理人";
   this.id = (options === null || options === void 0 ? void 0 : options.id) || "handlerList";
   this.sortField = "handlerList";
   this.formField = "handlerList";

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

@@ -45,7 +45,7 @@ var NodeInput = /*#__PURE__*/_createClass(function NodeInput(options) {
   _defineProperty(this, "filterConfig", function () {
     return [];
   });
-  this.name = "当前步骤";
+  this.name = (options === null || options === void 0 ? void 0 : options.name) || "当前步骤";
   this.id = (options === null || options === void 0 ? void 0 : options.id) || "nodeId";
   this.type = "NODE_INPUT";
   this.sortField = 'nodeId';

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

@@ -64,7 +64,7 @@ var PlatForm = /*#__PURE__*/_createClass(function PlatForm(options) {
       options: platData
     };
   });
-  this.name = "平台";
+  this.name = (options === null || options === void 0 ? void 0 : options.name) || "平台";
   this.id = (options === null || options === void 0 ? void 0 : options.id) || "platform";
   this.type = "PLATFORM_INPUT";
   this.sortField = 'platform';

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

@@ -13,7 +13,7 @@ import { ApaasPosting } from "@kmkf-fe-packages/basic-components";
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
-import { AddressData, BsAddressData } from "@kmkf-fe-packages/kmkf-utils";
+import { AddressData, BsAddressData, WdtAddressData } from "@kmkf-fe-packages/kmkf-utils";
 import Province from "../BS/BsPosting/components/Province";
 import City from "../BS/BsPosting/components//City";
 import District from "../BS/BsPosting/components//District";
@@ -186,7 +186,12 @@ var BasicPosting = /*#__PURE__*/_createClass(function BasicPosting(options) {
   this.isCombinationComponent = this.isSplitColumns;
   this.canSort = false;
   this.dataType = "string";
-  this.addressDateInstance = ((_options$componentCon2 = options.componentConfig) === null || _options$componentCon2 === void 0 ? void 0 : _options$componentCon2.showField) === "bs" ? BsAddressData.getInstance() : AddressData.getInstance();
+  var showField = (_options$componentCon2 = options.componentConfig) === null || _options$componentCon2 === void 0 ? void 0 : _options$componentCon2.showField;
+  this.addressDateInstance = (showField && {
+    bs: BsAddressData,
+    wdt: WdtAddressData,
+    workOrder: AddressData
+  }[showField] || AddressData).getInstance();
   this.province = new Province(_objectSpread(_objectSpread({}, options), {}, {
     id: "".concat(options.id, "_postingProvince"),
     name: "省",

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

@@ -86,7 +86,7 @@ var ShopInput = /*#__PURE__*/_createClass(function ShopInput(options) {
       }
     };
   });
-  this.name = "店铺名称";
+  this.name = (options === null || options === void 0 ? void 0 : options.name) || "店铺名称";
   this.id = (options === null || options === void 0 ? void 0 : options.id) || "shopName";
   this.type = "SHOP_INPUT";
   this.sortField = "shopName";

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.23.1-beta.11",
+  "version": "0.23.1-beta.13",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -20,8 +20,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^0.23.1-beta.11",
-    "@kmkf-fe-packages/kmkf-utils": "^0.23.1-beta.11"
+    "@kmkf-fe-packages/basic-components": "^0.23.1-beta.13",
+    "@kmkf-fe-packages/kmkf-utils": "^0.23.1-beta.13"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.59.2",
@@ -37,7 +37,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a50813e4cefd5c1cf0dec7defe301d16ed08c212",
+  "gitHead": "223ab35b159b1acce8d5316096e3dc2e248c3640",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }