npm - @kmkf-fe-packages/services-components - Versions diffs - 2.2.39-beta.1 → 2.2.39-beta.11 - Mend

@kmkf-fe-packages/services-components 2.2.39-beta.1 → 2.2.39-beta.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/esm/components/CommonHeaderGood/index.js +8 -0
package/dist/esm/components/PostIng/index.d.ts +1 -1
package/dist/esm/components/SubForm/index.js +39 -47
package/dist/esm/factory.d.ts +1 -1
package/package.json +4 -4

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

@@ -1500,6 +1500,14 @@ var GoodHeaderMap = {
         name: "系统规格ID",
         width: 150
       },
+      skuId: {
+        name: "平台规格ID",
+        width: 150
+      },
+      outerSkuId: {
+        name: "平台规格编码",
+        width: 150
+      },
       itemSysId: {
         name: "系统商品ID",
         width: 150

package/dist/esm/components/PostIng/index.d.ts CHANGED Viewed

@@ -31,7 +31,7 @@ declare class BasicPosting implements ComponentInterface {
     sortColumns: SortColumnsField;
     headerProvince: boolean;
     constructor(options: PickOption);
-    getChildren: () => (Province | City | District | Detail | ReceiverName | ReceiverMobile | undefined)[];
+    getChildren: () => (City | Detail | District | Province | ReceiverMobile | ReceiverName | undefined)[];
     getSortColumns: (sortColumns: string | undefined) => SortColumnsField;
     renderPc: (value: any, record: Record) => React.JSX.Element | null;
     renderLog: (r: Record) => React.JSX.Element | null;

package/dist/esm/components/SubForm/index.js CHANGED Viewed

@@ -19,53 +19,17 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React from "react";
 import { Table } from "antd";
-import { SubForm as SubFormComponent, renderMap } from "@kmkf-fe-packages/basic-components";
+import { SubForm as SubFormComponent, renderMap, renderSplitMap } from "@kmkf-fe-packages/basic-components";
 import { BsHeaderChild } from "../BS/common";
 import HeaderChildFile from "./children/HeaderChildFile";
 import HeaderChildPic from "./children/HeaderChildPic";
+import Express from "../Express";
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { difference } from "lodash";
 import { SYMBOL } from "../../constant";
 var ChildrenMap = {
-  INPUT: {
-    component: BsHeaderChild
-  },
-  TEXTAREA: {
-    component: BsHeaderChild
-  },
-  SELECT: {
-    component: BsHeaderChild
-  },
-  RADIO: {
-    component: BsHeaderChild
-    // transformValue: (value: any) => {
-    //   if (!value?.value) return null;
-    //   return `${value?.value}
-    //         ${
-    //           value?.value &&
-    //           typeof value.value === "string" &&
-    //           value?.value?.indexOf("其他") > -1 &&
-    //           value?.other
-    //             ? `(${value?.other})`
-    //             : ""
-    //         }`;
-    // },
-    // renderExport: (value: any) => {
-    //   if (!value?.value) return null;
-    //   return `${value?.value}
-    //         ${
-    //           value?.value &&
-    //           typeof value.value === "string" &&
-    //           value?.value?.indexOf("其他") > -1 &&
-    //           value?.other
-    //             ? `(${value?.other})`
-    //             : ""
-    //         }`;
-    // },
-  },
   CHECKBOX: {
     component: BsHeaderChild,
     transformValue: function transformValue(value) {
@@ -93,6 +57,23 @@ var ChildrenMap = {
   },
   FILE: {
     component: HeaderChildFile
+  },
+  jbCFrJV4m7_trajectoryCompany: {
+    component: Express
+  },
+  "0qFEv9GEyd_returnLogisticsCompany": {
+    component: Express
+  }
+};
+var getChildComponent = function getChildComponent(item) {
+  try {
+    return ChildrenMap[item.workOrderComponentType] || ChildrenMap[item.key] || {
+      component: BsHeaderChild
+    };
+  } catch (e) {
+    return {
+      component: BsHeaderChild
+    };
   }
 };
 var SubForm = /*#__PURE__*/_createClass(function SubForm(options) {
@@ -152,12 +133,23 @@ var SubForm = /*#__PURE__*/_createClass(function SubForm(options) {
         ellipsis: true,
         width: item.width,
         render: function render(val) {
-          return renderMap[item.workOrderComponentType] ? /*#__PURE__*/React.createElement("div", {
-            style: {
-              width: "100%",
-              overflow: "auto"
-            }
-          }, renderMap[item.workOrderComponentType](val)) : /*#__PURE__*/React.createElement("span", null, val);
+          if (renderMap[item.workOrderComponentType]) {
+            return /*#__PURE__*/React.createElement("div", {
+              style: {
+                width: "100%",
+                overflow: "auto"
+              }
+            }, renderMap[item.workOrderComponentType](val));
+          } else if (renderSplitMap[item.key]) {
+            return /*#__PURE__*/React.createElement("div", {
+              style: {
+                width: "100%",
+                overflow: "auto"
+              }
+            }, renderSplitMap[item.key](val));
+          } else {
+            return /*#__PURE__*/React.createElement("span", null, val);
+          }
         }
       };
     })) || []));
@@ -268,9 +260,9 @@ var SubForm = /*#__PURE__*/_createClass(function SubForm(options) {
   this.isCombinationComponent = true;
   this.canSort = false;
   this.children = (this.getNewTableHeader() || []).map(function (item) {
-    var _ChildrenMap$item$wor = ChildrenMap[item.workOrderComponentType],
-      component = _ChildrenMap$item$wor.component,
-      other = _objectWithoutProperties(_ChildrenMap$item$wor, _excluded);
+    var _getChildComponent = getChildComponent(item),
+      component = _getChildComponent.component,
+      other = _objectWithoutProperties(_getChildComponent, _excluded);
     return new component(_objectSpread(_objectSpread({}, options), {}, {
       name: item.name,
       id: "".concat(options.id, "_productList_").concat(item.key)

package/dist/esm/factory.d.ts CHANGED Viewed

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

package/package.json CHANGED Viewed

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