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

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

@@ -1208,11 +1208,11 @@ var GoodHeaderMap = {
         name: "总金额",
         transformValue: function transformValue(val, record, parentName) {
           if (!record) return "--";
-          return ((record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0)).toFixed(2);
+          return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
         },
         renderExport: function renderExport(val, record, parentName) {
           if (!record) return "--";
-          return ((record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0)).toFixed(2);
+          return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
         }
       },
       batchId: "批次号",
@@ -1320,11 +1320,11 @@ var GoodHeaderMap = {
         name: "总金额",
         transformValue: function transformValue(val, record, parentName) {
           if (!record) return "--";
-          return ((record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0)).toFixed(2);
+          return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
         },
         renderExport: function renderExport(val, record, parentName) {
           if (!record) return "--";
-          return ((record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0)).toFixed(2);
+          return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
         }
       },
       batchId: "批次号",
@@ -1500,14 +1500,6 @@ var GoodHeaderMap = {
         name: "系统规格ID",
         width: 150
       },
-      skuId: {
-        name: "平台规格ID",
-        width: 150
-      },
-      outerSkuId: {
-        name: "平台规格编码",
-        width: 150
-      },
       itemSysId: {
         name: "系统商品ID",
         width: 150

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

@@ -17,14 +17,6 @@ var INPUT_MAP = {
     key: "businessOrderNo",
     disabled: true,
     placeholder: "自动获取无需填写"
-  },
-  REPAIR_ORDER_SN: {
-    key: "repairOrderSn",
-    placeholder: "请输入维修单编号"
-  },
-  REPAIR_ORDER_ID: {
-    key: "repairOrderId",
-    placeholder: "请输入维修单id"
   }
 };
 var CommonInput = /*#__PURE__*/_createClass(function CommonInput(options) {
@@ -70,7 +62,7 @@ var CommonInput = /*#__PURE__*/_createClass(function CommonInput(options) {
     return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(INPUT_MAP[_this.type].key)]) !== null && _record !== void 0 ? _record : "--";
   });
   _defineProperty(this, "editRender", function (p) {
-    var _this$componentConfig, _this$componentConfig2, _this$componentConfig3, _this$componentConfig4, _this$componentConfig5;
+    var _this$componentConfig, _this$componentConfig2, _this$componentConfig3, _this$componentConfig4;
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
       name: _this.id,
@@ -78,10 +70,10 @@ var CommonInput = /*#__PURE__*/_createClass(function CommonInput(options) {
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       display: p === null || p === void 0 ? void 0 : p.display,
       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,
-      tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : "",
+      tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : '',
       component: /*#__PURE__*/React.createElement(Input, _extends({}, _this.componentConfig, {
         placeholder: INPUT_MAP[_this.type].placeholder || "\u8BF7\u8F93\u5165".concat(_this.name),
-        disabled: INPUT_MAP[_this.type].disabled || ((_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.disabled)
+        disabled: INPUT_MAP[_this.type].disabled
       }))
     });
   });

package/dist/esm/components/JST/JstSendGood/index.js

@@ -184,7 +184,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
   });
   _defineProperty(this, "filterConfig", function (item) {
     var _typeMap$_this$type8, _typeMap$_this$type9, _typeMap$_this$type11;
-    return [["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "KM_SEND_GOOD", "GY_SEND_GOOD", "JY_SEND_GOOD"].includes(_this.type) ? {
+    return [["WDT_SEND_GOOD", "BS_E3_SEND_GOOD", "GY_SEND_GOOD", "JY_SEND_GOOD"].includes(_this.type) ? {
       searchDefaultConditions: SYMBOL.in,
       type: item.type,
       id: "".concat(item.id, "_").concat((_typeMap$_this$type8 = typeMap[_this.type]) === null || _typeMap$_this$type8 === void 0 ? void 0 : _typeMap$_this$type8.sendName),

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

@@ -39,15 +39,10 @@ var typeMap = {
       label: "等待执行",
       color: "#e7780f"
     }, {
-      oldValue: "不满足条件，无需执行",
+      oldValue: "等待发送",
       value: "不满足条件，无需执行",
       label: "不满足条件，无需执行",
       color: "#8A8A8A"
-    }, {
-      oldValue: "暂不满足条件，等待执行",
-      value: "暂不满足条件，等待执行",
-      label: "暂不满足条件，等待执行",
-      color: "#4D90F7"
     }],
     key: "msgStatusValues",
     code: "msgStatus4Search",

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

@@ -28,14 +28,7 @@ declare class OrderSubForm implements ComponentInterface {
     expressDateInstance: InstanceType<typeof ExpressData>;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
-    sortChildField: {
-        name: string;
-        key: string;
-        dataType: string;
-        [key: string]: any;
-    }[];
     constructor(options: PickOption);
-    getSortChildFields: () => any;
     renderTransformItem: (item: subConfigType, val: any) => any;
     getNewTableHeader: () => any;
     renderTabel: (list: any) => React.JSX.Element;

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

@@ -48,19 +48,6 @@ function OrderSubForm(options) {
   _defineProperty(this, "expressDateInstance", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
-  _defineProperty(this, "sortChildField", void 0);
-  _defineProperty(this, "getSortChildFields", function () {
-    var orderSubformColumns = getOrderSubformColumns();
-    return orderSubformColumns.filter(function (item) {
-      return !["picUrl"].includes(item.dataIndex);
-    }).map(function (item) {
-      return {
-        name: item.title,
-        key: "".concat(_this.id, "_").concat(item.dataIndex),
-        dataType: "arrayObject"
-      };
-    });
-  });
   _defineProperty(this, "renderTransformItem", function (item, val) {
     var _getSelectWidgetMap;
     var mapValue = (_getSelectWidgetMap = getSelectWidgetMap(_this.expressDateInstance)) === null || _getSelectWidgetMap === void 0 ? void 0 : _getSelectWidgetMap[item.dataIndex];
@@ -280,6 +267,5 @@ function OrderSubForm(options) {
   });
   this.dataType = "object";
   this.expressDateInstance = ExpressData.getInstance();
-  this.sortChildField = this.getSortChildFields();
 });
 export default OrderSubForm;

package/dist/esm/components/Payment/PaymentAmount.d.ts

@@ -36,5 +36,6 @@ declare class PaymentAmount implements ComponentInterface {
         formatFilterValue: (val: Array<number | null>) => (number | null)[];
         filterFn: (value: string) => (i: Record) => boolean;
     };
+    formDataTransform: (value: string) => string | number;
 }
 export default PaymentAmount;

package/dist/esm/components/Payment/PaymentAmount.js

@@ -132,6 +132,10 @@ var PaymentAmount = /*#__PURE__*/_createClass(function PaymentAmount(options) {
       }
     };
   });
+  _defineProperty(this, "formDataTransform", function (value) {
+    var isNumber = new RegExp(/^[+-]?\d+(\.\d+)?$/);
+    return isNumber.test(value) ? Number(value) : value;
+  });
   this.name = '打款金额';
   this.id = "".concat(options.id, "_enterprisePaymentRefundFee");
   this.sortField = "".concat(options.id, "_enterprisePaymentRefundFee");

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

@@ -36,10 +36,6 @@ var selectTypeMap = {
     key: "agreeRefundStatusValue",
     info: "agreeRefundStatusReason"
   }),
-  REPAIR_ORDER_STATUS: getSelectTypeAttribute({
-    key: "repairOrderStatusValue",
-    info: "repairOrderStatusReason"
-  }),
   REJECT_REFUND_STATUS: getSelectTypeAttribute({
     key: "rejectRefundStatusValue",
     info: "rejectRefundStatusReason"

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

@@ -19,7 +19,7 @@ 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, renderSplitMap } from "@kmkf-fe-packages/basic-components";
+import { SubForm as SubFormComponent, renderMap } from "@kmkf-fe-packages/basic-components";
 import { BsHeaderChild } from "../BS/common";
 import HeaderChildFile from "./children/HeaderChildFile";
 import HeaderChildPic from "./children/HeaderChildPic";
@@ -40,7 +40,32 @@ var ChildrenMap = {
   },
   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) {
@@ -68,18 +93,6 @@ var ChildrenMap = {
   },
   FILE: {
     component: HeaderChildFile
-  },
-  jbCFrJV4m7_trajectoryCompany: {
-    component: BsHeaderChild
-  },
-  jbCFrJV4m7_trajectoryCode: {
-    component: BsHeaderChild
-  },
-  "0qFEv9GEyd_returnLogisticsCompany": {
-    component: BsHeaderChild
-  },
-  "0qFEv9GEyd_returnLogisticsCode": {
-    component: BsHeaderChild
   }
 };
 var SubForm = /*#__PURE__*/_createClass(function SubForm(options) {
@@ -139,23 +152,12 @@ var SubForm = /*#__PURE__*/_createClass(function SubForm(options) {
         ellipsis: true,
         width: item.width,
         render: function render(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);
-          }
+          return renderMap[item.workOrderComponentType] ? /*#__PURE__*/React.createElement("div", {
+            style: {
+              width: "100%",
+              overflow: "auto"
+            }
+          }, renderMap[item.workOrderComponentType](val)) : /*#__PURE__*/React.createElement("span", null, val);
         }
       };
     })) || []));
@@ -266,9 +268,9 @@ var SubForm = /*#__PURE__*/_createClass(function SubForm(options) {
   this.isCombinationComponent = true;
   this.canSort = false;
   this.children = (this.getNewTableHeader() || []).map(function (item) {
-    var _ref2 = ChildrenMap[item.workOrderComponentType] || ChildrenMap[item.key],
-      component = _ref2.component,
-      other = _objectWithoutProperties(_ref2, _excluded);
+    var _ChildrenMap$item$wor = ChildrenMap[item.workOrderComponentType],
+      component = _ChildrenMap$item$wor.component,
+      other = _objectWithoutProperties(_ChildrenMap$item$wor, _excluded);
     return new component(_objectSpread(_objectSpread({}, options), {}, {
       name: item.name,
       id: "".concat(options.id, "_productList_").concat(item.key)

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, 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 | CommonInput | BasicInput | JstSendGood | MsgStatus | OrderSubForm | PublicGoods | StatusSelect | SubForm | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | 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 | 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;
+export declare const factory: (type: string, options: PickOption) => BsLogistics | CommonInput | BasicInput | JstSendGood | MsgStatus | OrderSubForm | StatusSelect | SubForm | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | 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/dist/esm/factory.js

@@ -228,7 +228,6 @@ export var factory = function factory(type, options) {
     case "AGREE_RETURN_GOODS_STATUS":
     case "REJECT_RETURN_GOODS_STATUS":
     case "RETURN_EXCHANGE_GOODS_REVIEW_STATUS":
-    case "REPAIR_ORDER_STATUS":
       return new StatusSelect(options);
     case "RETURN_GOODS_STATUS":
     case "EXCHANGE_STATUS":
@@ -265,8 +264,6 @@ export var factory = function factory(type, options) {
       // 万里牛商品
       return new WdtGoods(options);
     case "BUSINESS_ORDER_NO":
-    case "REPAIR_ORDER_SN":
-    case "REPAIR_ORDER_ID":
       return new CommonInput(options);
     case "PAYMENT_VOUCHER_CODE":
       return new PaymentVoucherCode(options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "2.2.39-beta.8",
+  "version": "2.2.39",
   "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.8",
-    "@kmkf-fe-packages/kmkf-utils": "2.2.39-beta.7",
+    "@kmkf-fe-packages/basic-components": "2.2.39",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.39",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2c7c7de0f9e5d64f6342c42338bb0e9a51f47f35",
+  "gitHead": "52895fe5fa612a713b710ecc5cff271eb4b4036b",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }