@signalplus/params-about 1.0.23 → 1.0.25-alpha

package/index.d.ts

@@ -342,7 +342,7 @@ declare function numRangeValidator(val: {
     min?: string;
     max?: string;
 }, enableEmpty?: boolean): string;
-declare function expiryValidator(val: string, enableEmpty?: boolean): "Should not be empty" | "" | "Out of format";
+declare function expiryValidator(val: string, enableEmpty?: boolean): "Should not be empty" | "";
 declare function expiriesValidator(val: string[]): string;
 declare function keyValidator(val: string, allKeys: string[]): "Should not be empty" | "" | "Out of format: should be a combination of the following chars `_.0-9a-zA-Z`" | "This key has been used";
 declare function isExpired(val?: string): boolean;

package/lib/es/index.js

@@ -1,7 +1,7 @@
 /**
  * Bundle of @signalplus/params-about
- * Generated: 2024-05-17
- * Version: 1.0.23
+ * Generated: 2025-05-07
+ * Version: 1.0.25-alpha
  * License: MIT
  * Author: 2631541504@qq.com
  */
@@ -11,7 +11,7 @@ import classNames from 'classnames';
 import dayjs from 'dayjs';
 import Big from 'big.js';
 import { PlusOutlined, DeleteOutlined, CloseOutlined, CheckOutlined, DownOutlined } from '@ant-design/icons';
-import { Popover, Cascader, Input, Select, Form, Button, message, Modal } from 'antd';
+import { Select, Popover, Cascader, Input, Form, Button, message, Modal } from 'antd';
 import { isArray, capitalize, isEqual } from 'lodash-es';
 import ReactGlobalComp from 'react-global-comp';
 import ReactFileInput from '@livelybone/react-file-input';
@@ -293,16 +293,18 @@ function numRangeValidator(val, enableEmpty) {
 }
 function expiryValidator(val, enableEmpty) {
   var error = emptyValidator(val, enableEmpty);
-  if (error) return error;
-  var $val = dayjs(val.replace(/([a-zA-Z]+)/, ' $1 '), 'D MMM YY').format('DMMMYY').toUpperCase();
-  if ($val !== val && "0".concat($val) !== val) return 'Out of format';
+  if (error) return error; // const $val = dayjs(val.replace(/([a-zA-Z]+)/, ' $1 '), 'D MMM YY')
+  //   .format('DMMMYY')
+  //   .toUpperCase();
+  // if ($val !== val && `0${$val}` !== val) return 'Out of format';
+
   return '';
 }
 function expiriesValidator(val) {
   if (!(val === null || val === void 0 ? void 0 : val.length)) return '';
 
   for (var i = 0; i < val.length; i++) {
-    var error = expiryValidator(val[i]);
+    var error = emptyValidator(val[i]);
 
     if (error) {
       // return { [i]: error }
@@ -799,11 +801,8 @@ var Expiries = /*#__PURE__*/function (_PureComponent) {
         return (_this$props$options = _this.props.options) === null || _this$props$options === void 0 ? void 0 : _this$props$options.includes(item);
       })) || []);
 
-      if (_this.props.multiple !== false) {
-        var index = value.findIndex(function (it) {
-          return it === val;
-        });
-        if (index > -1) value.splice(index, 1);else value.push(val);
+      if (_this.props.multiple !== false || Array.isArray(val)) {
+        value = val;
       } else {
         value = [val];
       }
@@ -862,37 +861,94 @@ var Expiries = /*#__PURE__*/function (_PureComponent) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props$options2,
-          _this3 = this;
+      var _this3 = this,
+          _this$props$options2;
 
-      return /*#__PURE__*/React.createElement(Popover, {
-        overlayClassName: "param-expiries-popover",
-        trigger: 'click',
-        placement: 'bottomLeft',
-        visible: !this.props.readonly && this.state.visible,
-        onVisibleChange: this.handleVisibleChange,
-        content: (_this$props$options2 = this.props.options) === null || _this$props$options2 === void 0 ? void 0 : _this$props$options2.map(function (it) {
-          var _this3$props$value, _this3$props$calcDisa, _this3$props, _this3$onChange;
+      for (var i = 0; i < 100000; i++) {
+        "".concat(i.toString(36)).concat(i);
+      }
 
-          var checked = (_this3$props$value = _this3.props.value) === null || _this3$props$value === void 0 ? void 0 : _this3$props$value.includes(it);
-          var disabled = (_this3$props$calcDisa = (_this3$props = _this3.props).calcDisabled) === null || _this3$props$calcDisa === void 0 ? void 0 : _this3$props$calcDisa.call(_this3$props, it);
-          return /*#__PURE__*/React.createElement("div", {
-            className: classNames('param-expiries-option', {
-              'param-expiries-option-checked': checked,
-              'param-expiries-option-disabled': disabled
-            }),
-            key: it,
-            onClick: disabled ? undefined : (_this3$onChange = _this3.onChange) === null || _this3$onChange === void 0 ? void 0 : _this3$onChange.bind(null, it)
-          }, it, checked && /*#__PURE__*/React.createElement(CheckOutlined, null));
-        })
-      }, /*#__PURE__*/React.createElement("div", {
+      return this.props.readonly ? /*#__PURE__*/React.createElement("div", {
         className: classNames('param-expiries', {
           readonly: this.props.readonly,
           multiple: this.props.multiple !== false
-        }, this.props.className),
-        style: this.props.style
-      }, this.renderValue(), !this.props.readonly && this.props.options && /*#__PURE__*/React.createElement(DownOutlined, {
-        className: "param-expiries-arrow"
+        }, this.props.className)
+      }, this.renderValue()) :
+      /*#__PURE__*/
+      // <Popover
+      //   overlayClassName="param-expiries-popover"
+      //   trigger={'click'}
+      //   placement={'bottomLeft'}
+      //   visible={!this.props.readonly && this.state.visible}
+      //   onVisibleChange={this.handleVisibleChange}
+      //   content={this.props.options?.map((it) => {
+      //     const checked = this.props.value?.includes(it);
+      //     const disabled = this.props.calcDisabled?.(it);
+      //     return (
+      //       <div
+      //         className={classNames('param-expiries-option', {
+      //           'param-expiries-option-checked': checked,
+      //           'param-expiries-option-disabled': disabled,
+      //         })}
+      //         key={it}
+      //         onClick={disabled ? undefined : this.onChange?.bind(null, it)}
+      //       >
+      //         {it}
+      //         {checked && <CheckOutlined />}
+      //       </div>
+      //     );
+      //   })}
+      // >
+      //   <div
+      //     className={classNames(
+      //       'param-expiries',
+      //       { readonly: this.props.readonly, multiple: this.props.multiple !== false },
+      //       this.props.className,
+      //     )}
+      //     style={this.props.style}
+      //   >
+      //     {this.renderValue()}
+      //     {!this.props.readonly && this.props.options && (
+      //       <DownOutlined className="param-expiries-arrow" />
+      //     )}
+      //   </div>
+      // </Popover>
+      // <Select
+      //   mode={this.props.multiple ? 'multiple' : undefined}
+      //   style={{ width: '100%' }}
+      //   placeholder="Choose"
+      //   onSelect={(v: string) => this.onChange?.bind(null, v)}
+      //   value={this.props.value}
+      //   options={
+      //     this.props.options?.map((expiry) => ({
+      //       value: expiry,
+      //       label: expiry,
+      //       disabled: this.props.calcDisabled?.(expiry),
+      //     })) || []
+      //   }
+      // />
+      React.createElement("div", {
+        className: "param-expiries-select"
+      }, /*#__PURE__*/React.createElement(Select, {
+        mode: this.props.multiple === false ? undefined : 'multiple',
+        style: {
+          width: '100%'
+        },
+        placeholder: "Choose",
+        value: this.props.value,
+        onChange: function onChange(values) {
+          var _this3$onChange;
+
+          return (_this3$onChange = _this3.onChange) === null || _this3$onChange === void 0 ? void 0 : _this3$onChange.call(_this3, values);
+        }
+      }, (_this$props$options2 = this.props.options) === null || _this$props$options2 === void 0 ? void 0 : _this$props$options2.map(function (option) {
+        var _this3$props$calcDisa, _this3$props;
+
+        return /*#__PURE__*/React.createElement(Select.Option, {
+          key: option,
+          value: option,
+          disabled: (_this3$props$calcDisa = (_this3$props = _this3.props).calcDisabled) === null || _this3$props$calcDisa === void 0 ? void 0 : _this3$props$calcDisa.call(_this3$props, option)
+        }, option);
       })));
     }
   }]);
@@ -971,7 +1027,7 @@ var ExpiriesLimit = /*#__PURE__*/function (_PureComponent) {
       this.value = ((_this$props$value = this.props.value) === null || _this$props$value === void 0 ? void 0 : _this$props$value.filter(function (it) {
         return !isExpired(it.expiry);
       })) || [];
-      if (!this.value.length) this.value.push({
+      if (!this.value.length && !this.props.readonly) this.value.push({
         expiry: ''
       });
       return /*#__PURE__*/React.createElement("div", {
@@ -1130,7 +1186,7 @@ var ExpiriesValueList = /*#__PURE__*/function (_PureComponent) {
       this.value = ((_this$props$value = this.props.value) === null || _this$props$value === void 0 ? void 0 : _this$props$value.filter(function (it) {
         return !isExpired(it.expiry);
       })) || [];
-      if (!this.value.length) this.value.push({
+      if (!this.value.length && !this.props.readonly) this.value.push({
         expiry: ''
       });
       return /*#__PURE__*/React.createElement("div", {
@@ -1443,7 +1499,7 @@ var InstrumentsValueList = /*#__PURE__*/function (_PureComponent) {
           _this2 = this;
 
       this.value = this.props.value || [];
-      if (!this.value.length) this.value.push({
+      if (!this.value.length && !this.props.readonly) this.value.push({
         instrument: ''
       });
       return /*#__PURE__*/React.createElement("div", {
@@ -2590,7 +2646,7 @@ var ParamTypeConfig = (_ParamTypeConfig = {}, _defineProperty(_ParamTypeConfig,
 
     for (var i = 0; i < $val.length; i++) {
       var val = $val[i];
-      var error = expiryValidator(val === null || val === void 0 ? void 0 : val.expiry);
+      var error = emptyValidator(val === null || val === void 0 ? void 0 : val.expiry);
       if (isEmpty(val.expiry) && isNullLike(val.value)) return '';
 
       if (error) {
@@ -2618,7 +2674,7 @@ var ParamTypeConfig = (_ParamTypeConfig = {}, _defineProperty(_ParamTypeConfig,
 
     for (var i = 0; i < $val.length; i++) {
       var val = $val[i];
-      var error = expiryValidator(val === null || val === void 0 ? void 0 : val.expiry);
+      var error = emptyValidator(val === null || val === void 0 ? void 0 : val.expiry);
 
       if (error) {
         // return { [i]: { expire: error } }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalplus/params-about",
-  "version": "1.0.23",
+  "version": "1.0.25-alpha",
   "description": "A description for the module",
   "main": "./lib/umd/index.js",
   "module": "./lib/es/index.js",
@@ -48,7 +48,7 @@
     "@types/react": "^16.8.23",
     "@types/react-dom": "^16.8.5",
     "ahooks": "^3.3.0",
-    "antd": "^4.19.5",
+    "antd": "^5.24.9",
     "babel-plugin-istanbul": "^5.1.4",
     "babel-preset-react-app": "^9.0.0",
     "big.js": "^6.1.1",