@kmkf-fe-packages/services-components 2.7.0-rc.0 → 2.9.0-rc.0

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

@@ -34,18 +34,21 @@ declare class BsLogistics implements ComponentInterface {
     renderExport: () => null;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => ({
+        searchDefaultConditions: "in";
         filterComponentType: "MultipleSelect";
         props: {
             options: any[];
             filterOptions?: undefined;
         };
         filterFn: (value: string) => (i: Record) => any;
-        searchDefaultConditions: "in";
         type: string;
         id: string;
         name: string;
     } | {
-        searchDefaultConditions: "in";
+        searchDefaultConditions: {
+            in: "in";
+            anylike: "anylike";
+        };
         type: string;
         id: string;
         name: string;

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

@@ -91,6 +91,16 @@ var typeMap = {
     companyDataType: "like",
     companyCodeType: "like",
     logisticsCompanyFormType: "input"
+  },
+  SKX_RETURN_LOGISTICS: {
+    key: "skxReturnLogistics",
+    name: "斯凯奇退货",
+    company: "skxReturnLogisticsCompany",
+    code: "skxReturnLogisticsCode",
+    platformType: "skx",
+    companyDataType: "like",
+    companyCodeType: "like",
+    logisticsCompanyFormType: "input"
   }
 };
 var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
@@ -157,6 +167,7 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(_options) {
   _defineProperty(this, "renderPc", function (value, record) {
     var _typeMap$_this$type2, _typeMap$_this$type3;
     var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type2 = typeMap[_this.type]) === null || _typeMap$_this$type2 === void 0 ? void 0 : _typeMap$_this$type2.key)];
+    console.log("\uD83D\uDE80 ~ index.tsx:234 ~ list:", list);
     //兼容多个商品
     return /*#__PURE__*/React.createElement("span", {
       onClick: function onClick(e) {

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

@@ -26,7 +26,10 @@ declare class ExpressCode implements ComponentInterface {
     renderExport: (value: string, record: Record) => any;
     editRender: () => null;
     filterConfig: (item: ColumnConfig) => {
-        searchDefaultConditions: "in";
+        searchDefaultConditions: {
+            in: "in";
+            anylike: "anylike";
+        };
         type: string;
         id: string;
         name: string;

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

@@ -14,7 +14,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import React from "react";
 import { BsExpressRender } from "../../Common";
 import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
-import { SEARCH_OPTIONS_V2, SYMBOL, batchInput } from "../../../constant";
+import { SEARCH_OPTIONS, SYMBOL, batchInput } from "../../../constant";
 var typeMap = {
   BS_LOGISTICS: {
     key: "bsLogisticsItem"
@@ -39,6 +39,9 @@ var typeMap = {
   },
   SKX_LOGISTICS: {
     key: "skxLogisticsItem"
+  },
+  SKX_RETURN_LOGISTICS: {
+    key: "skxReturnLogisticsItem"
   }
 };
 var ExpressCode = /*#__PURE__*/_createClass(function ExpressCode(options) {
@@ -95,13 +98,16 @@ var ExpressCode = /*#__PURE__*/_createClass(function ExpressCode(options) {
   _defineProperty(this, "filterConfig", function (item) {
     var subKey = item.subKey;
     return {
-      searchDefaultConditions: SYMBOL.in,
+      searchDefaultConditions: {
+        in: SYMBOL.in,
+        anylike: SYMBOL.anylike
+      },
       type: item.type,
       id: "".concat(item.id, "_").concat(subKey),
       name: "".concat(_this.parentName, "-\u7269\u6D41\u5355\u53F7"),
       filterComponentType: "SelectInput",
       props: {
-        filterOptions: SEARCH_OPTIONS_V2
+        filterOptions: SEARCH_OPTIONS
       },
       filterFn: function filterFn(value) {
         return function (i) {
@@ -109,7 +115,7 @@ var ExpressCode = /*#__PURE__*/_createClass(function ExpressCode(options) {
         };
       },
       formatFilterValue: function formatFilterValue(value) {
-        if (value.type === "in") {
+        if (["in", "anylike"].includes(value.type)) {
           return batchInput(value.keywords);
         } else {
           return value;

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

@@ -31,6 +31,10 @@ declare class Express implements ComponentInterface {
     renderExport: (value: string, record: Record) => any;
     editRender: () => null;
     filterConfig: (item: ColumnConfig) => {
+        searchDefaultConditions: {
+            in: "in";
+            anylike: "anylike";
+        };
         filterComponentType: "SelectInput";
         props: {
             filterOptions: {
@@ -41,18 +45,17 @@ declare class Express implements ComponentInterface {
         };
         filterFn: (value: string) => (i: Record) => boolean;
         formatFilterValue: (value: any) => any;
-        searchDefaultConditions: "in";
         type: string;
         id: string;
         name: string;
     } | {
+        searchDefaultConditions: "in";
         filterComponentType: "MultipleSelect";
         props: {
             options: any[];
             filterOptions?: undefined;
         };
         filterFn: (value: string) => (i: Record) => any;
-        searchDefaultConditions: "in";
         type: string;
         id: string;
         name: string;

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

@@ -17,7 +17,7 @@ import React from "react";
 import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
 import { BsExpressRender } from "../../Common";
 import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
-import { SEARCH_OPTIONS_V2, SYMBOL, batchInput } from "../../../constant";
+import { SEARCH_OPTIONS, SYMBOL, batchInput } from "../../../constant";
 var typeMap = {
   BS_LOGISTICS: {
     key: "bsLogisticsItem"
@@ -42,6 +42,9 @@ var typeMap = {
   },
   SKX_LOGISTICS: {
     key: "skxLogisticsItem"
+  },
+  SKX_RETURN_LOGISTICS: {
+    key: "skxReturnLogisticsItem"
   }
 };
 var Express = /*#__PURE__*/_createClass(function Express(options) {
@@ -104,14 +107,17 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
     var _this$expressDateInst3;
     var subKey = item.subKey;
     return _objectSpread({
-      searchDefaultConditions: SYMBOL.in,
       type: item.type,
       id: "".concat(item.id, "_").concat(subKey),
       name: "".concat(_this.parentName, "-\u7269\u6D41\u516C\u53F8")
     }, _this.logisticsCompanyFormType === "input" ? {
+      searchDefaultConditions: {
+        in: SYMBOL.in,
+        anylike: SYMBOL.anylike
+      },
       filterComponentType: "SelectInput",
       props: {
-        filterOptions: SEARCH_OPTIONS_V2
+        filterOptions: SEARCH_OPTIONS
       },
       filterFn: function filterFn(value) {
         return function (i) {
@@ -119,13 +125,14 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
         };
       },
       formatFilterValue: function formatFilterValue(value) {
-        if (value.type === "in") {
+        if (["in", "anylike"].includes(value.type)) {
           return batchInput(value.keywords);
         } else {
           return value;
         }
       }
     } : {
+      searchDefaultConditions: SYMBOL.in,
       filterComponentType: "MultipleSelect",
       props: {
         options: ((_this$expressDateInst3 = _this.expressDateInstance) === null || _this$expressDateInst3 === void 0 ? void 0 : _this$expressDateInst3.getExpressData()) || []

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

@@ -1368,6 +1368,22 @@ var GoodHeaderMap = {
         width: 200
       }
     }
+  },
+  SKX_RETURN_GOODS: {
+    headerMap: {
+      returnSkuEcode: {
+        name: "[SKX]退货单明细-returnSkuEcode",
+        width: 200
+      },
+      returnSubOrderId: {
+        name: "[SKX]退货单-子订单号",
+        width: 300
+      },
+      returnBillNo: {
+        name: "[SKX]TH退换货单号",
+        width: 200
+      }
+    }
   }
 };
 GoodHeaderMap["WDT_REISSUE_GOODS"] = GoodHeaderMap["WDT_GOODS"];

package/dist/esm/components/SKX/SkxGoods/index.js

@@ -20,6 +20,10 @@ var typeMap = {
   SKX_GOODS: {
     name: "[SKX]商品信息(ON)",
     key: "skxGoods"
+  },
+  SKX_RETURN_GOODS: {
+    name: "[SKX]退货商品信息(TH)",
+    key: "skxReturnGoods"
   }
 };
 var SkxGoods = /*#__PURE__*/_createClass(function SkxGoods(options) {

package/dist/esm/components/SKX/SkxIdInputSelect/index.js

@@ -16,6 +16,10 @@ var typeMap = {
   SKX_OUTBOUND_NOTICE_NO: {
     key: "skxOutboundNoticeNo",
     blurType: "skxOutboundNoticeNo"
+  },
+  SKX_RETURN_BILL_NO: {
+    key: "skxReturnBillNo",
+    blurType: "skxReturnBillNo"
   }
 };
 var SkxIdInputSelect = /*#__PURE__*/_createClass(function SkxIdInputSelect(options) {

package/dist/esm/factory.d.ts

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

package/dist/esm/factory.js

@@ -201,6 +201,7 @@ export var factory = function factory(type, options) {
     case "KM_LOGISTICS":
     case "GY_LOGISTICS":
     case "SKX_LOGISTICS":
+    case "SKX_RETURN_LOGISTICS":
       return new BsLogistics(options);
     case "FLOW_WORK_ORDER_ID_INPUT":
       return new FlowWorkOrderId(options);
@@ -276,6 +277,7 @@ export var factory = function factory(type, options) {
     case "WDT_TAGS":
       return new AsyncSelect(options);
     case "SKX_OUTBOUND_NOTICE_NO":
+    case "SKX_RETURN_BILL_NO":
       return new SkxIdInputSelect(options);
     case "SKX_ORDER_TYPE":
       return new BasicSelectOption(options);
@@ -284,8 +286,11 @@ export var factory = function factory(type, options) {
     case "SKX_SHOP_NAME":
     case "SKX_WAREHOUSE":
     case "SKX_ORDER_STATUS":
+    case "SKX_REFUND_BILL_NO":
+    case "SKX_RETURN_ORDER_STATUS":
       return new BasicTypeInput(options);
     case "SKX_GOODS":
+    case "SKX_RETURN_GOODS":
       return new SkxGoods(options);
     case "ORDER_SUBFORM":
       return new OrderSubForm(options);

package/package.json

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