@kmkf-fe-packages/services-components 1.17.5-beta.8 → 1.17.6-rc.0

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

@@ -29,51 +29,42 @@ var InterceptApiStatus = /*#__PURE__*/_createClass(function InterceptApiStatus(o
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "options", void 0);
   _defineProperty(this, "getComponentValue", function (r) {
-    var _record$interceptLogi;
-    var record = r[_this.parentId];
-    return record === null || record === void 0 ? void 0 : (_record$interceptLogi = record.interceptLogisticsApiStatus) === null || _record$interceptLogi === void 0 ? void 0 : _record$interceptLogi.status;
+    var record = r[_this.id];
+    return record === null || record === void 0 ? void 0 : record.status;
   });
   _defineProperty(this, "renderClient", function (r) {
-    var _record$interceptLogi2, _record$interceptLogi3, _record$interceptLogi4, _record$interceptLogi5, _record$interceptLogi6;
+    var _record$interceptLogi, _record$interceptLogi2, _record$interceptLogi3, _record$interceptLogi4, _record$interceptLogi5;
     var record = r[_this.parentId];
-    var status = record === null || record === void 0 ? void 0 : (_record$interceptLogi2 = record.interceptLogisticsApiStatus) === null || _record$interceptLogi2 === void 0 ? void 0 : _record$interceptLogi2.status;
+    var status = record === null || record === void 0 ? void 0 : (_record$interceptLogi = record.interceptLogisticsApiStatus) === null || _record$interceptLogi === void 0 ? void 0 : _record$interceptLogi.status;
     var statusColor = status === "成功" ? "#52c41a" : "#ff4d4f";
-    return !isNull(record === null || record === void 0 ? void 0 : (_record$interceptLogi3 = record.interceptLogisticsApiStatus) === null || _record$interceptLogi3 === void 0 ? void 0 : _record$interceptLogi3.status) ? /*#__PURE__*/React.createElement(ItemView, {
+    return !isNull(record === null || record === void 0 ? void 0 : (_record$interceptLogi2 = record.interceptLogisticsApiStatus) === null || _record$interceptLogi2 === void 0 ? void 0 : _record$interceptLogi2.status) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
       value: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
         style: {
           color: statusColor
         }
-      }, record === null || record === void 0 ? void 0 : (_record$interceptLogi4 = record.interceptLogisticsApiStatus) === null || _record$interceptLogi4 === void 0 ? void 0 : _record$interceptLogi4.status, record !== null && record !== void 0 && (_record$interceptLogi5 = record.interceptLogisticsApiStatus) !== null && _record$interceptLogi5 !== void 0 && _record$interceptLogi5.reason ? /*#__PURE__*/React.createElement("span", {
-        className: "c-red"
-      }, ",", (record === null || record === void 0 ? void 0 : (_record$interceptLogi6 = record.interceptLogisticsApiStatus) === null || _record$interceptLogi6 === void 0 ? void 0 : _record$interceptLogi6.reason) || "") : null))
+      }, record === null || record === void 0 ? void 0 : (_record$interceptLogi3 = record.interceptLogisticsApiStatus) === null || _record$interceptLogi3 === void 0 ? void 0 : _record$interceptLogi3.status, record !== null && record !== void 0 && (_record$interceptLogi4 = record.interceptLogisticsApiStatus) !== null && _record$interceptLogi4 !== void 0 && _record$interceptLogi4.reason ? /*#__PURE__*/React.createElement("span", null, "\uFF0C", (record === null || record === void 0 ? void 0 : (_record$interceptLogi5 = record.interceptLogisticsApiStatus) === null || _record$interceptLogi5 === void 0 ? void 0 : _record$interceptLogi5.reason) || "") : null))
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, r) {
-    var _record$interceptLogi7, _record$interceptLogi8, _record$interceptLogi9, _record$interceptLogi10;
-    var record = r[_this.parentId];
-    var status = record === null || record === void 0 ? void 0 : (_record$interceptLogi7 = record.interceptLogisticsApiStatus) === null || _record$interceptLogi7 === void 0 ? void 0 : _record$interceptLogi7.status;
+    var record = r[_this.id];
+    var status = record === null || record === void 0 ? void 0 : record.status;
     var statusColor = status === "成功" ? "#52c41a" : "#ff4d4f";
     return !isNull(status) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       style: {
         color: statusColor
       }
-    }, record === null || record === void 0 ? void 0 : (_record$interceptLogi8 = record.interceptLogisticsApiStatus) === null || _record$interceptLogi8 === void 0 ? void 0 : _record$interceptLogi8.status, record !== null && record !== void 0 && (_record$interceptLogi9 = record.interceptLogisticsApiStatus) !== null && _record$interceptLogi9 !== void 0 && _record$interceptLogi9.reason ? /*#__PURE__*/React.createElement("span", {
-      className: "c-red"
-    }, ",", (record === null || record === void 0 ? void 0 : (_record$interceptLogi10 = record.interceptLogisticsApiStatus) === null || _record$interceptLogi10 === void 0 ? void 0 : _record$interceptLogi10.reason) || "") : null)) : "--";
+    }, record === null || record === void 0 ? void 0 : record.status, record !== null && record !== void 0 && record.reason ? /*#__PURE__*/React.createElement("span", null, "\uFF0C", (record === null || record === void 0 ? void 0 : record.reason) || "") : null)) : "--";
   });
   _defineProperty(this, "renderLog", function (r) {
-    var _record$interceptLogi11;
-    var record = r[_this.parentId];
-    if (isNull(record === null || record === void 0 ? void 0 : (_record$interceptLogi11 = record.interceptLogisticsApiStatus) === null || _record$interceptLogi11 === void 0 ? void 0 : _record$interceptLogi11.status)) return null;
+    var record = r[_this.id];
+    if (isNull(record === null || record === void 0 ? void 0 : record.status)) return null;
     return _this.renderPc(undefined, r);
   });
   _defineProperty(this, "renderExport", function (value, r) {
-    var _record$interceptLogi12, _record$interceptLogi13;
-    var record = r[_this.parentId];
-    console.log("renderExport", record);
-    return (_record$interceptLogi12 = record === null || record === void 0 ? void 0 : (_record$interceptLogi13 = record.interceptLogisticsApiStatus) === null || _record$interceptLogi13 === void 0 ? void 0 : _record$interceptLogi13.status) !== null && _record$interceptLogi12 !== void 0 ? _record$interceptLogi12 : "--";
+    var record = r[_this.id];
+    return record !== null && record !== void 0 && record.status ? "".concat(record === null || record === void 0 ? void 0 : record.status).concat(record.reason ? "\uFF0C".concat(record.reason) : "") : "--";
   });
   _defineProperty(this, "editRender", function () {
     return null;

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

@@ -28,20 +28,24 @@ var InterceptApiStatus = /*#__PURE__*/_createClass(function InterceptApiStatus(o
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "options", void 0);
   _defineProperty(this, "getComponentValue", function (r) {
-    return ((r === null || r === void 0 ? void 0 : r[_this.id]) || []).map(function (item) {
-      return item === null || item === void 0 ? void 0 : item.status;
-    }).join(",");
+    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 "".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;
-    var statusList = record["".concat(_this.parentId, "_logisticsInterceptApiStatusList")] || [];
+    var statusList = (record === null || record === void 0 ? void 0 : record[_this.id]) || [];
     if (isNull(statusList)) return "--";
     return /*#__PURE__*/React.createElement("div", null, statusList.map(function (item, index) {
       var status = item === null || item === void 0 ? void 0 : item.status;
       var reason = item === null || item === void 0 ? void 0 : item.reason;
-      return /*#__PURE__*/React.createElement("div", null, "\u5305\u88F9".concat(index + 1, ":"), status ? /*#__PURE__*/React.createElement(React.Fragment, null, status, " ", reason ? /*#__PURE__*/React.createElement("span", {
-        className: "c-red"
-      }, "\u5931\u8D25\u539F\u56E0:", reason) : null) : "--");
+      var statusColor = reason ? "#ff4d4f" : "#52c41a";
+      return /*#__PURE__*/React.createElement("div", null, "\u5305\u88F9".concat(index + 1, ":"), /*#__PURE__*/React.createElement("span", {
+        style: {
+          color: statusColor
+        }
+      }, status ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, status), reason ? /*#__PURE__*/React.createElement("span", null, "\uFF0C", reason) : null) : "--"));
     }));
   });
   _defineProperty(this, "renderClient", function () {

package/package.json

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