comp-adv3210 1.0.31 → 1.0.33

package/comp-adv3210.common.js

@@ -12768,9 +12768,9 @@ var exportHelper = __webpack_require__(1241);
 const __exports__ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_test_buttonvue_type_script_lang_js, [['render',render]])
 
 /* harmony default export */ var baowu_test_button = (__exports__);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=7d2c5eb8&scoped=true
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=47fc67f1&scoped=true
 
-const _withScopeId = n => (_pushScopeId("data-v-7d2c5eb8"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-47fc67f1"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
   style: {
     "height": "100%"
@@ -12806,7 +12806,7 @@ const _hoisted_11 = {
     "margin-top": "10px"
   }
 };
-function baowu_device_treevue_type_template_id_7d2c5eb8_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function baowu_device_treevue_type_template_id_47fc67f1_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_a_input = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-input");
   const _component_a_button = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-button");
   const _component_a_tree = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-tree");
@@ -13324,7 +13324,7 @@ function baowu_device_treevue_type_template_id_7d2c5eb8_scoped_true_render(_ctx,
     _: 1
   }, 8, ["visible", "getContainer", "onOk", "onCancel"])], 512)]);
 }
-;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=7d2c5eb8&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=47fc67f1&scoped=true
 
 ;// CONCATENATED MODULE: ./src/package/api/device-tree.js
 
@@ -15841,6 +15841,10 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
     onlyLeafSelectable: {
       type: Boolean,
       default: false
+    },
+    selectedNodeInfo: {
+      type: Object,
+      default: () => {}
     }
   },
   setup(props, {
@@ -15887,6 +15891,79 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
     // const ifXj = true;
     const treeMode = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)(localStorage.getItem("xjTreeMode") == null || localStorage.getItem("xjTreeMode") == undefined || localStorage.getItem("xjTreeMode") == "" || !localStorage.getItem("xjTreeMode") ? "actived" : localStorage.getItem("xjTreeMode")); // all全部设备 actived仅启用设备
     console.log(`当前环境，测试${ifTest},邢机${ifXj}`);
+    const checkNodeExists = (deviceCode, nodeId) => {
+      if (deviceCode) {
+        if (deviceCode.includes("/")) {
+          deviceCode = deviceCode.replace(/\//g, "\\/");
+        }
+        return document.querySelector("#deviceCode" + deviceCode) !== null;
+      } else {
+        return document.querySelector("#domainId" + nodeId) !== null;
+      }
+    };
+    const scrollToNode = (deviceCode, nodeId) => {
+      (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.nextTick)(() => {
+        if (deviceCode) {
+          if (deviceCode.includes("/")) {
+            deviceCode = deviceCode.replace(/\//g, "\\/");
+          }
+          document.querySelector("#deviceCode" + deviceCode)?.scrollIntoView({
+            behavior: "smooth",
+            block: "center",
+            inline: "start"
+          });
+          setTimeout(() => {
+            document.querySelector("#deviceCode" + deviceCode)?.click();
+          }, 500);
+        } else {
+          document.querySelector("#domainId" + nodeId)?.scrollIntoView({
+            behavior: "smooth",
+            block: "center",
+            inline: "start"
+          });
+          setTimeout(() => {
+            document.querySelector("#domainId" + nodeId)?.click();
+          }, 500);
+        }
+      });
+    };
+    const waitForNodeAndScroll = (deviceCode, nodeId, maxWaitTime = 5000, checkIntervalTime = 100) => {
+      return new Promise(resolve => {
+        const checkInterval = setInterval(() => {
+          if (checkNodeExists(deviceCode, nodeId)) {
+            console.log("find");
+            clearInterval(checkInterval);
+            scrollToNode(deviceCode, nodeId);
+            resolve(true);
+          }
+        }, checkIntervalTime);
+
+        // 设置最大等待时间，防止无限等待
+        setTimeout(() => {
+          clearInterval(checkInterval);
+          resolve(false);
+        }, maxWaitTime);
+      });
+    };
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.watch)(() => props.selectedNodeInfo, newVal => {
+      const {
+        domainPath,
+        deviceCode
+      } = newVal;
+      if (domainPath) {
+        const domainId = domainPath.split("/").pop();
+        const domainPathArr = domainPath.split("/");
+        domainPathArr.unshift("0");
+        if (!deviceCode) {
+          domainPathArr.pop();
+        }
+        // 设置展开节点
+        expandedKeys.value = domainPathArr;
+        waitForNodeAndScroll(deviceCode, domainId);
+      }
+    }, {
+      deep: true
+    });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.onMounted)(() => {
       if (!props.historySelect) return;
       const selectedNode = sessionStorage.getItem("treeNode");
@@ -15904,51 +15981,12 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
         expandedKeys.value = domainPathArr;
 
         // 检查节点是否存在的函数
-        const checkNodeExists = () => {
-          if (deviceCode) {
-            if (deviceCode.includes("/")) {
-              deviceCode = deviceCode.replace(/\//g, "\\/");
-            }
-            return document.querySelector("#deviceCode" + deviceCode) !== null;
-          } else {
-            console.log(node.name);
-            return document.querySelector("#domainId" + node.id) !== null;
+        // 使用提取的公共函数
+        waitForNodeAndScroll(deviceCode, node.id).then(found => {
+          if (!found) {
+            console.warn("Node not found");
           }
-        };
-
-        // 使用轮询方式检查节点是否存在
-        const checkInterval = setInterval(() => {
-          if (checkNodeExists()) {
-            console.log("find");
-            clearInterval(checkInterval);
-            (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.nextTick)(() => {
-              if (deviceCode) {
-                document.querySelector("#deviceCode" + deviceCode)?.scrollIntoView({
-                  behavior: "smooth",
-                  block: "center",
-                  inline: "start"
-                });
-                setTimeout(() => {
-                  document.querySelector("#deviceCode" + deviceCode)?.click();
-                }, 500);
-              } else {
-                document.querySelector("#domainId" + node.id)?.scrollIntoView({
-                  behavior: "smooth",
-                  block: "center",
-                  inline: "start"
-                });
-                setTimeout(() => {
-                  document.querySelector("#domainId" + node.id)?.click();
-                }, 500);
-              }
-            });
-          }
-        }, 100); // 每100ms检查一次
-
-        // 设置最大等待时间，防止无限等待
-        setTimeout(() => {
-          clearInterval(checkInterval);
-        }, 5000); // 5秒后超时
+        });
       }
     });
     const init = async function () {
@@ -15977,8 +16015,10 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
       result.isLeaf = false;
       if (props.onlyLeafSelectable) {
         result.selectable = false;
-        // 只选设备节点自动展开
-        // expandedKeys.value = [result.id];
+        // 只选设备节点且没有历史选择，自动展开
+        if (!props.historySelect || !sessionStorage.getItem("treeNode")) {
+          expandedKeys.value = [result.id];
+        }
       }
       rootNode.value = result;
       treeData.value = [result];
@@ -15988,10 +16028,6 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
           document.querySelector("#domainId" + id).click();
         });
       }
-
-      // setTimeout(() => {
-      //   document.querySelector("#deviceCode" + deviceCode).click();
-      // });
     };
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.onMounted)(() => {
       init();
@@ -16168,23 +16204,16 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
               a.dataRef.isLeaf = true;
             }
             treeData.value = [...treeData.value];
-            // 默认选到第一个设备节点
-            // if (props.onlyLeafSelectable) {
-            //   if (a.dataRef.children[0].isLeaf) {
-            //     setTimeout(() => {
-            //       document
-            //         .querySelector(
-            //           "#deviceCode" + a.dataRef.children[0].deviceCode
-            //         )
-            //         ?.click();
-            //     }, 500);
-            //   } else {
-            //     expandedKeys.value = [
-            //       ...expandedKeys.value,
-            //       a.dataRef.children[0].id,
-            //     ];
-            //   }
-            // }
+            // 没有历史选择，默认选到第一个设备节点
+            if (props.onlyLeafSelectable && (!props.historySelect || !sessionStorage.getItem("treeNode"))) {
+              if (a.dataRef.children[0].isLeaf) {
+                setTimeout(() => {
+                  document.querySelector("#deviceCode" + a.dataRef.children[0].deviceCode)?.click();
+                }, 500);
+              } else {
+                expandedKeys.value = [...expandedKeys.value, a.dataRef.children[0].id];
+              }
+            }
             resolve();
           });
         });
@@ -16797,10 +16826,10 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
 }));
 ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=script&lang=js
  
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=7d2c5eb8&lang=less&scoped=true
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=47fc67f1&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=7d2c5eb8&lang=less&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=47fc67f1&lang=less&scoped=true
 
 ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue
 
@@ -16810,7 +16839,7 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
 ;
 
 
-const baowu_device_tree_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_device_treevue_type_script_lang_js, [['render',baowu_device_treevue_type_template_id_7d2c5eb8_scoped_true_render],['__scopeId',"data-v-7d2c5eb8"]])
+const baowu_device_tree_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_device_treevue_type_script_lang_js, [['render',baowu_device_treevue_type_template_id_47fc67f1_scoped_true_render],['__scopeId',"data-v-47fc67f1"]])
 
 /* harmony default export */ var baowu_device_tree = (baowu_device_tree_exports_);
 ;// CONCATENATED MODULE: ./src/package/index.js