@signalplus/params-about 1.0.5-alpha3 → 1.0.5-alpha5

package/lib/es/index.js

@@ -1,7 +1,7 @@
 /**
  * Bundle of @signalplus/params-about
- * Generated: 2023-05-11
- * Version: 1.0.5-alpha3
+ * Generated: 2023-05-12
+ * Version: 1.0.5-alpha5
  * 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, Input, Cascader, Select, Form, Button, message, Modal } from 'antd';
+import { Popover, Cascader, Input, Select, Form, Button, message, Modal } from 'antd';
 import ReactGlobalComp from 'react-global-comp';
 import { isEqual } from 'lodash-es';
 import ReactFileInput from '@livelybone/react-file-input';
@@ -1316,14 +1316,20 @@ var Instruments = /*#__PURE__*/function (_PureComponent) {
         placement: 'bottomLeft',
         visible: !this.props.readonly && this.state.visible,
         onVisibleChange: this.handleVisibleChange,
-        content: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Input, {
+        content: /*#__PURE__*/React.createElement("div", {
+          className: "param-renderer"
+        }, /*#__PURE__*/React.createElement("input", {
+          style: {
+            width: '180px',
+            height: '30px'
+          },
           onChange: function onChange(e) {
             return _this3.inputValueChange(e.target.value);
           }
         }), /*#__PURE__*/React.createElement("div", {
           style: {
             marginTop: 2,
-            width: 178,
+            width: 220,
             height: 300,
             overflowY: 'auto',
             overflowX: 'hidden'
@@ -1660,16 +1666,17 @@ 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);
+      if (isNullLike(val.expiry) && isNullLike(val.value)) return '';
 
       if (error) {
         return "Expiry field of the ".concat(i + 1, "th item: ").concat(error);
       }
 
-      if (!isNullLike(val.expiry) && isNullLike(val.value)) {
+      if (isNullLike(val.expiry) && !isNullLike(val.value)) {
         return "The ".concat(i + 1, "th item: expiry shold not be empty");
       }
 
-      if (isNullLike(val.expiry) && !isNullLike(val.value)) {
+      if (!isNullLike(val.expiry) && isNullLike(val.value)) {
         return "The ".concat(i + 1, "th item: value shold not be empty");
       }
     }
@@ -1723,12 +1730,13 @@ var ParamTypeConfig = (_ParamTypeConfig = {}, _defineProperty(_ParamTypeConfig,
 
     for (var i = 0; i < $val.length; i++) {
       var val = $val[i];
+      if (isNullLike(val.instrument) && isNullLike(val.value)) return '';
 
-      if (!isNullLike(val.instrument) && isNullLike(val.value)) {
+      if (isNullLike(val.instrument) && !isNullLike(val.value)) {
         return "The ".concat(i + 1, "th item: instrument shold not be empty");
       }
 
-      if (isNullLike(val.instrument) && !isNullLike(val.value)) {
+      if (!isNullLike(val.instrument) && isNullLike(val.value)) {
         return "The ".concat(i + 1, "th item: value shold not be empty");
       }
     }
@@ -1801,7 +1809,7 @@ var ParamRenderer = /*#__PURE__*/function (_PureComponent) {
     value: function render() {
       var Comp = this.typeConfig.Comp;
       return /*#__PURE__*/React.createElement(Comp, Object.assign({}, this.props, {
-        options: this.typeConfig.key === 'expiryNumberList' ? this.props.expiriesOptions : this.props.instrumentsOptions,
+        options: this.typeConfig.key === 'instrumentNumberList' ? this.props.instrumentsOptions : this.props.expiriesOptions,
         value: this.value,
         onChange: this.onChange,
         className: classNames('param-renderer', this.props.className)
@@ -1905,7 +1913,6 @@ var ParamForm = /*#__PURE__*/function (_PureComponent) {
 
       var valueType = (_this$ref$current$get = (_this$ref$current = this.ref.current) === null || _this$ref$current === void 0 ? void 0 : _this$ref$current.getFieldValue('valueType')) !== null && _this$ref$current$get !== void 0 ? _this$ref$current$get : (_this$props$initialVa = this.props.initialValues) === null || _this$props$initialVa === void 0 ? void 0 : _this$props$initialVa.valueType;
       var config = ParamTypeConfig[valueType];
-      console.log('ParamTypeOptions', ParamTypeOptions);
       return [{
         label: '所属分组',
         name: 'parentId',
@@ -1993,6 +2000,8 @@ var ParamForm = /*#__PURE__*/function (_PureComponent) {
   }, {
     key: "render",
     value: function render() {
+      var _this3 = this;
+
       return /*#__PURE__*/React.createElement(Form, {
         className: "param-form",
         ref: this.ref,
@@ -2001,6 +2010,8 @@ var ParamForm = /*#__PURE__*/function (_PureComponent) {
         onFinish: this.props.onSubmit,
         onValuesChange: this.onChange
       }, this.formItems.map(function (it) {
+        var _this3$ref$current;
+
         return /*#__PURE__*/React.createElement(Form.Item, {
           key: it.name,
           label: it.label,
@@ -2012,7 +2023,7 @@ var ParamForm = /*#__PURE__*/function (_PureComponent) {
               return Promise.resolve();
             }
           }],
-          validateTrigger: 'onBlur'
+          validateTrigger: it.name === 'defaultValue' && [4, 5, 6, 10, 11].includes((_this3$ref$current = _this3.ref.current) === null || _this3$ref$current === void 0 ? void 0 : _this3$ref$current.getFieldValue('valueType')) ? 'onSubmit' : 'onBlur'
         }, /*#__PURE__*/React.createElement(it.Comp, null));
       }), this.props.onSubmit && /*#__PURE__*/React.createElement(Button, {
         type: "primary",
@@ -2030,7 +2041,7 @@ var ParamFormModalEl = /*#__PURE__*/function (_PureComponent2) {
   var _super2 = _createSuper(ParamFormModalEl);
 
   function ParamFormModalEl() {
-    var _this3;
+    var _this4;
 
     _classCallCheck(this, ParamFormModalEl);
 
@@ -2038,50 +2049,50 @@ var ParamFormModalEl = /*#__PURE__*/function (_PureComponent2) {
       args[_key2] = arguments[_key2];
     }
 
-    _this3 = _super2.call.apply(_super2, [this].concat(args));
+    _this4 = _super2.call.apply(_super2, [this].concat(args));
 
-    _defineProperty(_assertThisInitialized(_this3), "ref", React.createRef());
+    _defineProperty(_assertThisInitialized(_this4), "ref", React.createRef());
 
-    _defineProperty(_assertThisInitialized(_this3), "state", {
+    _defineProperty(_assertThisInitialized(_this4), "state", {
       visible: false,
       pending: false
     });
 
-    _defineProperty(_assertThisInitialized(_this3), "onShow", function () {
-      return _this3.setState({
+    _defineProperty(_assertThisInitialized(_this4), "onShow", function () {
+      return _this4.setState({
         visible: true
       });
     });
 
-    _defineProperty(_assertThisInitialized(_this3), "onHide", function () {
-      return _this3.setState({
+    _defineProperty(_assertThisInitialized(_this4), "onHide", function () {
+      return _this4.setState({
         visible: false
       });
     });
 
-    _defineProperty(_assertThisInitialized(_this3), "onSubmit", function () {
-      var form = _this3.ref.current.ref.current;
+    _defineProperty(_assertThisInitialized(_this4), "onSubmit", function () {
+      var form = _this4.ref.current.ref.current;
       return form.validateFields().then(function () {
-        return _this3.setState({
+        return _this4.setState({
           pending: true
         });
       }).then(function () {
-        var data = _objectSpread2(_objectSpread2({}, _this3.props.initialValues), form.getFieldsValue());
+        var data = _objectSpread2(_objectSpread2({}, _this4.props.initialValues), form.getFieldsValue());
 
-        if (_this3.isEdit && isEqual(data, _this3.props.initialValues)) {
+        if (_this4.isEdit && isEqual(data, _this4.props.initialValues)) {
           message.warning('请修改后再提交');
           return Promise.reject();
         }
 
-        return _this3.props.onSubmit(data);
-      }).then(_this3.onHide).catch(console.error).finally(function () {
-        return _this3.setState({
+        return _this4.props.onSubmit(data);
+      }).then(_this4.onHide).catch(console.error).finally(function () {
+        return _this4.setState({
           pending: false
         });
       });
     });
 
-    return _this3;
+    return _this4;
   }
 
   _createClass(ParamFormModalEl, [{

package/package.json

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