@signalplus/params-about 1.0.26-alpha6 → 1.0.26-alpha8

package/lib/es/index.js

@@ -1,7 +1,7 @@
 /**
  * Bundle of @signalplus/params-about
- * Generated: 2025-10-31
- * Version: 1.0.26-alpha6
+ * Generated: 2025-11-06
+ * Version: 1.0.26-alpha8
  * License: MIT
  * Author: 2631541504@qq.com
  */
@@ -2569,6 +2569,53 @@ var NumRangeFromTo = /*#__PURE__*/function (_PureComponent) {
   return NumRangeFromTo;
 }(PureComponent);
 
+function hasRangeOverlap(range1, range2) {
+  var _range1$min, _range1$max, _range2$min, _range2$max;
+
+  var min1 = (_range1$min = range1.min) !== null && _range1$min !== void 0 ? _range1$min : -Infinity;
+  var max1 = (_range1$max = range1.max) !== null && _range1$max !== void 0 ? _range1$max : Infinity;
+  var min2 = (_range2$min = range2.min) !== null && _range2$min !== void 0 ? _range2$min : -Infinity;
+  var max2 = (_range2$max = range2.max) !== null && _range2$max !== void 0 ? _range2$max : Infinity; // 边界相等不算重叠，所以用严格比较
+
+  return min1 < max2 && min2 < max1;
+}
+/**
+ * 检查VegaRules数组是否合法
+ */
+
+
+function validateVegaRules(rules) {
+  for (var i = 0; i < rules.length; i++) {
+    var _currentRule$optionTy;
+
+    var currentRule = rules[i];
+    var currentType = (_currentRule$optionTy = currentRule.optionType) !== null && _currentRule$optionTy !== void 0 ? _currentRule$optionTy : 'Both'; // 默认按Both处理
+
+    for (var j = i + 1; j < rules.length; j++) {
+      var _compareRule$optionTy;
+
+      var compareRule = rules[j];
+      var compareType = (_compareRule$optionTy = compareRule.optionType) !== null && _compareRule$optionTy !== void 0 ? _compareRule$optionTy : 'Both'; // 检查是否需要比较这两个规则
+
+      var shouldCompare = false;
+
+      if (currentType === 'Both' || compareType === 'Both') {
+        // 任意一个是Both，就需要比较
+        shouldCompare = true;
+      } else if (currentType === compareType) {
+        // 类型相同（都是Call或都是Put），需要比较
+        shouldCompare = true;
+      } // 类型不同（一个Call一个Put），不需要比较
+
+
+      if (shouldCompare && hasRangeOverlap(currentRule.deltaRange, compareRule.deltaRange)) {
+        return false; // 发现重叠，不合法
+      }
+    }
+  }
+
+  return true; // 没有发现重叠，合法
+}
 var ExpiryVegaAlphaByEdgeList = /*#__PURE__*/function (_PureComponent) {
   _inherits(ExpiryVegaAlphaByEdgeList, _PureComponent);
 
@@ -2625,38 +2672,38 @@ var ExpiryVegaAlphaByEdgeList = /*#__PURE__*/function (_PureComponent) {
 
       if (key) {
         if (subKey && typeof k === 'number') {
-          if (subKey === 'optionType') {
-            // console.log('changeValue==========================', value, i, val, key, k, subKey);
-            if (val === 'Both') {
-              value[i].vegaRules = [_objectSpread2(_objectSpread2({}, value[i].vegaRules[k]), {}, {
-                optionType: 'Both'
-              })];
-            } else {
-              var _value$i$vegaRules;
-
-              if (((_value$i$vegaRules = value[i].vegaRules) === null || _value$i$vegaRules === void 0 ? void 0 : _value$i$vegaRules.length) <= 1) value[i].vegaRules = [_objectSpread2(_objectSpread2({}, value[i].vegaRules[k]), {}, {
-                optionType: val
-              }), {
-                optionType: val === 'Call' ? 'Put' : 'Call',
-                deltaRange: {
-                  min: undefined,
-                  max: undefined
-                },
-                bidEdgeSpan: {
-                  from: undefined,
-                  to: undefined
-                },
-                askEdgeSpan: {
-                  from: undefined,
-                  to: undefined
-                },
-                allowTaker: false,
-                disable: false
-              }];else value[i].vegaRules[k][subKey] = val;
-            }
-          } else {
-            value[i].vegaRules[k][subKey] = val;
-          }
+          // if (subKey === 'optionType') {
+          //   // console.log('changeValue==========================', value, i, val, key, k, subKey);
+          //   if (val === 'Both') {
+          //     value[i].vegaRules = [{ ...value[i].vegaRules[k], optionType: 'Both' }];
+          //   } else {
+          //     if (value[i].vegaRules?.length <= 1)
+          //       value[i].vegaRules = [
+          //         { ...value[i].vegaRules[k], optionType: val },
+          //         {
+          //           optionType: val === 'Call' ? 'Put' : 'Call',
+          //           deltaRange: {
+          //             min: undefined,
+          //             max: undefined,
+          //           },
+          //           bidEdgeSpan: {
+          //             from: undefined,
+          //             to: undefined,
+          //           },
+          //           askEdgeSpan: {
+          //             from: undefined,
+          //             to: undefined,
+          //           },
+          //           allowTaker: false,
+          //           disable: false,
+          //         },
+          //       ];
+          //     else value[i].vegaRules[k][subKey] = val as never;
+          //   }
+          // } else {
+          //   value[i].vegaRules[k][subKey] = val as never;
+          // }
+          value[i].vegaRules[k][subKey] = val;
         } else {
           value[i][key] = val;
         }
@@ -2697,16 +2744,52 @@ var ExpiryVegaAlphaByEdgeList = /*#__PURE__*/function (_PureComponent) {
       (_this$props$onBlur = (_this$props3 = _this.props).onBlur) === null || _this$props$onBlur === void 0 ? void 0 : _this$props$onBlur.call(_this$props3);
     });
 
-    _defineProperty(_assertThisInitialized(_this), "onDel", function (i) {
+    _defineProperty(_assertThisInitialized(_this), "onAddRule", function (i, k) {
       var _this$props$onChange3, _this$props4, _this$props$onBlur2, _this$props5;
 
       var value = _toConsumableArray(_this.value);
 
-      value.splice(i, 1);
-      (_this$props$onChange3 = (_this$props4 = _this.props).onChange) === null || _this$props$onChange3 === void 0 ? void 0 : _this$props$onChange3.call(_this$props4, value.length === 1 && _this.isEmptyItem(value[0]) ? [] : value);
+      value[i].vegaRules.splice(k + 1, 0, {
+        optionType: undefined,
+        deltaRange: {
+          min: undefined,
+          max: undefined
+        },
+        bidEdgeSpan: {
+          from: undefined,
+          to: undefined
+        },
+        askEdgeSpan: {
+          from: undefined,
+          to: undefined
+        },
+        allowTaker: false,
+        disable: false
+      });
+      (_this$props$onChange3 = (_this$props4 = _this.props).onChange) === null || _this$props$onChange3 === void 0 ? void 0 : _this$props$onChange3.call(_this$props4, value);
       (_this$props$onBlur2 = (_this$props5 = _this.props).onBlur) === null || _this$props$onBlur2 === void 0 ? void 0 : _this$props$onBlur2.call(_this$props5);
     });
 
+    _defineProperty(_assertThisInitialized(_this), "onDel", function (i) {
+      var _this$props$onChange4, _this$props6, _this$props$onBlur3, _this$props7;
+
+      var value = _toConsumableArray(_this.value);
+
+      value.splice(i, 1);
+      (_this$props$onChange4 = (_this$props6 = _this.props).onChange) === null || _this$props$onChange4 === void 0 ? void 0 : _this$props$onChange4.call(_this$props6, value.length === 1 && _this.isEmptyItem(value[0]) ? [] : value);
+      (_this$props$onBlur3 = (_this$props7 = _this.props).onBlur) === null || _this$props$onBlur3 === void 0 ? void 0 : _this$props$onBlur3.call(_this$props7);
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "onDelRule", function (i, k) {
+      var _this$props$onChange5, _this$props8, _this$props$onBlur4, _this$props9;
+
+      var value = _toConsumableArray(_this.value);
+
+      value[i].vegaRules.splice(k, 1);
+      (_this$props$onChange5 = (_this$props8 = _this.props).onChange) === null || _this$props$onChange5 === void 0 ? void 0 : _this$props$onChange5.call(_this$props8, value.length === 1 && _this.isEmptyItem(value[0]) ? [] : value);
+      (_this$props$onBlur4 = (_this$props9 = _this.props).onBlur) === null || _this$props$onBlur4 === void 0 ? void 0 : _this$props$onBlur4.call(_this$props9);
+    });
+
     return _this;
   }
 
@@ -2814,7 +2897,10 @@ var ExpiryVegaAlphaByEdgeList = /*#__PURE__*/function (_PureComponent) {
           }
         }, it.vegaRules.map(function (rule, k) {
           return /*#__PURE__*/React.createElement(React.Fragment, null, i === 0 && k === 0 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-            className: "param-number-range readonly"
+            className: "param-number-range readonly",
+            style: {
+              paddingLeft: 36
+            }
           }, "Call/Put/Call"), /*#__PURE__*/React.createElement("div", {
             className: "param-number-range readonly"
           }, "Delta Range"), /*#__PURE__*/React.createElement("div", {
@@ -2825,7 +2911,29 @@ var ExpiryVegaAlphaByEdgeList = /*#__PURE__*/function (_PureComponent) {
             className: "param-number-range readonly"
           }, "Allow Taker"), /*#__PURE__*/React.createElement("div", {
             className: "param-number-range readonly"
-          }, "Disabled")) : /*#__PURE__*/React.createElement(React.Fragment, null), /*#__PURE__*/React.createElement(TextSelector, {
+          }, "Disabled")) : /*#__PURE__*/React.createElement(React.Fragment, null), /*#__PURE__*/React.createElement("div", {
+            style: {
+              display: 'flex'
+            }
+          }, /*#__PURE__*/React.createElement("div", {
+            className: "param-arr-ops"
+          }, /*#__PURE__*/React.createElement(PlusOutlined, {
+            className: "param-arr-ops-add",
+            onClick: _this2.onAddRule.bind(null, i, k),
+            style: {
+              position: 'relative',
+              top: i > 0 ? -30 : 0,
+              width: 18
+            }
+          }), /*#__PURE__*/React.createElement(DeleteOutlined, {
+            className: "param-arr-ops-del",
+            onClick: _this2.onDelRule.bind(null, i, k),
+            style: {
+              position: 'relative',
+              top: i > 0 ? -30 : 0,
+              width: 18
+            }
+          })), /*#__PURE__*/React.createElement(TextSelector, {
             style: {
               width: 88,
               minWidth: 0,
@@ -2839,7 +2947,7 @@ var ExpiryVegaAlphaByEdgeList = /*#__PURE__*/function (_PureComponent) {
             } // onBlur={this.props.onBlur}
             ,
             options: ['Both', 'Call', 'Put']
-          }), /*#__PURE__*/React.createElement(NumRange, {
+          })), /*#__PURE__*/React.createElement(NumRange, {
             value: {
               min: rule.deltaRange.min,
               max: rule.deltaRange.max
@@ -3250,8 +3358,12 @@ var ParamTypeConfig = (_ParamTypeConfig = {}, _defineProperty(_ParamTypeConfig,
         return emptyErrText(i, 'expiry');
       }
 
-      if (isEmpty(val.vegaTarget) || !Number(val.vegaTarget)) {
-        return emptyErrText(i, 'vegaTarget') + ' or 0';
+      if (isEmpty(val.vegaTarget)) {
+        return emptyErrText(i, 'vegaTarget');
+      }
+
+      if (Number(val.vegaTarget) === 0) {
+        return "The ".concat(i + 1).concat(i === 0 ? 'st' : i === 1 ? 'nd' : i === 2 ? 'rd' : 'th', " item: vega target can not be 0");
       }
 
       var $$val = val.vegaRules || [];
@@ -3331,6 +3443,8 @@ var ParamTypeConfig = (_ParamTypeConfig = {}, _defineProperty(_ParamTypeConfig,
       // }
 
 
+      var hasOverRange = validateVegaRules($$val);
+      if (!hasOverRange) return "The ".concat(i + 1).concat(i === 0 ? 'st' : i === 1 ? 'nd' : i === 2 ? 'rd' : 'th', " item: delta range overlap");
       expiries.push(val.expiry);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalplus/params-about",
-  "version": "1.0.26-alpha6",
+  "version": "1.0.26-alpha8",
   "description": "A description for the module",
   "main": "./lib/umd/index.js",
   "module": "./lib/es/index.js",