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

package/dist/index.esm.js

@@ -13801,7 +13801,10 @@ var getColumns$2 = function getColumns(_ref) {
       width: 250
     }, {
       dataIndex: 'orderPrice',
-      title: "\u5B9E\u4ED8\u603B\u91D1\u989D",
+      title: "\u6210\u4EA4\u603B\u91D1\u989D",
+      render: function render(val, record) {
+        return (record.num || record.num === 0) && (val || val === 0) ? val * record.num : null;
+      },
       width: 200
     }, {
       dataIndex: 'num',
@@ -13856,10 +13859,13 @@ var getColumns$2 = function getColumns(_ref) {
       width: 250
     }, {
       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"),
@@ -14167,7 +14173,7 @@ var getColumns$3 = function getColumns(_ref) {
   return {
     //万里牛商品信息
     WLN_GOODS: [{
-      dataIndex: 'itemName',
+      dataIndex: 'wlnItemName',
       title: "\u5546\u54C1\u540D\u79F0",
       align: 'center',
       ellipsis: true,
@@ -14195,13 +14201,13 @@ var getColumns$3 = function getColumns(_ref) {
       title: "\u7EBF\u4E0Asku\u7F16\u7801",
       align: 'center',
       ellipsis: true,
-      width: 100
+      width: 150
     }, {
       dataIndex: 'sku',
       title: "\u7EBF\u4E0Asku id",
       align: 'center',
       ellipsis: true,
-      width: 100
+      width: 150
     }, {
       dataIndex: 'name',
       title: "\u7EBF\u4E0A\u5546\u54C1\u540D\u79F0",
@@ -14225,7 +14231,7 @@ var getColumns$3 = function getColumns(_ref) {
       title: "\u7EBF\u4E0A\u5546\u54C1\u7F16\u7801",
       align: 'center',
       ellipsis: true,
-      width: 100
+      width: 150
     }, {
       dataIndex: 'code',
       title: "\u7EBF\u4E0A\u5546\u54C1id",
@@ -14237,7 +14243,7 @@ var getColumns$3 = function getColumns(_ref) {
       title: "\u5546\u54C1\u6761\u7801",
       align: 'center',
       ellipsis: true,
-      width: 100
+      width: 150
     }, {
       dataIndex: 'money',
       title: "\u5B9E\u4ED8\u91D1\u989D",
@@ -14265,7 +14271,7 @@ var getColumns$3 = function getColumns(_ref) {
       }
     }, {
       dataIndex: 'share',
-      title: "\u5206\u644A\u4EF7",
+      title: "\u5E94\u6536\u6B3E",
       align: 'center',
       ellipsis: true,
       width: 70
@@ -14276,7 +14282,7 @@ var getColumns$3 = function getColumns(_ref) {
       ellipsis: true,
       width: 100
     }, {
-      dataIndex: 'package',
+      dataIndex: 'isPackage',
       title: "\u662F\u5426\u7EC4\u5408\u5546\u54C1",
       align: 'center',
       ellipsis: true,
@@ -14296,24 +14302,6 @@ var getColumns$3 = function getColumns(_ref) {
         }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
       },
       width: 100
-    }, {
-      dataIndex: 'pkgGoodsName',
-      title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 100
-    }, {
-      dataIndex: 'pkgGoodsCode',
-      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
-      width: 100
-    }, {
-      dataIndex: 'pkgGoodsId',
-      title: "\u7EC4\u5408\u5546\u54C1id",
-      align: 'center',
-      ellipsis: true,
-      width: 100
     }]
   };
 };
@@ -19861,4 +19849,4 @@ var GyReturnGoods = function GyReturnGoods(props) {
   })));
 };
 
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$1 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$2 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, getColumns$5 as getJstColumns };
+export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$1 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$2 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, getColumns$5 as getJstColumns, getColumns$3 as getWlnColumns };

package/dist/index.js

@@ -13813,7 +13813,10 @@ var getColumns$2 = function getColumns(_ref) {
       width: 250
     }, {
       dataIndex: 'orderPrice',
-      title: "\u5B9E\u4ED8\u603B\u91D1\u989D",
+      title: "\u6210\u4EA4\u603B\u91D1\u989D",
+      render: function render(val, record) {
+        return (record.num || record.num === 0) && (val || val === 0) ? val * record.num : null;
+      },
       width: 200
     }, {
       dataIndex: 'num',
@@ -13868,10 +13871,13 @@ var getColumns$2 = function getColumns(_ref) {
       width: 250
     }, {
       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"),
@@ -14179,7 +14185,7 @@ var getColumns$3 = function getColumns(_ref) {
   return {
     //万里牛商品信息
     WLN_GOODS: [{
-      dataIndex: 'itemName',
+      dataIndex: 'wlnItemName',
       title: "\u5546\u54C1\u540D\u79F0",
       align: 'center',
       ellipsis: true,
@@ -14207,13 +14213,13 @@ var getColumns$3 = function getColumns(_ref) {
       title: "\u7EBF\u4E0Asku\u7F16\u7801",
       align: 'center',
       ellipsis: true,
-      width: 100
+      width: 150
     }, {
       dataIndex: 'sku',
       title: "\u7EBF\u4E0Asku id",
       align: 'center',
       ellipsis: true,
-      width: 100
+      width: 150
     }, {
       dataIndex: 'name',
       title: "\u7EBF\u4E0A\u5546\u54C1\u540D\u79F0",
@@ -14237,7 +14243,7 @@ var getColumns$3 = function getColumns(_ref) {
       title: "\u7EBF\u4E0A\u5546\u54C1\u7F16\u7801",
       align: 'center',
       ellipsis: true,
-      width: 100
+      width: 150
     }, {
       dataIndex: 'code',
       title: "\u7EBF\u4E0A\u5546\u54C1id",
@@ -14249,7 +14255,7 @@ var getColumns$3 = function getColumns(_ref) {
       title: "\u5546\u54C1\u6761\u7801",
       align: 'center',
       ellipsis: true,
-      width: 100
+      width: 150
     }, {
       dataIndex: 'money',
       title: "\u5B9E\u4ED8\u91D1\u989D",
@@ -14277,7 +14283,7 @@ var getColumns$3 = function getColumns(_ref) {
       }
     }, {
       dataIndex: 'share',
-      title: "\u5206\u644A\u4EF7",
+      title: "\u5E94\u6536\u6B3E",
       align: 'center',
       ellipsis: true,
       width: 70
@@ -14288,7 +14294,7 @@ var getColumns$3 = function getColumns(_ref) {
       ellipsis: true,
       width: 100
     }, {
-      dataIndex: 'package',
+      dataIndex: 'isPackage',
       title: "\u662F\u5426\u7EC4\u5408\u5546\u54C1",
       align: 'center',
       ellipsis: true,
@@ -14308,24 +14314,6 @@ var getColumns$3 = function getColumns(_ref) {
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
       },
       width: 100
-    }, {
-      dataIndex: 'pkgGoodsName',
-      title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 100
-    }, {
-      dataIndex: 'pkgGoodsCode',
-      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
-      width: 100
-    }, {
-      dataIndex: 'pkgGoodsId',
-      title: "\u7EC4\u5408\u5546\u54C1id",
-      align: 'center',
-      ellipsis: true,
-      width: 100
     }]
   };
 };
@@ -19939,3 +19927,4 @@ exports.WdtReissue = wdtReissue;
 exports.WlnGoods = WlnGoods;
 exports.columnsBaseInfoMap = columnsBaseInfoMap;
 exports.getJstColumns = getColumns$5;
+exports.getWlnColumns = getColumns$3;

package/dist/src/constants/index.d.ts

@@ -1 +1,2 @@
 export { default as getJstColumns } from './jst';
+export { default as getWlnColumns } from './wln';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.19-beta.39",
+  "version": "2.0.19-beta.40",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4f75174b75bae6b588f989301fcc7556a75fca73"
+  "gitHead": "ece6d4949ec9a05a80bfd43f219791bca2a86b03"
 }