@kmkf-fe-packages/basic-components 2.10.20 → 2.10.23

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, 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, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, normalizeYouzanStar, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, DxdSuppliersData, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, 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, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, normalizeYouzanStar, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, DxdSuppliersData, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, warehouseTypeMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, 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, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import every from 'lodash/every';
 import maxBy from 'lodash/maxBy';
 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';
@@ -10727,6 +10727,7 @@ var SubForm = function SubForm(props) {
         data,
         success,
         _cursorIdRef$current2,
+        _cursorIdRef$current3,
         transDataSourceItem,
         headerKeys,
         newList,
@@ -10785,6 +10786,9 @@ var SubForm = function SubForm(props) {
               if (cursorIdRef.current.cursorId) {
                 params.cursorId = cursorIdRef.current.cursorId;
               }
+              if (cursorIdRef.current.cursorCreated) {
+                params.cursorCreated = cursorIdRef.current.cursorCreated;
+              }
             } else {
               cursorIdRef.current = {
                 queryKey: queryKey
@@ -10802,6 +10806,9 @@ var SubForm = function SubForm(props) {
               if ((data === null || data === void 0 ? void 0 : data.cursorId) && ((_cursorIdRef$current2 = cursorIdRef.current) === null || _cursorIdRef$current2 === void 0 ? void 0 : _cursorIdRef$current2.queryKey) === queryKey) {
                 cursorIdRef.current.cursorId = data.cursorId;
               }
+              if ((data === null || data === void 0 ? void 0 : data.cursorCreated) && ((_cursorIdRef$current3 = cursorIdRef.current) === null || _cursorIdRef$current3 === void 0 ? void 0 : _cursorIdRef$current3.queryKey) === queryKey) {
+                cursorIdRef.current.cursorCreated = data.cursorCreated;
+              }
               transDataSourceItem = transformWorkOrderData(componentDtoList.length ? componentDtoList : componentList, 'edit');
               headerKeys = correlationList.map(function (t) {
                 return t.key;
@@ -21162,7 +21169,7 @@ var getColumns$2 = function getColumns(_ref) {
       }
     }, {
       dataIndex: 'returnPrice',
-      title: "".concat(text, "\u9000\u8D27\u91D1\u989D"),
+      title: "".concat(text, "\u9000\u6B3E\u91D1\u989D"),
       align: 'center',
       ellipsis: true,
       width: 100
@@ -27188,12 +27195,13 @@ var getWdtOrderListSingleton = function getWdtOrderListSingleton(orderNo) {
           var _data$data, _data$data$trades;
           if (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : (_data$data$trades = _data$data.trades) === null || _data$data$trades === void 0 ? void 0 : _data$data$trades.length) {
             data.data.trades = filterWdtOrders(data === null || data === void 0 ? void 0 : data.data, orderNo).map(function (item) {
-              var _tradeStatusMap$data$;
+              var _tradeStatusMap$data$, _warehouseTypeMap$dat;
               return _objectSpread2(_objectSpread2({}, item), {}, {
                 billNo: item.tradeNo,
                 billType: WDT_ORDER_TYPE_MAP[item.tradeType],
                 billTag: item.tagName || item.tags,
                 tradeStatusValue: tradeStatusMap === null || tradeStatusMap === void 0 ? void 0 : (_tradeStatusMap$data$ = tradeStatusMap[data.data.version]) === null || _tradeStatusMap$data$ === void 0 ? void 0 : _tradeStatusMap$data$[item.tradeStatus],
+                warehouseType: warehouseTypeMap === null || warehouseTypeMap === void 0 ? void 0 : (_warehouseTypeMap$dat = warehouseTypeMap[data.data.version]) === null || _warehouseTypeMap$dat === void 0 ? void 0 : _warehouseTypeMap$dat[item.warehouseType],
                 logisticsName: ExpressData.getInstance('wdt').getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
               });
             });

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

@@ -48,12 +48,36 @@ declare const SYSTEM_ORDER_COLUMNS_MAP: {
         render: (val: any, record: any, _?: any, parent?: any, index?: number | undefined) => any;
         renderExport: (val: any, record: any, _?: any, parent?: any, index?: number | undefined) => any;
     })[];
-    WDT_SYSTEM_ORDER: {
+    WDT_SYSTEM_ORDER: ({
         title: string;
         dataIndex: string;
         width: number;
         ellipsis: boolean;
-    }[];
+        conditionOptionsSetting?: undefined;
+    } | {
+        title: string;
+        dataIndex: string;
+        width: number;
+        ellipsis: boolean;
+        conditionOptionsSetting: {
+            dataType: string;
+            getOptions: () => any[];
+        };
+    } | {
+        title: string;
+        dataIndex: string;
+        width: number;
+        ellipsis: boolean;
+        conditionOptionsSetting: {
+            dataType: string;
+            getOptions: ({ wdtVersion }: {
+                wdtVersion: string;
+            }) => {
+                value: string;
+                label: string;
+            }[];
+        };
+    })[];
     BS_E3_SYSTEM_ORDER: ({
         title: string;
         dataIndex: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.10.20",
+  "version": "2.10.23",
   "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.10.20",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.23",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "35e842426da4373ec5caafc58e77a9f54be77bc0"
+  "gitHead": "bd441601bb0f5b93d8b1500c0a066c3d7e797c45"
 }