@kmkf-fe-packages/basic-components 2.0.79-beta.100 → 2.0.79-beta.102

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } 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, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, 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, JY_SYSTEM_ORDER_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, updateSkxGoodsHandle, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, 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, JY_SYSTEM_ORDER_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
@@ -21698,14 +21698,7 @@ var renderEditItem = function renderEditItem(_ref) {
       }
     }));
   } else if (item.widget === 'datePicker') {
-    Component = /*#__PURE__*/React.createElement(DatePicker, _objectSpread2(_objectSpread2({
-      popupStyle: {
-        zIndex: 2000
-      },
-      getPopupContainer: function getPopupContainer() {
-        return tableRef.current;
-      }
-    }, item.widgetProps), {}, {
+    Component = /*#__PURE__*/React.createElement(DatePicker, _objectSpread2(_objectSpread2({}, item.widgetProps), {}, {
       value: val ? hooks(val) : null,
       disabled: disabled,
       onChange: function onChange(e) {
@@ -21885,7 +21878,6 @@ var OrderSubForm = function OrderSubForm(props) {
             color: 'red'
           }
         }, "*") : null, (t === null || t === void 0 ? void 0 : t.settingName) || t.title),
-        ellipsis: true,
         width: Number(t.width),
         render: function render(val, record, index) {
           // const column = orderSubformColumnMap[t.dataIndex];
@@ -21944,6 +21936,7 @@ var OrderSubForm = function OrderSubForm(props) {
       return !['operation', 'index'].includes((item === null || item === void 0 ? void 0 : item.dataIndex) || '');
     }).map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
+        ellipsis: true,
         render: function render(val, record, index) {
           return renderDetailItem$1({
             item: item,
@@ -25702,6 +25695,8 @@ var typeMap$7 = {
   SKX_GOODS: {
     key: 'skxGoods',
     uniqueKey: 'skuEcode',
+    formatTrade: formatTrade,
+    ordersKey: 'orderDetailInfoList',
     requestParams: {
       key: 'onBillNo',
       sourceUniqueKey: '78CADF2951',
@@ -25712,8 +25707,10 @@ var typeMap$7 = {
   SKX_RETURN_GOODS: {
     key: 'skxReturnGoods',
     uniqueKey: 'returnSkuEcode',
+    formatTrade: formatReturnTrade,
+    ordersKey: 'skqReturnOrderDetailInfoDtos',
     requestParams: {
-      key: 'skxReturnBillNo',
+      key: 'returnBillNo',
       sourceUniqueKey: 'fe10d6f36b',
       request: servers.SKX.queryReturnOrderDetailSingleton
     },
@@ -25753,9 +25750,10 @@ var SkxGoods = function SkxGoods(props) {
       return Promise.resolve([]);
     }
     return typeMap$7[type].requestParams.request(_defineProperty({}, typeMap$7[type].requestParams.key, businessNo)).then(function (_ref) {
+      var _data$typeMap$type$or, _data$typeMap$type$or2;
       var data = _ref.data;
       onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-        allGoods: (data === null || data === void 0 ? void 0 : data.trades) || []
+        allGoods: (data === null || data === void 0 ? void 0 : (_data$typeMap$type$or = data[typeMap$7[type].ordersKey]) === null || _data$typeMap$type$or === void 0 ? void 0 : _data$typeMap$type$or[0]) ? typeMap$7[type].updateHandle(typeMap$7[type].formatTrade(data === null || data === void 0 ? void 0 : (_data$typeMap$type$or2 = data[typeMap$7[type].ordersKey]) === null || _data$typeMap$type$or2 === void 0 ? void 0 : _data$typeMap$type$or2[0])) : []
       }));
     });
   };

package/dist/index.js

@@ -21711,14 +21711,7 @@ var renderEditItem = function renderEditItem(_ref) {
       }
     }));
   } else if (item.widget === 'datePicker') {
-    Component = /*#__PURE__*/React__default['default'].createElement(antd.DatePicker, _objectSpread2(_objectSpread2({
-      popupStyle: {
-        zIndex: 2000
-      },
-      getPopupContainer: function getPopupContainer() {
-        return tableRef.current;
-      }
-    }, item.widgetProps), {}, {
+    Component = /*#__PURE__*/React__default['default'].createElement(antd.DatePicker, _objectSpread2(_objectSpread2({}, item.widgetProps), {}, {
       value: val ? hooks(val) : null,
       disabled: disabled,
       onChange: function onChange(e) {
@@ -21898,7 +21891,6 @@ var OrderSubForm = function OrderSubForm(props) {
             color: 'red'
           }
         }, "*") : null, (t === null || t === void 0 ? void 0 : t.settingName) || t.title),
-        ellipsis: true,
         width: Number(t.width),
         render: function render(val, record, index) {
           // const column = orderSubformColumnMap[t.dataIndex];
@@ -21957,6 +21949,7 @@ var OrderSubForm = function OrderSubForm(props) {
       return !['operation', 'index'].includes((item === null || item === void 0 ? void 0 : item.dataIndex) || '');
     }).map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
+        ellipsis: true,
         render: function render(val, record, index) {
           return renderDetailItem$1({
             item: item,
@@ -25715,6 +25708,8 @@ var typeMap$7 = {
   SKX_GOODS: {
     key: 'skxGoods',
     uniqueKey: 'skuEcode',
+    formatTrade: kmkfUtils.formatTrade,
+    ordersKey: 'orderDetailInfoList',
     requestParams: {
       key: 'onBillNo',
       sourceUniqueKey: '78CADF2951',
@@ -25725,8 +25720,10 @@ var typeMap$7 = {
   SKX_RETURN_GOODS: {
     key: 'skxReturnGoods',
     uniqueKey: 'returnSkuEcode',
+    formatTrade: kmkfUtils.formatReturnTrade,
+    ordersKey: 'skqReturnOrderDetailInfoDtos',
     requestParams: {
-      key: 'skxReturnBillNo',
+      key: 'returnBillNo',
       sourceUniqueKey: 'fe10d6f36b',
       request: kmkfUtils.servers.SKX.queryReturnOrderDetailSingleton
     },
@@ -25766,9 +25763,10 @@ var SkxGoods = function SkxGoods(props) {
       return Promise.resolve([]);
     }
     return typeMap$7[type].requestParams.request(_defineProperty({}, typeMap$7[type].requestParams.key, businessNo)).then(function (_ref) {
+      var _data$typeMap$type$or, _data$typeMap$type$or2;
       var data = _ref.data;
       onChange(_objectSpread2(_objectSpread2({}, value), {}, {
-        allGoods: (data === null || data === void 0 ? void 0 : data.trades) || []
+        allGoods: (data === null || data === void 0 ? void 0 : (_data$typeMap$type$or = data[typeMap$7[type].ordersKey]) === null || _data$typeMap$type$or === void 0 ? void 0 : _data$typeMap$type$or[0]) ? typeMap$7[type].updateHandle(typeMap$7[type].formatTrade(data === null || data === void 0 ? void 0 : (_data$typeMap$type$or2 = data[typeMap$7[type].ordersKey]) === null || _data$typeMap$type$or2 === void 0 ? void 0 : _data$typeMap$type$or2[0])) : []
       }));
     });
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.79-beta.100",
+  "version": "2.0.79-beta.102",
   "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.0.79-beta.91",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.79-beta.102",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "39852c6b705642897299eb7c42a5e92aa2da3b7e"
+  "gitHead": "f0b05044a31224354e8cf890a8cbd3114164d6af"
 }