@zgfe/modules-settings 2.1.0-zhongyuan.11 → 2.1.0-zhongyuan.12

package/es/modules/pointMap/tree.js

@@ -193,6 +193,7 @@ var pointMap = function pointMap(props) {
     });
   };
   var getPointTree = function getPointTree() {
+    var fn = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : function () {};
     request(apis.getPointTree, {
       method: 'post',
       data: {
@@ -213,6 +214,7 @@ var pointMap = function pointMap(props) {
           // props.onChangePage(res?.data ? { ...res?.data[0], currentPointVersion } : undefined);
         }
         setChangeNameId(undefined);
+        fn();
       }
     }).catch(function (err) {
       console.log(err);
@@ -231,7 +233,8 @@ var pointMap = function pointMap(props) {
         setPointList(res.data.map(function (res) {
           return {
             label: res.labelName,
-            value: res.id
+            value: res.id,
+            labelType: 1
           };
         }));
       }
@@ -439,6 +442,9 @@ var pointMap = function pointMap(props) {
               defaultChecked: pointIds.indexOf(res.value) != -1,
               onChange: function onChange(e) {
                 onChangeTag(e, nodeData, res);
+              },
+              onClick: function onClick(e) {
+                e.stopPropagation();
               }
             }, res.label)),
             disabled: true
@@ -462,6 +468,7 @@ var pointMap = function pointMap(props) {
         key: '4'
       }],
       onClick: function onClick(item) {
+        item.domEvent.stopPropagation();
         onItemClick(item.key);
       }
     };
@@ -568,17 +575,20 @@ var pointMap = function pointMap(props) {
       }
     }).then(function (res) {
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        getPointTree();
-        // setTimeout(() => {
-        //   let labels = node.labels;
-        //   if (checked) {
-        //     labels.push(option);
-        //   } else {
-        //     labels = labels.filter((res: LabelsData) => res.id != option.value);
-        //   }
-        //   node.labels = labels;
-        //   props.onChangePage({ ...node, currentPointVersion });
-        // }, 0);
+        getPointTree(function () {
+          var labels = node.labels;
+          if (checked) {
+            labels.push(option);
+          } else {
+            labels = labels.filter(function (res) {
+              return res.id != option.value;
+            });
+          }
+          node.labels = labels;
+          props.onChangePage(_objectSpread(_objectSpread({}, node), {}, {
+            currentPointVersion: currentPointVersion
+          }));
+        });
       }
     });
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.1.0-zhongyuan.11",
+  "version": "2.1.0-zhongyuan.12",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7a1eeee0a2443864124eb2968cb28b3d85577e91",
+  "gitHead": "c32391a1f6d07acd9021b7c3af800c6728936040",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }