@signalplus/params-about 0.1.10 → 0.1.13

package/index.d.ts

@@ -49,6 +49,7 @@ declare class ParamRenderer extends PureComponent<ParamRendererProps> {
 }
 
 interface ParentSelectorOption {
+    parentId?: string | number;
     $paramId: string | number;
     name: string;
     disabled?: boolean;
@@ -217,13 +218,13 @@ declare class ParamGroupEditorModal {
 }
 
 interface ParamMoverData {
-    parentId: string;
+    parentId: string | number;
 }
 interface ParamMoverProps {
     /**
      * 需要确保 targetParams 的元素之间无父子或者祖先子孙关系
      * */
-    targetParams: string[];
+    targetParams: (string | number)[];
     allParams: NonNullable<ParentSelectorProps['parentOptions']>;
     onSubmit?(params: NonNullable<ParentSelectorProps['parentOptions']>): any;
 }

package/lib/es/index.js

@@ -1,7 +1,7 @@
 /**
  * Bundle of @signalplus/params-about
  * Generated: 2022-04-10
- * Version: 0.1.10
+ * Version: 0.1.13
  * License: MIT
  * Author: 2631541504@qq.com
  */
@@ -2081,21 +2081,29 @@ var ParamGroupEditorModal = /*#__PURE__*/function () {
 
 _defineProperty(ParamGroupEditorModal, "el", new ReactGlobalComp('param-group-editor-modal', ParamGroupEditorModalEl));
 
-function genOptions(props) {
+function genOptions(props, paramsMap) {
   var filter = function filter(it) {
-    return it.valueType !== ParamType.ParamGroup;
+    return it.valueType === ParamType.ParamGroup;
   };
 
+  var paramsAndParent = props.targetParams.flatMap(function (id) {
+    var _paramsMap$id;
+
+    return [id, (_paramsMap$id = paramsMap[id]) === null || _paramsMap$id === void 0 ? void 0 : _paramsMap$id.$paramId].filter(function (it) {
+      return it !== undefined;
+    });
+  });
+
   var cvt = function cvt(it) {
     var _it$children;
 
     return _objectSpread2(_objectSpread2({}, it), {}, {
-      disabled: props.targetParams.includes(String(it.$paramId)),
+      disabled: paramsAndParent.includes(String(it.$paramId)),
       children: (_it$children = it.children) === null || _it$children === void 0 ? void 0 : _it$children.filter(filter).map(cvt)
     });
   };
 
-  return props.allParams.filter(filter).map(cvt) || [];
+  return props.allParams.map(cvt) || [];
 }
 
 function genParamsMap(props) {
@@ -2115,10 +2123,11 @@ function genParamsMap(props) {
 }
 
 function initState(props) {
+  var paramsMap = genParamsMap(props);
   return {
     preProps: props,
-    options: genOptions(props),
-    paramsMap: genParamsMap(props)
+    options: genOptions(props, paramsMap),
+    paramsMap: paramsMap
   };
 }
 
@@ -2226,7 +2235,7 @@ var ParamMover = /*#__PURE__*/function (_PureComponent) {
         state.paramsMap = genParamsMap(props);
 
         if (props.targetParams !== state.preProps.targetParams) {
-          state.options = genOptions(props);
+          state.options = genOptions(props, state.paramsMap);
         }
       }
 

package/package.json

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