comp-adv3210 1.1.1 → 1.1.3

package/comp-adv3210.common.js

@@ -13903,9 +13903,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=009cddea&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=4b316bba&scoped=true
 
-const _withScopeId = n => ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.pushScopeId)("data-v-009cddea"), n = n(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.popScopeId)(), n);
+const _withScopeId = n => ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.pushScopeId)("data-v-4b316bba"), n = n(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.popScopeId)(), n);
 const _hoisted_1 = {
   style: {
     "display": "flex",
@@ -14083,18 +14083,22 @@ const _hoisted_55 = {
 };
 const _hoisted_56 = {
   key: 0,
-  class: "mode-badge"
+  class: "mode-badge system"
 };
 const _hoisted_57 = {
-  class: "mode-desc"
+  key: 1,
+  class: "mode-badge"
 };
 const _hoisted_58 = {
+  class: "mode-desc"
+};
+const _hoisted_59 = {
   class: "mode-actions"
 };
-const _hoisted_59 = /*#__PURE__*/_withScopeId(() => /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", {
+const _hoisted_60 = /*#__PURE__*/_withScopeId(() => /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", {
   class: "drawer-footer-text"
 }, " 设备树模式为设备树加载时的固有过滤条件，在设备树加载时会固定应用默认模式的过滤条件。该过滤条件不受用户查询条件设置的影响。 ", -1));
-function baowu_device_treevue_type_template_id_009cddea_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function baowu_device_treevue_type_template_id_4b316bba_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_star_outlined = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("star-outlined");
@@ -14125,7 +14129,7 @@ function baowu_device_treevue_type_template_id_009cddea_scoped_true_render(_ctx,
   const _component_a_drawer = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-drawer");
   const _component_a_modal = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-modal");
   return (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("div", {
-    class: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.normalizeClass)(['baowu-device-tree-root', _ctx.theme === 'dark' ? 'theme-dark' : '']),
+    class: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.normalizeClass)(['baowu-device-tree-root', _ctx.theme === 'dark' ? 'dt-theme-dark' : '']),
     style: {
       "height": "100%"
     }
@@ -14317,7 +14321,7 @@ function baowu_device_treevue_type_template_id_009cddea_scoped_true_render(_ctx,
     onCancel: _ctx.handleSeniorCancel
   }, {
     default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", {
-      class: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.normalizeClass)(["app-container", _ctx.theme === 'dark' ? 'theme-dark' : '']),
+      class: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.normalizeClass)(["app-container", _ctx.theme === 'dark' ? 'dt-theme-dark' : '']),
       ref: "drawerContainerRef"
     }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", _hoisted_12, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", _hoisted_13, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", _hoisted_14, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_cluster_outlined), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("span", _hoisted_15, (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(_ctx.currentModeLabel), 1)])]), _hoisted_16, (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", _hoisted_17, [_hoisted_18, (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_input, {
       value: _ctx.queryParam.deviceCodeOrName,
@@ -14582,7 +14586,7 @@ function baowu_device_treevue_type_template_id_009cddea_scoped_true_render(_ctx,
           ref: "renameInput"
         }, null, 8, ["value", "onUpdate:value", "onBlur", "onPressEnter"])) : ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)(external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.Fragment, {
           key: 1
-        }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("span", _hoisted_55, (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(item.name), 1), item.isDefault ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("span", _hoisted_56, "默认")) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true)], 64))]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", _hoisted_57, (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(_ctx.getItemDesc(item)), 1)], 8, _hoisted_53), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", _hoisted_58, [_ctx.drawerType === 'mode' && !item.isDefault ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(_component_a_button, {
+        }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("span", _hoisted_55, (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(item.name), 1), item.isBuiltin ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("span", _hoisted_56, "系统")) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true), item.isDefault ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("span", _hoisted_57, "默认")) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true)], 64))]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", _hoisted_58, (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(_ctx.getItemDesc(item)), 1)], 8, _hoisted_53), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", _hoisted_59, [_ctx.drawerType === 'mode' && !item.isDefault && !item.isBuiltin ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(_component_a_button, {
           key: 0,
           type: "text",
           size: "small",
@@ -14591,7 +14595,8 @@ function baowu_device_treevue_type_template_id_009cddea_scoped_true_render(_ctx,
         }, {
           icon: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_star_outlined)]),
           _: 2
-        }, 1032, ["onClick"])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_button, {
+        }, 1032, ["onClick"])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true), !item.isBuiltin ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(_component_a_button, {
+          key: 1,
           type: "text",
           size: "small",
           title: "重命名",
@@ -14599,7 +14604,8 @@ function baowu_device_treevue_type_template_id_009cddea_scoped_true_render(_ctx,
         }, {
           icon: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_edit_outlined)]),
           _: 2
-        }, 1032, ["onClick"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_button, {
+        }, 1032, ["onClick"])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true), !item.isBuiltin ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createBlock)(_component_a_button, {
+          key: 2,
           type: "text",
           size: "small",
           danger: "",
@@ -14608,18 +14614,18 @@ function baowu_device_treevue_type_template_id_009cddea_scoped_true_render(_ctx,
         }, {
           icon: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_delete_outlined)]),
           _: 2
-        }, 1032, ["onClick"])])], 2);
+        }, 1032, ["onClick"])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createCommentVNode)("", true)])], 2);
       }), 128))])])]),
       _: 2
     }, [_ctx.drawerType === 'mode' ? {
       name: "footer",
-      fn: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [_hoisted_59]),
+      fn: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [_hoisted_60]),
       key: "0"
     } : undefined]), 1032, ["visible", "title", "onClose", "getContainer"])], 2)]),
     _: 1
   }, 8, ["visible", "getContainer", "onOk", "onCancel"])], 512)], 2);
 }
-;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=009cddea&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=4b316bba&scoped=true
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/esnext.set.difference.v2.js
 var esnext_set_difference_v2 = __webpack_require__(3375);
@@ -21379,7 +21385,9 @@ dayjs_min_default().locale("zh-cn");
       careService: null,
       meteringDevice: null,
       specialDevice: null,
-      collectStatus: (ifTest || ifXj) && treeMode.value == "actived" ? "1" : null,
+      collectStatus: null,
+      // collectStatus:
+      //   (ifTest || ifXj) && treeMode.value == "actived" ? "1" : null,
       specialtyCodeList: [],
       importanceDegreeCodeList: [],
       ruleConfigList: [],
@@ -21905,7 +21913,8 @@ dayjs_min_default().locale("zh-cn");
       try {
         const params = {
           configType: 1,
-          treeId: props.treeId || 0
+          treeId: props.treeId || 0,
+          appId: props.appId || undefined
         };
         const res = await listConfig(params);
         if (res.code === 200) {
@@ -21931,13 +21940,14 @@ dayjs_min_default().locale("zh-cn");
       try {
         const params = {
           configType: 2,
-          treeId: props.treeId || 0
+          treeId: props.treeId || 0,
+          appId: props.appId || undefined
         };
         const res = await listConfig(params);
         if (res.code === 200) {
           const rawItems = res.result || [];
           // 并行生成所有描述
-          mockModes.value = await Promise.all(rawItems.map(async item => {
+          const fetchedModes = await Promise.all(rawItems.map(async item => {
             const condition = item.condition ? typeof item.condition === "string" ? JSON.parse(item.condition) : item.condition : {};
             const filteredFilters = filterValidParams(condition);
             const desc = await mapParamsToLabels(filteredFilters);
@@ -21948,14 +21958,35 @@ dayjs_min_default().locale("zh-cn");
               desc: desc
             };
           }));
+
+          // 始终在开头添加内置的“全部设备”模式
+          const allDevicesMode = {
+            id: "builtin-all",
+            name: "全部设备",
+            desc: "所有设备，无筛选条件",
+            filters: {},
+            isDefault: false,
+            // 初始为 false，由 applyDefaultMode 决定是否设为默认
+            isBuiltin: true // 标记为内置模式，不可删除
+          };
+          mockModes.value = [allDevicesMode, ...fetchedModes];
         }
       } catch (error) {
         console.error("获取模式列表失败:", error);
       }
     };
     const applyDefaultMode = () => {
-      // 如果有默认模式，更新当前模式标签并应用条件
-      const defaultMode = mockModes.value.find(m => m.isDefault);
+      // 1. 优先查找服务器返回的默认模式
+      let defaultMode = mockModes.value.find(m => m.isDefault && !m.isBuiltin);
+
+      // 2. 如果没有服务器默认模式，则将“全部设备”设为默认
+      if (!defaultMode) {
+        const builtinAll = mockModes.value.find(m => m.id === "builtin-all");
+        if (builtinAll) {
+          builtinAll.isDefault = true;
+          defaultMode = builtinAll;
+        }
+      }
       if (defaultMode) {
         currentModeLabel.value = defaultMode.name;
         // 确保应用默认模式时不会弹出 drawer 相关的消息
@@ -22129,6 +22160,10 @@ dayjs_min_default().locale("zh-cn");
       const isNew = String(item.id).startsWith("mode-") || String(item.id).startsWith("cond-");
       const oldName = item.name;
       if (item.tempName && item.tempName.trim()) {
+        if (item.tempName.trim() === "全部设备") {
+          message.warning("全部设备为系统自带模式名称，请重新命名");
+          return;
+        }
         item.name = item.tempName;
       }
       item.isEditing = false;
@@ -22138,6 +22173,7 @@ dayjs_min_default().locale("zh-cn");
         try {
           const payload = {
             treeId: props.treeId,
+            appId: props.appId,
             name: item.name,
             configType: drawerType.value === "mode" ? 2 : 1,
             condition: item.filters
@@ -22182,6 +22218,10 @@ dayjs_min_default().locale("zh-cn");
       }
     };
     const deleteItem = item => {
+      if (item.isBuiltin) {
+        message.warning("内置模式不可删除");
+        return;
+      }
       modal.confirm({
         title: `确定要删除该${drawerType.value === "mode" ? "模式" : "条件"}吗？`,
         // getContainer: () => drawerContainerRef.value || document.body,
@@ -22397,7 +22437,8 @@ dayjs_min_default().locale("zh-cn");
       if (currentModeLabel.value === "全部设备") {
         Object.assign(fetchDataContext, {
           requestParams: {
-            ...queryParam
+            ...queryParam,
+            monId: undefined
           },
           current: 1,
           pageSize: 10
@@ -22474,7 +22515,9 @@ dayjs_min_default().locale("zh-cn");
         careService: null,
         meteringDevice: null,
         specialDevice: null,
-        collectStatus: (ifTest || ifXj) && treeMode.value == "actived" ? "1" : null,
+        // collectStatus:
+        //   (ifTest || ifXj) && treeMode.value == "actived" ? "1" : null,
+        collectStatus: null,
         deviceTypeCodeList: [],
         specialtyCodeList: [],
         importanceDegreeCodeList: [],
@@ -22496,7 +22539,7 @@ dayjs_min_default().locale("zh-cn");
 
       // 特殊处理 monId：如果当前有选中模式，确保 monId 被保留
       if (currentMode && currentMode.id) {
-        queryParam.monId = currentMode.id;
+        queryParam.monId = currentMode.id === "builtin-all" ? undefined : currentMode.id;
       }
 
       // 2. 同步 UI 状态
@@ -22837,15 +22880,15 @@ dayjs_min_default().locale("zh-cn");
 }));
 ;// 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=009cddea&lang=less
+;// 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=4b316bba&lang=less
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=009cddea&lang=less
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=4b316bba&lang=less
 
-;// 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=1&id=009cddea&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=1&id=4b316bba&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=1&id=009cddea&lang=less&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=1&id=4b316bba&lang=less&scoped=true
 
 ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue
 
@@ -22856,7 +22899,7 @@ dayjs_min_default().locale("zh-cn");
 
 
 
-const baowu_device_tree_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_device_treevue_type_script_lang_js, [['render',baowu_device_treevue_type_template_id_009cddea_scoped_true_render],['__scopeId',"data-v-009cddea"]])
+const baowu_device_tree_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_device_treevue_type_script_lang_js, [['render',baowu_device_treevue_type_template_id_4b316bba_scoped_true_render],['__scopeId',"data-v-4b316bba"]])
 
 /* harmony default export */ var baowu_device_tree = (baowu_device_tree_exports_);
 ;// CONCATENATED MODULE: ./src/package/index.js