@kmkf-fe-packages/basic-components 2.2.13-beta.36 → 2.2.13-beta.39

package/dist/index.esm.js

@@ -17764,7 +17764,7 @@ var relationComponentUniqueKeyMap = {
     // 产品分类
     goodClass: {
       relationComponentKey: '8gozpyUFtA',
-      reflectKey: 'c66dt8s48A_input',
+      reflectKey: '2h8KRbxMjD_input',
       transformValue: function transformValue(value, config) {
         return goodClassTransformValue(value, config);
       }
@@ -20376,6 +20376,15 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
+function toNum$3(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
 var getColumns$7 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     disabled = _ref.disabled,
@@ -20687,6 +20696,19 @@ 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.jyReissueGoods) || []).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: {
@@ -21765,8 +21787,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]';
@@ -21786,6 +21809,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: '序号',
@@ -21822,8 +21853,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: '',
@@ -21835,7 +21874,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

@@ -17779,7 +17779,7 @@ var relationComponentUniqueKeyMap = {
     // 产品分类
     goodClass: {
       relationComponentKey: '8gozpyUFtA',
-      reflectKey: 'c66dt8s48A_input',
+      reflectKey: '2h8KRbxMjD_input',
       transformValue: function transformValue(value, config) {
         return goodClassTransformValue(value, config);
       }
@@ -20391,6 +20391,15 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
+function toNum$3(value) {
+  if (typeof value === 'string') {
+    return value ? +value : void 0;
+  }
+  if (typeof value === 'number') {
+    return value;
+  }
+  return void 0;
+}
 var getColumns$7 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     disabled = _ref.disabled,
@@ -20702,6 +20711,19 @@ 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.jyReissueGoods) || []).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: {
@@ -21780,8 +21802,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]';
@@ -21801,6 +21824,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: '序号',
@@ -21837,8 +21868,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: '',
@@ -21850,7 +21889,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.13-beta.36",
+  "version": "2.2.13-beta.39",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "373ef728a9fd645bdfba37e85e7facdf2a50617b"
+  "gitHead": "72cf4aa05ae93f7182aa9b45c0fd9834ce356e08"
 }