@kmkf-fe-packages/services-components 0.12.0-alpha.1 → 0.12.0-alpha.14

package/dist/esm/commonComponents/OperationLog/index.js

@@ -8,7 +8,7 @@ import React from "react";
 import { factory } from "@kmkf-fe-packages/services-components";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 export var unTransField = function unTransField(key) {
-  return ["itemList", "jstItemList", "dateTime", "basicMultSelect", "checkbox", "multSelect", "rate", "picture", "file", "bsSendGood", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsSystemShowOrder", "bsSystemSelectIds", "reissueLogisticsList", "deliveryNoList", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "wlnLogisticsList", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "bsExchangeReason"].reduce(function (cur, nxt) {
+  return ["itemList", "jstItemList", "dateTime", "basicMultSelect", "checkbox", "multSelect", "rate", "picture", "file", "bsSendGood", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsSystemShowOrder", "bsSystemSelectIds", "reissueLogisticsList", "deliveryNoList", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "wlnLogisticsList", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "exchangeReason"].reduce(function (cur, nxt) {
     return cur || (key === null || key === void 0 ? void 0 : key.includes(nxt));
   }, false);
 };
@@ -107,6 +107,7 @@ var OperationLog = function OperationLog(_ref) {
             }, /*#__PURE__*/React.createElement("span", {
               style: {
                 maxWidth: "66px",
+                minWidth: "50px",
                 marginRight: "8px",
                 flexShrink: 1
               }

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

@@ -45,13 +45,35 @@ var typeMap = {
       label: '失败',
       color: '#ff4d4f'
     }],
-    key: 'bsExchangeReason',
-    code: 'bsExchangeStatusValue',
+    key: 'exchangeReason',
+    code: 'exchangeReason',
     name: '退货状态',
     type: 1,
     valueKey: 'status',
     idKey: 'systemOrderId',
     failValue: '失败'
+  },
+  WAREHOUSING_STATUS: {
+    options: [{
+      value: 2,
+      label: '已入库',
+      color: '#52c41a'
+    }, {
+      value: 1,
+      label: '部分入库',
+      color: '#e7780f'
+    }, {
+      value: 0,
+      label: '未入库',
+      color: '#ff4d4f'
+    }],
+    key: 'inStockStatusItemList',
+    code: 'inStockStatusList',
+    name: '退货入库状态',
+    type: 2,
+    valueKey: 'status',
+    idKey: 'systemOrderId',
+    failValue: '失败'
   }
 };
 var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(options) {
@@ -117,12 +139,16 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
     var _typeMap$_this$type10;
     var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type10 = typeMap[_this.type]) === null || _typeMap$_this$type10 === void 0 ? void 0 : _typeMap$_this$type10.key)];
     return (list || []).map(function (item) {
-      var _typeMap$_this$type11, _typeMap$_this$type12;
-      return "".concat(item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type11 = typeMap[_this.type]) === null || _typeMap$_this$type11 === void 0 ? void 0 : _typeMap$_this$type11.idKey], ":").concat(item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type12 = typeMap[_this.type]) === null || _typeMap$_this$type12 === void 0 ? void 0 : _typeMap$_this$type12.valueKey]);
+      var _typeMap$_this$type11, _typeMap$_this$type12, _typeMap$_this$type13, _typeMap$_this$type15, _typeMap$_this$type16;
+      var currentOption = (_typeMap$_this$type11 = typeMap[_this.type]) === null || _typeMap$_this$type11 === void 0 ? void 0 : (_typeMap$_this$type12 = _typeMap$_this$type11.options) === null || _typeMap$_this$type12 === void 0 ? void 0 : (_typeMap$_this$type13 = _typeMap$_this$type12.find) === null || _typeMap$_this$type13 === void 0 ? void 0 : _typeMap$_this$type13.call(_typeMap$_this$type12, function (option) {
+        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]);
     }).join(',');
   });
   _defineProperty(this, "editRender", function (p) {
-    var _this$componentConfig, _this$componentConfig2, _typeMap$_this$type13;
+    var _this$componentConfig, _this$componentConfig2, _typeMap$_this$type17;
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
       name: _this.id,
@@ -130,23 +156,23 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
       component: /*#__PURE__*/React.createElement(Status, _extends({}, _this.componentConfig, {
-        type: (_typeMap$_this$type13 = typeMap[_this.type]) === null || _typeMap$_this$type13 === void 0 ? void 0 : _typeMap$_this$type13.type,
+        type: (_typeMap$_this$type17 = typeMap[_this.type]) === null || _typeMap$_this$type17 === void 0 ? void 0 : _typeMap$_this$type17.type,
         failValue: typeMap[_this.type].failValue
       }))
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
-    var _typeMap$_this$type14;
+    var _typeMap$_this$type18;
     return {
       searchDefaultConditions: SYMBOL.like,
       type: item.type,
-      id: "".concat(item.id, "_").concat((_typeMap$_this$type14 = typeMap[_this.type]) === null || _typeMap$_this$type14 === void 0 ? void 0 : _typeMap$_this$type14.code),
+      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',
       filterFn: function filterFn(value) {
         return function (i) {
-          var _typeMap$_this$type15;
-          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type15 = typeMap[_this.type]) === null || _typeMap$_this$type15 === void 0 ? void 0 : _typeMap$_this$type15.code), value);
+          var _typeMap$_this$type19;
+          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type19 = typeMap[_this.type]) === null || _typeMap$_this$type19 === void 0 ? void 0 : _typeMap$_this$type19.code), value);
         };
       }
     };
@@ -167,12 +193,12 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
     required: true,
     validator: function validator(_, value) {
       var hasNo = (value || []).some(function (item) {
-        var _typeMap$_this$type16;
-        return item[(_typeMap$_this$type16 = typeMap[_this.type]) === null || _typeMap$_this$type16 === void 0 ? void 0 : _typeMap$_this$type16.valueKey];
+        var _typeMap$_this$type20;
+        return item[(_typeMap$_this$type20 = typeMap[_this.type]) === null || _typeMap$_this$type20 === void 0 ? void 0 : _typeMap$_this$type20.valueKey];
       });
       if (!hasNo) {
-        var _typeMap$_this$type17;
-        return Promise.reject(new Error("\u81F3\u5C11\u586B\u5199\u4E00\u4E2A\u5B8C\u6574\u7684".concat((_typeMap$_this$type17 = typeMap[_this.type]) === null || _typeMap$_this$type17 === void 0 ? void 0 : _typeMap$_this$type17.name)));
+        var _typeMap$_this$type21;
+        return Promise.reject(new Error("\u81F3\u5C11\u586B\u5199\u4E00\u4E2A\u5B8C\u6574\u7684".concat((_typeMap$_this$type21 = typeMap[_this.type]) === null || _typeMap$_this$type21 === void 0 ? void 0 : _typeMap$_this$type21.name)));
       }
       return Promise.resolve();
     }

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

@@ -109,6 +109,9 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
           var _this$componentConfig9;
           return (((_this$componentConfig9 = _this.componentConfig) === null || _this$componentConfig9 === void 0 ? void 0 : _this$componentConfig9.selectRules) || []).includes(item.id);
         });
+        if (!rulesList.length) {
+          return Promise.resolve();
+        }
         var hasRule = rulesList.some(function (item) {
           var reg = new RegExp(item.value);
           return reg.test(value);

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

package/dist/esm/factory.js

@@ -151,6 +151,7 @@ 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':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.12.0-alpha.1",
+  "version": "0.12.0-alpha.14",
   "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.13",
+    "@kmkf-fe-packages/kmkf-utils": "^0.12.0-alpha.13"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "dacb2b0d1a63e567725fefa01677383a21678756"
+  "gitHead": "2ecc1d02b04f0d85bf1d6b6ec1b5c43e1a79db7d"
 }