@kmkf-fe-packages/services-components 1.22.0 → 1.22.1-beta.3

package/dist/esm/components/BS/BsSystemOrder/index.js

@@ -11,7 +11,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import React from 'react';
 import GetFormItem from "../../GetFormItem";
 import ItemView from "../../../commonComponents/ItemView";
-import { isNull, BS_E3_BOOLEAN_STATUS_MAP, BS_E3_ORDER_STATUS_MAP } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, BS_E3_BOOLEAN_STATUS_MAP, BS_E3_ORDER_STATUS_MAP, KM_SYSTEM_ORDER_CONFIG } from "@kmkf-fe-packages/kmkf-utils";
 import { BsSystemOrder as SystemOrder } from '@kmkf-fe-packages/basic-components';
 import { BsSystemOrderTable } from "../../Common";
 import { BsHeaderChild } from "../common/index";
@@ -50,6 +50,7 @@ var typeMap = {
     ]
   },
 
+  KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG,
   WLN_SYSTEM_ORDER: {
     key: 'wlnSystemShowOrder',
     name: '万里牛',
@@ -246,6 +247,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
   this.canSort = false;
   this.children = ((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : (_typeMap$options$type2 = _typeMap$options$type.columns) === null || _typeMap$options$type2 === void 0 ? void 0 : _typeMap$options$type2.map(function (column) {
     return new BsHeaderChild(_objectSpread(_objectSpread({}, options), {}, {
+      transformValue: column.render,
       name: column.title,
       id: "".concat(options.id, "_").concat(typeMap[options.type].key, "_").concat(column.dataIndex),
       width: column.width || 150

package/dist/esm/components/BS/common/BsHeaderChild.d.ts

@@ -13,6 +13,7 @@ declare class BsHeaderChild implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface['dataType'];
+    transformValue: (val: any) => any;
     constructor(options: PickOption);
     getParentId: () => string;
     renderClient: (record: any) => React.JSX.Element | null;

package/dist/esm/components/BS/common/BsHeaderChild.js

@@ -29,6 +29,9 @@ var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "transformValue", function (val) {
+    return val;
+  });
   _defineProperty(this, "getParentId", function () {
     var _this$id$split = _this.id.split('_'),
       _this$id$split2 = _slicedToArray(_this$id$split, 3),
@@ -54,7 +57,7 @@ var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
     return _this.renderPc(undefined, r);
   });
   _defineProperty(this, "getComponentValue", function (r) {
-    return r === null || r === void 0 ? void 0 : r[_this.id];
+    return _this.transformValue(r === null || r === void 0 ? void 0 : r[_this.id]);
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var _this$getComponentVal2;
@@ -79,5 +82,8 @@ var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
   this.canSort = false;
   this.dataType = 'string';
   this.children = [];
+  if (options.transformValue) {
+    this.transformValue = options.transformValue;
+  }
 });
 export default BsHeaderChild;

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

@@ -20,6 +20,7 @@ import { CopyToClipboard } from 'react-copy-to-clipboard';
 import styles from "./index.module.less";
 import defaultImg from "./img/default-img.png";
 import CopyText from "../../commonComponents/CopyText";
+import { KM_SYSTEM_ORDER_CONFIG } from '@kmkf-fe-packages/kmkf-utils';
 var Paragraph = Typography.Paragraph;
 export var getFormItem = function getFormItem(_ref) {
   var name = _ref.name,
@@ -1149,6 +1150,7 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref13) {
     // },
     ],
 
+    KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
     WLN_SYSTEM_ORDER: [{
       dataIndex: 'billType',
       title: '单据类型'
@@ -1239,6 +1241,7 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref13) {
   };
   var rowKeyMap = {
     BS_SYSTEM_ORDER: 'billNo',
+    KM_SYSTEM_ORDER: 'billNo',
     WLN_SYSTEM_ORDER: 'billNo',
     WDT_SYSTEM_ORDER: 'billNo',
     BS_E3_SYSTEM_ORDER: 'orderSn'
@@ -1289,6 +1292,7 @@ export var MsgContent = function MsgContent(_ref14) {
     _ref14$options = _ref14.options,
     options = _ref14$options === void 0 ? [] : _ref14$options;
   var msgTypeCh = {
+    pdd: '拼多多',
     ding: '钉钉',
     wechat: '微信',
     qq: 'QQ',
@@ -1333,7 +1337,7 @@ export var MsgContent = function MsgContent(_ref14) {
     var key = item.msgType || 'ding';
     var formatMsgContent = /*#__PURE__*/React.createElement("span", {
       key: index
-    }, msgTypeCh[key], "-", item.ruleName, "-", currentOption ? currentOption.label : (item === null || item === void 0 ? void 0 : item[valueKey]) || "");
+    }, msgTypeCh[key] || key, "-", item.ruleName, "-", currentOption ? currentOption.label : (item === null || item === void 0 ? void 0 : item[valueKey]) || "");
     return /*#__PURE__*/React.createElement("div", {
       key: "wrap_".concat(index),
       style: {

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

@@ -57,12 +57,12 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
       name: "物流公司",
       key: "".concat(options.id, "_").concat((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.company),
       options: _this.expressDateInstance.getExpressData(),
-      dataType: "string",
+      dataType: "arrayObject",
       disabled: type === "logisticsCode"
     }, {
       name: "物流单号",
       key: "".concat(options.id, "_").concat((_typeMap$options$type2 = typeMap[options.type]) === null || _typeMap$options$type2 === void 0 ? void 0 : _typeMap$options$type2.code),
-      dataType: "string",
+      dataType: "arrayObject",
       disabled: type === "logisticsCompany"
     }];
   });
@@ -121,7 +121,7 @@ var JstLogistics = /*#__PURE__*/_createClass(function JstLogistics(_options) {
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       display: p === null || p === void 0 ? void 0 : p.display,
       required: (_this$componentConfig3 = (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.required) !== null && _this$componentConfig3 !== void 0 ? _this$componentConfig3 : false,
-      tooltip: (_this$componentConfig5 = _this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.showTooltip ? (_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.tooltip : '',
+      tooltip: (_this$componentConfig5 = _this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.showTooltip ? (_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.tooltip : "",
       component: /*#__PURE__*/React.createElement(JstGoods, _extends({}, _this.componentConfig, {
         type: 1,
         options: _this.expressDateInstance.getExpressData(),

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

@@ -43,6 +43,13 @@ var typeMap = {
     sendName: "wlnSendName",
     platformType: 'default'
   },
+  KM_SEND_GOOD: {
+    key: "kmSendGood",
+    name: "km",
+    sendId: "kmSendId",
+    sendName: "kmSendName",
+    platformType: 'km'
+  },
   WDT_SEND_GOOD: {
     key: "wdtSendGood",
     name: "wdt",

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

@@ -39,10 +39,15 @@ var typeMap = {
       label: '等待执行',
       color: '#e7780f'
     }, {
-      oldValue: '等待发送',
+      oldValue: '不满足条件，无需执行',
       value: '不满足条件，无需执行',
       label: '不满足条件，无需执行',
       color: '#8A8A8A'
+    }, {
+      oldValue: '暂不满足条件，等待执行',
+      value: '暂不满足条件，等待执行',
+      label: '暂不满足条件，等待执行',
+      color: '#4D90F7'
     }],
     key: 'msgStatusValues',
     code: 'msgStatus4Search',
@@ -55,6 +60,7 @@ var typeMap = {
   }
 };
 var msgTypeCh = {
+  pdd: '拼多多',
   ding: '钉钉',
   wechat: '微信',
   qq: 'QQ',
@@ -134,7 +140,7 @@ var MsgStatus = /*#__PURE__*/_createClass(function MsgStatus(options) {
         return item[(_typeMap$_this$type14 = typeMap[_this.type]) === null || _typeMap$_this$type14 === void 0 ? void 0 : _typeMap$_this$type14.valueKey] === option.value;
       });
       var key = item.msgType || 'ding';
-      return "".concat(msgTypeCh[key], "-").concat(item.ruleName, ":").concat(currentOption ? (currentOption === null || currentOption === void 0 ? void 0 : currentOption.label) || '' : (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.valueKey]) || '');
+      return "".concat(msgTypeCh[key] || key, "-").concat(item.ruleName, ":").concat(currentOption ? (currentOption === null || currentOption === void 0 ? void 0 : currentOption.label) || '' : (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.valueKey]) || '');
     }).join(',');
   });
   _defineProperty(this, "editRender", function (p) {

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

@@ -13,7 +13,7 @@ declare class BasicPicture implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
-    currenEnv: ComponentInterface['platform'];
+    currenEnv: ComponentInterface["platform"];
     constructor(options: PickOption);
     formatPictures: (pictures: string) => string[];
     render: (value: Value) => React.JSX.Element | null;

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

@@ -41,9 +41,9 @@ var BasicPicture = /*#__PURE__*/_createClass(function BasicPicture(options) {
       return null;
     }
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Image.PreviewGroup, {
-      preview: _this.currenEnv === 'ks' ? {
-        getContainer: (_document = document) === null || _document === void 0 ? void 0 : _document.getElementById('root')
-      } : false
+      preview: _this.currenEnv === "ks" ? {
+        getContainer: (_document = document) === null || _document === void 0 ? void 0 : _document.getElementById("root")
+      } : true
     }, value === null || value === void 0 ? void 0 : value.map(function (pic) {
       return /*#__PURE__*/React.createElement("div", {
         style: {

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, 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, KmErpSendGood, AfterSalesOrderId, BsE3Goods, BsE3Reissue } from "./index";
+import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, 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, AfterSalesOrderId, BsE3Goods, BsE3Reissue } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => ActualPayment | BsLogistics | BsSystemOrder | BsE3Reissue | BasicCascader | JstSendGood | KmErpSendGood | BasicPicture | BasicSelect | BasicInput | BasicAddress | BasicCheckbox | BasicDataTime | BasicRadio | BasicTextArea | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | 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 | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | Label | AfterSalesOrderId;
+export declare const factory: (type: string, options: PickOption) => ActualPayment | BsLogistics | BsSystemOrder | BsE3Reissue | BasicCascader | ItemEnCode | BasicInput | JstLogistics | JstSendGood | MsgStatus | BasicPicture | BasicSelect | BasicAddress | BasicCheckbox | BasicDataTime | BasicRadio | BasicTextArea | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ERemark | AliPay | ItemSelect | ItemId | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstItemSelect | JstSupply | BsGoods | BsE3Goods | 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 | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | Label | AfterSalesOrderId;

package/dist/esm/factory.js

@@ -1,6 +1,6 @@
 import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, ErpTradeId, 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,
 // CommonTradeId,
-CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, KmErpSendGood, AfterSalesOrderId, BsE3Goods, BsE3Reissue } from "./index";
+CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, AfterSalesOrderId, BsE3Goods, BsE3Reissue } from "./index";
 export var factory = function factory(type, options) {
   var _options$componentCon;
   switch (type) {
@@ -130,6 +130,7 @@ export var factory = function factory(type, options) {
     case "JST_SUPPLY":
       return new JstSupply(options);
     case "BS_SYSTEM_ORDER":
+    case "KM_SYSTEM_ORDER":
     case "WLN_SYSTEM_ORDER":
     case "WDT_SYSTEM_ORDER":
     case "BS_E3_SYSTEM_ORDER":
@@ -139,6 +140,7 @@ export var factory = function factory(type, options) {
     case "BS_E3_SEND_GOOD":
     case "WLN_SEND_GOOD":
     case "WDT_SEND_GOOD":
+    case "KM_SEND_GOOD":
       return new JstSendGood(options);
     case "BS_POSTING":
       return new BsPosting(options);
@@ -222,9 +224,8 @@ export var factory = function factory(type, options) {
       return new PaymentVoucherCode(options);
     case "LABEL":
       return new Label(options);
-    case "KM_SEND_GOOD":
-      // 快麦ERP发货仓
-      return new KmErpSendGood(options);
+    // case "KM_SEND_GOOD": // 快麦ERP发货仓
+    //   return new KmErpSendGood(options);
     case "AFTER_SALES_ORDER_ID":
       // 售后单ID
       return new AfterSalesOrderId(options);

package/dist/esm/type.d.ts

@@ -29,6 +29,7 @@ export declare type FilterConfigType = {
 };
 export declare type FilterComponentType = "MultipleSelect" | "Input" | "Date" | "Cascader" | "ShopList" | "Rate" | "SelectInput";
 export interface ComponentInterface {
+    transformValue?: (val: any) => any;
     id: string;
     sortField: string;
     sortChildField?: {
@@ -269,7 +270,7 @@ export interface ComponentInterface {
     getComponentValue: (r: Record) => any;
     formDataTransform?: (r: any) => any;
 }
-export declare type PickOption = Pick<ComponentInterface, "name" | "id" | "type" | "componentConfig" | "effects" | "columnHeader" | "templateId" | "workOrderUniqueKey" | "platform" | "parentName" | "width" | "flowTemplateKey">;
+export declare type PickOption = Pick<ComponentInterface, "name" | "id" | "type" | "componentConfig" | "effects" | "columnHeader" | "templateId" | "workOrderUniqueKey" | "platform" | "parentName" | "width" | "flowTemplateKey" | "transformValue">;
 export declare type ColumnConfig = {
     id: string;
     name: string;

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "1.22.0",
+  "version": "1.22.1-beta.3",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "sync": "yarn build && yalc push",
     "build": "yarn run lint && father build",
     "lint": "eslint '**/*.{ts,tsx}'",
-    "lint:fix": "eslint --fix '**/*.{ts,tsx}'"
+    "lint:fix": "eslint --fix '**/*.{ts,tsx}'",
+    "sync": "yarn build && yalc push"
   },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "1.22.0",
-    "@kmkf-fe-packages/kmkf-utils": "1.22.0",
+    "@kmkf-fe-packages/basic-components": "1.22.1-beta.3",
+    "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.3",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "71df1a3bb82c29f2f459f69c5a61c14f1671ccff",
+  "gitHead": "e29f0ae6aa1a63efec0cc0032560e56755a81cfb",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }