@kmkf-fe-packages/basic-components 2.6.1-beta.1 → 2.6.1-beta.11

package/dist/index.esm.js

@@ -8601,6 +8601,10 @@ var processCallBackStatus = function processCallBackStatus(getValue) {
       REPAIR_ORDER_STATUS: {
         status: 'repairOrderStatusValue',
         reason: 'repairOrderStatusReason'
+      },
+      ERP_REMARK: {
+        status: 'erpRemarkStatusValue',
+        reason: 'erpRemarkStatusReason'
       }
     };
     return _defineProperty({}, nex.uniqueKey, {
@@ -9446,6 +9450,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       REISSUE_LOGISTICS: processReissueLogistics,
       REISSUE_STATUS: processCallBackStatus,
       ADJUST_WORK_ORDER_STATUS: processCallBackStatus,
+      ERP_REMARK: processCallBackStatus,
       CREATE_STATUS: processCallBackStatus,
       INVOICE_STATUS: processCallBackStatus,
       INVOICING_STATUS: processCallBackStatus,
@@ -16359,6 +16364,10 @@ var searchFormData = [{
   label: '款式编码',
   name: 'styleCode',
   type: 'optionalInput'
+}, {
+  label: '规格值',
+  name: 'propertiesValue',
+  type: 'optionalInput'
 }, {
   label: '商品类型',
   name: 'skuType',
@@ -24076,7 +24085,7 @@ var processKmGoods$1 = function processKmGoods(_ref8) {
       sysTitle: item.goodName,
       title: null,
       shortTitle: item.goodShortName,
-      sysOuterId: item.goodNo,
+      sysOuterId: item.specNo,
       outerId: item.goodNo,
       skuSysId: item.specId,
       sysSkuId: item.specId,
@@ -26395,11 +26404,46 @@ var index$2 = (function (props) {
       return _ref13.apply(this, arguments);
     };
   }();
-  var rowSelection = {
-    type: isRadio ? 'radio' : 'checkbox',
+  var rowKey = rowKeyMap[type] || 'billNo';
+  var handleRadioChange = function handleRadioChange(record) {
+    var _value$selectIds;
+    if (disabled) return;
+    var currentKey = String(value === null || value === void 0 ? void 0 : (_value$selectIds = value.selectIds) === null || _value$selectIds === void 0 ? void 0 : _value$selectIds[0]);
+    var rowKeyVal = String(record[rowKey]);
+    if (currentKey && currentKey === rowKeyVal) {
+      _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        selectIds: [],
+        selectedRows: []
+      }));
+    } else {
+      _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        selectIds: [rowKeyVal],
+        selectedRows: [record]
+      }));
+    }
+  };
+  var radioColumn = isRadio ? {
+    width: 50,
+    fixed: true,
+    render: function render(_, record) {
+      var _value$selectIds2;
+      var checked = String(value === null || value === void 0 ? void 0 : (_value$selectIds2 = value.selectIds) === null || _value$selectIds2 === void 0 ? void 0 : _value$selectIds2[0]) === String(record[rowKey]);
+      return /*#__PURE__*/React.createElement(Radio, {
+        checked: checked,
+        onClick: function onClick(e) {
+          e.preventDefault();
+          handleRadioChange(record);
+        },
+        disabled: disabled
+      });
+    }
+  } : null;
+  var displayColumns = isRadio && radioColumn ? [radioColumn].concat(_toConsumableArray(columns)) : columns;
+  var rowSelection = isRadio ? undefined : {
+    type: 'checkbox',
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
     fixed: true,
-    onChange: function onChange(selectedRowKeys, selectedRows, info) {
+    onChange: function onChange(selectedRowKeys, selectedRows) {
       _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
         selectIds: selectedRowKeys,
         selectedRows: selectedRows
@@ -26445,9 +26489,9 @@ var index$2 = (function (props) {
     allowClear: true
   })), /*#__PURE__*/React.createElement(Table, {
     dataSource: filteredData,
-    columns: columns,
+    columns: displayColumns,
     rowSelection: rowSelection,
-    rowKey: rowKeyMap[type] || 'billNo',
+    rowKey: rowKey,
     size: "small",
     pagination: false,
     scroll: {

package/dist/index.js

@@ -8616,6 +8616,10 @@ var processCallBackStatus = function processCallBackStatus(getValue) {
       REPAIR_ORDER_STATUS: {
         status: 'repairOrderStatusValue',
         reason: 'repairOrderStatusReason'
+      },
+      ERP_REMARK: {
+        status: 'erpRemarkStatusValue',
+        reason: 'erpRemarkStatusReason'
       }
     };
     return _defineProperty({}, nex.uniqueKey, {
@@ -9461,6 +9465,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       REISSUE_LOGISTICS: processReissueLogistics,
       REISSUE_STATUS: processCallBackStatus,
       ADJUST_WORK_ORDER_STATUS: processCallBackStatus,
+      ERP_REMARK: processCallBackStatus,
       CREATE_STATUS: processCallBackStatus,
       INVOICE_STATUS: processCallBackStatus,
       INVOICING_STATUS: processCallBackStatus,
@@ -16374,6 +16379,10 @@ var searchFormData = [{
   label: '款式编码',
   name: 'styleCode',
   type: 'optionalInput'
+}, {
+  label: '规格值',
+  name: 'propertiesValue',
+  type: 'optionalInput'
 }, {
   label: '商品类型',
   name: 'skuType',
@@ -24091,7 +24100,7 @@ var processKmGoods$1 = function processKmGoods(_ref8) {
       sysTitle: item.goodName,
       title: null,
       shortTitle: item.goodShortName,
-      sysOuterId: item.goodNo,
+      sysOuterId: item.specNo,
       outerId: item.goodNo,
       skuSysId: item.specId,
       sysSkuId: item.specId,
@@ -26410,11 +26419,46 @@ var index$2 = (function (props) {
       return _ref13.apply(this, arguments);
     };
   }();
-  var rowSelection = {
-    type: isRadio ? 'radio' : 'checkbox',
+  var rowKey = rowKeyMap[type] || 'billNo';
+  var handleRadioChange = function handleRadioChange(record) {
+    var _value$selectIds;
+    if (disabled) return;
+    var currentKey = String(value === null || value === void 0 ? void 0 : (_value$selectIds = value.selectIds) === null || _value$selectIds === void 0 ? void 0 : _value$selectIds[0]);
+    var rowKeyVal = String(record[rowKey]);
+    if (currentKey && currentKey === rowKeyVal) {
+      _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        selectIds: [],
+        selectedRows: []
+      }));
+    } else {
+      _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+        selectIds: [rowKeyVal],
+        selectedRows: [record]
+      }));
+    }
+  };
+  var radioColumn = isRadio ? {
+    width: 50,
+    fixed: true,
+    render: function render(_, record) {
+      var _value$selectIds2;
+      var checked = String(value === null || value === void 0 ? void 0 : (_value$selectIds2 = value.selectIds) === null || _value$selectIds2 === void 0 ? void 0 : _value$selectIds2[0]) === String(record[rowKey]);
+      return /*#__PURE__*/React__default['default'].createElement(antd.Radio, {
+        checked: checked,
+        onClick: function onClick(e) {
+          e.preventDefault();
+          handleRadioChange(record);
+        },
+        disabled: disabled
+      });
+    }
+  } : null;
+  var displayColumns = isRadio && radioColumn ? [radioColumn].concat(_toConsumableArray(columns)) : columns;
+  var rowSelection = isRadio ? undefined : {
+    type: 'checkbox',
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
     fixed: true,
-    onChange: function onChange(selectedRowKeys, selectedRows, info) {
+    onChange: function onChange(selectedRowKeys, selectedRows) {
       _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
         selectIds: selectedRowKeys,
         selectedRows: selectedRows
@@ -26460,9 +26504,9 @@ var index$2 = (function (props) {
     allowClear: true
   })), /*#__PURE__*/React__default['default'].createElement(antd.Table, {
     dataSource: filteredData,
-    columns: columns,
+    columns: displayColumns,
     rowSelection: rowSelection,
-    rowKey: rowKeyMap[type] || 'billNo',
+    rowKey: rowKey,
     size: "small",
     pagination: false,
     scroll: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.6.1-beta.1",
+  "version": "2.6.1-beta.11",
   "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.3.19-beta.20",
+    "@kmkf-fe-packages/kmkf-utils": "2.6.1-beta.10",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f7102cdb1bc7fc2a9def9365d3d68bb20f78a8c6"
+  "gitHead": "d65356cd4c472acc03938936df301a92c41bb20d"
 }