@signalplus/params-about 0.1.14 → 0.1.17

package/lib/es/index.js

@@ -1,7 +1,7 @@
 /**
  * Bundle of @signalplus/params-about
  * Generated: 2022-04-10
- * Version: 0.1.14
+ * Version: 0.1.17
  * License: MIT
  * Author: 2631541504@qq.com
  */
@@ -2081,24 +2081,16 @@ var ParamGroupEditorModal = /*#__PURE__*/function () {
 
 _defineProperty(ParamGroupEditorModal, "el", new ReactGlobalComp('param-group-editor-modal', ParamGroupEditorModalEl));
 
-function genOptions(props, paramsMap) {
+function genOptions(props) {
   var filter = function filter(it) {
     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.parentId];
-  }).filter(function (it) {
-    return it !== undefined;
-  }).map(String);
-
   var cvt = function cvt(it) {
     var _it$children;
 
     return _objectSpread2(_objectSpread2({}, it), {}, {
-      disabled: paramsAndParent.includes(String(it.$paramId)),
+      disabled: props.targetParams.includes(String(it.$paramId)),
       children: (_it$children = it.children) === null || _it$children === void 0 ? void 0 : _it$children.filter(filter).map(cvt)
     });
   };
@@ -2126,7 +2118,7 @@ function initState(props) {
   var paramsMap = genParamsMap(props);
   return {
     preProps: props,
-    options: genOptions(props, paramsMap),
+    options: genOptions(props),
     paramsMap: paramsMap
   };
 }
@@ -2162,16 +2154,18 @@ var ParamMover = /*#__PURE__*/function (_PureComponent) {
       var _getFieldsValue = this.ref.current.getFieldsValue(),
           parentId = _getFieldsValue.parentId;
 
+      var targetParams = this.props.targetParams.map(String);
+
       var filter = function filter(it) {
-        return !_this2.props.targetParams.includes(String(it.$paramId));
+        return !targetParams.includes(String(it.$paramId));
       };
 
       var map = function map(it) {
         var _it$children3;
 
-        if (it.$paramId === parentId) {
+        if (String(it.$paramId) === String(parentId)) {
           return _objectSpread2(_objectSpread2({}, it), {}, {
-            children: (it.children || []).concat(_this2.props.targetParams.map(function ($paramId) {
+            children: (it.children || []).filter(filter).concat(_this2.props.targetParams.map(function ($paramId) {
               return _objectSpread2(_objectSpread2({}, _this2.state.paramsMap[$paramId]), {}, {
                 parentId: it.$paramId
               });
@@ -2235,7 +2229,7 @@ var ParamMover = /*#__PURE__*/function (_PureComponent) {
         state.paramsMap = genParamsMap(props);
 
         if (props.targetParams !== state.preProps.targetParams) {
-          state.options = genOptions(props, state.paramsMap);
+          state.options = genOptions(props);
         }
       }
 

package/package.json

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