@kmkf-fe-packages/services-components 1.22.1-beta.60 → 1.22.1-beta.62

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

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

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

@@ -42,6 +42,7 @@ var Global = function Global(_ref) {
               queryAllLogisticsCompany: queryAllLogisticsCompany,
               queryLabel: queryLabel,
               queryWdtAddressData: servers.queryWdtAddressData,
+              queryGyAddressData: servers.queryGyAddressData,
               queryWdtLogisticsCompany: queryWdtLogisticsCompany,
               queryBsE3LogisticsCompany: queryBsE3LogisticsCompany,
               querySendData: querySendData,

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

@@ -267,8 +267,9 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
     return SendDataCenter.getInstance(platformType).getSendNameByCode(item.sendName);
   };
   return list !== null && list !== void 0 && list.length ? (list || []).map(function (item, index) {
-    var logisticsCompany = item.logisticsCompany;
-    var company = ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany);
+    var logisticsCompany = item.logisticsCompany,
+      logisticsCompanyName = item.logisticsCompanyName;
+    var company = platformType === "gy" ? logisticsCompanyName : ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany);
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
       content: content(item, index),
       overlayStyle: {

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

@@ -13,7 +13,7 @@ import { ApaasPosting } from "@kmkf-fe-packages/basic-components";
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
-import { AddressData, BsAddressData, WdtAddressData } from "@kmkf-fe-packages/kmkf-utils";
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData } from "@kmkf-fe-packages/kmkf-utils";
 import Province from "../BS/BsPosting/components/Province";
 import City from "../BS/BsPosting/components//City";
 import District from "../BS/BsPosting/components//District";
@@ -191,6 +191,7 @@ var BasicPosting = /*#__PURE__*/_createClass(function BasicPosting(options) {
   var showField = (_options$componentCon2 = options.componentConfig) === null || _options$componentCon2 === void 0 ? void 0 : _options$componentCon2.showField;
   this.addressDateInstance = (showField && {
     bs: BsAddressData,
+    gy: GyAddressData,
     wdt: WdtAddressData,
     workOrder: AddressData
   }[showField] || AddressData).getInstance();

package/dist/esm/components/Reissue/Logistics/index.d.ts

@@ -30,6 +30,15 @@ declare class Logistics implements ComponentInterface {
     renderExport: (value: any, record: any) => any;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => ({
+        searchDefaultConditions: "in";
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
+        formatFilterValue: (input: string) => string | string[];
+        props?: undefined;
+    } | {
         searchDefaultConditions: "in";
         type: string;
         id: string;
@@ -40,15 +49,6 @@ declare class Logistics implements ComponentInterface {
         };
         filterFn: (value: string) => (i: Record) => any;
         formatFilterValue?: undefined;
-    } | {
-        searchDefaultConditions: "in";
-        type: string;
-        id: string;
-        name: string;
-        filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => boolean;
-        formatFilterValue: (input: string) => string | string[];
-        props?: undefined;
     } | {
         searchDefaultConditions: "like";
         type: string;
@@ -56,8 +56,8 @@ declare class Logistics implements ComponentInterface {
         name: string;
         filterComponentType: "Input";
         filterFn: (value: string) => (i: Record) => boolean;
-        props?: undefined;
         formatFilterValue?: undefined;
+        props?: undefined;
     })[];
 }
 export default Logistics;

package/dist/esm/components/Reissue/Logistics/index.js

@@ -16,10 +16,18 @@ import ItemView from "../../../commonComponents/ItemView";
 import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
 import { SYMBOL, batchInput } from "../../../constant";
 var typeMap = {
+  JST_LOGISTICS: {
+    key: "jstItemList",
+    name: "jst",
+    company: "logisticsCompany",
+    companyName: "logisticsCompanyName",
+    code: "logisticsCode"
+  },
   REISSUE_LOGISTICS: {
     key: "reissueLogisticsList",
     name: "reissue",
     company: "reissueLogisticsCompany",
+    companyName: "reissueLogisticsCompanyName",
     code: "reissueLogisticsCode"
   }
 };
@@ -27,9 +35,9 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(_options) {
   var _this = this,
     _typeMap$_options$typ,
     _typeMap$_options$typ2,
-    _this$componentConfig8,
     _this$componentConfig9,
-    _this$componentConfig10;
+    _this$componentConfig11,
+    _this$componentConfig12;
   _classCallCheck(this, Logistics);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
@@ -124,11 +132,26 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(_options) {
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
-    var _typeMap$_this$type5, _typeMap$_this$type6, _typeMap$_this$type7;
-    return [{
+    var _this$componentConfig8, _typeMap$_this$type5, _typeMap$_this$type6, _typeMap$_this$type7, _typeMap$_this$type8;
+    var logisticsType = ((_this$componentConfig8 = _this.componentConfig) === null || _this$componentConfig8 === void 0 ? void 0 : _this$componentConfig8.logistics) === 'gy' ? 'input' : 'select';
+    return [logisticsType === "input" ? {
+      searchDefaultConditions: SYMBOL.in,
+      type: item.type,
+      id: "".concat(item.id, "_").concat((_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.companyName),
+      name: "".concat(_this.name, "\u7269\u6D41\u516C\u53F8"),
+      filterComponentType: "Input",
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, "logisticsCode"), value);
+        };
+      },
+      formatFilterValue: function formatFilterValue(input) {
+        return batchInput(input);
+      }
+    } : {
       searchDefaultConditions: SYMBOL.in,
       type: item.type,
-      id: "".concat(item.id, "_").concat((_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.company),
+      id: "".concat(item.id, "_").concat((_typeMap$_this$type6 = typeMap[_this.type]) === null || _typeMap$_this$type6 === void 0 ? void 0 : _typeMap$_this$type6.company),
       name: "".concat(_this.name, "\u7269\u6D41\u516C\u53F8"),
       filterComponentType: "MultipleSelect",
       props: {
@@ -147,7 +170,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(_options) {
     }, _this.type === "REISSUE_LOGISTICS" ? {
       searchDefaultConditions: SYMBOL.in,
       type: item.type,
-      id: "".concat(item.id, "_").concat((_typeMap$_this$type6 = typeMap[_this.type]) === null || _typeMap$_this$type6 === void 0 ? void 0 : _typeMap$_this$type6.code),
+      id: "".concat(item.id, "_").concat((_typeMap$_this$type7 = typeMap[_this.type]) === null || _typeMap$_this$type7 === void 0 ? void 0 : _typeMap$_this$type7.code),
       name: "".concat(_this.name, "\u7269\u6D41\u5355\u53F7"),
       filterComponentType: "Input",
       filterFn: function filterFn(value) {
@@ -161,7 +184,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(_options) {
     } : {
       searchDefaultConditions: SYMBOL.like,
       type: item.type,
-      id: "".concat(item.id, "_").concat((_typeMap$_this$type7 = typeMap[_this.type]) === null || _typeMap$_this$type7 === void 0 ? void 0 : _typeMap$_this$type7.code),
+      id: "".concat(item.id, "_").concat((_typeMap$_this$type8 = typeMap[_this.type]) === null || _typeMap$_this$type8 === void 0 ? void 0 : _typeMap$_this$type8.code),
       name: "".concat(_this.name, "\u7269\u6D41\u5355\u53F7"),
       filterComponentType: "Input",
       filterFn: function filterFn(value) {
@@ -181,10 +204,14 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(_options) {
   this.canSort = false;
   this.children = [];
   this.dataType = "object";
-  this.rules = (_this$componentConfig8 = this.componentConfig) !== null && _this$componentConfig8 !== void 0 && _this$componentConfig8.required ? [{
+  this.rules = (_this$componentConfig9 = this.componentConfig) !== null && _this$componentConfig9 !== void 0 && _this$componentConfig9.required ? [{
     required: true,
     validator: function validator(_, value) {
       var hasNo = (value || []).some(function (item) {
+        var _this$componentConfig10;
+        if (((_this$componentConfig10 = _this.componentConfig) === null || _this$componentConfig10 === void 0 ? void 0 : _this$componentConfig10.logistics) === 'gy') {
+          return item.logisticsCompanyName && item.logisticsCode;
+        }
         return item.logisticsCompany && item.logisticsCode;
       });
       if (!hasNo) {
@@ -194,7 +221,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(_options) {
     }
   }] : [];
   this.align = "left";
-  this.expressDateInstance = ExpressData.getInstance((_this$componentConfig9 = this.componentConfig) === null || _this$componentConfig9 === void 0 ? void 0 : _this$componentConfig9.logistics);
-  this.sortChildField = this.getSortChildFields(((_this$componentConfig10 = this.componentConfig) === null || _this$componentConfig10 === void 0 ? void 0 : _this$componentConfig10.showField) || "", _options);
+  this.expressDateInstance = ExpressData.getInstance((_this$componentConfig11 = this.componentConfig) === null || _this$componentConfig11 === void 0 ? void 0 : _this$componentConfig11.logistics);
+  this.sortChildField = this.getSortChildFields(((_this$componentConfig12 = this.componentConfig) === null || _this$componentConfig12 === void 0 ? void 0 : _this$componentConfig12.showField) || "", _options);
 });
 export default Logistics;

package/package.json

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