@kmkf-fe-packages/basic-components 2.2.20 → 2.2.22

package/dist/index.esm.js

@@ -17789,6 +17789,7 @@ var relationComponentUniqueKeyMap = {
 };
 // 该方法只用于小白熊定制，当管易商品/管易补发/管易退换货组件的数据来源于关联工单数据，且其补发类型自定义组件选了值，根据该值填充到商品库弹框中类型筛选项
 var useDefaultSearchValue = (function (props) {
+  var _Object$entries;
   var form = props.form,
     _props$companyKey = props.companyKey,
     companyKey = _props$companyKey === void 0 ? '' : _props$companyKey,
@@ -17801,7 +17802,10 @@ var useDefaultSearchValue = (function (props) {
   }
   var result = {};
   var relationComponentKeyMap = relationComponentUniqueKeyMap === null || relationComponentUniqueKeyMap === void 0 ? void 0 : relationComponentUniqueKeyMap[companyKey];
-  Object.entries(relationComponentKeyMap).forEach(function (_ref) {
+  if (!relationComponentKeyMap) {
+    return '';
+  }
+  (_Object$entries = Object.entries(relationComponentKeyMap || {})) === null || _Object$entries === void 0 ? void 0 : _Object$entries.forEach(function (_ref) {
     var _templateDetail$compo;
     var _ref2 = _slicedToArray(_ref, 2),
       key = _ref2[0],
@@ -19800,19 +19804,21 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       width: 120,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
-          var v = toNum$1(goods === null || goods === void 0 ? void 0 : goods.salePrice);
-          var res = typeof v === 'number' ? v < 0 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
-        }
-      },
+      // validator: (_rule: any, value: any) => {
+      //   let goodsName = '';
+      //   if (
+      //     (value?.jstReissueGoods || []).some((goods: any) => {
+      //       const v = toNum(goods?.salePrice);
+      //       const res = typeof v === 'number' ? v < 0 : true;
+      //       if (res) {
+      //         goodsName = goods?.name ? `[${goods?.name}]` : '';
+      //       }
+      //       return res;
+      //     })
+      //   ) {
+      //     return Promise.reject(`${goodsName}单价为大于等于0的数`);
+      //   }
+      // },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -20500,19 +20506,6 @@ var getColumns$7 = function getColumns(_ref) {
       dataIndex: 'sellCount',
       title: "\u6570\u91CF",
       width: 100,
-      validator: function validator(_rule, value) {
-        var productName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jyGoods) || []).some(function (goods) {
-          var qty = toNum$3(goods === null || goods === void 0 ? void 0 : goods.sellCount);
-          var res = typeof qty === 'number' ? qty < 1 : true;
-          if (res) {
-            productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-        }
-      },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -21787,8 +21780,9 @@ var GoodItem$1 = function GoodItem(props) {
     var COLUMNS_INFO = COLUMNS_MAP(text);
     return COLUMNS_INFO(type);
   };
-  var newColumns = useMemo(function () {
-    var initBaseInfoColumns = GOODS_INFO_COLUMNS();
+  var getShowFilterColumns = useCallback(function (_ref2) {
+    var showHeader = _ref2.showHeader,
+      initBaseInfoColumns = _ref2.initBaseInfoColumns;
     var baseInfoColumns = [];
     var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === 'string';
     var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
@@ -21808,6 +21802,14 @@ var GoodItem$1 = function GoodItem(props) {
         return undefined;
       }).filter(Boolean);
     }
+    return baseInfoColumns;
+  }, [showHeader]);
+  var newColumns = useMemo(function () {
+    var initBaseInfoColumns = GOODS_INFO_COLUMNS();
+    var baseInfoColumns = getShowFilterColumns({
+      showHeader: showHeader,
+      initBaseInfoColumns: initBaseInfoColumns
+    });
     var columnList = [{
       dataIndex: '',
       title: '序号',
@@ -21844,8 +21846,16 @@ var GoodItem$1 = function GoodItem(props) {
     return columnList;
   }, [showHeader, value, disabled, hoveredRowIndex]);
   var orderModalColumns = useMemo(function () {
-    var list = newColumns.filter(function (col) {
-      return !['操作', '序号'].includes(col.title);
+    var initBaseInfoColumns = COLUMNS_MAP('', {
+      operate: false,
+      disabled: true
+    })(type);
+    var baseInfoColumns = getShowFilterColumns({
+      showHeader: showHeader,
+      initBaseInfoColumns: initBaseInfoColumns
+    });
+    var list = baseInfoColumns.filter(function (col) {
+      return !['操作'].includes(col.title);
     });
     return [{
       dataIndex: '',
@@ -21857,7 +21867,7 @@ var GoodItem$1 = function GoodItem(props) {
         return /*#__PURE__*/React.createElement("span", null, index + 1);
       }
     }].concat(_toConsumableArray(list));
-  }, [newColumns]);
+  }, [showHeader, value, disabled, hoveredRowIndex]);
   var orderColumns = useMemo(function () {
     var columns = COLUMNS_MAP('', {
       operate: false,

package/dist/index.js

@@ -17804,6 +17804,7 @@ var relationComponentUniqueKeyMap = {
 };
 // 该方法只用于小白熊定制，当管易商品/管易补发/管易退换货组件的数据来源于关联工单数据，且其补发类型自定义组件选了值，根据该值填充到商品库弹框中类型筛选项
 var useDefaultSearchValue = (function (props) {
+  var _Object$entries;
   var form = props.form,
     _props$companyKey = props.companyKey,
     companyKey = _props$companyKey === void 0 ? '' : _props$companyKey,
@@ -17816,7 +17817,10 @@ var useDefaultSearchValue = (function (props) {
   }
   var result = {};
   var relationComponentKeyMap = relationComponentUniqueKeyMap === null || relationComponentUniqueKeyMap === void 0 ? void 0 : relationComponentUniqueKeyMap[companyKey];
-  Object.entries(relationComponentKeyMap).forEach(function (_ref) {
+  if (!relationComponentKeyMap) {
+    return '';
+  }
+  (_Object$entries = Object.entries(relationComponentKeyMap || {})) === null || _Object$entries === void 0 ? void 0 : _Object$entries.forEach(function (_ref) {
     var _templateDetail$compo;
     var _ref2 = _slicedToArray(_ref, 2),
       key = _ref2[0],
@@ -19815,19 +19819,21 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       width: 120,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
-          var v = toNum$1(goods === null || goods === void 0 ? void 0 : goods.salePrice);
-          var res = typeof v === 'number' ? v < 0 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
-        }
-      },
+      // validator: (_rule: any, value: any) => {
+      //   let goodsName = '';
+      //   if (
+      //     (value?.jstReissueGoods || []).some((goods: any) => {
+      //       const v = toNum(goods?.salePrice);
+      //       const res = typeof v === 'number' ? v < 0 : true;
+      //       if (res) {
+      //         goodsName = goods?.name ? `[${goods?.name}]` : '';
+      //       }
+      //       return res;
+      //     })
+      //   ) {
+      //     return Promise.reject(`${goodsName}单价为大于等于0的数`);
+      //   }
+      // },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -20515,19 +20521,6 @@ var getColumns$7 = function getColumns(_ref) {
       dataIndex: 'sellCount',
       title: "\u6570\u91CF",
       width: 100,
-      validator: function validator(_rule, value) {
-        var productName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jyGoods) || []).some(function (goods) {
-          var qty = toNum$3(goods === null || goods === void 0 ? void 0 : goods.sellCount);
-          var res = typeof qty === 'number' ? qty < 1 : true;
-          if (res) {
-            productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-        }
-      },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -21802,8 +21795,9 @@ var GoodItem$1 = function GoodItem(props) {
     var COLUMNS_INFO = COLUMNS_MAP(text);
     return COLUMNS_INFO(type);
   };
-  var newColumns = React.useMemo(function () {
-    var initBaseInfoColumns = GOODS_INFO_COLUMNS();
+  var getShowFilterColumns = React.useCallback(function (_ref2) {
+    var showHeader = _ref2.showHeader,
+      initBaseInfoColumns = _ref2.initBaseInfoColumns;
     var baseInfoColumns = [];
     var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === 'string';
     var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
@@ -21823,6 +21817,14 @@ var GoodItem$1 = function GoodItem(props) {
         return undefined;
       }).filter(Boolean);
     }
+    return baseInfoColumns;
+  }, [showHeader]);
+  var newColumns = React.useMemo(function () {
+    var initBaseInfoColumns = GOODS_INFO_COLUMNS();
+    var baseInfoColumns = getShowFilterColumns({
+      showHeader: showHeader,
+      initBaseInfoColumns: initBaseInfoColumns
+    });
     var columnList = [{
       dataIndex: '',
       title: '序号',
@@ -21859,8 +21861,16 @@ var GoodItem$1 = function GoodItem(props) {
     return columnList;
   }, [showHeader, value, disabled, hoveredRowIndex]);
   var orderModalColumns = React.useMemo(function () {
-    var list = newColumns.filter(function (col) {
-      return !['操作', '序号'].includes(col.title);
+    var initBaseInfoColumns = COLUMNS_MAP('', {
+      operate: false,
+      disabled: true
+    })(type);
+    var baseInfoColumns = getShowFilterColumns({
+      showHeader: showHeader,
+      initBaseInfoColumns: initBaseInfoColumns
+    });
+    var list = baseInfoColumns.filter(function (col) {
+      return !['操作'].includes(col.title);
     });
     return [{
       dataIndex: '',
@@ -21872,7 +21882,7 @@ var GoodItem$1 = function GoodItem(props) {
         return /*#__PURE__*/React__default['default'].createElement("span", null, index + 1);
       }
     }].concat(_toConsumableArray(list));
-  }, [newColumns]);
+  }, [showHeader, value, disabled, hoveredRowIndex]);
   var orderColumns = React.useMemo(function () {
     var columns = COLUMNS_MAP('', {
       operate: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.20",
+  "version": "2.2.22",
   "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.2.20",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.21",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "251c7eb415db5fee9404462720250c11329a2b6a"
+  "gitHead": "c10557886dfdb507b45a46093a648a85af0ea904"
 }