@kmkf-fe-packages/basic-components 2.10.9-beta.33 → 2.10.9-beta.35

package/dist/index.esm.js

@@ -10510,6 +10510,7 @@ var SubForm = function SubForm(props) {
     maxCount = props.maxCount;
   var ref = useRef(null);
   var isRequest = useRef(false);
+  var cursorIdRef = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -10753,6 +10754,7 @@ var SubForm = function SubForm(props) {
   };
   var getWorkOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _cursorIdRef$current;
       var _ref2,
         _ref2$pageNo,
         pageNo,
@@ -10760,9 +10762,12 @@ var SubForm = function SubForm(props) {
         componentList,
         params,
         queryComponents,
+        cursorParams,
+        queryKey,
         res,
         data,
         success,
+        _cursorIdRef$current2,
         transDataSourceItem,
         headerKeys,
         newList,
@@ -10785,6 +10790,8 @@ var SubForm = function SubForm(props) {
               templateKey: workOrderTemplateId,
               needReturnRepeatValue: true,
               needFilterShopByPermission: needFilterShopByPermission,
+              needTotal: false,
+              useNext: true,
               queryComponents: [{
                 key: 'flowStatus',
                 symbol: 'in',
@@ -10803,17 +10810,39 @@ var SubForm = function SubForm(props) {
                 value: [inputValue]
               });
               params.queryComponents = queryComponents;
-              params.needTotal = false;
             }
-            _context.next = 7;
+            params.queryComponents = params.queryComponents.filter(function (item) {
+              var _item$value;
+              if (item.key === 'flowStatus' && ((_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.length) === 4) {
+                return false;
+              } else {
+                return true;
+              }
+            });
+            cursorParams = _objectSpread2({}, params);
+            delete cursorParams.pageNo;
+            queryKey = JSON.stringify(cursorParams);
+            if (((_cursorIdRef$current = cursorIdRef.current) === null || _cursorIdRef$current === void 0 ? void 0 : _cursorIdRef$current.queryKey) === queryKey) {
+              if (cursorIdRef.current.cursorId) {
+                params.cursorId = cursorIdRef.current.cursorId;
+              }
+            } else {
+              cursorIdRef.current = {
+                queryKey: queryKey
+              };
+            }
+            _context.next = 12;
             return extendRequest('/qy/view/workOrderListCached', {
               method: 'post',
               data: params
             });
-          case 7:
+          case 12:
             res = _context.sent;
             data = res.data, success = res.success;
             if (success) {
+              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;
+              }
               transDataSourceItem = transformWorkOrderData(componentDtoList.length ? componentDtoList : componentList, 'edit');
               headerKeys = correlationList.map(function (t) {
                 return t.key;
@@ -10839,7 +10868,7 @@ var SubForm = function SubForm(props) {
               setHasMore((data === null || data === void 0 ? void 0 : data.list.length) === pageSize);
               isRequest.current = false;
             }
-          case 10:
+          case 15:
           case "end":
             return _context.stop();
         }
@@ -14569,7 +14598,6 @@ var jstGoods = function jstGoods(props) {
     showField = _props$showField === void 0 ? '' : _props$showField,
     _props$platformType = props.platformType,
     platformType = _props$platformType === void 0 ? 'default' : _props$platformType,
-    onlyShowFieldSelect = props.onlyShowFieldSelect,
     logisticsCompanyFormType = props.logisticsCompanyFormType,
     form = props.form;
   var _useState = useState(0),
@@ -14633,12 +14661,10 @@ var jstGoods = function jstGoods(props) {
       }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, t.title), /*#__PURE__*/React.createElement("div", null, "\u7F16\u7801\uFF1A", t.skuId))));
     }));
   };
-  var handleSelected = function handleSelected(val, type, option, onlyShowFieldSelect) {
+  var handleSelected = function handleSelected(val, type, option) {
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
     changeOrderInfo[type] = val;
-    if (!onlyShowFieldSelect) {
-      changeOrderInfo['sendId'] = option.value;
-    }
+    changeOrderInfo['sendId'] = option.value;
     if (isSelectName && type === 'sendName') {
       if (isSendGoodSavedId) {
         // 如果发货仓名称存的是id，将名称存入快照
@@ -14653,12 +14679,10 @@ var jstGoods = function jstGoods(props) {
     newList[changeIndex] = changeOrderInfo;
     onChange === null || onChange === void 0 ? void 0 : onChange(newList);
   };
-  var handleSelectedReturn = function handleSelectedReturn(val, type, option, onlyShowFieldSelect) {
+  var handleSelectedReturn = function handleSelectedReturn(val, type, option) {
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
     changeOrderInfo[type] = val;
-    if (!onlyShowFieldSelect) {
-      changeOrderInfo['returnWarehouseId'] = option.value;
-    }
+    changeOrderInfo['returnWarehouseId'] = option.value;
     if (isSelectName && type === 'returnWarehouseName') {
       // 如果发货仓名称存的是name，将id存入快照，同时把id替换成名称
       changeOrderInfo['sendSnapshotId'] = option.value;
@@ -14765,7 +14789,7 @@ var jstGoods = function jstGoods(props) {
     filterOption: filterOption,
     value: ((_value$changeIndex10 = value[changeIndex]) === null || _value$changeIndex10 === void 0 ? void 0 : _value$changeIndex10.sendSnapshotId) || ((_value$changeIndex11 = value[changeIndex]) === null || _value$changeIndex11 === void 0 ? void 0 : _value$changeIndex11.sendName) || null,
     onChange: function onChange(value, option) {
-      return handleSelected(value, 'sendName', option, onlyShowFieldSelect);
+      return handleSelected(value, 'sendName', option);
     }
   }) : /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
@@ -14800,7 +14824,7 @@ var jstGoods = function jstGoods(props) {
     filterOption: filterOption,
     value: ((_value$changeIndex15 = value[changeIndex]) === null || _value$changeIndex15 === void 0 ? void 0 : _value$changeIndex15.sendSnapshotId) || ((_value$changeIndex16 = value[changeIndex]) === null || _value$changeIndex16 === void 0 ? void 0 : _value$changeIndex16.returnWarehouseName) || null,
     onChange: function onChange(value, option) {
-      return handleSelectedReturn(value, 'returnWarehouseName', option, onlyShowFieldSelect);
+      return handleSelectedReturn(value, 'returnWarehouseName', option);
     }
   }) : /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
@@ -23279,6 +23303,7 @@ var getColumns$5 = function getColumns() {
     }, {
       dataIndex: 'qty',
       title: "\u7533\u8BF7\u6570\u91CF",
+      conditionTitle: "\u7533\u8BF7\u603B\u6570\u91CF",
       width: 150,
       align: 'center',
       ellipsis: true,
@@ -25366,6 +25391,18 @@ var getColumns$c = function getColumns(_ref) {
   };
 };
 
+var MIN_COLUMN_WIDTH = 80;
+var MAX_COLUMN_WIDTH = 600;
+var resolveColumnWidth = function resolveColumnWidth(width, defaultWidth) {
+  if (width === undefined || width === null || width === '') {
+    return defaultWidth;
+  }
+  var parsedWidth = Number(width);
+  if (!isFinite(parsedWidth)) {
+    return defaultWidth;
+  }
+  return Math.min(MAX_COLUMN_WIDTH, Math.max(MIN_COLUMN_WIDTH, Math.round(parsedWidth)));
+};
 var getColumnsMap$1 = function getColumnsMap(args) {
   var _ref = args || {},
     _ref$text = _ref.text,
@@ -25459,11 +25496,13 @@ var getColumnsBaseInfo$1 = function getColumnsBaseInfo() {
   var newColumns = {};
   Object.keys(clone_columnsMap).forEach(function (key) {
     newColumns[key] = clone_columnsMap[key].map(function (col) {
-      return {
+      return _objectSpread2({
         title: col.title,
         dataIndex: col.dataIndex,
         disabled: !!col.validator
-      };
+      }, key === 'KM_REISSUE_GOODS' ? {
+        width: col.width
+      } : {});
     });
   });
   return newColumns;
@@ -26509,7 +26548,9 @@ var GoodItem$1 = function GoodItem(props) {
         });
         // 如果列应该显示（show不为false）或者有验证器，则返回对应的列配置
         if (currentCol && (col.show !== false || (currentCol === null || currentCol === void 0 ? void 0 : currentCol.validator))) {
-          return currentCol;
+          return _objectSpread2(_objectSpread2({}, currentCol), {}, {
+            width: resolveColumnWidth(col.width, currentCol.width)
+          });
         }
         return undefined;
       }).filter(Boolean);
@@ -26580,6 +26621,11 @@ var GoodItem$1 = function GoodItem(props) {
       }
     }].concat(_toConsumableArray(list));
   }, [showHeader, value, disabled, hoveredRowIndex]);
+  var tableScrollX = useMemo(function () {
+    return newColumns.reduce(function (total, column) {
+      return total + (Number(column.width) || 0);
+    }, 0);
+  }, [newColumns]);
   var onSubmit = function onSubmit(list) {
     var newList = processGoods$1({
       list: list,
@@ -26659,7 +26705,7 @@ var GoodItem$1 = function GoodItem(props) {
     size: "small",
     pagination: false,
     scroll: {
-      x: '100%'
+      x: tableScrollX
     },
     locale: {
       emptyText: '暂无数据'
@@ -33766,4 +33812,4 @@ var FIELD_COLUMNS_MAP = {
   PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
 };
 
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasImage, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, FIELD_COLUMNS_MAP, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, SYSTEM_ORDER_COLUMNS_MAP, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, YouzanStar, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$a as getDxdColumns, getColumns$4 as getGyColumns, getColumns$9 as getJkyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$8 as getSkxColumns, getColumns$b as getTtxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap, renderSplitMap };
+export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasImage, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, FIELD_COLUMNS_MAP, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MAX_COLUMN_WIDTH, MIN_COLUMN_WIDTH, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, SYSTEM_ORDER_COLUMNS_MAP, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, YouzanStar, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$a as getDxdColumns, getColumns$4 as getGyColumns, getColumns$9 as getJkyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$8 as getSkxColumns, getColumns$b as getTtxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap, renderSplitMap, resolveColumnWidth };

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

@@ -9,6 +9,9 @@ type ColumnsItemType = {
 };
 type ColumnsMapType = Record<string, ColumnsItemType[]>;
 export type GetColumnsBaseInfoMapFnType = (...args: any[]) => ColumnsMapType;
+export declare const MIN_COLUMN_WIDTH = 80;
+export declare const MAX_COLUMN_WIDTH = 600;
+export declare const resolveColumnWidth: (width: unknown, defaultWidth?: number) => number | undefined;
 export declare const getColumnsMap: GetColumnsBaseInfoMapFnType;
 export declare const erpColumnsMap: ColumnsMapType;
 export declare const erpFormValidator: (_rule: any, value: any, type: string, extraParams?: Record<string, any>) => any;

package/dist/src/index.d.ts

@@ -74,6 +74,6 @@ export { default as KmVideo } from './km/KmVideo';
 export { default as OrderSubFormUtils } from './apaas/OrderSubForm/utils';
 export { default as SkxIdInputSelect } from './skx/IdInputSelect';
 export { default as SkxGoods } from './skx/Goods';
-export { default as columnsBaseInfoMap, erpColumnsMap, erpFormValidator, } from './constants/columnsBaseInfoMap';
+export { default as columnsBaseInfoMap, erpColumnsMap, erpFormValidator, MAX_COLUMN_WIDTH, MIN_COLUMN_WIDTH, resolveColumnWidth, } from './constants/columnsBaseInfoMap';
 export { default as SYSTEM_ORDER_COLUMNS_MAP, FIELD_COLUMNS_MAP } from './constants/systemOrderColumnsMap';
 export { default as erpModalColumnsMap } from './bs/component/model/Columns';

package/dist/src/jst/Goods/index.d.ts

@@ -10,7 +10,7 @@ interface JstGoodsProps {
     onBlur?: (val: any) => void;
     showField: string;
     platformType?: string;
-    onlyShowFieldSelect: boolean;
+    onlyShowFieldSelect?: boolean;
     expressDateInstance: InstanceType<typeof ExpressData>;
     logisticsCompanyFormType?: string;
     form?: FormInstance;

package/package.json

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