@kmkf-fe-packages/services-components 2.10.9-beta.2 → 2.10.9-beta.21

package/dist/esm/components/WDT/WdtGoods/index.js

@@ -16,6 +16,7 @@ import ItemView from "../../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { CommonGoods as Goods } from "@kmkf-fe-packages/basic-components";
 import { SYMBOL } from "../../../constant";
+import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
 var WdtGoods = /*#__PURE__*/_createClass(function WdtGoods(options) {
   var _this = this,
     _this$componentConfig6;
@@ -32,7 +33,11 @@ var WdtGoods = /*#__PURE__*/_createClass(function WdtGoods(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "wdtGoods", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    return getGoodsSortChildFields(_this.type, _this.id);
+  });
   _defineProperty(this, "renderClient", function (record) {
     var _record, _this$componentConfig;
     return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ItemView, {
@@ -119,5 +124,6 @@ var WdtGoods = /*#__PURE__*/_createClass(function WdtGoods(options) {
     }
   }] : [];
   this.dataType = "object";
+  this.sortChildField = this.getSortChildFields();
 });
 export default WdtGoods;

package/dist/esm/components/WDT/WdtRessuie/index.d.ts

@@ -15,11 +15,18 @@ declare class WdtReissue implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
+    sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
     bsType: BsType;
     bsMemo: BsMemo;
     systemOrderNo: SystemOrderNo;
     reissueGoods: BsHeaderGood | CommonHeaderGoods;
     constructor(options: PickOption);
+    getSortChildFields: () => {
+        name: any;
+        key: string;
+        dataType: string;
+        conditionOptionsSetting: any;
+    }[];
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: () => null;
     renderLog: (r: Record) => React.JSX.Element;

package/dist/esm/components/WDT/WdtRessuie/index.js

@@ -17,6 +17,7 @@ import { SYMBOL } from "../../../constant";
 import { BsGoodsTable } from "../../Common/index";
 import { BsType, BsMemo, BsHeaderGood, SystemOrderNo } from "../../BS/common/index";
 import CommonHeaderGoods from "../../CommonHeaderGood";
+import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
 var typeMap = {
   WDT_REISSUE_GOODS: {
     key: "wdtReissueGoods",
@@ -56,10 +57,14 @@ var WdtReissue = /*#__PURE__*/_createClass(function WdtReissue(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "bsType", void 0);
   _defineProperty(this, "bsMemo", void 0);
   _defineProperty(this, "systemOrderNo", void 0);
   _defineProperty(this, "reissueGoods", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    return getGoodsSortChildFields(_this.type, _this.id);
+  });
   _defineProperty(this, "renderClient", function (record) {
     var _record, _typeMap$_this$type, _record2, _typeMap$_this$type2, _this$componentConfig;
     return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.bsType.renderClient(record), _this.bsMemo.renderClient(record), _this.systemOrderNo.renderClient(record), record !== null && record !== void 0 && (_record = record["".concat(_this.id)]) !== null && _record !== void 0 && _record[(_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.key].length ? /*#__PURE__*/React.createElement(ItemView, {
@@ -208,5 +213,6 @@ var WdtReissue = /*#__PURE__*/_createClass(function WdtReissue(options) {
     }
   }];
   this.dataType = "object";
+  this.sortChildField = this.getSortChildFields();
 });
 export default WdtReissue;

package/dist/esm/components/WDT/WdtReturn/index.d.ts

@@ -15,9 +15,16 @@ declare class WdtReturn implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
+    sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
     wdtType: BsType;
     reissueGoods: CommonHeaderGoods;
     constructor(options: PickOption);
+    getSortChildFields: () => {
+        name: any;
+        key: string;
+        dataType: string;
+        conditionOptionsSetting: any;
+    }[];
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: () => null;
     renderLog: (r: Record) => React.JSX.Element;

package/dist/esm/components/WDT/WdtReturn/index.js

@@ -17,6 +17,7 @@ import { BsGoodsTable } from "../../Common";
 import { BsType } from "../../BS/common/index";
 import { CommonReturnGoods } from "@kmkf-fe-packages/basic-components";
 import CommonHeaderGoods from "../../CommonHeaderGood";
+import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
 var WdtReturn = /*#__PURE__*/_createClass(function WdtReturn(options) {
   var _this = this,
     _this$componentConfig6;
@@ -33,8 +34,12 @@ var WdtReturn = /*#__PURE__*/_createClass(function WdtReturn(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "wdtType", void 0);
   _defineProperty(this, "reissueGoods", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    return getGoodsSortChildFields(_this.type, _this.id);
+  });
   _defineProperty(this, "renderClient", function (record) {
     var _this$componentConfig;
     return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.wdtType.renderClient(record), record !== null && record !== void 0 && record["".concat(_this.id)].wdtReturnGoods.length ? /*#__PURE__*/React.createElement(ItemView, {
@@ -147,5 +152,6 @@ var WdtReturn = /*#__PURE__*/_createClass(function WdtReturn(options) {
     }
   }] : [];
   this.dataType = "object";
+  this.sortChildField = this.getSortChildFields();
 });
 export default WdtReturn;

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, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, DxdShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption, OrderSubForm, FlowOverallStatusSelect, ReturnWarehouse, KmExchange } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | DxdShopSelect | JstSendGood | PublicGoods | 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 | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | ReturnWarehouse | GyGoods | KmExchange | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
+export declare const factory: (type: string, options: PickOption) => BsExchange | BsGoods | BsReissue | BsReturn | BsE3Goods | BsE3Reissue | CommonMultiStatus | 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 | JstSendGood | JstSupply | BsSystemOrder | PublicGoods | PublicReissueGoods | PublicExchange | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | DxdShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect | ReturnWarehouse | KmExchange | GyGoods;

package/dist/esm/factory.js

@@ -254,14 +254,18 @@ export var factory = function factory(type, options) {
       return new StatusSelect(options);
     case "RETURN_GOODS_STATUS":
     case "EXCHANGE_STATUS":
+      return new CommonMultiStatus(options);
     case "WAREHOUSING_STATUS":
     case "BS_E3_WAREHOUSING_STATUS":
     case "WDT_WAREHOUSING_STATUS":
+    case "DXD_WAREHOUSING_STATUS":
     case "WLN_WAREHOUSING_STATUS":
     case "JKY_WAREHOUSING_STATUS":
     case "JST_WAREHOUSING_STATUS":
     case "KM_WAREHOUSING_STATUS":
-      return new CommonMultiStatus(options);
+      return new CommonMultiStatus(options, {
+        isWarehousingStatus: true
+      });
     case "MSG_STATUS":
       return new MsgStatus(options);
     case "GY_PAYMENT_METHOD":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "2.10.9-beta.2",
+  "version": "2.10.9-beta.21",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "2.10.9-beta.2",
-    "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.2",
+    "@kmkf-fe-packages/basic-components": "2.10.9-beta.21",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.20",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dac375113d0fa85fd02bf62d03604d4ffb1b486e",
+  "gitHead": "4dedd2a3b38f76b1511c4cc6e50830a0db126ae9",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }