@kmkf-fe-packages/basic-components 2.0.34 → 2.0.36

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseCircleOutlined, CaretUpOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterKmOrders, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, servers, filterJstOrders, filterKmOrders, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
@@ -7960,6 +7960,9 @@ var SubForm = function SubForm(props) {
     value: selectKey,
     onChange: setSelectKey
   }), /*#__PURE__*/React.createElement(Popover, {
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentElement;
+    },
     content: /*#__PURE__*/React.createElement("div", {
       ref: ref,
       onScrollCapture: onScrollCapture,
@@ -16440,12 +16443,7 @@ var getJstOrderListSingleton = function getJstOrderListSingleton(orderNo) {
         // singletonMap.delete(orderNo);
         reject(err);
       };
-      extendRequest('/qy/gdfw/jst/erp/orderOut/list', {
-        method: 'post',
-        data: {
-          soId: orderNo
-        }
-      }).then(function (data) {
+      servers.JST.jstOrderDetailWrap(orderNo).then(function (data) {
         if (data === null || data === void 0 ? void 0 : data.success) {
           data.data = filterJstOrders({
             orderList: (data === null || data === void 0 ? void 0 : data.data) || []
@@ -16455,7 +16453,28 @@ var getJstOrderListSingleton = function getJstOrderListSingleton(orderNo) {
           doReject(data);
         }
       }).catch(doReject);
+      // request('/qy/gdfw/jst/erp/orderOut/list', {
+      //   method: 'post',
+      //   data: {
+      //     soId: orderNo,
+      //   },
+      // })
+      //   .then((data) => {
+      //     if (data?.success) {
+      //       data.data = filterJstOrders(
+      //         {
+      //           orderList: data?.data || [],
+      //         },
+      //         orderNo,
+      //       );
+      //       resolve(data.data);
+      //     } else {
+      //       doReject(data);
+      //     }
+      //   })
+      //   .catch(doReject);
     });
+
     singletonMap$3.set(orderNo, p);
   }
   return singletonMap$3.get(orderNo);

package/dist/index.js

@@ -7972,6 +7972,9 @@ var SubForm = function SubForm(props) {
     value: selectKey,
     onChange: setSelectKey
   }), /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentElement;
+    },
     content: /*#__PURE__*/React__default['default'].createElement("div", {
       ref: ref,
       onScrollCapture: onScrollCapture,
@@ -16452,12 +16455,7 @@ var getJstOrderListSingleton = function getJstOrderListSingleton(orderNo) {
         // singletonMap.delete(orderNo);
         reject(err);
       };
-      extendRequest('/qy/gdfw/jst/erp/orderOut/list', {
-        method: 'post',
-        data: {
-          soId: orderNo
-        }
-      }).then(function (data) {
+      kmkfUtils.servers.JST.jstOrderDetailWrap(orderNo).then(function (data) {
         if (data === null || data === void 0 ? void 0 : data.success) {
           data.data = kmkfUtils.filterJstOrders({
             orderList: (data === null || data === void 0 ? void 0 : data.data) || []
@@ -16467,7 +16465,28 @@ var getJstOrderListSingleton = function getJstOrderListSingleton(orderNo) {
           doReject(data);
         }
       }).catch(doReject);
+      // request('/qy/gdfw/jst/erp/orderOut/list', {
+      //   method: 'post',
+      //   data: {
+      //     soId: orderNo,
+      //   },
+      // })
+      //   .then((data) => {
+      //     if (data?.success) {
+      //       data.data = filterJstOrders(
+      //         {
+      //           orderList: data?.data || [],
+      //         },
+      //         orderNo,
+      //       );
+      //       resolve(data.data);
+      //     } else {
+      //       doReject(data);
+      //     }
+      //   })
+      //   .catch(doReject);
     });
+
     singletonMap$3.set(orderNo, p);
   }
   return singletonMap$3.get(orderNo);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.34",
+  "version": "2.0.36",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -11,16 +11,16 @@
     "dist"
   ],
   "scripts": {
-    "sync": "yarn build && yalc push",
     "build": "yarn lint && father-build",
     "lint": "eslint '**/*.{ts,tsx}'",
     "lint:fix": "eslint --fix '**/*.{ts,tsx}'",
     "start": "dumi dev",
+    "sync": "yarn build && yalc push",
     "test": "jest",
     "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.0.34",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.36",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "00e06f420455b7ea2eedc3ad876607f925af101d"
+  "gitHead": "0d96086e345abce2acf20f0cb4be85add93aa49e"
 }