@kmkf-fe-packages/services-components 0.24.1-alpha.8 → 0.24.1

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"
   }
 };
 var ExpressCode = /*#__PURE__*/_createClass(function ExpressCode(options) {
@@ -45,7 +45,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],
@@ -55,7 +55,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) {
@@ -67,7 +67,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;
@@ -75,15 +75,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;
+        }
       }
     };
   });
@@ -98,14 +105,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/Common/index.module.less

@@ -1,9 +1,14 @@
 .goodImgBox {
   display: flex;
   width: 100%;
+  margin-bottom: 8px;
+  &:last-child {
+    margin-bottom: 0;
+  }
 
   .options {
     width: calc(100% - 40px);
+    padding-left: 6px;
   }
 }
 

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

@@ -85,7 +85,7 @@ var EItemEncode = /*#__PURE__*/_createClass(function EItemEncode(options) {
       required: false,
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       component: /*#__PURE__*/React.createElement(ItemEncode, _extends({
-        isSingleRow: _this.platform === 'pc'
+        isSingleRow: _this.platform !== 'pc'
       }, _this.componentConfig, {
         shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
         shopList: (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList,

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

package/package.json

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