@kmkf-fe-packages/services-components 1.17.5-beta.12 → 1.17.5-beta.14

package/dist/esm/commonComponents/GlobalContext/index.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
 declare type RequestType = "queryAddressData" | "queryBsAddressData" | "queryExpressInterceptData" | "queryLogisticsAddressData" | "queryPlatData" | "queryWdtAddressData" | "queryAllLogisticsCompany" | "queryLabel" | "queryWdtLogisticsCompany" | "queryWdtSendData";
-declare const Global: ({ children, requestList, repeatRequestList }: React.PropsWithChildren<{
+declare const Global: ({ children, requestList, repeatRequestList, }: React.PropsWithChildren<{
     requestList?: RequestType[] | undefined;
     repeatRequestList?: Record<string, () => Promise<any>> | undefined;
 }>) => React.JSX.Element;

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

@@ -14,9 +14,9 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from "react";
-import { Skeleton, Result, Button } from "antd";
+import { Skeleton, Button, Alert, Space } from "antd";
 import { queryExpressInterceptData, queryLogisticsAddressData, queryPlatData, queryLabel, queryAllLogisticsCompany, queryWdtLogisticsCompany, queryWdtSendData } from "../../service/api";
-import { servers } from '@kmkf-fe-packages/kmkf-utils';
+import { servers } from "@kmkf-fe-packages/kmkf-utils";
 var Global = function Global(_ref) {
   var children = _ref.children,
     _ref$requestList = _ref.requestList,
@@ -93,15 +93,17 @@ var Global = function Global(_ref) {
     });
   }
   if (globalState === "failed") {
-    return /*#__PURE__*/React.createElement(Result, {
-      status: "error",
-      title: "\u6570\u636E\u52A0\u8F7D\u5F02\u5E38,\u8BF7\u5237\u65B0\u91CD\u8BD5",
-      extra: /*#__PURE__*/React.createElement(Button, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Alert, {
+      message: "\u6570\u636E\u52A0\u8F7D\u5F02\u5E38,\u53EF\u80FD\u5F71\u54CD\u90E8\u5206\u7EC4\u4EF6\u4F7F\u7528",
+      type: "warning",
+      action: /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
         type: "primary",
         key: "console",
-        onClick: initDataSource
-      }, "\u5237\u65B0\u91CD\u8BD5")
-    });
+        onClick: initDataSource,
+        size: "small"
+      }, "\u5237\u65B0\u91CD\u8BD5")),
+      closable: true
+    }), children);
   }
   return /*#__PURE__*/React.createElement(React.Fragment, null, children);
 };

package/dist/esm/components/JST/JstSendGood/index.d.ts

@@ -20,7 +20,7 @@ declare class JstSendGood implements ComponentInterface {
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
     constructor(options: PickOption);
-    getSortChildFields: (type: string, options: PickOption) => any;
+    getSortChildFields: (type: string, options: PickOption, fieldType?: string) => any;
     renderClient: (record: Record) => React.JSX.Element | null;
     renderPc: (value: any, record: Record) => React.JSX.Element;
     renderLog: (r: Record) => React.JSX.Element | null;

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

@@ -60,34 +60,29 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
-  _defineProperty(this, "getSortChildFields", function (type, options) {
+  _defineProperty(this, "getSortChildFields", function (type, options, fieldType) {
+    var _typeMap$options$type, _typeMap$options$type2;
+    var sendName = {
+      name: "发货仓名称",
+      key: "".concat(options.id, "_").concat((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.sendName),
+      dataType: "string"
+    };
+    var sendId = {
+      name: "发货仓编码",
+      key: "".concat(options.id, "_").concat((_typeMap$options$type2 = typeMap[options.type]) === null || _typeMap$options$type2 === void 0 ? void 0 : _typeMap$options$type2.sendId),
+      dataType: "string"
+    };
+    if (fieldType === 'WDT_SEND_GOOD') {
+      sendName.options = WdtSendData.getInstance().getWdtSendData() || [];
+    }
     if (type === 'all') {
-      var _typeMap$options$type, _typeMap$options$type2;
-      return [{
-        name: "发货仓名称",
-        key: "".concat(options.id, "_").concat((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.sendName),
-        dataType: "string"
-      }, {
-        name: "发货仓编码",
-        key: "".concat(options.id, "_").concat((_typeMap$options$type2 = typeMap[options.type]) === null || _typeMap$options$type2 === void 0 ? void 0 : _typeMap$options$type2.sendId),
-        dataType: "string"
-      }];
+      return [sendName, sendId];
     }
     if (type === 'sendName') {
-      var _typeMap$options$type3;
-      return [{
-        name: "发货仓名称",
-        key: "".concat(options.id, "_").concat((_typeMap$options$type3 = typeMap[options.type]) === null || _typeMap$options$type3 === void 0 ? void 0 : _typeMap$options$type3.sendName),
-        dataType: "string"
-      }];
+      return [sendName];
     }
     if (type === 'sendId') {
-      var _typeMap$options$type4;
-      return [{
-        name: "发货仓编码",
-        key: "".concat(options.id, "_").concat((_typeMap$options$type4 = typeMap[options.type]) === null || _typeMap$options$type4 === void 0 ? void 0 : _typeMap$options$type4.sendId),
-        dataType: "string"
-      }];
+      return [sendId];
     }
     return [];
   });
@@ -212,7 +207,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
   this.sortField = "".concat(_options.id, "_").concat((_typeMap$_options$typ = typeMap[_options.type]) === null || _typeMap$_options$typ === void 0 ? void 0 : _typeMap$_options$typ.key);
   this.formField = "".concat(_options.id, "_").concat((_typeMap$_options$typ2 = typeMap[_options.type]) === null || _typeMap$_options$typ2 === void 0 ? void 0 : _typeMap$_options$typ2.key);
   this.componentConfig = _options.componentConfig;
-  this.sortChildField = this.getSortChildFields(((_this$componentConfig3 = this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.showField) || '', _options);
+  this.sortChildField = this.getSortChildFields(((_this$componentConfig3 = this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.showField) || '', _options, _options.type);
   this.type = _options.type;
   this.dataType = "object";
   this.rules = (_this$componentConfig4 = this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.required ? [{

package/dist/esm/components/LogisticsInterception/InterceptApiStatus.d.ts

@@ -22,7 +22,7 @@ declare class InterceptApiStatus implements ComponentInterface {
     renderClient: (r: any) => React.JSX.Element | null;
     renderPc: (value: any, r: Record) => React.JSX.Element | "--";
     renderLog: (r: Record) => React.JSX.Element | "--" | null;
-    renderExport: (value: any, r: Record) => any;
+    renderExport: (value: any, r: Record) => string;
     editRender: () => null;
     filterConfig: (item: ColumnConfig) => {
         searchDefaultConditions: "in";

package/dist/esm/components/LogisticsInterception/InterceptApiStatus.js

@@ -65,9 +65,8 @@ var InterceptApiStatus = /*#__PURE__*/_createClass(function InterceptApiStatus(o
     return _this.renderPc(undefined, r);
   });
   _defineProperty(this, "renderExport", function (value, r) {
-    var _record$status;
     var record = r[_this.id];
-    return (_record$status = record === null || record === void 0 ? void 0 : record.status) !== null && _record$status !== void 0 ? _record$status : "--";
+    return record !== null && record !== void 0 && record.status ? "".concat(record === null || record === void 0 ? void 0 : record.status).concat(record.reason ? ",".concat(record.reason) : "") : "--";
   });
   _defineProperty(this, "editRender", function () {
     return null;

package/dist/esm/components/LogisticsMoreInterception/InterceptApiStatus.js

@@ -30,8 +30,8 @@ var InterceptApiStatus = /*#__PURE__*/_createClass(function InterceptApiStatus(o
   _defineProperty(this, "getComponentValue", function (r) {
     var _ref;
     return (_ref = (r === null || r === void 0 ? void 0 : r[_this.id]) || []) === null || _ref === void 0 ? void 0 : _ref.map(function (item) {
-      return item === null || item === void 0 ? void 0 : item.status;
-    }).join(",");
+      return "".concat(item === null || item === void 0 ? void 0 : item.status).concat(item !== null && item !== void 0 && item.reason ? ",".concat(item === null || item === void 0 ? void 0 : item.reason) : "");
+    }).join(";");
   });
   _defineProperty(this, "renderStatus", function (record) {
     var w = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 500;

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "1.17.5-beta.12",
+  "version": "1.17.5-beta.14",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4fbea6c3464f52e15c0625802dfe5d9f5247828d",
+  "gitHead": "7dc53a9d108de60f9ce37f4356fcf7d1897eccaa",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }