@kmkf-fe-packages/basic-components 2.2.31-beta.66 → 2.2.31-beta.70

package/dist/index.esm.js

@@ -14816,13 +14816,15 @@ var wdtColumns = [{
     return price || price === 0 ? Number(price).toFixed(2) : '';
   }
 }, {
-  dataIndex: 'specUnitName',
+  dataIndex: 'unitName',
   title: '基本单位',
-  width: 150
+  width: 150,
+  render: renderTextEllipsis
 }, {
-  dataIndex: 'specAuxUnitName',
+  dataIndex: 'auxUnitName',
   title: '辅助单位',
-  width: 150
+  width: 150,
+  render: renderTextEllipsis
 }];
 
 var bse3Columns = [{
@@ -18991,11 +18993,11 @@ var getColumns$2 = function getColumns(_ref) {
       width: 100,
       render: renderGiftType
     }, {
-      dataIndex: 'specUnitName',
+      dataIndex: 'unitName',
       title: "\u57FA\u672C\u5355\u4F4D",
       width: 150
     }, {
-      dataIndex: 'specAuxUnitName',
+      dataIndex: 'auxUnitName',
       title: "\u8F85\u52A9\u5355\u4F4D",
       width: 150
     }],
@@ -19124,11 +19126,11 @@ var getColumns$2 = function getColumns(_ref) {
       ellipsis: true,
       width: 100
     }, {
-      dataIndex: 'specUnitName',
+      dataIndex: 'unitName',
       title: "\u57FA\u672C\u5355\u4F4D",
       width: 150
     }, {
-      dataIndex: 'specAuxUnitName',
+      dataIndex: 'auxUnitName',
       title: "\u8F85\u52A9\u5355\u4F4D",
       width: 150
     }],
@@ -19296,11 +19298,11 @@ var getColumns$2 = function getColumns(_ref) {
         }) : /*#__PURE__*/React.createElement("span", null, typeMap[val]);
       }
     }, {
-      dataIndex: 'specUnitName',
+      dataIndex: 'unitName',
       title: "\u57FA\u672C\u5355\u4F4D",
       width: 150
     }, {
-      dataIndex: 'specAuxUnitName',
+      dataIndex: 'auxUnitName',
       title: "\u8F85\u52A9\u5355\u4F4D",
       width: 150
     }],
@@ -19468,11 +19470,11 @@ var getColumns$2 = function getColumns(_ref) {
         }) : /*#__PURE__*/React.createElement("span", null, typeMap[val]);
       }
     }, {
-      dataIndex: 'specUnitName',
+      dataIndex: 'unitName',
       title: "\u57FA\u672C\u5355\u4F4D",
       width: 150
     }, {
-      dataIndex: 'specAuxUnitName',
+      dataIndex: 'auxUnitName',
       title: "\u8F85\u52A9\u5355\u4F4D",
       width: 150
     }],
@@ -19631,11 +19633,11 @@ var getColumns$2 = function getColumns(_ref) {
       ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'specUnitName',
+      dataIndex: 'unitName',
       title: "\u57FA\u672C\u5355\u4F4D",
       width: 150
     }, {
-      dataIndex: 'specAuxUnitName',
+      dataIndex: 'auxUnitName',
       title: "\u8F85\u52A9\u5355\u4F4D",
       width: 150
     }]
@@ -26063,12 +26065,12 @@ var wdtReissue = function wdtReissue(props) {
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.tradeNo === systemOrderNo;
     });
-    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
+    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : order ? [order] : [];
     var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
       var _order$goodDetails;
       return order === null || order === void 0 ? void 0 : (_order$goodDetails = order.goodDetails) === null || _order$goodDetails === void 0 ? void 0 : _order$goodDetails.length;
     });
-    var goodDetails = hasGoodDetails ? updateWdtGoodsHandle([order]) : [];
+    var goodDetails = hasGoodDetails ? updateWdtGoodsHandle(orders) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
     return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem.srcTid === orderNo;
@@ -26413,7 +26415,7 @@ var PublicReissue = function PublicReissue(props) {
         canEdit: true
       };
     }
-    var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : [order];
+    var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
     var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
       var _order$typeMap$type$g;
       return order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length;
@@ -27467,12 +27469,12 @@ var bsE3Reissue = function bsE3Reissue(props) {
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.orderSn === systemOrderNo;
     });
-    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
+    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : order ? [order] : [];
     var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
       var _order$orderDetailGet;
       return order === null || order === void 0 ? void 0 : (_order$orderDetailGet = order.orderDetailGets) === null || _order$orderDetailGet === void 0 ? void 0 : _order$orderDetailGet.length;
     });
-    var goodDetails = hasGoodDetails ? updateBsE3GoodsHandle([order], 'sharePrice') : [];
+    var goodDetails = hasGoodDetails ? updateBsE3GoodsHandle(orders, 'sharePrice') : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
     return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem.originalOrderSn === orderNo;
@@ -27781,7 +27783,7 @@ var GyReissue = function GyReissue(props) {
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.code === systemOrderNo;
     });
-    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
+    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : order ? [order] : [];
     var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
       var _order$details;
       return order === null || order === void 0 ? void 0 : (_order$details = order.details) === null || _order$details === void 0 ? void 0 : _order$details.length;

package/dist/index.js

@@ -14831,13 +14831,15 @@ var wdtColumns = [{
     return price || price === 0 ? Number(price).toFixed(2) : '';
   }
 }, {
-  dataIndex: 'specUnitName',
+  dataIndex: 'unitName',
   title: '基本单位',
-  width: 150
+  width: 150,
+  render: renderTextEllipsis
 }, {
-  dataIndex: 'specAuxUnitName',
+  dataIndex: 'auxUnitName',
   title: '辅助单位',
-  width: 150
+  width: 150,
+  render: renderTextEllipsis
 }];
 
 var bse3Columns = [{
@@ -19006,11 +19008,11 @@ var getColumns$2 = function getColumns(_ref) {
       width: 100,
       render: renderGiftType
     }, {
-      dataIndex: 'specUnitName',
+      dataIndex: 'unitName',
       title: "\u57FA\u672C\u5355\u4F4D",
       width: 150
     }, {
-      dataIndex: 'specAuxUnitName',
+      dataIndex: 'auxUnitName',
       title: "\u8F85\u52A9\u5355\u4F4D",
       width: 150
     }],
@@ -19139,11 +19141,11 @@ var getColumns$2 = function getColumns(_ref) {
       ellipsis: true,
       width: 100
     }, {
-      dataIndex: 'specUnitName',
+      dataIndex: 'unitName',
       title: "\u57FA\u672C\u5355\u4F4D",
       width: 150
     }, {
-      dataIndex: 'specAuxUnitName',
+      dataIndex: 'auxUnitName',
       title: "\u8F85\u52A9\u5355\u4F4D",
       width: 150
     }],
@@ -19311,11 +19313,11 @@ var getColumns$2 = function getColumns(_ref) {
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeMap[val]);
       }
     }, {
-      dataIndex: 'specUnitName',
+      dataIndex: 'unitName',
       title: "\u57FA\u672C\u5355\u4F4D",
       width: 150
     }, {
-      dataIndex: 'specAuxUnitName',
+      dataIndex: 'auxUnitName',
       title: "\u8F85\u52A9\u5355\u4F4D",
       width: 150
     }],
@@ -19483,11 +19485,11 @@ var getColumns$2 = function getColumns(_ref) {
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeMap[val]);
       }
     }, {
-      dataIndex: 'specUnitName',
+      dataIndex: 'unitName',
       title: "\u57FA\u672C\u5355\u4F4D",
       width: 150
     }, {
-      dataIndex: 'specAuxUnitName',
+      dataIndex: 'auxUnitName',
       title: "\u8F85\u52A9\u5355\u4F4D",
       width: 150
     }],
@@ -19646,11 +19648,11 @@ var getColumns$2 = function getColumns(_ref) {
       ellipsis: true,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'specUnitName',
+      dataIndex: 'unitName',
       title: "\u57FA\u672C\u5355\u4F4D",
       width: 150
     }, {
-      dataIndex: 'specAuxUnitName',
+      dataIndex: 'auxUnitName',
       title: "\u8F85\u52A9\u5355\u4F4D",
       width: 150
     }]
@@ -26078,12 +26080,12 @@ var wdtReissue = function wdtReissue(props) {
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.tradeNo === systemOrderNo;
     });
-    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
+    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : order ? [order] : [];
     var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
       var _order$goodDetails;
       return order === null || order === void 0 ? void 0 : (_order$goodDetails = order.goodDetails) === null || _order$goodDetails === void 0 ? void 0 : _order$goodDetails.length;
     });
-    var goodDetails = hasGoodDetails ? kmkfUtils.updateWdtGoodsHandle([order]) : [];
+    var goodDetails = hasGoodDetails ? kmkfUtils.updateWdtGoodsHandle(orders) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
     return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem.srcTid === orderNo;
@@ -26428,7 +26430,7 @@ var PublicReissue = function PublicReissue(props) {
         canEdit: true
       };
     }
-    var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : [order];
+    var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : order ? [order] : [];
     var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
       var _order$typeMap$type$g;
       return order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length;
@@ -27482,12 +27484,12 @@ var bsE3Reissue = function bsE3Reissue(props) {
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.orderSn === systemOrderNo;
     });
-    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
+    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : order ? [order] : [];
     var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
       var _order$orderDetailGet;
       return order === null || order === void 0 ? void 0 : (_order$orderDetailGet = order.orderDetailGets) === null || _order$orderDetailGet === void 0 ? void 0 : _order$orderDetailGet.length;
     });
-    var goodDetails = hasGoodDetails ? kmkfUtils.updateBsE3GoodsHandle([order], 'sharePrice') : [];
+    var goodDetails = hasGoodDetails ? kmkfUtils.updateBsE3GoodsHandle(orders, 'sharePrice') : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
     return mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem.originalOrderSn === orderNo;
@@ -27796,7 +27798,7 @@ var GyReissue = function GyReissue(props) {
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order.code === systemOrderNo;
     });
-    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : [order];
+    var orders = isAllOrders ? (systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || [] : order ? [order] : [];
     var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
       var _order$details;
       return order === null || order === void 0 ? void 0 : (_order$details = order.details) === null || _order$details === void 0 ? void 0 : _order$details.length;

package/dist/src/bs/component/model/Columns/Erp/wdt.d.ts

@@ -17,11 +17,5 @@ declare const _default: ({
     width: number;
     render: (price: string | number) => string;
     ellipsis?: undefined;
-} | {
-    dataIndex: string;
-    title: string;
-    width: number;
-    ellipsis?: undefined;
-    render?: undefined;
 })[];
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.31-beta.66",
+  "version": "2.2.31-beta.70",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "2.2.31-beta.66",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.31-beta.70",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b957bfb71a171449b3ba44436a5f6400ad7c41b6"
+  "gitHead": "efdfba0ab5694c47d80b9a71a03fb6bd3b5ddbdb"
 }