@kmkf-fe-packages/services-components 2.0.19-beta.39 → 2.0.19-beta.40

package/dist/esm/components/Common/constants/columnsBaseInfoMap.js

@@ -9,18 +9,20 @@ import bs_e3 from "./bs_e3";
 import bs from "./bs";
 import wdt from "./wdt";
 import gy from "./gy";
-import { getJstColumns } from "@kmkf-fe-packages/basic-components";
+import { getJstColumns, getWlnColumns } from "@kmkf-fe-packages/basic-components";
 import defaultColumns from "./defaultColumns";
 export var getColumnsMap = function getColumnsMap(args) {
   var _ref = args || {},
     _ref$text = _ref.text,
     text = _ref$text === void 0 ? "" : _ref$text;
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, system()), bs({
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, system()), bs({
     text: text
   })), bs_e3()), wdt({
     text: text
   })), gy()), getJstColumns({
     disabled: true
+  })), getWlnColumns({
+    text: text
   })), {}, {
     default: defaultColumns({
       text: text

package/dist/esm/components/Common/constants/wdt.js

@@ -55,10 +55,13 @@ var getColumns = function getColumns(_ref) {
       }
     }, {
       dataIndex: "orderPrice",
-      title: "\u5B9E\u4ED8\u603B\u91D1\u989D",
+      title: "\u6210\u4EA4\u603B\u91D1\u989D",
       align: "center",
       ellipsis: true,
-      width: 100
+      width: 100,
+      render: function render(val, record) {
+        return (record.num || record.num === 0) && (val || val === 0) ? val * record.num : null;
+      }
     }, {
       dataIndex: "num",
       title: "".concat(text, "\u6570\u91CF"),

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

@@ -69,9 +69,17 @@ var GoodHeaderMap = {
       },
       orderPrice: {
         component: BsHeaderChild,
-        name: "实付总金额",
+        name: "成交总金额",
         key: "orderPrice",
-        width: 100
+        width: 100,
+        transformValue: function transformValue(val, record, parentName) {
+          var num = record["".concat(parentName, "_num")];
+          return (num || num === 0) && (val || val === 0) ? val * num : null;
+        },
+        renderExport: function renderExport(val, record, parentName) {
+          var num = record["".concat(parentName, "_num")];
+          return (num || num === 0) && (val || val === 0) ? val * num : null;
+        }
       },
       num: {
         component: BsHeaderChild,
@@ -99,7 +107,7 @@ var GoodHeaderMap = {
       specId: "SKUID",
       specNo: "商品SKU编码",
       specName: "商品SKU名称",
-      orderPrice: "实付总金额",
+      orderPrice: "成交总金额",
       num: "数量",
       sharePrice: "分摊价",
       giftType: "赠品方式"
@@ -1068,6 +1076,81 @@ var GoodHeaderMap = {
       remark: "备注"
     },
     moneyKey: "salePrice"
+  },
+  WLN_GOODS: {
+    headerMap: {
+      wlnItemName: {
+        name: '商品名称',
+        width: 250
+      },
+      goodsCode: {
+        name: '商品编码',
+        width: 250
+      },
+      skuCode: {
+        name: 'sku编码',
+        width: 250
+      },
+      skuName: {
+        name: '线上sku名称',
+        width: 250
+      },
+      olnSkuCode: {
+        name: '线上sku编码',
+        width: 150
+      },
+      sku: {
+        name: '线上sku id',
+        width: 150
+      },
+      name: {
+        name: '线上商品名称',
+        width: 250
+      },
+      pic: {
+        name: '线上图片',
+        width: 100,
+        component: BsHeaderPic
+      },
+      olnItemCOde: {
+        name: '线上商品编码',
+        width: 150
+      },
+      code: {
+        name: '线上商品id',
+        width: 150
+      },
+      barCode: {
+        name: '商品条码',
+        width: 150
+      },
+      money: {
+        name: '实付金额',
+        width: 100
+      },
+      number: {
+        name: '数量',
+        width: 100
+      },
+      share: '应收款',
+      type: {
+        name: '赠品类型',
+        width: 100
+      },
+      isPackage: {
+        width: 100,
+        name: "是否组合商品",
+        transformValue: function transformValue(val) {
+          if (isNull(val)) return '--';
+          return val ? '是' : '否';
+        },
+        renderExport: function renderExport(val) {
+          if (isNull(val)) return '--';
+          return val ? '是' : '否';
+        }
+      }
+    },
+    moneyKey: "money"
   }
 };
 GoodHeaderMap["WDT_REISSUE_GOODS"] = GoodHeaderMap["WDT_GOODS"];

package/dist/esm/components/WLN/WlnGoods/index.d.ts

@@ -1,6 +1,6 @@
 import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../../type";
 import React from "react";
-import { BsHeaderGood } from "../../BS/common/index";
+import CommonHeaderGoods from "../../CommonHeaderGood";
 declare class WlnGoods implements ComponentInterface {
     name: string;
     id: string;
@@ -14,7 +14,7 @@ declare class WlnGoods implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
-    wlnGoods: BsHeaderGood;
+    wlnGoods: CommonHeaderGoods;
     constructor(options: PickOption);
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: () => null;

package/dist/esm/components/WLN/WlnGoods/index.js

@@ -11,7 +11,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import React from "react";
 import GetFormItem from "../../GetFormItem";
 import { BsGoodsTable } from "../../Common";
-import { BsHeaderGood } from "../../BS/common/index";
+import CommonHeaderGoods from "../../CommonHeaderGood";
 import ItemView from "../../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { WlnGoods as Goods } from "@kmkf-fe-packages/basic-components";
@@ -102,7 +102,7 @@ var WlnGoods = /*#__PURE__*/_createClass(function WlnGoods(options) {
   this.effects = options === null || options === void 0 ? void 0 : options.effects;
   this.isCombinationComponent = true;
   this.canSort = false;
-  this.wlnGoods = new BsHeaderGood(_objectSpread(_objectSpread({}, options), {}, {
+  this.wlnGoods = new CommonHeaderGoods(_objectSpread(_objectSpread({}, options), {}, {
     id: "".concat(options.id, "_wlnGoods"),
     name: "商品信息"
   }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "2.0.19-beta.39",
+  "version": "2.0.19-beta.40",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,7 +21,7 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "2.0.19-beta.39",
+    "@kmkf-fe-packages/basic-components": "2.0.19-beta.40",
     "@kmkf-fe-packages/kmkf-utils": "2.0.19-beta.39",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4f75174b75bae6b588f989301fcc7556a75fca73",
+  "gitHead": "ece6d4949ec9a05a80bfd43f219791bca2a86b03",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }