@kmkf-fe-packages/services-components 2.10.9-beta.3 → 2.10.9-beta.31

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

@@ -21,7 +21,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, GY_SYSTEM_ORDER_CONFIG, BS_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
+import { KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, BS_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, TTX_SYSTEM_ORDER_CONFIG, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
 import { getColumnsMap } from "./constants/columnsBaseInfoMap";
 import { VideoCameraTwoTone } from "@ant-design/icons";
 import { ApaasImage } from "@kmkf-fe-packages/basic-components";
@@ -309,6 +309,7 @@ export var BsExpressRender = function BsExpressRender(_ref7) {
     var logisticsCompany = item.logisticsCompany,
       logisticsCompanyName = item.logisticsCompanyName;
     var company = logisticsCompanyFormType === "input" ? logisticsCompany : ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany, false) || logisticsCompanyName || logisticsCompany;
+    console.log("00001--", [platformType, logisticsCompany, ExpressData.getInstance(platformType), ExpressData.getInstance(platformType).getExpressNameByCode(logisticsCompany, false) || logisticsCompanyName || logisticsCompany]);
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
       content: content(item, index),
       overlayStyle: {
@@ -788,7 +789,8 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
     JKY_SYSTEM_ORDER: JKY_SYSTEM_ORDER_CONFIG.columns,
     WDT_RETURN_BILL_NO: WDT_RETURN_BILL_NO_CONFIG.columns,
     PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns,
-    DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns
+    DXD_SYSTEM_ORDER: DXD_SYSTEM_ORDER_CONFIG.columns,
+    TTX_SYSTEM_ORDER: TTX_SYSTEM_ORDER_CONFIG.columns
   };
   var rowKeyMap = {
     BS_SYSTEM_ORDER: "billNo",
@@ -802,7 +804,8 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref14) {
     JKY_SYSTEM_ORDER: "tradeNo",
     WDT_RETURN_BILL_NO: "refundNo",
     PLATFORM_AFTER_SALES_ORDER: "afterSaleOrderId",
-    DXD_SYSTEM_ORDER: "orderNo"
+    DXD_SYSTEM_ORDER: "orderNo",
+    TTX_SYSTEM_ORDER: "code"
   };
   var rowSelection = {
     type: isRadio ? "radio" : "checkbox",

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

@@ -19,7 +19,11 @@ import { isNull, BS_E3_BOOLEAN_STATUS_MAP } from "@kmkf-fe-packages/kmkf-utils";
 import { BsHeaderPic, BsHeaderChild } from "../BS/common";
 import ReissueGift from "../BsE3/ReissueGift";
 import { erpColumnsMap } from "@kmkf-fe-packages/basic-components";
-import { getJstColumns, getKmColumns, getDxdColumns } from "@kmkf-fe-packages/basic-components";
+import { getJstColumns, getKmColumns, getDxdColumns, getTtxColumns } from "@kmkf-fe-packages/basic-components";
+var isNullNotFalse = function isNullNotFalse(val) {
+  if (val === false) return false;
+  return isNull(val);
+};
 var orderGoodsHeaderComponentMap = {
   pic: BsHeaderPic
 };
@@ -1188,19 +1192,19 @@ var GoodHeaderMap = {
       saleBasePrice: {
         name: "原价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         }
       },
       salePrice: {
         name: "单价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         }
       },
       qty: "数量",
@@ -1209,12 +1213,12 @@ var GoodHeaderMap = {
         transformValue: function transformValue(val, record, parentName) {
           if (!record) return "--";
           var amount = (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
-          return Number(amount).toFixed(4).replace(/\.?0+$/, '');
+          return Number(amount).toFixed(4).replace(/\.?0+$/, "");
         },
         renderExport: function renderExport(val, record, parentName) {
           if (!record) return "--";
           var amount = (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
-          return Number(amount).toFixed(4).replace(/\.?0+$/, '');
+          return Number(amount).toFixed(4).replace(/\.?0+$/, "");
         }
       },
       batchId: "批次号",
@@ -1260,19 +1264,19 @@ var GoodHeaderMap = {
       saleBasePrice: {
         name: "原价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         }
       },
       salePrice: {
         name: "单价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         }
       },
       qty: "数量",
@@ -1302,19 +1306,19 @@ var GoodHeaderMap = {
       saleBasePrice: {
         name: "原价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         }
       },
       salePrice: {
         name: "单价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         }
       },
       qty: "数量",
@@ -1323,12 +1327,12 @@ var GoodHeaderMap = {
         transformValue: function transformValue(val, record, parentName) {
           if (!record) return "--";
           var amount = (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
-          return Number(amount).toFixed(4).replace(/\.?0+$/, '');
+          return Number(amount).toFixed(4).replace(/\.?0+$/, "");
         },
         renderExport: function renderExport(val, record, parentName) {
           if (!record) return "--";
           var amount = (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
-          return Number(amount).toFixed(4).replace(/\.?0+$/, '');
+          return Number(amount).toFixed(4).replace(/\.?0+$/, "");
         }
       },
       batchId: "批次号",
@@ -1359,19 +1363,19 @@ var GoodHeaderMap = {
       saleBasePrice: {
         name: "原价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         }
       },
       salePrice: {
         name: "单价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : "";
+          return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, "") : "";
         }
       },
       qty: "数量",
@@ -1380,12 +1384,12 @@ var GoodHeaderMap = {
         transformValue: function transformValue(val, record, parentName) {
           if (!record) return "--";
           var amount = (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
-          return Number(amount).toFixed(4).replace(/\.?0+$/, '');
+          return Number(amount).toFixed(4).replace(/\.?0+$/, "");
         },
         renderExport: function renderExport(val, record, parentName) {
           if (!record) return "--";
           var amount = (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
-          return Number(amount).toFixed(4).replace(/\.?0+$/, '');
+          return Number(amount).toFixed(4).replace(/\.?0+$/, "");
         }
       },
       isGift: {
@@ -1473,11 +1477,11 @@ var GoodHeaderMap = {
         name: "赠品类型",
         width: 100,
         transformValue: function transformValue(val) {
-          if (isNull(val)) return "--";
+          if (isNullNotFalse(val)) return "--";
           return val ? "赠品" : "非赠品";
         },
         renderExport: function renderExport(val) {
-          if (isNull(val)) return "--";
+          if (isNullNotFalse(val)) return "--";
           return val ? "赠品" : "非赠品";
         }
       },
@@ -1485,11 +1489,11 @@ var GoodHeaderMap = {
         width: 200,
         name: "是否组合商品",
         transformValue: function transformValue(val) {
-          if (isNull(val)) return "--";
+          if (isNullNotFalse(val)) return "--";
           return val ? "是" : "否";
         },
         renderExport: function renderExport(val) {
-          if (isNull(val)) return "--";
+          if (isNullNotFalse(val)) return "--";
           return val ? "是" : "否";
         }
       },
@@ -1497,11 +1501,11 @@ var GoodHeaderMap = {
         width: 100,
         name: "是否退款",
         transformValue: function transformValue(val) {
-          if (isNull(val)) return "--";
+          if (isNullNotFalse(val)) return "--";
           return val ? "是" : "否";
         },
         renderExport: function renderExport(val) {
-          if (isNull(val)) return "--";
+          if (isNullNotFalse(val)) return "--";
           return val ? "是" : "否";
         }
       },
@@ -1587,11 +1591,11 @@ var GoodHeaderMap = {
         name: "赠品类型",
         width: 100,
         transformValue: function transformValue(val) {
-          if (isNull(val)) return "--";
+          if (isNullNotFalse(val)) return "--";
           return val ? "赠品" : "非赠品";
         },
         renderExport: function renderExport(val) {
-          if (isNull(val)) return "--";
+          if (isNullNotFalse(val)) return "--";
           return val ? "赠品" : "非赠品";
         }
       },
@@ -1599,11 +1603,11 @@ var GoodHeaderMap = {
         width: 200,
         name: "是否组合商品",
         transformValue: function transformValue(val) {
-          if (isNull(val)) return "--";
+          if (isNullNotFalse(val)) return "--";
           return val ? "是" : "否";
         },
         renderExport: function renderExport(val) {
-          if (isNull(val)) return "--";
+          if (isNullNotFalse(val)) return "--";
           return val ? "是" : "否";
         }
       },
@@ -1611,11 +1615,11 @@ var GoodHeaderMap = {
         width: 100,
         name: "是否退款",
         transformValue: function transformValue(val) {
-          if (isNull(val)) return "--";
+          if (isNullNotFalse(val)) return "--";
           return val ? "是" : "否";
         },
         renderExport: function renderExport(val) {
-          if (isNull(val)) return "--";
+          if (isNullNotFalse(val)) return "--";
           return val ? "是" : "否";
         }
       },
@@ -2594,6 +2598,21 @@ var GoodHeaderMap = {
       return acc;
     }, {})
   },
+  TTX_GOODS: {
+    headerMap: getTtxColumns()["TTX_GOODS"].reduce(function (acc, item) {
+      acc[item.dataIndex] = _objectSpread(_objectSpread({}, item.headerMapping || {}), {}, {
+        component: orderGoodsHeaderComponentMap[item.headerComponentType] || BsHeaderChild,
+        name: item.title,
+        key: item.dataIndex,
+        width: item.width || 150
+      });
+      return acc;
+    }, {}),
+    itemKey: getTtxColumns()["TTX_GOODS"].reduce(function (acc, item) {
+      acc[item.dataIndex] = item.title;
+      return acc;
+    }, {})
+  },
   JKY_REISSUE_GOODS: {
     headerMap: {
       goodsNo: {

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

@@ -14,7 +14,10 @@ declare class CommonMultiStatus implements ComponentInterface {
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
     isSingleValue: boolean;
-    constructor(options: PickOption);
+    ext?: {
+        [key: string]: any;
+    };
+    constructor(options: PickOption, ext?: {});
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: (value: any, record: Record) => React.JSX.Element;
     renderLog: (r: Record) => React.JSX.Element | null;

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

@@ -134,6 +134,29 @@ var typeMap = {
     failValue: "失败",
     dataType: "array_object"
   },
+  DXD_WAREHOUSING_STATUS: {
+    options: [{
+      value: "1",
+      label: "已入库",
+      color: "#52c41a"
+    }, {
+      value: "2",
+      label: "未入库",
+      color: "#ff4d4f"
+    }, {
+      value: "3",
+      label: "查无此单",
+      color: "#e7780f"
+    }],
+    key: "dxdInStockStatusItemList",
+    code: "dxdInStockStatusList",
+    name: "商品入库状态",
+    type: 2,
+    valueKey: "status",
+    idKey: "systemOrderId",
+    failValue: "失败",
+    dataType: "array_object"
+  },
   WLN_WAREHOUSING_STATUS: {
     options: [{
       value: "1",
@@ -219,6 +242,33 @@ var typeMap = {
     failValue: "失败",
     dataType: "array_object"
   },
+  TTX_WAREHOUSING_STATUS: {
+    options: [{
+      value: "1",
+      label: "未入库",
+      color: "#ff4d4f"
+    }, {
+      value: "2",
+      label: "部分入库",
+      color: "#e7780f"
+    }, {
+      value: "3",
+      label: "已入库",
+      color: "#52c41a"
+    }, {
+      label: "已入库-多收",
+      value: "4",
+      color: "#e7780f"
+    }],
+    key: "ttxInStockStatusItemList",
+    code: "ttxInStockStatusList",
+    name: "通天晓商品入库状态",
+    type: 2,
+    valueKey: "status",
+    idKey: "sourceTradeNo",
+    failValue: "失败",
+    dataType: "array_object"
+  },
   KM_WAREHOUSING_STATUS: {
     options: [{
       value: "0",
@@ -250,7 +300,9 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
     _typeMap$options$type3,
     _typeMap$options$type4,
     _this$componentConfig5,
-    _this$componentConfig6;
+    _this$componentConfig6,
+    _this$ext4;
+  var ext = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   _classCallCheck(this, CommonMultiStatus);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
@@ -265,6 +317,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "isSingleValue", void 0);
+  _defineProperty(this, "ext", void 0);
   _defineProperty(this, "renderClient", function (record) {
     var _typeMap$_this$type, _typeMap$_this$type2, _typeMap$_this$type3, _typeMap$_this$type4;
     var isShow = Array.isArray(record === null || record === void 0 ? void 0 : record[_this.id]) ? some(record === null || record === void 0 ? void 0 : record[_this.id], function (item) {
@@ -343,13 +396,13 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
-    var _typeMap$_this$type21, _item$templateConfig;
+    var _this$ext, _typeMap$_this$type21, _this$ext2, _item$templateConfig, _this$ext3;
     return {
-      searchDefaultConditions: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "WLN_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS", "JST_WAREHOUSING_STATUS", "KM_WAREHOUSING_STATUS"].includes(_this.type) ? SYMBOL.in : SYMBOL.like,
+      searchDefaultConditions: (_this$ext = _this.ext) !== null && _this$ext !== void 0 && _this$ext.isWarehousingStatus ? SYMBOL.in : SYMBOL.like,
       type: item.type,
       id: "".concat(item.id, "_").concat((_typeMap$_this$type21 = typeMap[_this.type]) === null || _typeMap$_this$type21 === void 0 ? void 0 : _typeMap$_this$type21.code),
       name: "".concat(_this.name),
-      filterComponentType: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "WLN_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS", "JST_WAREHOUSING_STATUS", "KM_WAREHOUSING_STATUS"].includes(_this.type) ? "MultipleSelect" : "SelectInput",
+      filterComponentType: (_this$ext2 = _this.ext) !== null && _this$ext2 !== void 0 && _this$ext2.isWarehousingStatus ? "MultipleSelect" : "SelectInput",
       props: {
         options: item === null || item === void 0 ? void 0 : (_item$templateConfig = item.templateConfig) === null || _item$templateConfig === void 0 ? void 0 : _item$templateConfig.reasonList,
         fieldNames: {
@@ -364,7 +417,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
           return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type22 = typeMap[_this.type]) === null || _typeMap$_this$type22 === void 0 ? void 0 : _typeMap$_this$type22.code), value);
         };
       },
-      formatFilterValue: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "WLN_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS", "JST_WAREHOUSING_STATUS", "KM_WAREHOUSING_STATUS"].includes(_this.type) ? null : function (value) {
+      formatFilterValue: (_this$ext3 = _this.ext) !== null && _this$ext3 !== void 0 && _this$ext3.isWarehousingStatus ? null : function (value) {
         if (value.type === "in") {
           return value.keywords;
         } else {
@@ -384,6 +437,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
   this.isCombinationComponent = false;
   this.canSort = false;
   this.children = [];
+  this.ext = ext;
   this.dataType = (_typeMap$options$type3 = (_typeMap$options$type4 = typeMap[options.type]) === null || _typeMap$options$type4 === void 0 ? void 0 : _typeMap$options$type4.dataType) !== null && _typeMap$options$type3 !== void 0 ? _typeMap$options$type3 : "object";
   this.rules = (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
     required: true,
@@ -400,6 +454,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
     }
   }] : [];
   this.align = "left";
-  this.isSingleValue = ((_this$componentConfig6 = this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.belongType) === "wdt" || this.type === "BS_E3_WAREHOUSING_STATUS" || this.type === "WDT_WAREHOUSING_STATUS" || this.type === "WLN_WAREHOUSING_STATUS" || this.type === "JST_WAREHOUSING_STATUS" || this.type === "JKY_WAREHOUSING_STATUS";
+  //优化写法，this.type !== "WAREHOUSING_STATUS"不修改原有逻辑
+  this.isSingleValue = ((_this$componentConfig6 = this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.belongType) === "wdt" || ((_this$ext4 = this.ext) === null || _this$ext4 === void 0 ? void 0 : _this$ext4.isWarehousingStatus) && this.type !== "WAREHOUSING_STATUS";
 });
 export default CommonMultiStatus;

package/dist/esm/components/GY/GyGoods/index.d.ts

@@ -14,8 +14,15 @@ declare class GyGoods implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
+    sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
     gyGoods: CommonHeaderGoods;
     constructor(options: PickOption);
+    getSortChildFields: () => {
+        name: any;
+        key: string;
+        dataType: string;
+        conditionOptionsSetting: any;
+    }[];
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: () => null;
     renderLog: (r: Record) => React.JSX.Element | null;

package/dist/esm/components/GY/GyGoods/index.js

@@ -17,6 +17,7 @@ import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { CommonGoods as Goods } from "@kmkf-fe-packages/basic-components";
 import { SYMBOL } from "../../../constant";
 import { useGoodsSourceFormat } from "../../../Hooks";
+import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
 var GyGoods = /*#__PURE__*/_createClass(function GyGoods(options) {
   var _this = this,
     _this$componentConfig6;
@@ -33,7 +34,11 @@ var GyGoods = /*#__PURE__*/_createClass(function GyGoods(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "gyGoods", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    return getGoodsSortChildFields(_this.type, _this.id);
+  });
   _defineProperty(this, "renderClient", function (record) {
     var _record, _this$componentConfig;
     return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ItemView, {
@@ -123,5 +128,6 @@ var GyGoods = /*#__PURE__*/_createClass(function GyGoods(options) {
     }
   }] : [];
   this.dataType = "object";
+  this.sortChildField = this.getSortChildFields();
 });
 export default GyGoods;

package/dist/esm/components/GY/GyReissue/index.d.ts

@@ -15,11 +15,18 @@ declare class GyReissue implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
+    sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
     bsType: BsType;
     bsMemo: BsMemo;
     systemOrderNo: SystemOrderNo;
     reissueGoods: BsHeaderGood | CommonHeaderGoods;
     constructor(options: PickOption);
+    getSortChildFields: () => {
+        name: any;
+        key: string;
+        dataType: string;
+        conditionOptionsSetting: any;
+    }[];
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: () => null;
     renderLog: (r: Record) => React.JSX.Element;

package/dist/esm/components/GY/GyReissue/index.js

@@ -18,6 +18,7 @@ import { BsGoodsTable } from "../../Common/index";
 import { BsType, BsMemo, SystemOrderNo } from "../../BS/common/index";
 import CommonHeaderGoods from "../../CommonHeaderGood";
 import { useGoodsSourceFormat } from "../../../Hooks";
+import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
 var typeMap = {
   GY_REISSUE_GOODS: {
     key: "gyReissueGoods",
@@ -56,10 +57,14 @@ var GyReissue = /*#__PURE__*/_createClass(function GyReissue(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "bsType", void 0);
   _defineProperty(this, "bsMemo", void 0);
   _defineProperty(this, "systemOrderNo", void 0);
   _defineProperty(this, "reissueGoods", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    return getGoodsSortChildFields(_this.type, _this.id);
+  });
   _defineProperty(this, "renderClient", function (record) {
     var _record, _typeMap$_this$type, _record2, _typeMap$_this$type2, _this$componentConfig;
     return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.bsType.renderClient(record), _this.bsMemo.renderClient(record), _this.systemOrderNo.renderClient(record), record !== null && record !== void 0 && (_record = record["".concat(_this.id)]) !== null && _record !== void 0 && _record[(_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.key].length ? /*#__PURE__*/React.createElement(ItemView, {
@@ -206,5 +211,6 @@ var GyReissue = /*#__PURE__*/_createClass(function GyReissue(options) {
     }
   }];
   this.dataType = "object";
+  this.sortChildField = this.getSortChildFields();
 });
 export default GyReissue;

package/dist/esm/components/GY/GyReturn/index.d.ts

@@ -15,10 +15,17 @@ declare class GyReturn implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
+    sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
     gyType: BsType;
     systemOrderNo: SystemOrderNo;
     returnGoods: BsHeaderGood | CommonHeaderGoods;
     constructor(options: PickOption);
+    getSortChildFields: () => {
+        name: any;
+        key: string;
+        dataType: string;
+        conditionOptionsSetting: any;
+    }[];
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: () => null;
     renderLog: (r: Record) => React.JSX.Element;

package/dist/esm/components/GY/GyReturn/index.js

@@ -18,6 +18,7 @@ import CommonHeaderGoods from "../../CommonHeaderGood";
 import { GyReturn as Return, erpFormValidator } from "@kmkf-fe-packages/basic-components";
 import { BsType, SystemOrderNo } from "../../BS/common/index";
 import { useGoodsSourceFormat } from "../../../Hooks";
+import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
 var typeMap = {
   GY_RETURN_GOODS: {
     key: "gyReturnGoods",
@@ -54,9 +55,13 @@ var GyReturn = /*#__PURE__*/_createClass(function GyReturn(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "gyType", void 0);
   _defineProperty(this, "systemOrderNo", void 0);
   _defineProperty(this, "returnGoods", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    return getGoodsSortChildFields(_this.type, _this.id);
+  });
   _defineProperty(this, "renderClient", function (record) {
     var _record, _typeMap$_this$type, _record2, _typeMap$_this$type2, _this$componentConfig;
     return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.gyType.renderClient(record), _this.systemOrderNo.renderClient(record), record !== null && record !== void 0 && (_record = record["".concat(_this.id)]) !== null && _record !== void 0 && _record[(_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.key].length ? /*#__PURE__*/React.createElement(ItemView, {
@@ -198,5 +203,6 @@ var GyReturn = /*#__PURE__*/_createClass(function GyReturn(options) {
     }
   }];
   this.dataType = "object";
+  this.sortChildField = this.getSortChildFields();
 });
 export default GyReturn;

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

@@ -20,13 +20,14 @@ declare class JstSendGood implements ComponentInterface {
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
     format: ComponentInterface["format"];
+    effects: ComponentInterface["effects"];
     constructor(options: PickOption);
     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;
     getComponentValue: (r: Record) => any;
-    renderExport: (value: any, record: any) => any;
+    renderExport: (value: any, record: any) => string;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => ({
         searchDefaultConditions: "in";