@kmkf-fe-packages/basic-components 0.7.15-alpha.11 → 0.7.15-alpha.17

package/dist/index.esm.js

@@ -6940,7 +6940,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
   var beforeUpload = function beforeUpload(file) {
     console.log('beforeUpload', file);
     var size = file.size / 1024 / 1024 < maxSize;
-    if (value.length > maxCount) {
+    if (value.length >= maxCount) {
       message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u4E2A\u6587\u4EF6\uFF01"));
       return Upload.LIST_IGNORE;
     }
@@ -6963,7 +6963,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
     className: styles$2.tips
   }, "\u5141\u8BB8\u4E0A\u4F20", maxCount, "\u4E2A\u6587\u4EF6"), /*#__PURE__*/React.createElement(Dragger, _objectSpread2({
     disabled: disabled,
-    multiple: true,
+    multiple: false,
     accept: accept,
     name: "file",
     maxCount: maxCount,
@@ -9332,9 +9332,6 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
   //物流单号
   var LogisticsCode = function LogisticsCode() {
     return /*#__PURE__*/React.createElement(Input, {
-      style: {
-        marginBottom: '8px'
-      },
       disabled: disabled,
       placeholder: "\u7269\u6D41\u5355\u53F7",
       onChange: function onChange(e) {
@@ -9346,6 +9343,9 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
   //物流快照
   var LogisticsSnapshot = function LogisticsSnapshot() {
     return /*#__PURE__*/React.createElement(Input, {
+      style: {
+        marginTop: '8px'
+      },
       disabled: true,
       placeholder: "\u7269\u6D41\u5FEB\u7167",
       onChange: function onChange(e) {
@@ -9644,6 +9644,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
       pageNo: page,
       pageSize: pageSize
     }));
+    queryItems();
   };
   /**
    *
@@ -9738,7 +9739,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     _onCancel();
   };
   return /*#__PURE__*/React.createElement(Modal, {
-    title: '选择商品编码',
+    title: '选择商品',
     okText: '确认',
     cancelText: '取消',
     visible: visible,
@@ -9748,26 +9749,6 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     },
     onOk: onOk,
     wrapClassName: "goodModal"
-  }, /*#__PURE__*/React.createElement(Tabs, {
-    type: "card",
-    activeKey: searchParams.type,
-    onChange: function onChange(e) {
-      var params = _objectSpread2(_objectSpread2({}, searchParams), {}, {
-        type: e,
-        pageNo: 1
-      });
-      setSearch(params);
-    }
-  }, tabs.map(function (tab) {
-    return /*#__PURE__*/React.createElement(TabPane$1, {
-      tab: tab.tab + (tab.key === 'select' ? "(".concat(selectList.length, ")") : ''),
-      key: tab.key
-    });
-  })), /*#__PURE__*/React.createElement("div", {
-    className: "searchBox",
-    style: {
-      display: searchParams.type === 'select' ? 'none' : ''
-    }
   }, /*#__PURE__*/React.createElement(Form, {
     layout: "inline"
   }, /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Input, {
@@ -9779,7 +9760,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     htmlType: "submit"
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, null, "\u91CD\u7F6E")))), /*#__PURE__*/React.createElement(Spin, {
+  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, null, "\u91CD\u7F6E"))), /*#__PURE__*/React.createElement(Spin, {
     spinning: loading
   }, /*#__PURE__*/React.createElement(Table, {
     rowSelection: rowSelection,
@@ -10157,11 +10138,10 @@ var BsExchange = function BsExchange(props) {
     });
   }, [value]);
   var getListHandle = function getListHandle(list, val) {
-    var _val$bsExchangeType;
+    var _val$bsExchangeType, _val$bsExchangeType2;
     //如果是原单换
     if (['1', '3'].includes(val === null || val === void 0 ? void 0 : (_val$bsExchangeType = val.bsExchangeType) === null || _val$bsExchangeType === void 0 ? void 0 : _val$bsExchangeType[0])) {
       return list.reduce(function (prv, next) {
-        var _val$bsExchangeType2;
         next.canDelete = false;
         //数量大于1 拆开
         if (next.number > 1) {
@@ -10170,12 +10150,12 @@ var BsExchange = function BsExchange(props) {
             return t;
           });
           prv.push.apply(prv, _toConsumableArray(newList));
-        } else if (['2', '4'].includes(val === null || val === void 0 ? void 0 : (_val$bsExchangeType2 = val.bsExchangeType) === null || _val$bsExchangeType2 === void 0 ? void 0 : _val$bsExchangeType2[0])) {
+        } else {
           prv.push(_objectSpread2({}, next));
         }
         return prv;
       }, []);
-    } else {
+    } else if (['2', '4'].includes(val === null || val === void 0 ? void 0 : (_val$bsExchangeType2 = val.bsExchangeType) === null || _val$bsExchangeType2 === void 0 ? void 0 : _val$bsExchangeType2[0])) {
       //补发换货
       return list.reduce(function (prv, next, index) {
         next.canDelete = true;

package/dist/index.js

@@ -6951,7 +6951,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
   var beforeUpload = function beforeUpload(file) {
     console.log('beforeUpload', file);
     var size = file.size / 1024 / 1024 < maxSize;
-    if (value.length > maxCount) {
+    if (value.length >= maxCount) {
       antd.message.error("\u6700\u591A\u6DFB\u52A0".concat(maxCount, "\u4E2A\u6587\u4EF6\uFF01"));
       return antd.Upload.LIST_IGNORE;
     }
@@ -6974,7 +6974,7 @@ var ApaasUploadAsync$1 = function ApaasUploadAsync(_ref) {
     className: styles$2.tips
   }, "\u5141\u8BB8\u4E0A\u4F20", maxCount, "\u4E2A\u6587\u4EF6"), /*#__PURE__*/React__default['default'].createElement(Dragger, _objectSpread2({
     disabled: disabled,
-    multiple: true,
+    multiple: false,
     accept: accept,
     name: "file",
     maxCount: maxCount,
@@ -9343,9 +9343,6 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
   //物流单号
   var LogisticsCode = function LogisticsCode() {
     return /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-      style: {
-        marginBottom: '8px'
-      },
       disabled: disabled,
       placeholder: "\u7269\u6D41\u5355\u53F7",
       onChange: function onChange(e) {
@@ -9357,6 +9354,9 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
   //物流快照
   var LogisticsSnapshot = function LogisticsSnapshot() {
     return /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+      style: {
+        marginTop: '8px'
+      },
       disabled: true,
       placeholder: "\u7269\u6D41\u5FEB\u7167",
       onChange: function onChange(e) {
@@ -9655,6 +9655,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
       pageNo: page,
       pageSize: pageSize
     }));
+    queryItems();
   };
   /**
    *
@@ -9749,7 +9750,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     _onCancel();
   };
   return /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
-    title: '选择商品编码',
+    title: '选择商品',
     okText: '确认',
     cancelText: '取消',
     visible: visible,
@@ -9759,26 +9760,6 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     },
     onOk: onOk,
     wrapClassName: "goodModal"
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Tabs, {
-    type: "card",
-    activeKey: searchParams.type,
-    onChange: function onChange(e) {
-      var params = _objectSpread2(_objectSpread2({}, searchParams), {}, {
-        type: e,
-        pageNo: 1
-      });
-      setSearch(params);
-    }
-  }, tabs.map(function (tab) {
-    return /*#__PURE__*/React__default['default'].createElement(TabPane$1, {
-      tab: tab.tab + (tab.key === 'select' ? "(".concat(selectList.length, ")") : ''),
-      key: tab.key
-    });
-  })), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "searchBox",
-    style: {
-      display: searchParams.type === 'select' ? 'none' : ''
-    }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form, {
     layout: "inline"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
@@ -9790,7 +9771,7 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "primary",
     htmlType: "submit"
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Button, null, "\u91CD\u7F6E")))), /*#__PURE__*/React__default['default'].createElement(antd.Spin, {
+  }, "\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Button, null, "\u91CD\u7F6E"))), /*#__PURE__*/React__default['default'].createElement(antd.Spin, {
     spinning: loading
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
     rowSelection: rowSelection,
@@ -10168,11 +10149,10 @@ var BsExchange = function BsExchange(props) {
     });
   }, [value]);
   var getListHandle = function getListHandle(list, val) {
-    var _val$bsExchangeType;
+    var _val$bsExchangeType, _val$bsExchangeType2;
     //如果是原单换
     if (['1', '3'].includes(val === null || val === void 0 ? void 0 : (_val$bsExchangeType = val.bsExchangeType) === null || _val$bsExchangeType === void 0 ? void 0 : _val$bsExchangeType[0])) {
       return list.reduce(function (prv, next) {
-        var _val$bsExchangeType2;
         next.canDelete = false;
         //数量大于1 拆开
         if (next.number > 1) {
@@ -10181,12 +10161,12 @@ var BsExchange = function BsExchange(props) {
             return t;
           });
           prv.push.apply(prv, _toConsumableArray(newList));
-        } else if (['2', '4'].includes(val === null || val === void 0 ? void 0 : (_val$bsExchangeType2 = val.bsExchangeType) === null || _val$bsExchangeType2 === void 0 ? void 0 : _val$bsExchangeType2[0])) {
+        } else {
           prv.push(_objectSpread2({}, next));
         }
         return prv;
       }, []);
-    } else {
+    } else if (['2', '4'].includes(val === null || val === void 0 ? void 0 : (_val$bsExchangeType2 = val.bsExchangeType) === null || _val$bsExchangeType2 === void 0 ? void 0 : _val$bsExchangeType2[0])) {
       //补发换货
       return list.reduce(function (prv, next, index) {
         next.canDelete = true;

package/package.json

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