@kmkf-fe-packages/kmkf-utils 2.2.13-beta.31 → 2.2.13-beta.43

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

@@ -0,0 +1,10 @@
+declare type ShowHeaderObjType = {
+    title: string;
+    dataIndex: string;
+    show?: boolean;
+};
+declare const getSystemShowHead: ({ columns, showHeader, }: {
+    columns: any[];
+    showHeader: (string | ShowHeaderObjType)[];
+}) => any[];
+export default getSystemShowHead;

package/dist/esm/utils/getSystemShowHead.js

@@ -0,0 +1,25 @@
+var getSystemShowHead = function getSystemShowHead(_ref) {
+  var columns = _ref.columns,
+    showHeader = _ref.showHeader;
+  var initBaseInfoColumns = columns || [];
+  var baseInfoColumns = [];
+  var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === "string";
+  var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === "[object Object]";
+  if (isStringArray) {
+    baseInfoColumns = initBaseInfoColumns.filter(function (col) {
+      return showHeader.includes(col.dataIndex);
+    });
+  } else if (isObjectArray) {
+    baseInfoColumns = showHeader.map(function (col) {
+      var currentCol = initBaseInfoColumns.find(function (item) {
+        return item.dataIndex === col.dataIndex;
+      }); // 如果列应该显示（show不为false），则返回对应的列配置
+      if (currentCol && col.show !== false) {
+        return currentCol;
+      }
+      return undefined;
+    }).filter(Boolean);
+  }
+  return baseInfoColumns || [];
+};
+export default getSystemShowHead;

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

@@ -27,3 +27,4 @@ export * as templateFn from "./template";
 export * as tree from "./multidimensionalFindChild";
 export { default as unTransField } from "./unTransField";
 export { fetchAll } from "./FetchAll";
+export { default as getSystemShowHead } from "./getSystemShowHead";

package/dist/esm/utils/index.js

@@ -30,4 +30,5 @@ export { _templateFn as templateFn };
 import * as _tree from "./multidimensionalFindChild";
 export { _tree as tree };
 export { default as unTransField } from "./unTransField";
-export { fetchAll } from "./FetchAll";
+export { fetchAll } from "./FetchAll";
+export { default as getSystemShowHead } from "./getSystemShowHead";

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

@@ -9,8 +9,8 @@ export declare const updateSkxGoodsHandle: (orders?: any[]) => {
     uuid: any;
 }[];
 export declare const skxOrderTransform: (detail: any, form: any) => {
-    shopId: any;
-    shopName: any;
+    shopUniqueKey: any;
+    erpShopName: any;
     onBillNo: any;
     skxGoods: {
         allGoods: {

package/dist/esm/utils/skxOrderBackFormValues.js

@@ -31,9 +31,9 @@ export var skxOrderBackFormValues = function skxOrderBackFormValues() {
   var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var initValue = {};
-  if (detail !== null && detail !== void 0 && detail.shopId) {
-    initValue.shopId = detail === null || detail === void 0 ? void 0 : detail.shopId;
-    initValue.shopName = detail === null || detail === void 0 ? void 0 : detail.shopName;
+  if (detail !== null && detail !== void 0 && detail.shopUniqueKey) {
+    initValue.shopUniqueKey = detail === null || detail === void 0 ? void 0 : detail.shopUniqueKey;
+    initValue.erpShopName = detail === null || detail === void 0 ? void 0 : detail.erpShopName;
   }
   return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
     var uniqueKey = next.uniqueKey;
@@ -159,8 +159,8 @@ export var skxOrderTransform = function skxOrderTransform(detail, form) {
   var skxGoods = updateSkxGoodsHandle(allGoodsList);
   var data = onlyOne ? trades[0] : {};
   return {
-    shopId: trades === null || trades === void 0 ? void 0 : (_trades$ = trades[0]) === null || _trades$ === void 0 ? void 0 : _trades$.shopUniqueKey,
-    shopName: trades === null || trades === void 0 ? void 0 : (_trades$2 = trades[0]) === null || _trades$2 === void 0 ? void 0 : _trades$2.shopTitle,
+    shopUniqueKey: trades === null || trades === void 0 ? void 0 : (_trades$ = trades[0]) === null || _trades$ === void 0 ? void 0 : _trades$.shopUniqueKey,
+    erpShopName: trades === null || trades === void 0 ? void 0 : (_trades$2 = trades[0]) === null || _trades$2 === void 0 ? void 0 : _trades$2.shopTitle,
     onBillNo: data === null || data === void 0 ? void 0 : data.onBillNo,
     skxGoods: {
       allGoods: skxGoods,

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

@@ -3,11 +3,17 @@ export declare const WDT_SYSTEM_ORDER_CONFIG: {
     key: string;
     name: string;
     selectId: string;
-    columns: {
+    columns: ({
         title: string;
         dataIndex: string;
         width: number;
-    }[];
+        ellipsis: boolean;
+    } | {
+        title: string;
+        dataIndex: string;
+        width: number;
+        ellipsis?: undefined;
+    })[];
 };
 export declare const WDT_ORDER_TYPE_MAP: {
     1: string;

package/dist/esm/utils/wdtOrderBackFormValues.js

@@ -72,19 +72,52 @@ export var WDT_SYSTEM_ORDER_CONFIG = {
   columns: [{
     title: "订单类型",
     dataIndex: "billType",
-    width: 150
+    width: 150,
+    ellipsis: true
   }, {
     title: "系统订单号",
     dataIndex: "billNo",
-    width: 150
+    width: 150,
+    ellipsis: true
   }, {
     title: "订单状态",
     dataIndex: "tradeStatusValue",
-    width: 150
+    width: 150,
+    ellipsis: true
   }, {
     title: "订单标签",
     dataIndex: "billTag",
     width: 150
+  }, {
+    title: "物流公司名称",
+    dataIndex: "logisticsName",
+    width: 150,
+    ellipsis: true
+  }, {
+    title: "物流公司名称",
+    dataIndex: "logisticsName",
+    width: 200,
+    ellipsis: true
+  }, {
+    title: "物流公司编码",
+    dataIndex: "logisticsCode",
+    width: 200,
+    ellipsis: true
+  }, {
+    title: "物流单号",
+    dataIndex: "logisticsNo",
+    width: 200,
+    ellipsis: true
+  }, {
+    title: "发货仓名称",
+    dataIndex: "warehouseName",
+    width: 200,
+    ellipsis: true
+  }, {
+    title: "发货仓编码",
+    dataIndex: "warehouseNo",
+    width: 200,
+    ellipsis: true
   }]
 };
 export var WDT_ORDER_TYPE_MAP = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.2.13-beta.31",
+  "version": "2.2.13-beta.43",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "95ce877aed30ef604316f40df926437dfc42d7a9",
+  "gitHead": "f67ba14c08ec0295f39da3b56255a5f37eac1788",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }