@signalplus/params-about 1.0.5-alpha2 → 1.0.5-alpha4

package/index.d.ts

@@ -44,6 +44,7 @@ declare class ParamRenderer extends PureComponent<ParamRendererProps> {
         Comp: React.ComponentType<BaseInputProps>;
         validator?(value: any, enableEmpty?: boolean | undefined): string;
         required?: boolean | undefined;
+        sort: number;
     };
     get value(): any;
     onChange: (val: any) => void;
@@ -310,6 +311,7 @@ declare const ParamTypeConfig: Record<ParamType, {
     Comp: React.ComponentType<BaseInputProps>;
     validator?(value: any, enableEmpty?: boolean): string;
     required?: boolean;
+    sort: number;
 }>;
 declare function paramValidator(val: any, values: {
     valueType: ParamType;
@@ -323,6 +325,7 @@ declare const ParamTypeOptions: {
     Comp: React.ComponentType<BaseInputProps>;
     validator?(value: any, enableEmpty?: boolean | undefined): string;
     required?: boolean | undefined;
+    sort: number;
 }[];
 
 declare function formatNum(val: string): number | undefined;

package/lib/es/index.js

@@ -1,7 +1,7 @@
 /**
  * Bundle of @signalplus/params-about
- * Generated: 2023-05-11
- * Version: 1.0.5-alpha2
+ * Generated: 2023-05-12
+ * Version: 1.0.5-alpha4
  * License: MIT
  * Author: 2631541504@qq.com
  */
@@ -260,7 +260,7 @@ function formatNum(val) {
   return isNaN(num) ? undefined : num;
 }
 function isNullLike(val) {
-  return val === undefined || val === null;
+  return val === undefined || val === null || val === '';
 }
 function emptyValidator(val, enableEmpty) {
   return !enableEmpty && (isNullLike(val) || val instanceof Array && !val.length || typeof val === 'string' && !val) ? 'Should not be empty' : '';
@@ -1459,7 +1459,7 @@ var InstrumentsValueList = /*#__PURE__*/function (_PureComponent) {
           key: i
         }, /*#__PURE__*/React.createElement(Instruments, {
           style: {
-            width: 210
+            width: 240
           },
           multiple: false,
           options: _this2.props.options,
@@ -1476,7 +1476,7 @@ var InstrumentsValueList = /*#__PURE__*/function (_PureComponent) {
         }), /*#__PURE__*/React.createElement(Num, {
           style: {
             height: 30,
-            width: 210
+            width: 180
           },
           value: it.value,
           onChange: function onChange(val) {
@@ -1580,13 +1580,15 @@ var ParamTypeConfig = (_ParamTypeConfig = {}, _defineProperty(_ParamTypeConfig,
   name: '参数组',
   Comp: function Comp() {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
-  }
+  },
+  sort: 12
 }), _defineProperty(_ParamTypeConfig, ParamType.Number, {
   name: '普通数值',
   key: 'number',
   Comp: Num,
   validator: emptyValidator,
-  required: true
+  required: true,
+  sort: 1
 }), _defineProperty(_ParamTypeConfig, ParamType.Percentage, {
   name: '百分比数值',
   key: 'number',
@@ -1596,19 +1598,22 @@ var ParamTypeConfig = (_ParamTypeConfig = {}, _defineProperty(_ParamTypeConfig,
     }));
   },
   validator: emptyValidator,
-  required: true
+  required: true,
+  sort: 2
 }), _defineProperty(_ParamTypeConfig, ParamType.Bool, {
   name: 'TRUE/FALSE',
   key: 'bool',
   Comp: Bool,
   validator: emptyValidator,
-  required: true
+  required: true,
+  sort: 3
 }), _defineProperty(_ParamTypeConfig, ParamType.NumberRange, {
   name: '数值范围',
   key: 'range',
   Comp: NumRange,
   validator: numRangeValidator,
-  required: true
+  required: true,
+  sort: 4
 }), _defineProperty(_ParamTypeConfig, ParamType.PercentageRange, {
   name: '百分比范围',
   key: 'range',
@@ -1618,7 +1623,61 @@ var ParamTypeConfig = (_ParamTypeConfig = {}, _defineProperty(_ParamTypeConfig,
     }));
   },
   validator: numRangeValidator,
-  required: true
+  required: true,
+  sort: 5
+}), _defineProperty(_ParamTypeConfig, ParamType.Text, {
+  name: '文本',
+  key: 'text',
+  Comp: Text,
+  validator: emptyValidator,
+  sort: 6
+}), _defineProperty(_ParamTypeConfig, ParamType.Phone, {
+  name: '文本列表',
+  key: 'list',
+  Comp: TextArray,
+  validator: function validator($val) {
+    if (!($val === null || $val === void 0 ? void 0 : $val.length)) return '';
+    var index = $val.findIndex(function ($it) {
+      return !$it.trim();
+    });
+    if (index > -1) return "The ".concat(index + 1, "th item: should not be empty");
+    return '';
+  },
+  sort: 7
+}), _defineProperty(_ParamTypeConfig, ParamType.Expiry, {
+  name: '到期日',
+  key: 'list',
+  Comp: Expiries,
+  validator: expiriesValidator,
+  sort: 8
+}), _defineProperty(_ParamTypeConfig, ParamType.ExpiryValue, {
+  name: '到期日 Value',
+  key: 'expiryNumberList',
+  Comp: ExpiriesValueList,
+  validator: function validator($val) {
+    if (!($val === null || $val === void 0 ? void 0 : $val.length)) return '';
+
+    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)) {
+        return "The ".concat(i + 1, "th item: expiry shold not be empty");
+      }
+
+      if (!isNullLike(val.expiry) && isNullLike(val.value)) {
+        return "The ".concat(i + 1, "th item: value shold not be empty");
+      }
+    }
+
+    return '';
+  },
+  sort: 9
 }), _defineProperty(_ParamTypeConfig, ParamType.ExpiryLimit, {
   name: '到期日 Limit',
   key: 'expiryLimitList',
@@ -1654,55 +1713,8 @@ var ParamTypeConfig = (_ParamTypeConfig = {}, _defineProperty(_ParamTypeConfig,
     }
 
     return '';
-  }
-}), _defineProperty(_ParamTypeConfig, ParamType.Expiry, {
-  name: '到期日',
-  key: 'list',
-  Comp: Expiries,
-  validator: expiriesValidator
-}), _defineProperty(_ParamTypeConfig, ParamType.Phone, {
-  name: '文本列表',
-  key: 'list',
-  Comp: TextArray,
-  validator: function validator($val) {
-    if (!($val === null || $val === void 0 ? void 0 : $val.length)) return '';
-    var index = $val.findIndex(function ($it) {
-      return !$it.trim();
-    });
-    if (index > -1) return "The ".concat(index + 1, "th item: should not be empty");
-    return '';
-  }
-}), _defineProperty(_ParamTypeConfig, ParamType.Text, {
-  name: '文本',
-  key: 'text',
-  Comp: Text,
-  validator: emptyValidator
-}), _defineProperty(_ParamTypeConfig, ParamType.ExpiryValue, {
-  name: '到期日 Value',
-  key: 'expiryNumberList',
-  Comp: ExpiriesValueList,
-  validator: function validator($val) {
-    if (!($val === null || $val === void 0 ? void 0 : $val.length)) return '';
-
-    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 (error) {
-        return "Expiry field of the ".concat(i + 1, "th item: ").concat(error);
-      }
-
-      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)) {
-        return "The ".concat(i + 1, "th item: value shold not be empty");
-      }
-    }
-
-    return '';
-  }
+  },
+  sort: 10
 }), _defineProperty(_ParamTypeConfig, ParamType.InstrumentValue, {
   name: 'Instrument Value',
   key: 'instrumentNumberList',
@@ -1712,18 +1724,20 @@ 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");
       }
     }
 
     return '';
-  }
+  },
+  sort: 11
 }), _ParamTypeConfig);
 function paramValidator(val, values, enableEmpty) {
   var _config$validator;
@@ -1742,6 +1756,8 @@ var ParamTypeOptions = Object.entries(ParamTypeConfig).map(function (_ref) {
     value: Number(value),
     label: config.name
   });
+}).sort(function (a, b) {
+  return a.sort - b.sort;
 });
 
 var ParamRenderer = /*#__PURE__*/function (_PureComponent) {
@@ -1891,6 +1907,7 @@ 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',

package/package.json

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