@kmkf-fe-packages/services-components 0.12.0-alpha.0 → 0.12.0-alpha.2

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

@@ -270,6 +270,9 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
     var color = ((_options$find = options.find(function (item) {
       return item[valueKey] === failValue;
     })) === null || _options$find === void 0 ? void 0 : _options$find.color) || '#000';
+    var currentOption = options.find(function (option) {
+      return item[valueKey] === option.value;
+    });
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
       content: orderContent(item, index),
       overlayStyle: {
@@ -285,7 +288,7 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
       style: {
         color: color
       }
-    }, (item === null || item === void 0 ? void 0 : item[valueKey]) || '')), item.reason && (item === null || item === void 0 ? void 0 : item[valueKey]) !== "成功" && /*#__PURE__*/React.createElement("div", {
+    }, currentOption ? currentOption.label : (item === null || item === void 0 ? void 0 : item[valueKey]) || '')), item.reason && (item === null || item === void 0 ? void 0 : item[valueKey]) !== "成功" && /*#__PURE__*/React.createElement("div", {
       className: "c-red"
     }, item.reason));
   }) : null;

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

@@ -52,6 +52,28 @@ var typeMap = {
     valueKey: 'status',
     idKey: 'systemOrderId',
     failValue: '失败'
+  },
+  WAREHOUSING_STATUS: {
+    options: [{
+      value: 2,
+      label: '已入库',
+      color: '#52c41a'
+    }, {
+      value: 1,
+      label: '部分入库',
+      color: '#e7780f'
+    }, {
+      value: 0,
+      label: '未入库',
+      color: '#ff4d4f'
+    }],
+    key: 'inStockStatusList',
+    code: 'inStockStatusItemList',
+    name: '退货入库状态',
+    type: 2,
+    valueKey: 'status',
+    idKey: 'systemOrderId',
+    failValue: '失败'
   }
 };
 var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(options) {

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, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, Handler, CompletedUser, LogisticsInterception, LogisticsTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonTradeId, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods } 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, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, Handler, CompletedUser, LogisticsInterception, LogisticsTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods } from './index';
 import { PickOption } from './type';
-export declare const factory: (type: string, options: PickOption) => BsExchange | BsLogistics | BsReissue | BsSystemOrder | 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 | BsReturn | FlowStatusSelect | FlowMarkSelect | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | PlatForm | ShopInput | Submitter | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | CommonTradeId | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods;
+export declare const factory: (type: string, options: PickOption) => BsExchange | BsLogistics | BsReissue | CommonMultiStatus | 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 | BsReturn | FlowStatusSelect | FlowMarkSelect | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | PlatForm | ShopInput | Submitter | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods;

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, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, Handler, CompletedUser, LogisticsInterception, LogisticsTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonTradeId, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods } 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, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, Handler, CompletedUser, LogisticsInterception, LogisticsTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect,
+// CommonTradeId,
+CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods } from "./index";
 export var factory = function factory(type, options) {
   var _options$componentCon;
   switch (type) {
@@ -130,9 +132,9 @@ export var factory = function factory(type, options) {
       return new BsReissue(options);
     case 'BS_RETURN_GOODS':
       return new BsReturn(options);
-    // case 'REISSUE_TRADE_ID':
     case 'BS_DELIVERY_NO':
     case 'RETURN_GOODS_TRADE_ID':
+    case 'REISSUE_TRADE_ID':
     case 'EXCHANGE_TRADE_ID':
       return new CommonSystemOrder(options);
     case 'BS_LOGISTICS':
@@ -149,10 +151,11 @@ export var factory = function factory(type, options) {
       return new StatusSelect(options);
     case 'RETURN_GOODS_STATUS':
     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.12.0-alpha.0",
+  "version": "0.12.0-alpha.2",
   "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.12.0-alpha.0",
-    "@kmkf-fe-packages/kmkf-utils": "^0.12.0-alpha.0"
+    "@kmkf-fe-packages/basic-components": "^0.12.0-alpha.2",
+    "@kmkf-fe-packages/kmkf-utils": "^0.12.0-alpha.2"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "9a0504b552aa6000b416f1bc4def20c7a635f738"
+  "gitHead": "c5701df104256c82fd72607ed5e92d77ff2a717d"
 }