@kmkf-fe-packages/kmkf-utils 2.10.9-beta.56 → 2.10.9-beta.58

package/dist/esm/global.d.ts

@@ -94,6 +94,7 @@ declare enum TComponentType {
   WDT_LOGISTICS = "WDT_LOGISTICS",
   WDT_SEND_GOOD = "WDR_SEND_GOOD",
   WDT_SYSTEM_ORDER = "WDT_SYSTEM_ORDER",
+  WDT_TAGS = "WDT_TAGS",
   WDT_RETURN_GOODS = "WDT_RETURN_GOODS",
   WDT_EXCHANGE_GOODS = "WDT_EXCHANGE_GOODS",
   JST_RETURN_GOODS = "JST_RETURN_GOODS",

package/dist/esm/utils/wdtOrderBackFormValues.d.ts

@@ -76,6 +76,8 @@ export declare const WDT_ORDER_TYPE_MAP: {
 export declare const updateWdtGoodsHandle: (orders?: any[]) => any;
 export declare const updateWdtAftersaleGoodsHandle: (orders?: any[]) => any;
 export declare const filterWdtOrders: (detail: any, order_no: string) => any;
+/** Normalize flagship trade_label and enterprise tags into the form's name array. */
+export declare const getWdtOrderTags: (order: any, version?: string) => string[];
 export declare const wdtOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
 export declare const wdtOrderTransform: (detail: any, form: any) => {
     wdtSystemOrder: {
@@ -112,5 +114,6 @@ export declare const wdtOrderTransform: (detail: any, form: any) => {
     };
     wdtLogistics: any;
     wdtSendGood: any;
+    wdtTags: unknown[];
     shopCode: any;
 };

package/dist/esm/utils/wdtOrderBackFormValues.js

@@ -1,6 +1,6 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 var _excluded = ["label"],
   _excluded2 = ["label"];
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -487,6 +487,28 @@ export var filterWdtOrders = function filterWdtOrders(detail, order_no) {
   }
   return [];
 };
+var splitWdtTagValue = function splitWdtTagValue(value) {
+  if (value === undefined || value === null || value === "") return [];
+  if (Array.isArray(value)) return value.flatMap(splitWdtTagValue);
+  if (_typeof(value) === "object") {
+    var _ref4, _ref5, _ref6, _ref7, _value$tagName;
+    return splitWdtTagValue((_ref4 = (_ref5 = (_ref6 = (_ref7 = (_value$tagName = value.tagName) !== null && _value$tagName !== void 0 ? _value$tagName : value.name) !== null && _ref7 !== void 0 ? _ref7 : value.label) !== null && _ref6 !== void 0 ? _ref6 : value.tag_name) !== null && _ref5 !== void 0 ? _ref5 : value.id) !== null && _ref4 !== void 0 ? _ref4 : value.tagId);
+  }
+  return String(value).split(/[\u002c\uFF0C\u3001]/).map(function (item) {
+    return item.trim();
+  }).filter(Boolean);
+};
+
+/** Normalize flagship trade_label and enterprise tags into the form's name array. */
+export var getWdtOrderTags = function getWdtOrderTags(order, version) {
+  var candidates = version === "enterprise" ? [order === null || order === void 0 ? void 0 : order.trade_label, order === null || order === void 0 ? void 0 : order.tradeLabel, order === null || order === void 0 ? void 0 : order.tagNames, order === null || order === void 0 ? void 0 : order.tagName, order === null || order === void 0 ? void 0 : order.tags] : [order === null || order === void 0 ? void 0 : order.trade_label, order === null || order === void 0 ? void 0 : order.tradeLabel, order === null || order === void 0 ? void 0 : order.tagName, order === null || order === void 0 ? void 0 : order.tagNames, order === null || order === void 0 ? void 0 : order.tags];
+  for (var _i = 0, _candidates = candidates; _i < _candidates.length; _i++) {
+    var candidate = _candidates[_i];
+    var tags = splitWdtTagValue(candidate);
+    if (tags.length) return _toConsumableArray(new Set(tags));
+  }
+  return [];
+};
 export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
   var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -520,6 +542,9 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
       case "WDT_SEND_GOOD":
         prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wdtSendGood;
         break;
+      case "WDT_TAGS":
+        prv[uniqueKey] = (detail === null || detail === void 0 ? void 0 : detail.wdtTags) || [];
+        break;
       case "WDT_SHOP":
         prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.shopCode;
         break;
@@ -586,7 +611,9 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
     allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
     _detail$wdtReturnOrde = detail.wdtReturnOrders,
     wdtReturnOrders = _detail$wdtReturnOrde === void 0 ? [] : _detail$wdtReturnOrde,
-    matchLogisticsNo = detail.matchLogisticsNo;
+    matchLogisticsNo = detail.matchLogisticsNo,
+    version = detail.version,
+    explicitlySelectedRows = detail.selectedRows;
   var wdtGoodsCom = (componentList || []).find(function (com) {
     return com.workOrderComponentType === "WDT_GOODS";
   });
@@ -603,10 +630,18 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
   var matchedSystemOrderIds = matchedSystemOrders.map(function (item) {
     return item.tradeNo;
   });
-  var selectedSystemOrders = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder || isReissueDefaultSelect ? defaultOrder : [];
-  var selectedRows = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder ? defaultOrder : [];
+  var selectedSystemOrders = explicitlySelectedRows ? explicitlySelectedRows : matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder || isReissueDefaultSelect ? defaultOrder : [];
+  var selectedRows = explicitlySelectedRows ? explicitlySelectedRows : matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder ? defaultOrder : [];
   var orderBackTrades = selectedSystemOrders.length ? selectedSystemOrders : currentTrades;
   var selectedSystemOrderNo = selectedSystemOrders === null || selectedSystemOrders === void 0 ? void 0 : (_selectedSystemOrders = selectedSystemOrders[0]) === null || _selectedSystemOrders === void 0 ? void 0 : _selectedSystemOrders.tradeNo;
+  var selectedSystemOrderIds = explicitlySelectedRows ? explicitlySelectedRows.map(function (item) {
+    return item.tradeNo;
+  }) : matchedSystemOrderIds.length ? matchedSystemOrderIds : onlyOneSystemOrder ? currentTrades.map(function (item) {
+    return item.tradeNo;
+  }) : [];
+  var wdtTags = selectedSystemOrders.reduce(function (tags, order) {
+    return [].concat(_toConsumableArray(tags), _toConsumableArray(getWdtOrderTags(order, version)));
+  }, []);
   return {
     wdtSystemOrder: {
       //标记通过请求获取的值
@@ -616,20 +651,16 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
         return _objectSpread(_objectSpread({}, item), {}, {
           billNo: item.tradeNo,
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-          billTag: item.tagName || item.tags,
-          // 网页版取tags，其他版本用tagName
+          billTag: getWdtOrderTags(item, version).join("、"),
           logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
         });
       }),
-      selectIds: matchedSystemOrderIds.length ? matchedSystemOrderIds : onlyOneSystemOrder ? currentTrades.map(function (item) {
-        return item.tradeNo;
-      }) : [],
+      selectIds: selectedSystemOrderIds,
       selectedRows: selectedRows.map(function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
           billNo: item.tradeNo,
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-          billTag: item.tagName || item.tags,
-          // 网页版取tags，其他版本用tagName
+          billTag: getWdtOrderTags(item, version).join("、"),
           logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
         });
       }),
@@ -637,8 +668,7 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
         return _objectSpread(_objectSpread({}, item), {}, {
           billNo: item.tradeNo,
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-          billTag: item.tagName || item.tags,
-          // 网页版取tags，其他版本用tagName
+          billTag: getWdtOrderTags(item, version).join("、"),
           logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
         });
       })
@@ -682,6 +712,7 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
     },
     wdtLogistics: updateWdtItemListHandle(orderBackTrades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
     wdtSendGood: updateWdtItemListHandle(orderBackTrades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
+    wdtTags: _toConsumableArray(new Set(wdtTags)),
     shopCode: (_orderBackTrades$ = orderBackTrades[0]) === null || _orderBackTrades$ === void 0 ? void 0 : _orderBackTrades$.shopNo
     // wdtSingingTime: detail?.receiptDate,
     // wdtSendTime:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.10.9-beta.56",
+  "version": "2.10.9-beta.58",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a2528b1360a946fde60b9affa0ab7b697e3f7cf8",
+  "gitHead": "11de08d8038366553a81351d0a8fa010678614da",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }