@kmkf-fe-packages/basic-components 2.0.79-beta.10 → 2.0.79-beta.12

package/dist/index.esm.js

@@ -17025,7 +17025,6 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     _ref$systemOrders = _ref.systemOrders,
     systemOrders = _ref$systemOrders === void 0 ? [] : _ref$systemOrders,
     _ref$selectedSystemOr = _ref.selectedSystemOrders,
-    selectedSystemOrders = _ref$selectedSystemOr === void 0 ? [] : _ref$selectedSystemOr,
     _ref$type = _ref.type,
     type = _ref$type === void 0 ? '' : _ref$type,
     width = _ref.width;
@@ -17045,13 +17044,15 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     } else {
       setTradeGoodsVisible(true);
     }
-    if (isGoods) {
-      var codeList = selectedSystemOrders === null || selectedSystemOrders === void 0 ? void 0 : selectedSystemOrders.map(function (item) {
-        return item === null || item === void 0 ? void 0 : item[systemOrderNoMap === null || systemOrderNoMap === void 0 ? void 0 : systemOrderNoMap[type]];
-      });
-      setSelectSystemNo(codeList || []);
-    }
+    // 暂时先去掉带入系统自订单组件所选值作为默认筛选项
+    // if (isGoods) {
+    //   const codeList: string[] = selectedSystemOrders?.map(
+    //     (item) => item?.[systemOrderNoMap?.[type]],
+    //   );
+    //   setSelectSystemNo(codeList || []);
+    // }
   };
+
   var closeModal = function closeModal() {
     return setTradeGoodsVisible(false);
   };
@@ -17082,7 +17083,10 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     visible: tradeGoodsVisible,
     footer: null,
     onCancel: closeModal,
-    width: width || 850
+    width: width || 850,
+    style: {
+      maxWidth: '1000px'
+    }
   }, isGoods && /*#__PURE__*/React.createElement(Row, {
     style: {
       marginBottom: '20px'
@@ -17433,14 +17437,14 @@ var GoodItem$1 = function GoodItem(props) {
     isGoods: isGoods,
     uniqueKey: uniqueKey,
     type: type,
-    columns: orderColumns,
+    columns: newColumns,
     dataSource: tradeGoods.originDataSource,
     getDataSourceAsync: tradeGoods.getDataSourceAsync,
     selectedRowKeys: selectedGoods,
     onChangeSelectedKeys: tradeGoods.selectedGoodsChange,
     systemOrders: systemOrders,
     selectedSystemOrders: selectedSystemOrders,
-    width: width
+    width: width || 850
   }), showErpGoodsBtn && /*#__PURE__*/React.createElement(Button, {
     type: "link",
     onClick: handleChangeGoods

package/dist/index.js

@@ -17037,7 +17037,6 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     _ref$systemOrders = _ref.systemOrders,
     systemOrders = _ref$systemOrders === void 0 ? [] : _ref$systemOrders,
     _ref$selectedSystemOr = _ref.selectedSystemOrders,
-    selectedSystemOrders = _ref$selectedSystemOr === void 0 ? [] : _ref$selectedSystemOr,
     _ref$type = _ref.type,
     type = _ref$type === void 0 ? '' : _ref$type,
     width = _ref.width;
@@ -17057,13 +17056,15 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     } else {
       setTradeGoodsVisible(true);
     }
-    if (isGoods) {
-      var codeList = selectedSystemOrders === null || selectedSystemOrders === void 0 ? void 0 : selectedSystemOrders.map(function (item) {
-        return item === null || item === void 0 ? void 0 : item[systemOrderNoMap === null || systemOrderNoMap === void 0 ? void 0 : systemOrderNoMap[type]];
-      });
-      setSelectSystemNo(codeList || []);
-    }
+    // 暂时先去掉带入系统自订单组件所选值作为默认筛选项
+    // if (isGoods) {
+    //   const codeList: string[] = selectedSystemOrders?.map(
+    //     (item) => item?.[systemOrderNoMap?.[type]],
+    //   );
+    //   setSelectSystemNo(codeList || []);
+    // }
   };
+
   var closeModal = function closeModal() {
     return setTradeGoodsVisible(false);
   };
@@ -17094,7 +17095,10 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     visible: tradeGoodsVisible,
     footer: null,
     onCancel: closeModal,
-    width: width || 850
+    width: width || 850,
+    style: {
+      maxWidth: '1000px'
+    }
   }, isGoods && /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     style: {
       marginBottom: '20px'
@@ -17445,14 +17449,14 @@ var GoodItem$1 = function GoodItem(props) {
     isGoods: isGoods,
     uniqueKey: uniqueKey,
     type: type,
-    columns: orderColumns,
+    columns: newColumns,
     dataSource: tradeGoods.originDataSource,
     getDataSourceAsync: tradeGoods.getDataSourceAsync,
     selectedRowKeys: selectedGoods,
     onChangeSelectedKeys: tradeGoods.selectedGoodsChange,
     systemOrders: systemOrders,
     selectedSystemOrders: selectedSystemOrders,
-    width: width
+    width: width || 850
   }), showErpGoodsBtn && /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "link",
     onClick: handleChangeGoods

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.79-beta.10",
+  "version": "2.0.79-beta.12",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "980a2ddae0f585d26e66c541a14b6b2bccd34e5e"
+  "gitHead": "1e41fa302803987040cc63b2eb1a50403161736d"
 }