@kmkf-fe-packages/basic-components 0.7.15-alpha.47 → 0.7.15-alpha.49

package/dist/index.esm.js

@@ -9837,7 +9837,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   }, /*#__PURE__*/React.createElement(Table, {
     rowSelection: rowSelection,
     columns: columns,
-    rowKey: 'goodsId',
+    rowKey: 'skuCode',
     dataSource: goodList,
     scroll: {
       x: '100%',
@@ -10034,7 +10034,7 @@ var GoodItem = function GoodItem(props) {
   var onSelectChange = function onSelectChange(newSelectedRowKeys) {
     setSelectedRowKeys(newSelectedRowKeys);
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(value.filter(function (t) {
-      return newSelectedRowKeys.includes(t.id);
+      return newSelectedRowKeys.includes(t.sku);
     }));
   };
   var handleChangeGoods = function handleChangeGoods() {
@@ -10062,7 +10062,7 @@ var GoodItem = function GoodItem(props) {
   }, "\u9009\u62E9\u5546\u54C1"), otherOperations), /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
     columns: newColumns,
     dataSource: value,
-    rowKey: 'id',
+    rowKey: 'sku',
     size: "small",
     pagination: false,
     scroll: {
@@ -10102,6 +10102,7 @@ var BsGoods = function BsGoods(props) {
   useEffect(function () {
     ref.current = pubsub.subscribeOnce('type', function (type, val) {
       var _value$bsGoods;
+      console.log(value);
       if (disabled) return;
       setWithInfo({
         type: type,
@@ -10109,9 +10110,10 @@ var BsGoods = function BsGoods(props) {
       });
       setTableSelect(['2', '4'].includes(val));
       if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : (_value$bsGoods = value.bsGoods) === null || _value$bsGoods === void 0 ? void 0 : _value$bsGoods.length)) {
+        var newGoods = cloneDeep(value === null || value === void 0 ? void 0 : value.bsGoods);
         pubsub.publish('selectList', {
           type: val,
-          list: ((value === null || value === void 0 ? void 0 : value.bsGoods) || []).map(function (item) {
+          list: (newGoods || []).map(function (item) {
             item.canDelete = false;
             return item;
           })
@@ -10128,9 +10130,10 @@ var BsGoods = function BsGoods(props) {
       });
       setTableSelect(['2', '4'].includes(val));
       if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : (_value$bsGoods2 = value.bsGoods) === null || _value$bsGoods2 === void 0 ? void 0 : _value$bsGoods2.length)) {
+        var newGoods = cloneDeep(value === null || value === void 0 ? void 0 : value.bsGoods);
         pubsub.publish('reissueSelectList', {
           type: val,
-          list: ((value === null || value === void 0 ? void 0 : value.bsGoods) || []).map(function (item) {
+          list: (newGoods || []).map(function (item) {
             item.canDelete = false;
             return item;
           })
@@ -10264,7 +10267,7 @@ var BsExchange = function BsExchange(props) {
     newValue.bsExchangeGiftGoods = [];
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     pubsub.publish('type', val[0]);
-    pubsub.subscribeOnce('selectList', function (_, data) {
+    pubsub.subscribe('selectList', function (_, data) {
       if (disabled) return;
       if (newValue) {
         var newData = cloneDeep(data);
@@ -10338,7 +10341,12 @@ var BsExchange = function BsExchange(props) {
       return changeHandle(val, 'bsExchangeReturnGoods');
     }
   })) : /*#__PURE__*/React.createElement(React.Fragment, null, ((value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods) || []).map(function (item, index) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\u9000\u56DE\u5546\u54C1"), /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        border: '1px dashed #eee',
+        marginBottom: '8px'
+      }
+    }, /*#__PURE__*/React.createElement("div", null, "\u9000\u56DE\u5546\u54C1"), /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
       key: 'bsReturnGoods'
     }, other), {}, {
       disabled: disabled,
@@ -10407,7 +10415,7 @@ var BsReissue = function BsReissue(props) {
     }
     if (key === 'bsReissueType') {
       pubsub.publish('reissueType', val[0]);
-      pubsub.subscribeOnce('reissueSelectList', function (_, data) {
+      pubsub.subscribe('reissueSelectList', function (_, data) {
         if (disabled) return;
         if (value) {
           var newData = cloneDeep(data);

package/dist/index.js

@@ -9848,7 +9848,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
     rowSelection: rowSelection,
     columns: columns,
-    rowKey: 'goodsId',
+    rowKey: 'skuCode',
     dataSource: goodList,
     scroll: {
       x: '100%',
@@ -10045,7 +10045,7 @@ var GoodItem = function GoodItem(props) {
   var onSelectChange = function onSelectChange(newSelectedRowKeys) {
     setSelectedRowKeys(newSelectedRowKeys);
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(value.filter(function (t) {
-      return newSelectedRowKeys.includes(t.id);
+      return newSelectedRowKeys.includes(t.sku);
     }));
   };
   var handleChangeGoods = function handleChangeGoods() {
@@ -10073,7 +10073,7 @@ var GoodItem = function GoodItem(props) {
   }, "\u9009\u62E9\u5546\u54C1"), otherOperations), /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {
     columns: newColumns,
     dataSource: value,
-    rowKey: 'id',
+    rowKey: 'sku',
     size: "small",
     pagination: false,
     scroll: {
@@ -10113,6 +10113,7 @@ var BsGoods = function BsGoods(props) {
   React.useEffect(function () {
     ref.current = pubsub__default['default'].subscribeOnce('type', function (type, val) {
       var _value$bsGoods;
+      console.log(value);
       if (disabled) return;
       setWithInfo({
         type: type,
@@ -10120,9 +10121,10 @@ var BsGoods = function BsGoods(props) {
       });
       setTableSelect(['2', '4'].includes(val));
       if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : (_value$bsGoods = value.bsGoods) === null || _value$bsGoods === void 0 ? void 0 : _value$bsGoods.length)) {
+        var newGoods = lodash.cloneDeep(value === null || value === void 0 ? void 0 : value.bsGoods);
         pubsub__default['default'].publish('selectList', {
           type: val,
-          list: ((value === null || value === void 0 ? void 0 : value.bsGoods) || []).map(function (item) {
+          list: (newGoods || []).map(function (item) {
             item.canDelete = false;
             return item;
           })
@@ -10139,9 +10141,10 @@ var BsGoods = function BsGoods(props) {
       });
       setTableSelect(['2', '4'].includes(val));
       if (['1', '3'].includes(val) && (value === null || value === void 0 ? void 0 : (_value$bsGoods2 = value.bsGoods) === null || _value$bsGoods2 === void 0 ? void 0 : _value$bsGoods2.length)) {
+        var newGoods = lodash.cloneDeep(value === null || value === void 0 ? void 0 : value.bsGoods);
         pubsub__default['default'].publish('reissueSelectList', {
           type: val,
-          list: ((value === null || value === void 0 ? void 0 : value.bsGoods) || []).map(function (item) {
+          list: (newGoods || []).map(function (item) {
             item.canDelete = false;
             return item;
           })
@@ -10275,7 +10278,7 @@ var BsExchange = function BsExchange(props) {
     newValue.bsExchangeGiftGoods = [];
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     pubsub__default['default'].publish('type', val[0]);
-    pubsub__default['default'].subscribeOnce('selectList', function (_, data) {
+    pubsub__default['default'].subscribe('selectList', function (_, data) {
       if (disabled) return;
       if (newValue) {
         var newData = lodash.cloneDeep(data);
@@ -10349,7 +10352,12 @@ var BsExchange = function BsExchange(props) {
       return changeHandle(val, 'bsExchangeReturnGoods');
     }
   })) : /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, ((value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods) || []).map(function (item, index) {
-    return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", null, "\u9000\u56DE\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
+    return /*#__PURE__*/React__default['default'].createElement("div", {
+      style: {
+        border: '1px dashed #eee',
+        marginBottom: '8px'
+      }
+    }, /*#__PURE__*/React__default['default'].createElement("div", null, "\u9000\u56DE\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
       key: 'bsReturnGoods'
     }, other), {}, {
       disabled: disabled,
@@ -10418,7 +10426,7 @@ var BsReissue = function BsReissue(props) {
     }
     if (key === 'bsReissueType') {
       pubsub__default['default'].publish('reissueType', val[0]);
-      pubsub__default['default'].subscribeOnce('reissueSelectList', function (_, data) {
+      pubsub__default['default'].subscribe('reissueSelectList', function (_, data) {
         if (disabled) return;
         if (value) {
           var newData = lodash.cloneDeep(data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.7.15-alpha.47",
+  "version": "0.7.15-alpha.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": "^0.7.15-alpha.47",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.49",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "umi-request": "^1.4.0"
@@ -58,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0d20fc03fc8f894662640e8dee21f7ee4c7250fa"
+  "gitHead": "83a1112fe9ef93e93431e2c4ae163b9b4e5bc0c8"
 }