@kmkf-fe-packages/basic-components 2.0.19-beta.34 → 2.0.19-beta.39

package/dist/index.esm.js

@@ -13192,29 +13192,29 @@ var GoodList$3 = function GoodList(props, ref) {
     fixed: true,
     onSelect: function onSelect(record, selected) {
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.id]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== record.specNo;
+          return t !== record.id;
         }));
         setSelect(selectList.filter(function (t) {
-          return t.specNo !== record.specNo;
+          return t.id !== record.id;
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
         setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
-          return t.specNo;
+          return t.id;
         }))));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
         setSelectIds(difference(selectIds, changeRows.map(function (t) {
-          return t.specNo;
+          return t.id;
         })));
         var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return arrVal.specNo !== othVal.specNo;
+          return arrVal.id !== othVal.id;
         });
         setSelect(list);
       }
@@ -13223,10 +13223,10 @@ var GoodList$3 = function GoodList(props, ref) {
   var showTable = function showTable() {
     var handleDelete = function handleDelete(record) {
       setSelectIds(selectIds.filter(function (t) {
-        return t !== record.specNo;
+        return t !== record.id;
       }));
       setSelect(selectList.filter(function (t) {
-        return t.specNo !== record.specNo;
+        return t.id !== record.id;
       }));
     };
     var showColumns = [{
@@ -13250,7 +13250,7 @@ var GoodList$3 = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React.createElement(Table, {
       columns: showColumns,
-      rowKey: 'specNo',
+      rowKey: 'id',
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -13270,7 +13270,7 @@ var GoodList$3 = function GoodList(props, ref) {
     }
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
     rowSelection: rowSelection,
-    rowKey: "specNo",
+    rowKey: "id",
     columns: columns$4,
     scroll: {
       x: '100%',
@@ -14155,6 +14155,10 @@ var getColumns$2 = function getColumns(_ref) {
   };
 };
 
+var getYesOrNo = function getYesOrNo(val) {
+  if (isNull(val)) return null;
+  return val ? '是' : '否';
+};
 var getColumns$3 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
@@ -14163,26 +14167,50 @@ var getColumns$3 = function getColumns(_ref) {
   return {
     //万里牛商品信息
     WLN_GOODS: [{
+      dataIndex: 'itemName',
+      title: "\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'goodsCode',
+      title: "\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'skuCode',
+      title: "sku\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
       dataIndex: 'skuName',
-      title: "".concat(text, "sku\u540D\u79F0"),
+      title: "\u7EBF\u4E0Asku\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 250
+    }, {
+      dataIndex: 'olnSkuCode',
+      title: "\u7EBF\u4E0Asku\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 100
     }, {
       dataIndex: 'sku',
-      title: "".concat(text, "sku\u7F16\u7801"),
+      title: "\u7EBF\u4E0Asku id",
       align: 'center',
       ellipsis: true,
       width: 100
     }, {
       dataIndex: 'name',
-      title: "".concat(text, "\u540D\u79F0"),
+      title: "\u7EBF\u4E0A\u5546\u54C1\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 250
     }, {
       dataIndex: 'pic',
-      title: "\u56FE\u7247",
+      title: "\u7EBF\u4E0A\u56FE\u7247",
       align: 'center',
       ellipsis: true,
       width: 100,
@@ -14192,9 +14220,21 @@ var getColumns$3 = function getColumns(_ref) {
           src: val
         });
       }
+    }, {
+      dataIndex: 'olnItemCOde',
+      title: "\u7EBF\u4E0A\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 100
     }, {
       dataIndex: 'code',
-      title: "".concat(text, "\u7F16\u7801"),
+      title: "\u7EBF\u4E0A\u5546\u54C1id",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'barCode',
+      title: "\u5546\u54C1\u6761\u7801",
       align: 'center',
       ellipsis: true,
       width: 100
@@ -14235,6 +14275,45 @@ var getColumns$3 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100
+    }, {
+      dataIndex: 'package',
+      title: "\u662F\u5426\u7EC4\u5408\u5546\u54C1",
+      align: 'center',
+      ellipsis: true,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: true
+          }, {
+            label: '否',
+            value: false
+          }]
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
+      },
+      width: 100
+    }, {
+      dataIndex: 'pkgGoodsName',
+      title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'pkgGoodsCode',
+      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'pkgGoodsId',
+      title: "\u7EC4\u5408\u5546\u54C1id",
+      align: 'center',
+      ellipsis: true,
+      width: 100
     }]
   };
 };
@@ -14244,7 +14323,7 @@ var isNumberOrNumberString = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo = function getYesOrNo(val) {
+var getYesOrNo$1 = function getYesOrNo(val) {
   if (isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -14345,7 +14424,7 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u662F\u5426\u53D6\u6D88",
       width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
+        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -14364,7 +14443,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
       }
     }, {
       dataIndex: 'skuNote',
@@ -14471,7 +14550,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -14582,7 +14661,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {

package/dist/index.js

@@ -13204,29 +13204,29 @@ var GoodList$3 = function GoodList(props, ref) {
     fixed: true,
     onSelect: function onSelect(record, selected) {
       if (selected) {
-        setSelectIds([].concat(_toConsumableArray(selectIds), [record.specNo]));
+        setSelectIds([].concat(_toConsumableArray(selectIds), [record.id]));
         setSelect([].concat(_toConsumableArray(selectList), [record]));
       } else {
         setSelectIds(selectIds.filter(function (t) {
-          return t !== record.specNo;
+          return t !== record.id;
         }));
         setSelect(selectList.filter(function (t) {
-          return t.specNo !== record.specNo;
+          return t.id !== record.id;
         }));
       }
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       if (selected) {
         setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
-          return t.specNo;
+          return t.id;
         }))));
         setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
       } else {
         setSelectIds(lodash.difference(selectIds, changeRows.map(function (t) {
-          return t.specNo;
+          return t.id;
         })));
         var list = lodash.differenceWith(selectList, changeRows, function (arrVal, othVal) {
-          return arrVal.specNo !== othVal.specNo;
+          return arrVal.id !== othVal.id;
         });
         setSelect(list);
       }
@@ -13235,10 +13235,10 @@ var GoodList$3 = function GoodList(props, ref) {
   var showTable = function showTable() {
     var handleDelete = function handleDelete(record) {
       setSelectIds(selectIds.filter(function (t) {
-        return t !== record.specNo;
+        return t !== record.id;
       }));
       setSelect(selectList.filter(function (t) {
-        return t.specNo !== record.specNo;
+        return t.id !== record.id;
       }));
     };
     var showColumns = [{
@@ -13262,7 +13262,7 @@ var GoodList$3 = function GoodList(props, ref) {
       }
     }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
       columns: showColumns,
-      rowKey: 'specNo',
+      rowKey: 'id',
       dataSource: selectList,
       scroll: {
         x: '100%',
@@ -13282,7 +13282,7 @@ var GoodList$3 = function GoodList(props, ref) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2({
     rowSelection: rowSelection,
-    rowKey: "specNo",
+    rowKey: "id",
     columns: columns$4,
     scroll: {
       x: '100%',
@@ -14167,6 +14167,10 @@ var getColumns$2 = function getColumns(_ref) {
   };
 };
 
+var getYesOrNo = function getYesOrNo(val) {
+  if (kmkfUtils.isNull(val)) return null;
+  return val ? '是' : '否';
+};
 var getColumns$3 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
@@ -14175,26 +14179,50 @@ var getColumns$3 = function getColumns(_ref) {
   return {
     //万里牛商品信息
     WLN_GOODS: [{
+      dataIndex: 'itemName',
+      title: "\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'goodsCode',
+      title: "\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'skuCode',
+      title: "sku\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
       dataIndex: 'skuName',
-      title: "".concat(text, "sku\u540D\u79F0"),
+      title: "\u7EBF\u4E0Asku\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 250
+    }, {
+      dataIndex: 'olnSkuCode',
+      title: "\u7EBF\u4E0Asku\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 100
     }, {
       dataIndex: 'sku',
-      title: "".concat(text, "sku\u7F16\u7801"),
+      title: "\u7EBF\u4E0Asku id",
       align: 'center',
       ellipsis: true,
       width: 100
     }, {
       dataIndex: 'name',
-      title: "".concat(text, "\u540D\u79F0"),
+      title: "\u7EBF\u4E0A\u5546\u54C1\u540D\u79F0",
       align: 'center',
       ellipsis: true,
       width: 250
     }, {
       dataIndex: 'pic',
-      title: "\u56FE\u7247",
+      title: "\u7EBF\u4E0A\u56FE\u7247",
       align: 'center',
       ellipsis: true,
       width: 100,
@@ -14204,9 +14232,21 @@ var getColumns$3 = function getColumns(_ref) {
           src: val
         });
       }
+    }, {
+      dataIndex: 'olnItemCOde',
+      title: "\u7EBF\u4E0A\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 100
     }, {
       dataIndex: 'code',
-      title: "".concat(text, "\u7F16\u7801"),
+      title: "\u7EBF\u4E0A\u5546\u54C1id",
+      align: 'center',
+      ellipsis: true,
+      width: 150
+    }, {
+      dataIndex: 'barCode',
+      title: "\u5546\u54C1\u6761\u7801",
       align: 'center',
       ellipsis: true,
       width: 100
@@ -14247,6 +14287,45 @@ var getColumns$3 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100
+    }, {
+      dataIndex: 'package',
+      title: "\u662F\u5426\u7EC4\u5408\u5546\u54C1",
+      align: 'center',
+      ellipsis: true,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          value: val,
+          onChange: function onChange(value) {
+            updateHandle(value, index, 'isGift');
+          },
+          options: [{
+            label: '是',
+            value: true
+          }, {
+            label: '否',
+            value: false
+          }]
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
+      },
+      width: 100
+    }, {
+      dataIndex: 'pkgGoodsName',
+      title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'pkgGoodsCode',
+      title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'pkgGoodsId',
+      title: "\u7EC4\u5408\u5546\u54C1id",
+      align: 'center',
+      ellipsis: true,
+      width: 100
     }]
   };
 };
@@ -14256,7 +14335,7 @@ var isNumberOrNumberString = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo = function getYesOrNo(val) {
+var getYesOrNo$1 = function getYesOrNo(val) {
   if (kmkfUtils.isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -14357,7 +14436,7 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u662F\u5426\u53D6\u6D88",
       width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
+        return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -14376,7 +14455,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val));
       }
     }, {
       dataIndex: 'skuNote',
@@ -14483,7 +14562,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -14594,7 +14673,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.19-beta.34",
+  "version": "2.0.19-beta.39",
   "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.0.19-beta.32",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.19-beta.39",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9bf241376c41f6d7634c4217ebe68995d0d2e686"
+  "gitHead": "4f75174b75bae6b588f989301fcc7556a75fca73"
 }