@kmkf-fe-packages/basic-components 2.10.9-beta.34 → 2.10.9-beta.36

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,
@@ -25230,28 +25255,110 @@ var getTtxBomTypeName = function getTtxBomTypeName(value) {
 };
 var getColumns$b = function getColumns() {
   return {
-    TTX_GOODS: [['skuName', 'SKU名称'], ['skuCode', 'SKU编码'], ['sourceSpuId', '平台商品ID'], ['sourceSkuId', '平台SKU ID'], ['requestQty', '要求发货数量'], ['shipQty', '已发货数量'], ['returnQty', '退货数量'], ['listPrice', '零售价/标价'], ['netPrice', '客户实付单价'], ['msrPrice', '建议零售价'], ['itemTotalAmount', '商品总金额'], ['totalPayAmount', '实付金额'], ['isGift', '是否赠品'], ['bomType', 'BOM类型'], ['bomSkuCode', 'BOM商品编码'], ['platformSpuCode', '商品货号'], ['platformSkuCode', 'SKU货号']].map(function (_ref) {
-      var _ref2 = _slicedToArray(_ref, 2),
-        dataIndex = _ref2[0],
-        title = _ref2[1];
-      var isGift = dataIndex === 'isGift';
-      var isBomType = dataIndex === 'bomType';
-      return _objectSpread2(_objectSpread2({
-        dataIndex: dataIndex,
-        title: title,
-        width: 150,
-        align: 'center',
-        ellipsis: true,
-        render: isGift ? function (value) {
-          return renderTextEllipsis(getYesOrNo$4(value));
-        } : isBomType ? function (value) {
-          return renderTextEllipsis(getTtxBomTypeName(value));
-        } : renderTextEllipsis
-      }, isGift ? {
+    TTX_GOODS: [{
+      dataIndex: 'skuName',
+      title: 'SKU名称',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'skuCode',
+      title: 'SKU编码',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sourceSpuId',
+      title: '平台商品ID',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'sourceSkuId',
+      title: '平台SKU ID',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'requestQty',
+      title: '要求发货数量',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'shipQty',
+      title: '已发货数量',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'returnQty',
+      title: '退货数量',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'listPrice',
+      title: '零售价/标价',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'netPrice',
+      title: '客户实付单价',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'msrPrice',
+      title: '建议零售价',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'itemTotalAmount',
+      title: '商品总金额',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'totalPayAmount',
+      title: '实付金额',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'isGift',
+      title: '是否赠品',
+      width: 150,
+      render: function render(value) {
+        return renderTextEllipsis(getYesOrNo$4(value));
+      },
+      renderExport: getYesOrNo$4,
+      headerMapping: {
+        transformValue: getYesOrNo$4,
         renderExport: getYesOrNo$4
-      } : {}), isBomType ? {
+      }
+    }, {
+      dataIndex: 'bomType',
+      title: 'BOM类型',
+      width: 150,
+      render: function render(value) {
+        return renderTextEllipsis(getTtxBomTypeName(value));
+      },
+      renderExport: getTtxBomTypeName,
+      headerMapping: {
+        transformValue: getTtxBomTypeName,
         renderExport: getTtxBomTypeName
-      } : {});
+      }
+    }, {
+      dataIndex: 'bomSkuCode',
+      title: 'BOM商品编码',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'platformSpuCode',
+      title: '商品货号',
+      width: 150,
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'platformSkuCode',
+      title: 'SKU货号',
+      width: 150,
+      render: renderTextEllipsis
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
     })
   };
 };

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.34",
+  "version": "2.10.9-beta.36",
   "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.34",
+    "@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": "50f6675508c29e033fb10ce1d240bd6f80c9dd93"
+  "gitHead": "e1a69e0dda71023cde183e1f0d7e07cb87921d46"
 }