comp-adv3210 1.0.29 → 1.0.31

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=3062dbfe&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=7d2c5eb8&scoped=true
 
-const _withScopeId = n => (_pushScopeId("data-v-3062dbfe"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-7d2c5eb8"), 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_3062dbfe_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function baowu_device_treevue_type_template_id_7d2c5eb8_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");
@@ -12902,7 +12902,7 @@ function baowu_device_treevue_type_template_id_3062dbfe_scoped_true_render(_ctx,
           src: _ctx.colorSvg[dataRef.status]
         }, null, 8, _hoisted_5), (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.deviceCode) + "） ", 1)], 8, _hoisted_4)) : ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("span", {
           key: 1,
-          id: 'domainName' + dataRef.name,
+          id: 'domainId' + dataRef.id,
           style: {
             "display": "inline-flex",
             "align-items": "center"
@@ -13324,7 +13324,7 @@ function baowu_device_treevue_type_template_id_3062dbfe_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=3062dbfe&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=7d2c5eb8&scoped=true
 
 ;// CONCATENATED MODULE: ./src/package/api/device-tree.js
 
@@ -15911,13 +15911,15 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
             }
             return document.querySelector("#deviceCode" + deviceCode) !== null;
           } else {
-            return document.querySelector("#domainName" + node.name) !== null;
+            console.log(node.name);
+            return document.querySelector("#domainId" + node.id) !== null;
           }
         };
 
         // 使用轮询方式检查节点是否存在
         const checkInterval = setInterval(() => {
           if (checkNodeExists()) {
+            console.log("find");
             clearInterval(checkInterval);
             (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.nextTick)(() => {
               if (deviceCode) {
@@ -15930,13 +15932,13 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
                   document.querySelector("#deviceCode" + deviceCode)?.click();
                 }, 500);
               } else {
-                document.querySelector("#domainName" + node.name)?.scrollIntoView({
+                document.querySelector("#domainId" + node.id)?.scrollIntoView({
                   behavior: "smooth",
                   block: "center",
                   inline: "start"
                 });
                 setTimeout(() => {
-                  document.querySelector("#domainName" + node.name)?.click();
+                  document.querySelector("#domainId" + node.id)?.click();
                 }, 500);
               }
             });
@@ -15975,13 +15977,15 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
       result.isLeaf = false;
       if (props.onlyLeafSelectable) {
         result.selectable = false;
+        // 只选设备节点自动展开
+        // expandedKeys.value = [result.id];
       }
       rootNode.value = result;
       treeData.value = [result];
-      if (props.defaultSelect && !sessionStorage.getItem("treeNode")) {
-        let name = treeData.value[0].name;
+      if (props.defaultSelect && !sessionStorage.getItem("treeNode") && !props.onlyLeafSelectable) {
+        let id = treeData.value[0].id;
         (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.nextTick)(() => {
-          document.querySelector("#domainName" + name).click();
+          document.querySelector("#domainId" + id).click();
         });
       }
 
@@ -16047,6 +16051,7 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
 
       // 3. 重新初始化数据（如果需要）
       treeData.value = [];
+      expandedKeys.value = [];
       init();
       // 去激活useFetchData中watch的回调
       queryParam.authMode = newAuthMode;
@@ -16106,8 +16111,10 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
           result.data.forEach(element => {
             element.isLeaf = !!element.deviceCode;
             // 检查是否只允许选择叶子节点
-            if (props.onlyLeafSelectable && !element.isLeaf) {
-              element.selectable = false;
+            if (props.onlyLeafSelectable) {
+              if (!element.isLeaf) {
+                element.selectable = false;
+              }
             }
             if (element.deviceCode) {
               deviceCode.push(element.deviceCode);
@@ -16161,6 +16168,23 @@ 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,
+            //     ];
+            //   }
+            // }
             resolve();
           });
         });
@@ -16773,10 +16797,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=3062dbfe&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=7d2c5eb8&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=3062dbfe&lang=less&scoped=true
+;// 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
 
@@ -16786,7 +16810,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_3062dbfe_scoped_true_render],['__scopeId',"data-v-3062dbfe"]])
+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"]])
 
 /* harmony default export */ var baowu_device_tree = (baowu_device_tree_exports_);
 ;// CONCATENATED MODULE: ./src/package/index.js