@kmkf-fe-packages/basic-components 2.3.19-beta.8 → 2.4.1

package/dist/index.esm.js

@@ -9132,10 +9132,6 @@ var processErpTradeId = function processErpTradeId(getValue) {
       EXCHANGE_TRADE_ID: {
         key: 'tradeItemList',
         defaultValue: []
-      },
-      SWAP_OUT_TRADE_ID: {
-        key: 'tradeItemList',
-        defaultValue: []
       }
     };
     return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)), SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue));
@@ -9503,7 +9499,6 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       RETURN_GOODS_TRADE_ID: processErpTradeId,
       BS_DELIVERY_NO: processErpTradeId,
       REISSUE_TRADE_ID: processErpTradeId,
-      SWAP_OUT_TRADE_ID: processErpTradeId,
       ERP_AFTER_SALE_TRADE_ID: processErpTradeId,
       EXCHANGE_TRADE_ID: processErpTradeId,
       WLN_GOODS: processWlnGoods(templateColumns),
@@ -15126,13 +15121,6 @@ var wdtColumns = [{
   title: '辅助单位',
   width: 150,
   render: renderTextEllipsis
-}, {
-  dataIndex: 'skuType',
-  title: '是否组合装',
-  width: 150,
-  render: function render(type) {
-    return type === 'suite' ? '组合装' : '非组合装';
-  }
 }];
 
 var bse3Columns = [{
@@ -15975,7 +15963,7 @@ var transformFormData = function transformFormData(formData) {
     if (formData[key]) {
       var _formData$key, _formData$key2, _formData$key3, _formData$key4;
       var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
-      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : Array.isArray(value) ? 'eq' : 'like';
+      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : 'like';
       conditionList.push({
         leftValue: key,
         compareSymbol: compareSymbol,
@@ -16121,56 +16109,35 @@ var GoodList = function GoodList(props, ref) {
         };
       })
     }
-  }, {
-    label: '是否组合装',
-    name: 'skuType',
-    dataIndex: 'skuType',
-    type: 'select',
-    formItemProps: {
-      mode: 'multiple',
-      filterOption: function filterOption(input, option) {
-        return option.label.includes(input);
-      },
-      options: [{
-        label: '组合装',
-        value: 'suite'
-      }, {
-        label: '非组合装',
-        value: ''
-      }]
-    }
   }];
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
     onSelect: function onSelect(record, selected) {
-      var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [uniqueKey]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== uniqueKey;
+          return t !== record.specNo;
         }));
         setSelect(selectList.filter(function (t) {
-          return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
+          return t.specNo !== record.specNo;
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
-        var changeKeys = changeRows.map(function (t) {
-          return "".concat(t.goodNo, "-").concat(t.specNo);
-        });
-        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeKeys)));
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t.specNo;
+        }))));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
-        var _changeKeys = changeRows.map(function (t) {
-          return "".concat(t.goodNo, "-").concat(t.specNo);
-        });
-        setSelectIds(difference(selectIds, _changeKeys));
+        setSelectIds(difference(selectIds, changeRows.map(function (t) {
+          return t.specNo;
+        })));
         var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return "".concat(arrVal.goodNo, "-").concat(arrVal.specNo) !== "".concat(othVal.goodNo, "-").concat(othVal.specNo);
+          return arrVal.specNo !== othVal.specNo;
         });
         setSelect(list);
       }
@@ -16178,12 +16145,11 @@ var GoodList = function GoodList(props, ref) {
   };
   var showTable = function showTable() {
     var handleDelete = function handleDelete(record) {
-      var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
       setSelectIds(selectIds.filter(function (t) {
-        return t !== uniqueKey;
+        return t !== record.specNo;
       }));
       setSelect(selectList.filter(function (t) {
-        return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
+        return t.specNo !== record.specNo;
       }));
     };
     var showColumns = [{
@@ -16207,9 +16173,7 @@ var GoodList = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React.createElement(Table, {
       columns: showColumns,
-      rowKey: function rowKey(record) {
-        return "".concat(record.goodNo, "-").concat(record.specNo);
-      },
+      rowKey: 'specNo',
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -16239,9 +16203,7 @@ var GoodList = function GoodList(props, ref) {
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({
     className: "GoodModalColumns",
     rowSelection: rowSelection,
-    rowKey: function rowKey(record) {
-      return "".concat(record.goodNo, "-").concat(record.specNo);
-    },
+    rowKey: "specNo",
     columns: columns,
     scroll: {
       x: '100%',
@@ -21851,11 +21813,6 @@ var getColumns$6 = function getColumns() {
       title: "\u5546\u54C1\u7B80\u79F0",
       width: 150,
       render: renderTextEllipsis
-    }, {
-      dataIndex: 'sysItemOuterId',
-      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
-      width: 250,
-      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -21984,11 +21941,6 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
-    }, {
-      dataIndex: 'sysItemOuterId',
-      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
-      width: 250,
-      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -22157,11 +22109,6 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
-    }, {
-      dataIndex: 'sysItemOuterId',
-      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
-      width: 250,
-      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -22343,11 +22290,6 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
-    }, {
-      dataIndex: 'sysItemOuterId',
-      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
-      width: 250,
-      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -24071,7 +24013,6 @@ var processKmGoods$1 = function processKmGoods(_ref8) {
       itemSysId: item.goodId,
       sysItemId: item.goodId,
       sysPicPath: item.goodPicUrl,
-      sysItemOuterId: item.goodNo,
       payment: null,
       price: item.retailPrice,
       type: (kmSkuTypeMap === null || kmSkuTypeMap === void 0 ? void 0 : kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]) || '',

package/dist/index.js

@@ -9147,10 +9147,6 @@ var processErpTradeId = function processErpTradeId(getValue) {
       EXCHANGE_TRADE_ID: {
         key: 'tradeItemList',
         defaultValue: []
-      },
-      SWAP_OUT_TRADE_ID: {
-        key: 'tradeItemList',
-        defaultValue: []
       }
     };
     return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)), SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue));
@@ -9518,7 +9514,6 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       RETURN_GOODS_TRADE_ID: processErpTradeId,
       BS_DELIVERY_NO: processErpTradeId,
       REISSUE_TRADE_ID: processErpTradeId,
-      SWAP_OUT_TRADE_ID: processErpTradeId,
       ERP_AFTER_SALE_TRADE_ID: processErpTradeId,
       EXCHANGE_TRADE_ID: processErpTradeId,
       WLN_GOODS: processWlnGoods(templateColumns),
@@ -15141,13 +15136,6 @@ var wdtColumns = [{
   title: '辅助单位',
   width: 150,
   render: renderTextEllipsis
-}, {
-  dataIndex: 'skuType',
-  title: '是否组合装',
-  width: 150,
-  render: function render(type) {
-    return type === 'suite' ? '组合装' : '非组合装';
-  }
 }];
 
 var bse3Columns = [{
@@ -15990,7 +15978,7 @@ var transformFormData = function transformFormData(formData) {
     if (formData[key]) {
       var _formData$key, _formData$key2, _formData$key3, _formData$key4;
       var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
-      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : Array.isArray(value) ? 'eq' : 'like';
+      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : 'like';
       conditionList.push({
         leftValue: key,
         compareSymbol: compareSymbol,
@@ -16136,56 +16124,35 @@ var GoodList = function GoodList(props, ref) {
         };
       })
     }
-  }, {
-    label: '是否组合装',
-    name: 'skuType',
-    dataIndex: 'skuType',
-    type: 'select',
-    formItemProps: {
-      mode: 'multiple',
-      filterOption: function filterOption(input, option) {
-        return option.label.includes(input);
-      },
-      options: [{
-        label: '组合装',
-        value: 'suite'
-      }, {
-        label: '非组合装',
-        value: ''
-      }]
-    }
   }];
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
     onSelect: function onSelect(record, selected) {
-      var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [uniqueKey]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== uniqueKey;
+          return t !== record.specNo;
         }));
         setSelect(selectList.filter(function (t) {
-          return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
+          return t.specNo !== record.specNo;
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
-        var changeKeys = changeRows.map(function (t) {
-          return "".concat(t.goodNo, "-").concat(t.specNo);
-        });
-        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeKeys)));
+        setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
+          return t.specNo;
+        }))));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
-        var _changeKeys = changeRows.map(function (t) {
-          return "".concat(t.goodNo, "-").concat(t.specNo);
-        });
-        setSelectIds(lodash.difference(selectIds, _changeKeys));
+        setSelectIds(lodash.difference(selectIds, changeRows.map(function (t) {
+          return t.specNo;
+        })));
         var list = lodash.differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return "".concat(arrVal.goodNo, "-").concat(arrVal.specNo) !== "".concat(othVal.goodNo, "-").concat(othVal.specNo);
+          return arrVal.specNo !== othVal.specNo;
         });
         setSelect(list);
       }
@@ -16193,12 +16160,11 @@ var GoodList = function GoodList(props, ref) {
   };
   var showTable = function showTable() {
     var handleDelete = function handleDelete(record) {
-      var uniqueKey = "".concat(record.goodNo, "-").concat(record.specNo);
       setSelectIds(selectIds.filter(function (t) {
-        return t !== uniqueKey;
+        return t !== record.specNo;
       }));
       setSelect(selectList.filter(function (t) {
-        return "".concat(t.goodNo, "-").concat(t.specNo) !== uniqueKey;
+        return t.specNo !== record.specNo;
       }));
     };
     var showColumns = [{
@@ -16222,9 +16188,7 @@ var GoodList = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
       columns: showColumns,
-      rowKey: function rowKey(record) {
-        return "".concat(record.goodNo, "-").concat(record.specNo);
-      },
+      rowKey: 'specNo',
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -16254,9 +16218,7 @@ var GoodList = function GoodList(props, ref) {
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({
     className: "GoodModalColumns",
     rowSelection: rowSelection,
-    rowKey: function rowKey(record) {
-      return "".concat(record.goodNo, "-").concat(record.specNo);
-    },
+    rowKey: "specNo",
     columns: columns,
     scroll: {
       x: '100%',
@@ -21866,11 +21828,6 @@ var getColumns$6 = function getColumns() {
       title: "\u5546\u54C1\u7B80\u79F0",
       width: 150,
       render: renderTextEllipsis
-    }, {
-      dataIndex: 'sysItemOuterId',
-      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
-      width: 250,
-      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -21999,11 +21956,6 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
-    }, {
-      dataIndex: 'sysItemOuterId',
-      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
-      width: 250,
-      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -22172,11 +22124,6 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
-    }, {
-      dataIndex: 'sysItemOuterId',
-      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
-      width: 250,
-      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -22358,11 +22305,6 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
-    }, {
-      dataIndex: 'sysItemOuterId',
-      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
-      width: 250,
-      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -24086,7 +24028,6 @@ var processKmGoods$1 = function processKmGoods(_ref8) {
       itemSysId: item.goodId,
       sysItemId: item.goodId,
       sysPicPath: item.goodPicUrl,
-      sysItemOuterId: item.goodNo,
       payment: null,
       price: item.retailPrice,
       type: (kmkfUtils.kmSkuTypeMap === null || kmkfUtils.kmSkuTypeMap === void 0 ? void 0 : kmkfUtils.kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]) || '',

package/dist/src/bs/component/model/Columns/Erp/wdt.d.ts

@@ -17,11 +17,5 @@ declare const _default: ({
     width: number;
     render: (price: string | number) => string;
     ellipsis?: undefined;
-} | {
-    dataIndex: string;
-    title: string;
-    width: number;
-    render: (type: string) => "组合装" | "非组合装";
-    ellipsis?: undefined;
 })[];
 export default _default;

package/package.json

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