@signalplus/params-about 1.0.26-alpha8 → 1.0.26

package/index.d.ts

@@ -111,7 +111,7 @@ declare class ParamFormModalEl extends PureComponent<ParamFormProps & Required<P
     state: {
         visible: boolean;
         pending: boolean;
-        width: number | undefined;
+        width: number;
     };
     get isEdit(): boolean;
     onShow: () => void;

package/lib/es/index.js

@@ -1,7 +1,7 @@
 /**
  * Bundle of @signalplus/params-about
- * Generated: 2025-11-06
- * Version: 1.0.26-alpha8
+ * Generated: 2025-11-11
+ * Version: 1.0.26
  * License: MIT
  * Author: 2631541504@qq.com
  */
@@ -561,7 +561,7 @@ var Num = /*#__PURE__*/function (_PureComponent) {
         className: "param-number-val"
       }, this.state.tempValue || 'N/A') : /*#__PURE__*/React.createElement("input", {
         style: {
-          width: this.props.isPercentage ? 50 : 90
+          width: this.props.singleWidth || this.props.isPercentage ? 50 : 90
         },
         className: "param-number-val",
         type: "text",
@@ -634,7 +634,8 @@ var NumRange = /*#__PURE__*/function (_PureComponent) {
         onChange: this.onChange.bind(null, 'min'),
         isPercentage: this.props.isPercentage,
         readonly: this.props.readonly,
-        onBlur: this.props.onBlur
+        onBlur: this.props.onBlur,
+        singleWidth: this.props.singleWidth
       }), /*#__PURE__*/React.createElement("span", {
         className: "param-number-range-sep",
         style: this.props.readonly ? {
@@ -647,7 +648,8 @@ var NumRange = /*#__PURE__*/function (_PureComponent) {
         onChange: this.onChange.bind(null, 'max'),
         isPercentage: this.props.isPercentage,
         readonly: this.props.readonly,
-        onBlur: this.props.onBlur
+        onBlur: this.props.onBlur,
+        singleWidth: this.props.singleWidth
       }), this.props.readonly ? ')' : '');
     }
   }]);
@@ -2842,39 +2844,93 @@ var ExpiryVegaAlphaByEdgeList = /*#__PURE__*/function (_PureComponent) {
       }) : '-' : /*#__PURE__*/React.createElement("div", {
         className: "param-expiries-limit-inputs",
         style: {
-          gridTemplateColumns: '110px 100px auto auto'
+          display: 'flex',
+          flexDirection: 'column',
+          width: 1150
         }
       }, /*#__PURE__*/React.createElement("div", {
-        className: "param-number-range readonly"
+        style: {
+          display: 'flex',
+          width: '100%',
+          gap: 8
+        }
+      }, /*#__PURE__*/React.createElement("div", {
+        style: {
+          width: 100
+        }
       }, "Expiry"), /*#__PURE__*/React.createElement("div", {
-        className: "param-number-range readonly"
+        style: {
+          width: 80
+        }
       }, "Vega Target"), /*#__PURE__*/React.createElement("div", {
-        className: "param-number-range readonly"
-      }), /*#__PURE__*/React.createElement("div", {
-        className: "param-number-range readonly"
-      }), this.value.map(function (it, i) {
+        style: {
+          width: 120,
+          paddingLeft: 18
+        }
+      }, "Both/Call/Put"), /*#__PURE__*/React.createElement("div", {
+        style: {
+          width: 160
+        }
+      }, "Delta Range"), /*#__PURE__*/React.createElement("div", {
+        style: {
+          width: 210
+        }
+      }, "Bid Edge Range"), /*#__PURE__*/React.createElement("div", {
+        style: {
+          width: 210
+        }
+      }, "Ask Edge Range"), /*#__PURE__*/React.createElement("div", {
+        style: {
+          width: 74
+        }
+      }, "Allow Taker"), /*#__PURE__*/React.createElement("div", {
+        style: {
+          width: 60
+        }
+      }, "Disable")), this.value.map(function (it, i) {
         var _this2$props$value, _this2$props$value$i;
 
-        return /*#__PURE__*/React.createElement(React.Fragment, {
-          key: i
+        return /*#__PURE__*/React.createElement("div", {
+          key: i,
+          style: {
+            display: 'flex',
+            flexDirection: 'column',
+            width: '100%'
+          }
+        }, /*#__PURE__*/React.createElement("div", {
+          style: {
+            display: 'flex',
+            width: '100%',
+            alignItems: 'flex-start',
+            gap: 8
+          }
+        }, /*#__PURE__*/React.createElement("div", {
+          style: {
+            width: 100,
+            marginRight: 0
+          }
         }, /*#__PURE__*/React.createElement(Expiries, {
           style: {
-            width: 110,
-            minWidth: 0,
-            position: 'relative',
-            top: i > 0 ? -30 : 0
+            width: 100,
+            minWidth: 0
           },
           multiple: false,
           options: _this2.props.options,
           value: [it.expiry || ''],
           onChange: function onChange(val) {
             return _this2.onChange(i, val[0], 'expiry');
-          } // calcDisabled={(expiry) =>
-          //   this.value.some((item) => item !== it && item.expiry === expiry)
-          // }
-          ,
-          onBlur: _this2.props.onBlur
-        }), /*#__PURE__*/React.createElement(Num, {
+          },
+          onBlur: _this2.props.onBlur,
+          calcDisabled: function calcDisabled(option) {
+            return !!_this2.value.find(function (vega) {
+              return vega.expiry === option;
+            });
+          }
+        })), /*#__PURE__*/React.createElement("div", {
+          style: {
+            width: 80
+          }
+        }, /*#__PURE__*/React.createElement(Num, {
           value: (_this2$props$value = _this2.props.value) === null || _this2$props$value === void 0 ? void 0 : (_this2$props$value$i = _this2$props$value[i]) === null || _this2$props$value$i === void 0 ? void 0 : _this2$props$value$i.vegaTarget,
           onChange: function onChange(val) {
             return _this2.onChange(i, val, 'vegaTarget');
@@ -2883,71 +2939,66 @@ var ExpiryVegaAlphaByEdgeList = /*#__PURE__*/function (_PureComponent) {
           readonly: _this2.props.readonly,
           onBlur: _this2.props.onBlur,
           style: {
-            height: 30,
-            position: 'relative',
-            top: i > 0 ? -30 : 0
+            height: 30
+          },
+          singleWidth: 50
+        })), /*#__PURE__*/React.createElement("div", {
+          style: {
+            flex: 1,
+            minWidth: 734
           }
-        }), /*#__PURE__*/React.createElement("div", {
-          className: "param-expiries-limit-inputs",
+        }, /*#__PURE__*/React.createElement("div", {
           style: {
-            position: 'relative',
-            top: -30,
-            width: 734,
-            gridTemplateColumns: 'auto auto auto auto auto auto'
+            display: 'flex',
+            flexDirection: 'column',
+            gap: 8
           }
         }, 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",
+          var _it$vegaRules;
+
+          return /*#__PURE__*/React.createElement("div", {
+            key: k,
             style: {
-              paddingLeft: 36
+              display: 'flex',
+              width: '100%',
+              alignItems: 'center',
+              gap: 8
             }
-          }, "Call/Put/Call"), /*#__PURE__*/React.createElement("div", {
-            className: "param-number-range readonly"
-          }, "Delta Range"), /*#__PURE__*/React.createElement("div", {
-            className: "param-number-range readonly"
-          }, "Bid Edge Range"), /*#__PURE__*/React.createElement("div", {
-            className: "param-number-range readonly"
-          }, "Ask Edge Range"), /*#__PURE__*/React.createElement("div", {
-            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("div", {
+          }, /*#__PURE__*/React.createElement("div", {
             style: {
-              display: 'flex'
+              display: 'flex',
+              width: 120,
+              height: 30,
+              alignItems: 'center'
             }
           }, /*#__PURE__*/React.createElement("div", {
-            className: "param-arr-ops"
+            className: "param-arr-ops",
+            style: {
+              visibility: k === ((_it$vegaRules = it.vegaRules) === null || _it$vegaRules === void 0 ? void 0 : _it$vegaRules.length) - 1 ? 'visible' : 'hidden'
+            }
           }, /*#__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,
               padding: '0 10px',
-              height: 30
+              height: '30px !important'
             },
             multiple: false,
             value: [rule.optionType || ''],
             onChange: function onChange(val) {
               return _this2.onChange(i, val[0], 'vegaRules', k, 'optionType');
-            } // onBlur={this.props.onBlur}
-            ,
+            },
             options: ['Both', 'Call', 'Put']
-          })), /*#__PURE__*/React.createElement(NumRange, {
+          })), /*#__PURE__*/React.createElement("div", {
+            style: {
+              width: 160
+            }
+          }, /*#__PURE__*/React.createElement(NumRange, {
             value: {
               min: rule.deltaRange.min,
               max: rule.deltaRange.max
@@ -2955,8 +3006,13 @@ var ExpiryVegaAlphaByEdgeList = /*#__PURE__*/function (_PureComponent) {
             onChange: function onChange(val) {
               return _this2.onChange(i, val, 'vegaRules', k, 'deltaRange');
             },
-            onBlur: _this2.props.onBlur
-          }), /*#__PURE__*/React.createElement(NumRangeFromTo, {
+            onBlur: _this2.props.onBlur,
+            singleWidth: 50
+          })), /*#__PURE__*/React.createElement("div", {
+            style: {
+              width: 210
+            }
+          }, /*#__PURE__*/React.createElement(NumRangeFromTo, {
             value: {
               from: rule.bidEdgeSpan.from,
               to: rule.bidEdgeSpan.to
@@ -2966,7 +3022,11 @@ var ExpiryVegaAlphaByEdgeList = /*#__PURE__*/function (_PureComponent) {
             },
             isPercentage: true,
             onBlur: _this2.props.onBlur
-          }), /*#__PURE__*/React.createElement(NumRangeFromTo, {
+          })), /*#__PURE__*/React.createElement("div", {
+            style: {
+              width: 210
+            }
+          }, /*#__PURE__*/React.createElement(NumRangeFromTo, {
             value: {
               from: rule.askEdgeSpan.from,
               to: rule.askEdgeSpan.to
@@ -2976,11 +3036,11 @@ var ExpiryVegaAlphaByEdgeList = /*#__PURE__*/function (_PureComponent) {
             },
             isPercentage: true,
             onBlur: _this2.props.onBlur
-          }), /*#__PURE__*/React.createElement("div", {
+          })), /*#__PURE__*/React.createElement("div", {
             style: {
-              width: 74,
-              position: 'relative',
-              top: 4
+              display: 'flex',
+              justifyContent: 'center',
+              width: 74
             }
           }, /*#__PURE__*/React.createElement(Checkbox, {
             checked: rule.allowTaker,
@@ -2989,33 +3049,40 @@ var ExpiryVegaAlphaByEdgeList = /*#__PURE__*/function (_PureComponent) {
             }
           })), /*#__PURE__*/React.createElement("div", {
             style: {
-              width: 74,
+              display: 'flex',
+              justifyContent: 'center',
               position: 'relative',
-              top: 4
+              width: 60
             }
           }, /*#__PURE__*/React.createElement(Checkbox, {
             checked: rule.disable,
             onChange: function onChange(e) {
               return _this2.onChange(i, e.target.checked, 'vegaRules', k, 'disable');
             }
-          })));
-        })), /*#__PURE__*/React.createElement("div", {
-          className: "param-arr-ops"
-        }, /*#__PURE__*/React.createElement(PlusOutlined, {
-          className: "param-arr-ops-add",
-          onClick: _this2.onAdd.bind(null, i),
+          }), /*#__PURE__*/React.createElement("div", {
+            className: "param-arr-ops",
+            style: {
+              position: 'absolute',
+              right: -80,
+              top: -4,
+              visibility: k === 0 ? 'hidden' : 'visible'
+            }
+          }, /*#__PURE__*/React.createElement(DeleteOutlined, {
+            className: "param-arr-ops-del",
+            onClick: _this2.onDelRule.bind(null, i, k)
+          }))));
+        }))), /*#__PURE__*/React.createElement("div", {
+          className: "param-arr-ops",
           style: {
-            position: 'relative',
-            top: i > 0 ? -30 : 0
+            width: 60
           }
+        }, /*#__PURE__*/React.createElement(PlusOutlined, {
+          className: "param-arr-ops-add",
+          onClick: _this2.onAdd.bind(null, i)
         }), /*#__PURE__*/React.createElement(DeleteOutlined, {
           className: "param-arr-ops-del",
-          onClick: _this2.onDel.bind(null, i),
-          style: {
-            position: 'relative',
-            top: i > 0 ? -30 : 0
-          }
-        })));
+          onClick: _this2.onDel.bind(null, i)
+        }))));
       })));
     }
   }]);
@@ -3029,8 +3096,8 @@ function emptyErrText(index, key) {
   return "The ".concat(index + 1).concat(index === 0 ? 'st' : index === 1 ? 'nd' : index === 2 ? 'rd' : 'th', " item: ").concat(key ? key + ' ' : '', "should not be empty");
 }
 
-function zeroErrText(index, key, type) {
-  return "The ".concat(index + 1).concat(index === 0 ? 'st' : index === 1 ? 'nd' : index === 2 ? 'rd' : 'th', " item: ").concat(key ? key + ' ' : '', "should be ").concat(type === 'min' ? '<' : '>', " 0");
+function zeroErrText(index, key, type, canZero) {
+  return "The ".concat(index + 1).concat(index === 0 ? 'st' : index === 1 ? 'nd' : index === 2 ? 'rd' : 'th', " item: ").concat(key ? key + ' ' : '', "should be ").concat(type === 'min' ? canZero ? '<=' : '<' : canZero ? '>=' : '>', " 0");
 }
 
 var ParamTypeConfig = (_ParamTypeConfig = {}, _defineProperty(_ParamTypeConfig, ParamType.ParamGroup, {
@@ -3379,10 +3446,25 @@ var ParamTypeConfig = (_ParamTypeConfig = {}, _defineProperty(_ParamTypeConfig,
           return emptyErrText(i, "delta range's min");
         }
 
+        if (Number(vegaRule.deltaRange.min) < 0 || Number(vegaRule.deltaRange.min) > 1) {
+          // return zeroErrText(i, "delta range's min", 'max', true);
+          return "The ".concat(i + 1).concat(i === 0 ? 'st' : i === 1 ? 'nd' : i === 2 ? 'rd' : 'th', " item: delta range's min only support 0 ~ 1");
+        }
+
         if (isEmpty(vegaRule.deltaRange.max)) {
           return emptyErrText(i, "delta range's max");
         }
 
+        if (Number(vegaRule.deltaRange.max) < 0 || Number(vegaRule.deltaRange.max) > 1) {
+          // return zeroErrText(i, "delta range's max", 'max', true);
+          return "The ".concat(i + 1).concat(i === 0 ? 'st' : i === 1 ? 'nd' : i === 2 ? 'rd' : 'th', " item: delta range's max only support 0 ~ 1");
+        }
+
+        if (Number(vegaRule.deltaRange.max) <= Number(vegaRule.deltaRange.min)) {
+          // return zeroErrText(i, "delta range's max", 'max', true);
+          return "The ".concat(i + 1).concat(i === 0 ? 'st' : i === 1 ? 'nd' : i === 2 ? 'rd' : 'th', " item: delta range's max should be > min");
+        }
+
         if (isEmpty(vegaRule.bidEdgeSpan.from)) {
           return emptyErrText(i, "bid edge range's from");
         }
@@ -3400,38 +3482,38 @@ var ParamTypeConfig = (_ParamTypeConfig = {}, _defineProperty(_ParamTypeConfig,
         }
 
         if (Number(val.vegaTarget) > 0) {
-          if (Number(vegaRule.bidEdgeSpan.from) <= 0) {
-            return zeroErrText(i, "bid edge range's from", 'max');
+          if (Number(vegaRule.bidEdgeSpan.from) < 0) {
+            return zeroErrText(i, "bid edge range's from", 'max', true);
           }
 
-          if (Number(vegaRule.bidEdgeSpan.to) <= 0) {
-            return zeroErrText(i, "bid edge range's to", 'max');
+          if (Number(vegaRule.bidEdgeSpan.to) < 0) {
+            return zeroErrText(i, "bid edge range's to", 'max', true);
           }
 
-          if (Number(vegaRule.askEdgeSpan.from) <= 0) {
-            return zeroErrText(i, "ask edge range's from", 'max');
+          if (Number(vegaRule.askEdgeSpan.from) < 0) {
+            return zeroErrText(i, "ask edge range's from", 'max', true);
           }
 
-          if (Number(vegaRule.askEdgeSpan.to) <= 0) {
-            return zeroErrText(i, "ask edge range's to", 'max');
+          if (Number(vegaRule.askEdgeSpan.to) < 0) {
+            return zeroErrText(i, "ask edge range's to", 'max', true);
           }
         }
 
         if (Number(val.vegaTarget) < 0) {
-          if (Number(vegaRule.bidEdgeSpan.from) >= 0) {
-            return zeroErrText(i, "bid edge range's from", 'min');
+          if (Number(vegaRule.bidEdgeSpan.from) > 0) {
+            return zeroErrText(i, "bid edge range's from", 'min', true);
           }
 
-          if (Number(vegaRule.bidEdgeSpan.to) >= 0) {
-            return zeroErrText(i, "bid edge range's to", 'min');
+          if (Number(vegaRule.bidEdgeSpan.to) > 0) {
+            return zeroErrText(i, "bid edge range's to", 'min', true);
           }
 
-          if (Number(vegaRule.askEdgeSpan.from) >= 0) {
-            return zeroErrText(i, "ask edge range's from", 'min');
+          if (Number(vegaRule.askEdgeSpan.from) > 0) {
+            return zeroErrText(i, "ask edge range's from", 'min', true);
           }
 
-          if (Number(vegaRule.askEdgeSpan.to) >= 0) {
-            return zeroErrText(i, "ask edge range's to", 'min');
+          if (Number(vegaRule.askEdgeSpan.to) > 0) {
+            return zeroErrText(i, "ask edge range's to", 'min', true);
           }
         }
       } // if (expiries.includes(val.expiry)) {
@@ -3451,7 +3533,7 @@ var ParamTypeConfig = (_ParamTypeConfig = {}, _defineProperty(_ParamTypeConfig,
     return '';
   },
   sort: 18,
-  modalWidth: 1280
+  modalWidth: 1300
 }), _ParamTypeConfig);
 function paramValidator(val, values, enableEmpty) {
   var _config$validator;
@@ -3772,8 +3854,6 @@ var ParamFormModalEl = /*#__PURE__*/function (_PureComponent2) {
   var _super2 = _createSuper(ParamFormModalEl);
 
   function ParamFormModalEl() {
-    var _this4$props$initialV, _ParamTypeConfig$_thi, _this4$props$initialV2;
-
     var _this4;
 
     _classCallCheck(this, ParamFormModalEl);
@@ -3789,12 +3869,15 @@ var ParamFormModalEl = /*#__PURE__*/function (_PureComponent2) {
     _defineProperty(_assertThisInitialized(_this4), "state", {
       visible: false,
       pending: false,
-      width: ((_this4$props$initialV = _this4.props.initialValues) === null || _this4$props$initialV === void 0 ? void 0 : _this4$props$initialV.valueType) ? (_ParamTypeConfig$_thi = ParamTypeConfig[(_this4$props$initialV2 = _this4.props.initialValues) === null || _this4$props$initialV2 === void 0 ? void 0 : _this4$props$initialV2.valueType]) === null || _ParamTypeConfig$_thi === void 0 ? void 0 : _ParamTypeConfig$_thi.modalWidth : 740
+      width: 740
     });
 
     _defineProperty(_assertThisInitialized(_this4), "onShow", function () {
+      var _this4$props$initialV, _ParamTypeConfig$_thi, _this4$props$initialV2;
+
       return _this4.setState({
-        visible: true
+        visible: true,
+        width: ((_this4$props$initialV = _this4.props.initialValues) === null || _this4$props$initialV === void 0 ? void 0 : _this4$props$initialV.valueType) ? (_ParamTypeConfig$_thi = ParamTypeConfig[(_this4$props$initialV2 = _this4.props.initialValues) === null || _this4$props$initialV2 === void 0 ? void 0 : _this4$props$initialV2.valueType]) === null || _ParamTypeConfig$_thi === void 0 ? void 0 : _ParamTypeConfig$_thi.modalWidth : 740
       });
     });
 
@@ -3851,6 +3934,7 @@ var ParamFormModalEl = /*#__PURE__*/function (_PureComponent2) {
         closable: false,
         title: !this.isEdit ? '新增参数' : '修改参数',
         visible: this.state.visible,
+        destroyOnClose: true,
         footer: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
           onClick: this.onHide
         }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
@@ -4056,12 +4140,13 @@ var ParamValueEditorModalEl = /*#__PURE__*/function (_PureComponent2) {
     _defineProperty(_assertThisInitialized(_this3), "state", {
       visible: false,
       pending: false,
-      width: ParamTypeConfig[_this3.props.valueType].modalWidth || 740
+      width: 740
     });
 
     _defineProperty(_assertThisInitialized(_this3), "onShow", function () {
       return _this3.setState({
-        visible: true
+        visible: true,
+        width: ParamTypeConfig[_this3.props.valueType].modalWidth || 740
       });
     });
 
@@ -4107,10 +4192,11 @@ var ParamValueEditorModalEl = /*#__PURE__*/function (_PureComponent2) {
     value: function render() {
       return /*#__PURE__*/React.createElement(Modal, {
         key: String(this.state.visible),
-        width: this.state.width || 740,
+        width: this.state.width,
         title: 'Edit Value',
         closable: false,
         visible: this.state.visible,
+        destroyOnClose: true,
         footer: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
           onClick: this.onHide
         }, "Cancel"), /*#__PURE__*/React.createElement(Button, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalplus/params-about",
-  "version": "1.0.26-alpha8",
+  "version": "1.0.26",
   "description": "A description for the module",
   "main": "./lib/umd/index.js",
   "module": "./lib/es/index.js",
@@ -89,5 +89,8 @@
     "dayjs": "^1.11.0",
     "lodash-es": "^4.17.21",
     "react-global-comp": "^2.0.1"
+  },
+  "dependencies": {
+    "@signalplus/params-about": "1.0.26-alpha18"
   }
 }