comp-adv3210 1.0.27 → 1.0.29

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=b0166a6a&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=3062dbfe&scoped=true
 
-const _withScopeId = n => (_pushScopeId("data-v-b0166a6a"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-3062dbfe"), 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_b0166a6a_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function baowu_device_treevue_type_template_id_3062dbfe_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");
@@ -12882,7 +12882,8 @@ function baowu_device_treevue_type_template_id_b0166a6a_scoped_true_render(_ctx,
         onSelect: _ctx.handleSelect,
         "show-icon": "",
         "field-names": _ctx.fieldNames,
-        onDblclick: _ctx.handleDoubleClick
+        onDblclick: _ctx.handleDoubleClick,
+        "only-leaf-selectable": _ctx.onlyLeafSelectable
       }, {
         title: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(({
           dataRef
@@ -12914,7 +12915,7 @@ function baowu_device_treevue_type_template_id_b0166a6a_scoped_true_render(_ctx,
           src: _ctx.colorSvg[dataRef.status]
         }, null, 8, _hoisted_7), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createTextVNode)(" " + (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(dataRef.name) + " " + (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(dataRef.deviceNum != -1 ? "（" + dataRef.deviceNum + "）" : ""), 1)], 8, _hoisted_6))]),
         _: 1
-      }, 8, ["expandedKeys", "selectedKeys", "loaded-keys", "load-data", "tree-data", "onSelect", "field-names", "onDblclick"])])])]),
+      }, 8, ["expandedKeys", "selectedKeys", "loaded-keys", "load-data", "tree-data", "onSelect", "field-names", "onDblclick", "only-leaf-selectable"])])])]),
       _: 1
     }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_tab_pane, {
       key: "2",
@@ -13323,7 +13324,7 @@ function baowu_device_treevue_type_template_id_b0166a6a_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=b0166a6a&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=3062dbfe&scoped=true
 
 ;// CONCATENATED MODULE: ./src/package/api/device-tree.js
 
@@ -15821,6 +15822,10 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
       type: Boolean,
       default: true
     },
+    historySelect: {
+      type: Boolean,
+      default: false
+    },
     hasSeniorSearch: {
       type: Boolean,
       default: true
@@ -15832,6 +15837,10 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
     noLeaf: {
       type: Boolean,
       default: false
+    },
+    onlyLeafSelectable: {
+      type: Boolean,
+      default: false
     }
   },
   setup(props, {
@@ -15877,7 +15886,69 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
     const ifXj = window.location.href.includes(xjIP);
     // 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);
+    console.log(`当前环境，测试${ifTest},邢机${ifXj}`);
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.onMounted)(() => {
+      if (!props.historySelect) return;
+      const selectedNode = sessionStorage.getItem("treeNode");
+      if (selectedNode && selectedNode != "undefined") {
+        const node = JSON.parse(selectedNode);
+        const path = node.domainPath;
+        let deviceCode = node?.deviceCode;
+        const domainPathArr = path.split("/");
+        domainPathArr.unshift("0");
+        if (!deviceCode) {
+          domainPathArr.pop();
+        }
+
+        // 设置展开节点
+        expandedKeys.value = domainPathArr;
+
+        // 检查节点是否存在的函数
+        const checkNodeExists = () => {
+          if (deviceCode) {
+            if (deviceCode.includes("/")) {
+              deviceCode = deviceCode.replace(/\//g, "\\/");
+            }
+            return document.querySelector("#deviceCode" + deviceCode) !== null;
+          } else {
+            return document.querySelector("#domainName" + node.name) !== null;
+          }
+        };
+
+        // 使用轮询方式检查节点是否存在
+        const checkInterval = setInterval(() => {
+          if (checkNodeExists()) {
+            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("#domainName" + node.name)?.scrollIntoView({
+                  behavior: "smooth",
+                  block: "center",
+                  inline: "start"
+                });
+                setTimeout(() => {
+                  document.querySelector("#domainName" + node.name)?.click();
+                }, 500);
+              }
+            });
+          }
+        }, 100); // 每100ms检查一次
+
+        // 设置最大等待时间，防止无限等待
+        setTimeout(() => {
+          clearInterval(checkInterval);
+        }, 5000); // 5秒后超时
+      }
+    });
     const init = async function () {
       const {
         result
@@ -15902,9 +15973,12 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
       result.deviceNum = info.deviceCount;
       result.status = levelMap[0].level;
       result.isLeaf = false;
+      if (props.onlyLeafSelectable) {
+        result.selectable = false;
+      }
       rootNode.value = result;
       treeData.value = [result];
-      if (props.defaultSelect) {
+      if (props.defaultSelect && !sessionStorage.getItem("treeNode")) {
         let name = treeData.value[0].name;
         (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.nextTick)(() => {
           document.querySelector("#domainName" + name).click();
@@ -16031,6 +16105,10 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
             deviceCode = [];
           result.data.forEach(element => {
             element.isLeaf = !!element.deviceCode;
+            // 检查是否只允许选择叶子节点
+            if (props.onlyLeafSelectable && !element.isLeaf) {
+              element.selectable = false;
+            }
             if (element.deviceCode) {
               deviceCode.push(element.deviceCode);
             } else {
@@ -16224,6 +16302,9 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
           const deviceCodes = [];
           result.data.forEach(element => {
             element.isLeaf = !!element.deviceCode;
+            if (props.onlyLeafSelectable && !element.isLeaf) {
+              element.selectable = false;
+            }
             if (element.deviceCode) {
               deviceCodes.push(element.deviceCode);
             } else {
@@ -16692,10 +16773,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=b0166a6a&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=3062dbfe&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=b0166a6a&lang=less&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=3062dbfe&lang=less&scoped=true
 
 ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue
 
@@ -16705,7 +16786,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_b0166a6a_scoped_true_render],['__scopeId',"data-v-b0166a6a"]])
+const baowu_device_tree_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_device_treevue_type_script_lang_js, [['render',baowu_device_treevue_type_template_id_3062dbfe_scoped_true_render],['__scopeId',"data-v-3062dbfe"]])
 
 /* harmony default export */ var baowu_device_tree = (baowu_device_tree_exports_);
 ;// CONCATENATED MODULE: ./src/package/index.js