@kmkf-fe-packages/services-components 0.13.0-alpha.20 → 0.13.0-alpha.21

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

@@ -21,11 +21,18 @@ declare class CommonMultiStatus implements ComponentInterface {
     renderExport: (value: any, record: any) => any;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => {
-        searchDefaultConditions: "like";
+        searchDefaultConditions: "like" | "in";
         type: string;
         id: string;
         name: string;
-        filterComponentType: "Input";
+        filterComponentType: "MultipleSelect" | "Input";
+        props: {
+            options: any[] | undefined;
+            fieldNames: {
+                label: string;
+                value: string;
+            };
+        };
         filterFn: (value: string) => (i: Record) => boolean;
     };
 }

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

@@ -45,8 +45,8 @@ var typeMap = {
       label: '失败',
       color: '#ff4d4f'
     }],
-    key: 'bsExchangeReason',
-    code: 'bsExchangeStatusValue',
+    key: 'exchangeReason',
+    code: 'exchangeStatusValue',
     name: '退货状态',
     type: 1,
     valueKey: 'status',
@@ -55,15 +55,15 @@ var typeMap = {
   },
   WAREHOUSING_STATUS: {
     options: [{
-      value: 2,
+      value: '2',
       label: '已入库',
       color: '#52c41a'
     }, {
-      value: 1,
+      value: '1',
       label: '部分入库',
       color: '#e7780f'
     }, {
-      value: 0,
+      value: '0',
       label: '未入库',
       color: '#ff4d4f'
     }],
@@ -144,7 +144,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
         var _typeMap$_this$type14;
         return item[(_typeMap$_this$type14 = typeMap[_this.type]) === null || _typeMap$_this$type14 === void 0 ? void 0 : _typeMap$_this$type14.valueKey] === option.value;
       });
-      return "".concat(item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type15 = typeMap[_this.type]) === null || _typeMap$_this$type15 === void 0 ? void 0 : _typeMap$_this$type15.idKey], ":").concat(currentOption ? currentOption.label : item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type16 = typeMap[_this.type]) === null || _typeMap$_this$type16 === void 0 ? void 0 : _typeMap$_this$type16.valueKey]);
+      return "".concat(item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type15 = typeMap[_this.type]) === null || _typeMap$_this$type15 === void 0 ? void 0 : _typeMap$_this$type15.idKey], ":").concat(currentOption ? (currentOption === null || currentOption === void 0 ? void 0 : currentOption.label) || '' : (item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type16 = typeMap[_this.type]) === null || _typeMap$_this$type16 === void 0 ? void 0 : _typeMap$_this$type16.valueKey]) || '');
     }).join(',');
   });
   _defineProperty(this, "editRender", function (p) {
@@ -162,13 +162,20 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
-    var _typeMap$_this$type18;
+    var _typeMap$_this$type18, _item$templateConfig;
     return {
-      searchDefaultConditions: SYMBOL.like,
+      searchDefaultConditions: _this.type === 'WAREHOUSING_STATUS' ? SYMBOL.in : SYMBOL.like,
       type: item.type,
       id: "".concat(item.id, "_").concat((_typeMap$_this$type18 = typeMap[_this.type]) === null || _typeMap$_this$type18 === void 0 ? void 0 : _typeMap$_this$type18.code),
       name: "".concat(_this.name),
-      filterComponentType: 'Input',
+      filterComponentType: _this.type === 'WAREHOUSING_STATUS' ? 'MultipleSelect' : "Input",
+      props: {
+        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"
+        }
+      },
       filterFn: function filterFn(value) {
         return function (i) {
           var _typeMap$_this$type19;

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, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonTradeId, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting } from "./index";
+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, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => BasicAddress | BsSystemOrder | BasicCascader | BasicCheckbox | CommonDataTime | BasicDataTime | BasicInput | PrevSubmitter | Submitter | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | 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 | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | PlatForm | ShopInput | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | CommonTradeId | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting;
+export declare const factory: (type: string, options: PickOption) => CommonMultiStatus | FlowTag | BasicRadio | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | 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 | FlowStatusSelect | FlowMarkSelect | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting;

package/dist/esm/factory.js

@@ -1,4 +1,6 @@
-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, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonTradeId, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting } from "./index";
+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, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect,
+// CommonTradeId,
+CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting } from "./index";
 export var factory = function factory(type, options) {
   var _options$componentCon;
   switch (type) {
@@ -136,7 +138,7 @@ export var factory = function factory(type, options) {
       return new BsReissue(options);
     case "BS_RETURN_GOODS":
       return new BsReturn(options);
-    // case 'REISSUE_TRADE_ID':
+    case 'REISSUE_TRADE_ID':
     case "BS_DELIVERY_NO":
     case "RETURN_GOODS_TRADE_ID":
     case "EXCHANGE_TRADE_ID":
@@ -157,9 +159,9 @@ export var factory = function factory(type, options) {
     case "EXCHANGE_STATUS":
     case "WAREHOUSING_STATUS":
       return new CommonMultiStatus(options);
-    case "REISSUE_TRADE_ID":
-      // case 'EXCHANGE_TRADE_ID':
-      return new CommonTradeId(options);
+    // case "REISSUE_TRADE_ID":
+    // case 'EXCHANGE_TRADE_ID':
+    // return new CommonTradeId(options);
     case "NUMERICAL_CALCULATION":
       return new Calculation(options);
     case "NODE_DEAD_LINE_INPUT":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.13.0-alpha.20",
+  "version": "0.13.0-alpha.21",
   "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.13.0-alpha.20",
-    "@kmkf-fe-packages/kmkf-utils": "^0.13.0-alpha.20"
+    "@kmkf-fe-packages/basic-components": "^0.13.0-alpha.21",
+    "@kmkf-fe-packages/kmkf-utils": "^0.13.0-alpha.21"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "fea106f2b37b8b288b4ac231723ec0b08a736c76"
+  "gitHead": "fbeb98f026a1e5e5afbfd113179bbe85271213d6"
 }