@signalplus/params-about 0.1.25 → 0.1.28

package/index.d.ts

@@ -77,6 +77,7 @@ interface ParamFormData {
 }
 interface ParamFormProps {
     parentOptions: ParentSelectorProps['parentOptions'];
+    allKeys: string[];
     expiriesOptions: string[];
     initialValues?: Partial<ParamFormData>;
     groupEditable?: boolean;
@@ -308,7 +309,7 @@ declare function numRangeValidator(val: {
 }, enableEmpty?: boolean): string;
 declare function expiryValidator(val: string, enableEmpty?: boolean): "Should not be empty" | "" | "Out of format";
 declare function expiriesValidator(val: string[]): string;
-declare function keyValidator(val: string): "Should not be empty" | "" | "Out of format: should be a combination of the following chars `_.0-9a-zA-Z`";
+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;
 declare function validatorCvt(validator: (val: any, values: any) => ValidateInfo['string'], form?: () => any): (_: any, val: any) => Promise<any>;
 

package/lib/es/index.js

@@ -1,7 +1,7 @@
 /**
  * Bundle of @signalplus/params-about
  * Generated: 2022-04-12
- * Version: 0.1.25
+ * Version: 0.1.28
  * License: MIT
  * Author: 2631541504@qq.com
  */
@@ -409,10 +409,19 @@ function expiriesValidator(val) {
 
   return '';
 }
-function keyValidator(val) {
+function keyValidator(val, allKeys) {
   var error = emptyValidator(val);
   if (error) return error;
-  return /^[_.a-zA-Z0-9]+$/.test(val) ? '' : 'Out of format: should be a combination of the following chars `_.0-9a-zA-Z`';
+
+  if (/^[_.a-zA-Z0-9]+$/.test(val)) {
+    return 'Out of format: should be a combination of the following chars `_.0-9a-zA-Z`';
+  }
+
+  var has = allKeys.some(function (it) {
+    return val === it;
+  });
+  if (has) return 'This key has been used';
+  return '';
 }
 function isExpired(val) {
   if (!val) return false;
@@ -751,6 +760,10 @@ var TextArray = /*#__PURE__*/function (_PureComponent) {
 
     _defineProperty(_assertThisInitialized(_this), "value", []);
 
+    _defineProperty(_assertThisInitialized(_this), "isEmptyItem", function (item) {
+      return !item.trim();
+    });
+
     _defineProperty(_assertThisInitialized(_this), "onChange", function (i, e) {
       var _this$props$onChange, _this$props;
 
@@ -759,7 +772,7 @@ var TextArray = /*#__PURE__*/function (_PureComponent) {
       var value = _toConsumableArray(_this.value);
 
       value[i] = val;
-      (_this$props$onChange = (_this$props = _this.props).onChange) === null || _this$props$onChange === void 0 ? void 0 : _this$props$onChange.call(_this$props, value);
+      (_this$props$onChange = (_this$props = _this.props).onChange) === null || _this$props$onChange === void 0 ? void 0 : _this$props$onChange.call(_this$props, value.length === 1 && _this.isEmptyItem(value[0]) ? [] : value);
     });
 
     _defineProperty(_assertThisInitialized(_this), "onAdd", function (i) {
@@ -777,7 +790,7 @@ var TextArray = /*#__PURE__*/function (_PureComponent) {
       var value = _toConsumableArray(_this.value);
 
       value.splice(i, 1);
-      (_this$props$onChange3 = (_this$props3 = _this.props).onChange) === null || _this$props$onChange3 === void 0 ? void 0 : _this$props$onChange3.call(_this$props3, value);
+      (_this$props$onChange3 = (_this$props3 = _this.props).onChange) === null || _this$props$onChange3 === void 0 ? void 0 : _this$props$onChange3.call(_this$props3, value.length === 1 && _this.isEmptyItem(value[0]) ? [] : value);
     });
 
     return _this;
@@ -786,9 +799,10 @@ var TextArray = /*#__PURE__*/function (_PureComponent) {
   _createClass(TextArray, [{
     key: "render",
     value: function render() {
-      var _this2 = this;
+      var _this$props$value,
+          _this2 = this;
 
-      this.value = this.props.value || [];
+      this.value = ((_this$props$value = this.props.value) === null || _this$props$value === void 0 ? void 0 : _this$props$value.slice()) || [];
       if (!this.value.length) this.value.push('');
       return /*#__PURE__*/React.createElement("div", {
         className: classNames('param-text-array', {
@@ -973,6 +987,12 @@ var ExpiriesLimit = /*#__PURE__*/function (_PureComponent) {
 
     _defineProperty(_assertThisInitialized(_this), "value", []);
 
+    _defineProperty(_assertThisInitialized(_this), "isEmptyItem", function (item) {
+      var _item$expiry;
+
+      return !((_item$expiry = item.expiry) === null || _item$expiry === void 0 ? void 0 : _item$expiry.trim()) && isNullLike(item.minAumPercentage) && isNullLike(item.maxAumPercentage) && isNullLike(item.minAbs) && isNullLike(item.maxAbs);
+    });
+
     _defineProperty(_assertThisInitialized(_this), "onChange", function (i, val, key) {
       var _this$props$onChange, _this$props;
 
@@ -982,7 +1002,7 @@ var ExpiriesLimit = /*#__PURE__*/function (_PureComponent) {
         expiry: ''
       };
       if (key) value[i][key] = val;else value[i] = _objectSpread2(_objectSpread2({}, value[i]), val);
-      (_this$props$onChange = (_this$props = _this.props).onChange) === null || _this$props$onChange === void 0 ? void 0 : _this$props$onChange.call(_this$props, value);
+      (_this$props$onChange = (_this$props = _this.props).onChange) === null || _this$props$onChange === void 0 ? void 0 : _this$props$onChange.call(_this$props, value.length === 1 && _this.isEmptyItem(value[0]) ? [] : value);
     });
 
     _defineProperty(_assertThisInitialized(_this), "onAdd", function (i) {
@@ -1003,7 +1023,7 @@ var ExpiriesLimit = /*#__PURE__*/function (_PureComponent) {
       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);
+      (_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);
       (_this$props$onBlur2 = (_this$props5 = _this.props).onBlur) === null || _this$props$onBlur2 === void 0 ? void 0 : _this$props$onBlur2.call(_this$props5);
     });
 
@@ -1392,7 +1412,9 @@ var ParamForm = /*#__PURE__*/function (_PureComponent) {
           }, props));
         },
         required: true,
-        validator: validatorCvt(keyValidator)
+        validator: validatorCvt(function (val) {
+          return keyValidator(val, _this2.props.allKeys);
+        })
       }, {
         label: '参数名称',
         name: 'name',

package/package.json

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