@kmkf-fe-packages/basic-components 0.8.7-alpha.11 → 0.8.7-alpha.16

package/dist/index.esm.js

@@ -9705,10 +9705,20 @@ var columns = [{
   render: function render(val, record, index) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
-        width: '50px'
+        width: '30px'
       }
     }, index + 1);
   }
+}, {
+  dataIndex: 'skuName',
+  title: '商品sku名称',
+  with: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'skuCode',
+  title: '商品sku编码',
+  with: 200,
+  ellipsis: true
 }, {
   dataIndex: 'name',
   title: '商品名称',
@@ -9719,11 +9729,6 @@ var columns = [{
   title: '商品id',
   with: 200,
   ellipsis: true
-}, {
-  dataIndex: 'skuName',
-  title: '商品sku名称',
-  with: 200,
-  ellipsis: true
 }, {
   dataIndex: 'code',
   title: '商品编码',
@@ -9736,11 +9741,6 @@ var columns = [{
       }
     }, val);
   }
-}, {
-  dataIndex: 'skuCode',
-  title: '商品sku编码',
-  with: 200,
-  ellipsis: true
 }, {
   dataIndex: 'marketPrice',
   title: '市场价',
@@ -9897,14 +9897,21 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   };
   var onFinish = function onFinish(value) {
     var newFilterList = [];
-    Object.keys(value).forEach(function (key) {
-      if (value[key]) {
-        newFilterList = allList.filter(function (item) {
-          return item[key].indexOf(value[key]) > -1;
-        });
-      }
+    var hasValue = Object.values(value).some(function (t) {
+      return !!t;
     });
-    initData(newFilterList);
+    if (hasValue) {
+      Object.keys(value).forEach(function (key) {
+        if (value[key]) {
+          newFilterList = allList.filter(function (item) {
+            return item[key].indexOf(value[key]) > -1;
+          });
+        }
+      });
+      initData(newFilterList);
+    } else {
+      initData(allList);
+    }
   };
   var onReset = function onReset() {
     form.resetFields();
@@ -9926,33 +9933,33 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     form: form,
     onFinish: onFinish
   }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: "name"
+    name: "skuName"
   }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0",
+    placeholder: "\u5546\u54C1sku\u540D\u79F0",
     allowClear: true,
     style: {
       width: 150
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "code"
+    name: "skuCode"
   }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801",
+    placeholder: "\u5546\u54C1sku\u7F16\u7801",
     allowClear: true,
     style: {
       width: 150
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "skuCode"
+    name: "name"
   }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1sku\u7F16\u7801",
+    placeholder: "\u5546\u54C1\u540D\u79F0",
     allowClear: true,
     style: {
       width: 150
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "skuName"
+    name: "code"
   }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1sku\u540D\u79F0",
+    placeholder: "\u5546\u54C1\u7F16\u7801",
     allowClear: true,
     style: {
       width: 150
@@ -10048,7 +10055,7 @@ var GoodItem = function GoodItem(props) {
       title: "\u5546\u54C1\u6807\u8BB0",
       align: 'center',
       ellipsis: true,
-      width: 100,
+      width: 70,
       render: function render(val, record, index) {
         return /*#__PURE__*/React.createElement(Select, {
           options: [{
@@ -10082,7 +10089,7 @@ var GoodItem = function GoodItem(props) {
       title: "".concat(text, "\u540D\u79F0"),
       align: 'center',
       ellipsis: true,
-      width: 100
+      width: 250
     }, {
       dataIndex: 'code',
       title: "".concat(text, "\u7F16\u7801"),

package/dist/index.js

@@ -9716,10 +9716,20 @@ var columns = [{
   render: function render(val, record, index) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
-        width: '50px'
+        width: '30px'
       }
     }, index + 1);
   }
+}, {
+  dataIndex: 'skuName',
+  title: '商品sku名称',
+  with: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'skuCode',
+  title: '商品sku编码',
+  with: 200,
+  ellipsis: true
 }, {
   dataIndex: 'name',
   title: '商品名称',
@@ -9730,11 +9740,6 @@ var columns = [{
   title: '商品id',
   with: 200,
   ellipsis: true
-}, {
-  dataIndex: 'skuName',
-  title: '商品sku名称',
-  with: 200,
-  ellipsis: true
 }, {
   dataIndex: 'code',
   title: '商品编码',
@@ -9747,11 +9752,6 @@ var columns = [{
       }
     }, val);
   }
-}, {
-  dataIndex: 'skuCode',
-  title: '商品sku编码',
-  with: 200,
-  ellipsis: true
 }, {
   dataIndex: 'marketPrice',
   title: '市场价',
@@ -9908,14 +9908,21 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
   };
   var onFinish = function onFinish(value) {
     var newFilterList = [];
-    Object.keys(value).forEach(function (key) {
-      if (value[key]) {
-        newFilterList = allList.filter(function (item) {
-          return item[key].indexOf(value[key]) > -1;
-        });
-      }
+    var hasValue = Object.values(value).some(function (t) {
+      return !!t;
     });
-    initData(newFilterList);
+    if (hasValue) {
+      Object.keys(value).forEach(function (key) {
+        if (value[key]) {
+          newFilterList = allList.filter(function (item) {
+            return item[key].indexOf(value[key]) > -1;
+          });
+        }
+      });
+      initData(newFilterList);
+    } else {
+      initData(allList);
+    }
   };
   var onReset = function onReset() {
     form.resetFields();
@@ -9937,33 +9944,33 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
     form: form,
     onFinish: onFinish
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "name"
+    name: "skuName"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0",
+    placeholder: "\u5546\u54C1sku\u540D\u79F0",
     allowClear: true,
     style: {
       width: 150
     }
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "code"
+    name: "skuCode"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801",
+    placeholder: "\u5546\u54C1sku\u7F16\u7801",
     allowClear: true,
     style: {
       width: 150
     }
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "skuCode"
+    name: "name"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1sku\u7F16\u7801",
+    placeholder: "\u5546\u54C1\u540D\u79F0",
     allowClear: true,
     style: {
       width: 150
     }
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "skuName"
+    name: "code"
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
-    placeholder: "\u5546\u54C1sku\u540D\u79F0",
+    placeholder: "\u5546\u54C1\u7F16\u7801",
     allowClear: true,
     style: {
       width: 150
@@ -10059,7 +10066,7 @@ var GoodItem = function GoodItem(props) {
       title: "\u5546\u54C1\u6807\u8BB0",
       align: 'center',
       ellipsis: true,
-      width: 100,
+      width: 70,
       render: function render(val, record, index) {
         return /*#__PURE__*/React__default['default'].createElement(antd.Select, {
           options: [{
@@ -10093,7 +10100,7 @@ var GoodItem = function GoodItem(props) {
       title: "".concat(text, "\u540D\u79F0"),
       align: 'center',
       ellipsis: true,
-      width: 100
+      width: 250
     }, {
       dataIndex: 'code',
       title: "".concat(text, "\u7F16\u7801"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.8.7-alpha.11",
+  "version": "0.8.7-alpha.16",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c5c3b6840ab8c42984a16aef61dccb2c256adc2c"
+  "gitHead": "0e72729e981f3b20c08a80e187e99504d5dc14fd"
 }