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

package/dist/index.esm.js

@@ -7183,6 +7183,9 @@ var Province = function Province(props) {
   }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
     options: option,
+    style: {
+      minWidth: '100px'
+    },
     placeholder: "\u8BF7\u9009\u62E9\u7701\u5E02\u533A"
   })));
 };
@@ -9624,26 +9627,43 @@ var ItemList = function ItemList(props) {
 };
 
 var columns = [{
-  dataIndex: '',
+  dataIndex: 'index',
   title: '序号',
+  // with: 70,
+  ellipsis: true,
   render: function render(val, record, index) {
     return /*#__PURE__*/React.createElement("span", null, index + 1);
   }
 }, {
   dataIndex: 'name',
-  title: '商品名称'
+  title: '商品名称',
+  with: 200,
+  ellipsis: true
 }, {
   dataIndex: 'goodsId',
-  title: '商品id'
+  title: '商品id',
+  with: 200,
+  ellipsis: true
 }, {
   dataIndex: 'skuName',
-  title: '商品sku名称'
+  title: '商品sku名称',
+  with: 200,
+  ellipsis: true
 }, {
   dataIndex: 'code',
-  title: '商品编码'
+  title: '商品编码',
+  with: 200,
+  ellipsis: true
 }, {
   dataIndex: 'skuCode',
-  title: '商品sku编码'
+  title: '商品sku编码',
+  with: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'marketPrice',
+  title: '市场价',
+  with: 200,
+  ellipsis: true
 }];
 var GoodsModal$1 = function GoodsModal(props, ref) {
   useImperativeHandle(ref, function () {
@@ -9729,7 +9749,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
           _context.prev = 0;
           setLoading(true);
           params = {
-            shopCode: shopCode || 'DP015'
+            shopCode: shopCode
           };
           _context.next = 5;
           return extendRequest('/qy/gdfw/product/bsListProduct', {
@@ -9766,6 +9786,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   }, [shopId]);
   var rowSelection = {
     selectedRowKeys: selectIds,
+    fixed: true,
     onChange: function onChange(selectedRowKeys, selectedRows, info) {
       console.log(selectedRowKeys, selectedRows, info);
       setSelectIds(selectedRowKeys);
@@ -9840,7 +9861,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     rowKey: 'skuCode',
     dataSource: goodList,
     scroll: {
-      x: '100%',
+      x: true,
       y: 300
     },
     pagination: {
@@ -10014,14 +10035,15 @@ var GoodItem = function GoodItem(props) {
       var goodsId = item.goodsId,
         name = item.name,
         code = item.code,
-        skuCode = item.skuCode;
+        skuCode = item.skuCode,
+        marketPrice = item.marketPrice;
       return {
         id: goodsId,
         pic: '',
         name: name,
         code: code,
         sku: skuCode,
-        money: '',
+        money: marketPrice || 0,
         share: '',
         number: 1,
         type: '',
@@ -10279,6 +10301,12 @@ var BsExchange = function BsExchange(props) {
   };
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
+    if (key === 'bsExchangeGiftGoods') {
+      val = cloneDeep(val).map(function (t) {
+        t.money = 0;
+        return t;
+      });
+    }
     newValue[key] = val;
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     if (key === 'bsExchangeType') {
@@ -10343,7 +10371,7 @@ var BsExchange = function BsExchange(props) {
   })) : /*#__PURE__*/React.createElement(React.Fragment, null, ((value === null || value === void 0 ? void 0 : value.bsExchangeReturnGoods) || []).map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
-        border: '1px dashed #eee',
+        border: '1px dashed',
         marginBottom: '8px'
       }
     }, /*#__PURE__*/React.createElement("div", null, "\u9000\u56DE\u5546\u54C1"), /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
@@ -10371,7 +10399,8 @@ var BsExchange = function BsExchange(props) {
   })), ['3', '4'].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType6 = value.bsExchangeType) === null || _value$bsExchangeType6 === void 0 ? void 0 : _value$bsExchangeType6[0]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, "\u8D60\u54C1\u4FE1\u606F"), /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
     headerText: "\u8D60\u54C1",
     key: 'bsGiftGoods',
-    disabled: disabled
+    disabled: disabled,
+    shopCode: value === null || value === void 0 ? void 0 : value.shopCode
   }, other), {}, {
     value: value === null || value === void 0 ? void 0 : value.bsExchangeGiftGoods,
     onChange: function onChange(val) {
@@ -10411,8 +10440,8 @@ var BsReissue = function BsReissue(props) {
     newValue[key] = val;
     if (key === 'bsReissueType') {
       newValue.bsReissueGoods = [];
-      onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
     }
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
     if (key === 'bsReissueType') {
       pubsub.publish('reissueType', val[0]);
       pubsub.subscribe('reissueSelectList', function (_, data) {

package/dist/index.js

@@ -7194,6 +7194,9 @@ var Province = function Province(props) {
   }, []);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, _objectSpread2(_objectSpread2({}, props), {}, {
     options: option,
+    style: {
+      minWidth: '100px'
+    },
     placeholder: "\u8BF7\u9009\u62E9\u7701\u5E02\u533A"
   })));
 };
@@ -9635,26 +9638,43 @@ var ItemList = function ItemList(props) {
 };
 
 var columns = [{
-  dataIndex: '',
+  dataIndex: 'index',
   title: '序号',
+  // with: 70,
+  ellipsis: true,
   render: function render(val, record, index) {
     return /*#__PURE__*/React__default['default'].createElement("span", null, index + 1);
   }
 }, {
   dataIndex: 'name',
-  title: '商品名称'
+  title: '商品名称',
+  with: 200,
+  ellipsis: true
 }, {
   dataIndex: 'goodsId',
-  title: '商品id'
+  title: '商品id',
+  with: 200,
+  ellipsis: true
 }, {
   dataIndex: 'skuName',
-  title: '商品sku名称'
+  title: '商品sku名称',
+  with: 200,
+  ellipsis: true
 }, {
   dataIndex: 'code',
-  title: '商品编码'
+  title: '商品编码',
+  with: 200,
+  ellipsis: true
 }, {
   dataIndex: 'skuCode',
-  title: '商品sku编码'
+  title: '商品sku编码',
+  with: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'marketPrice',
+  title: '市场价',
+  with: 200,
+  ellipsis: true
 }];
 var GoodsModal$1 = function GoodsModal(props, ref) {
   React.useImperativeHandle(ref, function () {
@@ -9740,7 +9760,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
           _context.prev = 0;
           setLoading(true);
           params = {
-            shopCode: shopCode || 'DP015'
+            shopCode: shopCode
           };
           _context.next = 5;
           return extendRequest('/qy/gdfw/product/bsListProduct', {
@@ -9777,6 +9797,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   }, [shopId]);
   var rowSelection = {
     selectedRowKeys: selectIds,
+    fixed: true,
     onChange: function onChange(selectedRowKeys, selectedRows, info) {
       console.log(selectedRowKeys, selectedRows, info);
       setSelectIds(selectedRowKeys);
@@ -9851,7 +9872,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     rowKey: 'skuCode',
     dataSource: goodList,
     scroll: {
-      x: '100%',
+      x: true,
       y: 300
     },
     pagination: {
@@ -10025,14 +10046,15 @@ var GoodItem = function GoodItem(props) {
       var goodsId = item.goodsId,
         name = item.name,
         code = item.code,
-        skuCode = item.skuCode;
+        skuCode = item.skuCode,
+        marketPrice = item.marketPrice;
       return {
         id: goodsId,
         pic: '',
         name: name,
         code: code,
         sku: skuCode,
-        money: '',
+        money: marketPrice || 0,
         share: '',
         number: 1,
         type: '',
@@ -10290,6 +10312,12 @@ var BsExchange = function BsExchange(props) {
   };
   var changeHandle = function changeHandle(val, key) {
     var newValue = _objectSpread2({}, value);
+    if (key === 'bsExchangeGiftGoods') {
+      val = lodash.cloneDeep(val).map(function (t) {
+        t.money = 0;
+        return t;
+      });
+    }
     newValue[key] = val;
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     if (key === 'bsExchangeType') {
@@ -10354,7 +10382,7 @@ var BsExchange = function BsExchange(props) {
   })) : /*#__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("div", {
       style: {
-        border: '1px dashed #eee',
+        border: '1px dashed',
         marginBottom: '8px'
       }
     }, /*#__PURE__*/React__default['default'].createElement("div", null, "\u9000\u56DE\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
@@ -10382,7 +10410,8 @@ var BsExchange = function BsExchange(props) {
   })), ['3', '4'].includes(value === null || value === void 0 ? void 0 : (_value$bsExchangeType6 = value.bsExchangeType) === null || _value$bsExchangeType6 === void 0 ? void 0 : _value$bsExchangeType6[0]) ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", null, "\u8D60\u54C1\u4FE1\u606F"), /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
     headerText: "\u8D60\u54C1",
     key: 'bsGiftGoods',
-    disabled: disabled
+    disabled: disabled,
+    shopCode: value === null || value === void 0 ? void 0 : value.shopCode
   }, other), {}, {
     value: value === null || value === void 0 ? void 0 : value.bsExchangeGiftGoods,
     onChange: function onChange(val) {
@@ -10422,8 +10451,8 @@ var BsReissue = function BsReissue(props) {
     newValue[key] = val;
     if (key === 'bsReissueType') {
       newValue.bsReissueGoods = [];
-      onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
     }
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2({}, newValue));
     if (key === 'bsReissueType') {
       pubsub__default['default'].publish('reissueType', val[0]);
       pubsub__default['default'].subscribe('reissueSelectList', function (_, data) {

package/package.json

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