@kmkf-fe-packages/basic-components 2.0.79-beta.46 → 2.0.79-beta.49

package/dist/index.esm.js

@@ -14501,12 +14501,14 @@ var Cell = function Cell(_ref) {
   var children = tdProps.children,
     otherProps = _objectWithoutProperties(tdProps, _excluded$e);
   return /*#__PURE__*/React.createElement("td", _objectSpread2({}, otherProps), /*#__PURE__*/React.createElement("div", {
-    className: 'cell-content'
+    className: "cell-content"
   }, children));
 };
 var HighPerformanceTable = function HighPerformanceTable(_ref2) {
   var _ref2$disabledIds = _ref2.disabledIds,
     disabledIds = _ref2$disabledIds === void 0 ? [] : _ref2$disabledIds,
+    _ref2$useSelectCol = _ref2.useSelectCol,
+    useSelectCol = _ref2$useSelectCol === void 0 ? true : _ref2$useSelectCol,
     selectedKeys = _ref2.selectedKeys,
     handleChangeSelectedKeys = _ref2.handleChangeSelectedKeys,
     dataSource = _ref2.dataSource,
@@ -14532,20 +14534,22 @@ var HighPerformanceTable = function HighPerformanceTable(_ref2) {
     handleHoverBackground: '#aaa',
     handleActiveBackground: '#89bff7'
   }));
-  pipeline.use(multiSelect({
-    value: selectedKeys,
-    isDisabled: function isDisabled(value) {
-      return disabledIds.includes(value === null || value === void 0 ? void 0 : value.id);
-    },
-    onChange: handleChangeSelectedKeys,
-    highlightRowWhenSelected: true,
-    checkboxPlacement: 'start',
-    checkboxColumn: {
-      lock: true
-    },
-    clickArea: 'cell',
-    stopClickEventPropagation: true
-  }));
+  if (useSelectCol) {
+    pipeline.use(multiSelect({
+      value: selectedKeys,
+      isDisabled: function isDisabled(value) {
+        return disabledIds.includes(value === null || value === void 0 ? void 0 : value.id);
+      },
+      onChange: handleChangeSelectedKeys,
+      highlightRowWhenSelected: true,
+      checkboxPlacement: 'start',
+      checkboxColumn: {
+        lock: true
+      },
+      clickArea: 'cell',
+      stopClickEventPropagation: true
+    }));
+  }
   pipeline.use(features.autoRowSpan());
   // FIXME: 自定义列头宽度暂时有实现难度，暂缓实现
   // pipeline.use(
@@ -15248,10 +15252,6 @@ var WorkorderList = function WorkorderList(props, ref) {
     _React$useState8 = _slicedToArray(_React$useState7, 2),
     paginationData = _React$useState8[0],
     setPaginationData = _React$useState8[1];
-  var _useGetColumns = useGetColumns(props.erp),
-    _useGetColumns2 = _slicedToArray(_useGetColumns, 2),
-    columns = _useGetColumns2[0],
-    showColumnsDataIndexList = _useGetColumns2[1];
   var disabledIds = (props.seletedGooods || []).map(function (goods) {
     return goods.id;
   }).filter(function (key) {
@@ -15260,7 +15260,9 @@ var WorkorderList = function WorkorderList(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       getSelectGoodList: function getSelectGoodList() {
-        return selectedList;
+        return selectedList.map(function (workOrderData) {
+          return goodsSourceFormat.workOrderDataToGoods(workOrderData, props.erp);
+        });
       }
     };
   });
@@ -15411,8 +15413,11 @@ var WorkorderList = function WorkorderList(props, ref) {
         var workOrderData = workOrderList.find(function (item) {
           return item.id === key;
         });
-        var goods = goodsSourceFormat.workOrderDataToGoods(workOrderData, props.erp);
-        newList.push(goods);
+        // const goods = goodsSourceFormat.workOrderDataToGoods(
+        //   workOrderData,
+        //   props.erp,
+        // );
+        newList.push(workOrderData);
       }
     });
     setSelectedList(newList);
@@ -15432,7 +15437,22 @@ var WorkorderList = function WorkorderList(props, ref) {
         return t.id !== record.id;
       }));
     };
-    var showColumns = [{
+    var _React$useState9 = React.useState({
+        current: 1,
+        pageSize: 1
+      }),
+      _React$useState10 = _slicedToArray(_React$useState9, 2),
+      showPaginationData = _React$useState10[0],
+      setShowPaginationData = _React$useState10[1];
+    var pointer = (showPaginationData.current - 1) * showPaginationData.pageSize;
+    var showList = selectedList.slice(pointer, pointer + showPaginationData.pageSize);
+    var showPaginationChange = function showPaginationChange(current, pageSize) {
+      setShowPaginationData(_objectSpread2(_objectSpread2({}, showPaginationData), {}, {
+        current: current,
+        pageSize: pageSize
+      }));
+    };
+    var operationCol = {
       dataIndex: '',
       title: "\u64CD\u4F5C",
       ellipsis: true,
@@ -15445,26 +15465,31 @@ var WorkorderList = function WorkorderList(props, ref) {
           }
         }, "\u5220\u9664");
       }
-    }].concat(takeRight(columns, columns.length - 1));
+    };
     return selectedKeys.length ? /*#__PURE__*/React.createElement("div", {
       style: {
         width: '100%',
         maxWidth: '387px'
       }
-    }, /*#__PURE__*/React.createElement(Table, {
-      columns: showColumns,
-      rowKey: 'id',
-      dataSource: selectedList,
-      scroll: {
-        x: '100%',
-        y: 250
+    }, /*#__PURE__*/React.createElement(HighPerformanceTable, {
+      useSelectCol: false,
+      columns: [operationCol].concat(_toConsumableArray(goodsSourceFormat.tableColumns)),
+      height: 250,
+      dataSource: showList,
+      loading: false
+    }), /*#__PURE__*/React.createElement(Pagination, {
+      disabled: false,
+      current: showPaginationData.current,
+      pageSize: showPaginationData.pageSize,
+      total: selectedList.length,
+      onChange: showPaginationChange,
+      showSizeChanger: true,
+      style: {
+        marginTop: 8,
+        textAlign: 'right'
       },
-      pagination: {
-        size: 'small',
-        total: selectedKeys.length,
-        pageSize: 10,
-        showSizeChanger: false
-      }
+      size: "small",
+      pageSizeOptions: [10, 20, 50, 100, 500, 1000]
     })) : null;
   };
   React.useEffect(function () {
@@ -18125,44 +18150,52 @@ var isErpType = {
 var processGoods = function processGoods(_ref) {
   var list = _ref.list,
     type = _ref.type,
-    canUpdateNumber = _ref.canUpdateNumber;
+    canUpdateNumber = _ref.canUpdateNumber,
+    _ref$source = _ref.source,
+    source = _ref$source === void 0 ? 'erp' : _ref$source;
   var newList = [];
   // 根据商品类型处理数据
   if (isErpType.isWdt(type)) {
     newList = processWdtGoods({
       list: list,
       type: type,
-      canUpdateNumber: canUpdateNumber
+      canUpdateNumber: canUpdateNumber,
+      source: source
     });
   } else if (isErpType.isBsE3(type)) {
     newList = processBsE3Goods({
       list: list,
       type: type,
-      canUpdateNumber: canUpdateNumber
+      canUpdateNumber: canUpdateNumber,
+      source: source
     });
   } else if (isErpType.isGy(type)) {
     newList = processGyGoods({
       list: list,
       type: type,
-      canUpdateNumber: canUpdateNumber
+      canUpdateNumber: canUpdateNumber,
+      source: source
     });
   } else if (isErpType.isJst(type)) {
     newList = processJstGoods({
       list: list,
       type: type,
-      canUpdateNumber: canUpdateNumber
+      canUpdateNumber: canUpdateNumber,
+      source: source
     });
   } else if (isErpType.isKm(type)) {
     newList = processKmGoods({
       list: list,
       type: type,
-      canUpdateNumber: canUpdateNumber
+      canUpdateNumber: canUpdateNumber,
+      source: source
     });
   } else {
     newList = processDefaultGoods({
       list: list,
       type: type,
-      canUpdateNumber: canUpdateNumber
+      canUpdateNumber: canUpdateNumber,
+      source: source
     });
   }
   return newList;
@@ -18227,26 +18260,31 @@ var processBsE3Goods = function processBsE3Goods(_ref3) {
   });
 };
 var processGyGoods = function processGyGoods(_ref4) {
-  var list = _ref4.list;
+  var list = _ref4.list,
+    source = _ref4.source;
+  var isFormWorkOrder = source === 'workOrder';
   return list.map(function (item) {
     var goodName = item.goodName,
       goodShortName = item.goodShortName,
       goodNo = item.goodNo,
       specName = item.specName,
       specNo = item.specNo,
-      retailPrice = item.retailPrice;
+      retailPrice = item.retailPrice,
+      qty = item.qty,
+      originPrice = item.originPrice,
+      originAmount = item.originAmount;
     return _objectSpread2(_objectSpread2({}, item), {}, {
       uuid: uuid(),
       canDelete: true,
       canEdit: true,
-      qty: 1,
+      qty: isFormWorkOrder ? qty : 1,
       goodName: goodName,
       goodShortName: goodShortName,
       goodNo: goodNo,
       specName: specName,
       specNo: specNo,
-      originPrice: !isNull(retailPrice) ? Number(retailPrice) : null,
-      originAmount: !isNull(retailPrice) ? Number(retailPrice) : null
+      originPrice: isFormWorkOrder ? originPrice : !isNull(retailPrice) ? Number(retailPrice) : null,
+      originAmount: isFormWorkOrder ? originAmount : !isNull(retailPrice) ? Number(retailPrice) : null
     });
   });
 };
@@ -18756,7 +18794,8 @@ var GoodItem$1 = function GoodItem(props) {
     var newList = processGoods({
       list: list,
       canUpdateNumber: canUpdateNumber,
-      type: type
+      type: type,
+      source: (goodsSource === null || goodsSource === void 0 ? void 0 : goodsSource.source) || 'erp'
     });
     onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value), _toConsumableArray(newList)));
   };

package/dist/index.js

@@ -14514,12 +14514,14 @@ var Cell = function Cell(_ref) {
   var children = tdProps.children,
     otherProps = _objectWithoutProperties(tdProps, _excluded$e);
   return /*#__PURE__*/React__default['default'].createElement("td", _objectSpread2({}, otherProps), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: 'cell-content'
+    className: "cell-content"
   }, children));
 };
 var HighPerformanceTable = function HighPerformanceTable(_ref2) {
   var _ref2$disabledIds = _ref2.disabledIds,
     disabledIds = _ref2$disabledIds === void 0 ? [] : _ref2$disabledIds,
+    _ref2$useSelectCol = _ref2.useSelectCol,
+    useSelectCol = _ref2$useSelectCol === void 0 ? true : _ref2$useSelectCol,
     selectedKeys = _ref2.selectedKeys,
     handleChangeSelectedKeys = _ref2.handleChangeSelectedKeys,
     dataSource = _ref2.dataSource,
@@ -14545,20 +14547,22 @@ var HighPerformanceTable = function HighPerformanceTable(_ref2) {
     handleHoverBackground: '#aaa',
     handleActiveBackground: '#89bff7'
   }));
-  pipeline.use(multiSelect({
-    value: selectedKeys,
-    isDisabled: function isDisabled(value) {
-      return disabledIds.includes(value === null || value === void 0 ? void 0 : value.id);
-    },
-    onChange: handleChangeSelectedKeys,
-    highlightRowWhenSelected: true,
-    checkboxPlacement: 'start',
-    checkboxColumn: {
-      lock: true
-    },
-    clickArea: 'cell',
-    stopClickEventPropagation: true
-  }));
+  if (useSelectCol) {
+    pipeline.use(multiSelect({
+      value: selectedKeys,
+      isDisabled: function isDisabled(value) {
+        return disabledIds.includes(value === null || value === void 0 ? void 0 : value.id);
+      },
+      onChange: handleChangeSelectedKeys,
+      highlightRowWhenSelected: true,
+      checkboxPlacement: 'start',
+      checkboxColumn: {
+        lock: true
+      },
+      clickArea: 'cell',
+      stopClickEventPropagation: true
+    }));
+  }
   pipeline.use(aliReactTable.features.autoRowSpan());
   // FIXME: 自定义列头宽度暂时有实现难度，暂缓实现
   // pipeline.use(
@@ -15261,10 +15265,6 @@ var WorkorderList = function WorkorderList(props, ref) {
     _React$useState8 = _slicedToArray(_React$useState7, 2),
     paginationData = _React$useState8[0],
     setPaginationData = _React$useState8[1];
-  var _useGetColumns = useGetColumns(props.erp),
-    _useGetColumns2 = _slicedToArray(_useGetColumns, 2),
-    columns = _useGetColumns2[0],
-    showColumnsDataIndexList = _useGetColumns2[1];
   var disabledIds = (props.seletedGooods || []).map(function (goods) {
     return goods.id;
   }).filter(function (key) {
@@ -15273,7 +15273,9 @@ var WorkorderList = function WorkorderList(props, ref) {
   React.useImperativeHandle(ref, function () {
     return {
       getSelectGoodList: function getSelectGoodList() {
-        return selectedList;
+        return selectedList.map(function (workOrderData) {
+          return goodsSourceFormat.workOrderDataToGoods(workOrderData, props.erp);
+        });
       }
     };
   });
@@ -15424,8 +15426,11 @@ var WorkorderList = function WorkorderList(props, ref) {
         var workOrderData = workOrderList.find(function (item) {
           return item.id === key;
         });
-        var goods = goodsSourceFormat.workOrderDataToGoods(workOrderData, props.erp);
-        newList.push(goods);
+        // const goods = goodsSourceFormat.workOrderDataToGoods(
+        //   workOrderData,
+        //   props.erp,
+        // );
+        newList.push(workOrderData);
       }
     });
     setSelectedList(newList);
@@ -15445,7 +15450,22 @@ var WorkorderList = function WorkorderList(props, ref) {
         return t.id !== record.id;
       }));
     };
-    var showColumns = [{
+    var _React$useState9 = React__default['default'].useState({
+        current: 1,
+        pageSize: 1
+      }),
+      _React$useState10 = _slicedToArray(_React$useState9, 2),
+      showPaginationData = _React$useState10[0],
+      setShowPaginationData = _React$useState10[1];
+    var pointer = (showPaginationData.current - 1) * showPaginationData.pageSize;
+    var showList = selectedList.slice(pointer, pointer + showPaginationData.pageSize);
+    var showPaginationChange = function showPaginationChange(current, pageSize) {
+      setShowPaginationData(_objectSpread2(_objectSpread2({}, showPaginationData), {}, {
+        current: current,
+        pageSize: pageSize
+      }));
+    };
+    var operationCol = {
       dataIndex: '',
       title: "\u64CD\u4F5C",
       ellipsis: true,
@@ -15458,26 +15478,31 @@ var WorkorderList = function WorkorderList(props, ref) {
           }
         }, "\u5220\u9664");
       }
-    }].concat(lodash.takeRight(columns, columns.length - 1));
+    };
     return selectedKeys.length ? /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
         width: '100%',
         maxWidth: '387px'
       }
-    }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
-      columns: showColumns,
-      rowKey: 'id',
-      dataSource: selectedList,
-      scroll: {
-        x: '100%',
-        y: 250
+    }, /*#__PURE__*/React__default['default'].createElement(HighPerformanceTable, {
+      useSelectCol: false,
+      columns: [operationCol].concat(_toConsumableArray(goodsSourceFormat.tableColumns)),
+      height: 250,
+      dataSource: showList,
+      loading: false
+    }), /*#__PURE__*/React__default['default'].createElement(antd.Pagination, {
+      disabled: false,
+      current: showPaginationData.current,
+      pageSize: showPaginationData.pageSize,
+      total: selectedList.length,
+      onChange: showPaginationChange,
+      showSizeChanger: true,
+      style: {
+        marginTop: 8,
+        textAlign: 'right'
       },
-      pagination: {
-        size: 'small',
-        total: selectedKeys.length,
-        pageSize: 10,
-        showSizeChanger: false
-      }
+      size: "small",
+      pageSizeOptions: [10, 20, 50, 100, 500, 1000]
     })) : null;
   };
   React__default['default'].useEffect(function () {
@@ -18138,44 +18163,52 @@ var isErpType = {
 var processGoods = function processGoods(_ref) {
   var list = _ref.list,
     type = _ref.type,
-    canUpdateNumber = _ref.canUpdateNumber;
+    canUpdateNumber = _ref.canUpdateNumber,
+    _ref$source = _ref.source,
+    source = _ref$source === void 0 ? 'erp' : _ref$source;
   var newList = [];
   // 根据商品类型处理数据
   if (isErpType.isWdt(type)) {
     newList = processWdtGoods({
       list: list,
       type: type,
-      canUpdateNumber: canUpdateNumber
+      canUpdateNumber: canUpdateNumber,
+      source: source
     });
   } else if (isErpType.isBsE3(type)) {
     newList = processBsE3Goods({
       list: list,
       type: type,
-      canUpdateNumber: canUpdateNumber
+      canUpdateNumber: canUpdateNumber,
+      source: source
     });
   } else if (isErpType.isGy(type)) {
     newList = processGyGoods({
       list: list,
       type: type,
-      canUpdateNumber: canUpdateNumber
+      canUpdateNumber: canUpdateNumber,
+      source: source
     });
   } else if (isErpType.isJst(type)) {
     newList = processJstGoods({
       list: list,
       type: type,
-      canUpdateNumber: canUpdateNumber
+      canUpdateNumber: canUpdateNumber,
+      source: source
     });
   } else if (isErpType.isKm(type)) {
     newList = processKmGoods({
       list: list,
       type: type,
-      canUpdateNumber: canUpdateNumber
+      canUpdateNumber: canUpdateNumber,
+      source: source
     });
   } else {
     newList = processDefaultGoods({
       list: list,
       type: type,
-      canUpdateNumber: canUpdateNumber
+      canUpdateNumber: canUpdateNumber,
+      source: source
     });
   }
   return newList;
@@ -18240,26 +18273,31 @@ var processBsE3Goods = function processBsE3Goods(_ref3) {
   });
 };
 var processGyGoods = function processGyGoods(_ref4) {
-  var list = _ref4.list;
+  var list = _ref4.list,
+    source = _ref4.source;
+  var isFormWorkOrder = source === 'workOrder';
   return list.map(function (item) {
     var goodName = item.goodName,
       goodShortName = item.goodShortName,
       goodNo = item.goodNo,
       specName = item.specName,
       specNo = item.specNo,
-      retailPrice = item.retailPrice;
+      retailPrice = item.retailPrice,
+      qty = item.qty,
+      originPrice = item.originPrice,
+      originAmount = item.originAmount;
     return _objectSpread2(_objectSpread2({}, item), {}, {
       uuid: kmkfUtils.uuid(),
       canDelete: true,
       canEdit: true,
-      qty: 1,
+      qty: isFormWorkOrder ? qty : 1,
       goodName: goodName,
       goodShortName: goodShortName,
       goodNo: goodNo,
       specName: specName,
       specNo: specNo,
-      originPrice: !kmkfUtils.isNull(retailPrice) ? Number(retailPrice) : null,
-      originAmount: !kmkfUtils.isNull(retailPrice) ? Number(retailPrice) : null
+      originPrice: isFormWorkOrder ? originPrice : !kmkfUtils.isNull(retailPrice) ? Number(retailPrice) : null,
+      originAmount: isFormWorkOrder ? originAmount : !kmkfUtils.isNull(retailPrice) ? Number(retailPrice) : null
     });
   });
 };
@@ -18769,7 +18807,8 @@ var GoodItem$1 = function GoodItem(props) {
     var newList = processGoods({
       list: list,
       canUpdateNumber: canUpdateNumber,
-      type: type
+      type: type,
+      source: (goodsSource === null || goodsSource === void 0 ? void 0 : goodsSource.source) || 'erp'
     });
     onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value), _toConsumableArray(newList)));
   };

package/dist/src/bs/component/GoodItem/constants/index.d.ts

@@ -1,5 +1,6 @@
-export declare const processGoods: ({ list, type, canUpdateNumber, }: {
+export declare const processGoods: ({ list, type, canUpdateNumber, source, }: {
     list: any[];
     type: string;
     canUpdateNumber: boolean;
+    source?: "erp" | "workOrder" | undefined;
 }) => any[];

package/dist/src/common/HighPerformanceTable/index.d.ts

@@ -2,8 +2,9 @@ import React from 'react';
 import './index.less';
 interface HighPerformanceTableProps {
     disabledIds?: string[];
-    selectedKeys: string[];
-    handleChangeSelectedKeys: (keys: string[]) => void;
+    selectedKeys?: string[];
+    useSelectCol?: boolean;
+    handleChangeSelectedKeys?: (keys: string[]) => void;
     dataSource: any[];
     columns: any[];
     height: number;
@@ -11,5 +12,5 @@ interface HighPerformanceTableProps {
     className?: string;
     onRow?: (record: any, rowIndex: number) => void;
 }
-declare const HighPerformanceTable: ({ disabledIds, selectedKeys, handleChangeSelectedKeys, dataSource, columns, height, loading, className, onRow, }: HighPerformanceTableProps) => React.JSX.Element;
+declare const HighPerformanceTable: ({ disabledIds, useSelectCol, selectedKeys, handleChangeSelectedKeys, dataSource, columns, height, loading, className, onRow, }: HighPerformanceTableProps) => React.JSX.Element;
 export default HighPerformanceTable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.79-beta.46",
+  "version": "2.0.79-beta.49",
   "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.44",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.79-beta.47",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4bdb4ce294d26374f682748c12064a8ea1375346"
+  "gitHead": "a58273277e7c30785c023d600ce5ab2f61b14875"
 }