@signalplus/params-about 1.0.4 → 1.0.5-alpha1

package/index.d.ts

@@ -39,7 +39,7 @@ declare class ParamRenderer extends PureComponent<ParamRendererProps> {
         key?: string | undefined;
         defaultValue?: any;
         Comp: React.ComponentType<BaseInputProps>;
-        validator?(value: any): string;
+        validator?(value: any, enableEmpty?: boolean | undefined): string;
         required?: boolean | undefined;
     };
     get value(): any;
@@ -172,12 +172,38 @@ interface ParamGroupEditorData {
     valueType?: ParamType;
     descriptionUrl?: string;
 }
+interface ParamItem {
+    parentId?: number | string;
+    paramId: number | string;
+    name?: string;
+    key?: string;
+    valueType: ParamType;
+    description?: string;
+    descriptionUrl?: string;
+    rank?: number;
+    value?: Record<string, any>;
+    defaultValue?: Record<string, any>;
+    children?: ParamItem[];
+}
+interface LocalParamItem extends Omit<ParamItem, 'paramId' | 'children' | 'childrenList'> {
+    paramId?: number | string;
+    /**
+     * 前端字段，用于本地建立参数与参数组之间的关系
+     * 提交到服务端不解析
+     * */
+    $paramId: number | string;
+    children?: LocalParamItem[];
+}
 interface ParamGroupEditorProps extends Required<Pick<ImageUploadProps, 'getSignedUrl' | 'handleUpload'>> {
     /**
      * 传了表示为有父级
      * */
     parentOptions?: ParentSelectorProps['parentOptions'];
     initialValues?: Partial<ParamGroupEditorData>;
+    paramList: LocalParamItem[];
+    projectName: string;
+    templateName: string;
+    parentNames?: string;
     onChange?(data: ParamGroupEditorData): void;
     onSubmit?(data: ParamGroupEditorData): any;
 }
@@ -277,12 +303,12 @@ declare const ParamTypeConfig: Record<ParamType, {
     key?: string;
     defaultValue?: any;
     Comp: React.ComponentType<BaseInputProps>;
-    validator?(value: any): string;
+    validator?(value: any, enableEmpty?: boolean): string;
     required?: boolean;
 }>;
 declare function paramValidator(val: any, values: {
     valueType: ParamType;
-}): string;
+}, enableEmpty?: boolean): string;
 declare const ParamTypeOptions: {
     value: number;
     label: string;
@@ -290,7 +316,7 @@ declare const ParamTypeOptions: {
     key?: string | undefined;
     defaultValue?: any;
     Comp: React.ComponentType<BaseInputProps>;
-    validator?(value: any): string;
+    validator?(value: any, enableEmpty?: boolean | undefined): string;
     required?: boolean | undefined;
 }[];
 
@@ -305,6 +331,7 @@ declare function expiryValidator(val: string, enableEmpty?: boolean): "Should no
 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;
+declare function sameGroupNameValidator(val: string, paramList: LocalParamItem[], projectName: string, templateName: string, parentNames?: string): string | undefined;
 declare function validatorCvt(validator: (val: any, values: any) => ValidateInfo['string'], form?: () => any): (_: any, val: any) => Promise<any>;
 
-export { BaseInputProps, ParamForm, ParamFormData, ParamFormModal, ParamFormProps, ParamGroupEditor, ParamGroupEditorData, ParamGroupEditorModal, ParamGroupEditorModalEl, ParamGroupEditorProps, ParamMover, ParamMoverData, ParamMoverModal, ParamMoverModalEl, ParamMoverProps, ParamMoverState, ParamRenderer, ParamRendererProps, ParamType, ParamTypeConfig, ParamTypeOptions, ParamValueEditor, ParamValueEditorData, ParamValueEditorModal, ParamValueEditorModalEl, ParamValueEditorProps, ParamValueStruct, ValidateInfo, emptyValidator, expiriesValidator, expiryValidator, formatNum, isExpired, isNullLike, keyValidator, numRangeValidator, paramValidator, validatorCvt };
+export { BaseInputProps, LocalParamItem, ParamForm, ParamFormData, ParamFormModal, ParamFormProps, ParamGroupEditor, ParamGroupEditorData, ParamGroupEditorModal, ParamGroupEditorModalEl, ParamGroupEditorProps, ParamItem, ParamMover, ParamMoverData, ParamMoverModal, ParamMoverModalEl, ParamMoverProps, ParamMoverState, ParamRenderer, ParamRendererProps, ParamType, ParamTypeConfig, ParamTypeOptions, ParamValueEditor, ParamValueEditorData, ParamValueEditorModal, ParamValueEditorModalEl, ParamValueEditorProps, ParamValueStruct, ValidateInfo, emptyValidator, expiriesValidator, expiryValidator, formatNum, isExpired, isNullLike, keyValidator, numRangeValidator, paramValidator, sameGroupNameValidator, validatorCvt };

package/lib/es/index.js

@@ -1,7 +1,7 @@
 /**
  * Bundle of @signalplus/params-about
- * Generated: 2022-08-15
- * Version: 1.0.4
+ * Generated: 2023-05-08
+ * Version: 1.0.5-alpha1
  * License: MIT
  * Author: 2631541504@qq.com
  */
@@ -324,6 +324,14 @@ function isExpired(val) {
   var expireTime = dayjs("".concat(expiry.format('YYYY-MM-DD'), "T08:00Z"));
   return now >= expireTime;
 }
+function sameGroupNameValidator(val, paramList, projectName, templateName, parentNames) {
+  var error = emptyValidator(val);
+  if (error) return error;
+  var hasSame = paramList.some(function (_it) {
+    return _it.name === val;
+  });
+  return hasSame ? "\u8BE5\u53C2\u6570\u7EC4\u540D\u79F0\u5728".concat(projectName, ">").concat(templateName).concat(parentNames ? '>' + parentNames : '', "\u4E0B\u5DF2\u5B58\u5728") : undefined;
+}
 function validatorCvt(validator, form) {
   return function (_, val) {
     var $form = form === null || form === void 0 ? void 0 : form();
@@ -1212,13 +1220,13 @@ var ParamTypeConfig = (_ParamTypeConfig = {}, _defineProperty(_ParamTypeConfig,
   Comp: Text,
   validator: emptyValidator
 }), _ParamTypeConfig);
-function paramValidator(val, values) {
+function paramValidator(val, values, enableEmpty) {
   var _config$validator;
 
   var config = ParamTypeConfig[values.valueType];
   if (!config) return '';
   var value = config.key ? val === null || val === void 0 ? void 0 : val[config.key] : val;
-  return ((_config$validator = config.validator) === null || _config$validator === void 0 ? void 0 : _config$validator.call(config, value)) || '';
+  return ((_config$validator = config.validator) === null || _config$validator === void 0 ? void 0 : _config$validator.call(config, value, enableEmpty)) || '';
 }
 var ParamTypeOptions = Object.entries(ParamTypeConfig).map(function (_ref) {
   var _ref2 = _slicedToArray(_ref, 2),
@@ -1952,7 +1960,7 @@ var ParamGroupEditor = /*#__PURE__*/function (_PureComponent) {
           }));
         },
         validator: validatorCvt(function (val) {
-          return emptyValidator(val);
+          return sameGroupNameValidator(val, _this2.props.paramList, _this2.props.projectName, _this2.props.templateName, _this2.props.parentNames);
         })
       }, {
         label: '业务流程图',
@@ -1962,10 +1970,7 @@ var ParamGroupEditor = /*#__PURE__*/function (_PureComponent) {
             getSignedUrl: _this2.props.getSignedUrl,
             handleUpload: _this2.props.handleUpload
           }));
-        },
-        validator: isFirstLevel ? validatorCvt(function (val) {
-          return emptyValidator(val);
-        }) : undefined
+        }
       }];
 
       if (!isFirstLevel) {
@@ -2419,4 +2424,4 @@ var ParamMoverModal = /*#__PURE__*/function () {
 
 _defineProperty(ParamMoverModal, "el", new ReactGlobalComp('param-mover-modal', ParamMoverModalEl));
 
-export { ParamForm, ParamFormModal, ParamGroupEditor, ParamGroupEditorModal, ParamGroupEditorModalEl, ParamMover, ParamMoverModal, ParamMoverModalEl, ParamRenderer, ParamType, ParamTypeConfig, ParamTypeOptions, ParamValueEditor, ParamValueEditorModal, ParamValueEditorModalEl, emptyValidator, expiriesValidator, expiryValidator, formatNum, isExpired, isNullLike, keyValidator, numRangeValidator, paramValidator, validatorCvt };
+export { ParamForm, ParamFormModal, ParamGroupEditor, ParamGroupEditorModal, ParamGroupEditorModalEl, ParamMover, ParamMoverModal, ParamMoverModalEl, ParamRenderer, ParamType, ParamTypeConfig, ParamTypeOptions, ParamValueEditor, ParamValueEditorModal, ParamValueEditorModalEl, emptyValidator, expiriesValidator, expiryValidator, formatNum, isExpired, isNullLike, keyValidator, numRangeValidator, paramValidator, sameGroupNameValidator, validatorCvt };

package/package.json

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