comp-adv3210 1.1.4 → 1.1.5

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=7924f56e&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=7716f4a6&scoped=true
 
-const _withScopeId = n => ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.pushScopeId)("data-v-7924f56e"), 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-7716f4a6"), n = n(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.popScopeId)(), n);
 const _hoisted_1 = {
   style: {
     "display": "flex",
@@ -14094,7 +14094,7 @@ const _hoisted_58 = {
 const _hoisted_59 = /*#__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_7924f56e_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function baowu_device_treevue_type_template_id_7716f4a6_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");
@@ -14621,7 +14621,7 @@ function baowu_device_treevue_type_template_id_7924f56e_scoped_true_render(_ctx,
     _: 1
   }, 8, ["visible", "getContainer", "onOk", "onCancel"])], 512)], 2);
 }
-;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=7924f56e&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=7716f4a6&scoped=true
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/esnext.set.difference.v2.js
 var esnext_set_difference_v2 = __webpack_require__(3375);
@@ -21330,22 +21330,29 @@ dayjs_min_default().locale("zh-cn");
       if (!result) {
         return;
       }
+
+      // 准备参数，如果 monId 是 builtin-all 则不传
+      const getBaseParams = (extra = {}) => {
+        const p = {
+          ...queryParam,
+          ...extra,
+          authMode: props.authMode
+        };
+        if (p.monId === "builtin-all" || p.monId === undefined || p.monId === null) {
+          delete p.monId;
+        }
+        return p;
+      };
       const {
         result: info
-      } = await deviceNumByDomainId({
-        ...queryParam,
-        parentId: result.id,
-        // collectStatus: queryParam.collectStatus,
-        authMode: props.authMode
-      });
+      } = await deviceNumByDomainId(getBaseParams({
+        parentId: result.id
+      }));
       const {
         result: levelMap
-      } = await getStateByDeviceCodeListOrDomainIdList({
-        ...queryParam,
-        domains: [result.id],
-        // collectStatus: queryParam.collectStatus,
-        authMode: props.authMode
-      });
+      } = await getStateByDeviceCodeListOrDomainIdList(getBaseParams({
+        domains: [result.id]
+      }));
       result.deviceNum = info.deviceCount;
       result.status = levelMap[0].level;
       result.isLeaf = false;
@@ -21436,10 +21443,14 @@ dayjs_min_default().locale("zh-cn");
       });
       // 去激活useFetchData中watch的回调
       queryParam.authMode = newAuthMode;
+      const params = {
+        ...queryParam
+      };
+      if (params.monId === "builtin-all" || params.monId === undefined || params.monId === null) {
+        delete params.monId;
+      }
       Object.assign(fetchDataContext, {
-        requestParams: {
-          ...queryParam
-        },
+        requestParams: params,
         current: 1,
         pageSize: 10
       });
@@ -22257,10 +22268,14 @@ dayjs_min_default().locale("zh-cn");
 
       // 2. 应用保存的过滤条件
       Object.assign(queryParam, JSON.parse(JSON.stringify(filters)));
+      const params = {
+        ...queryParam
+      };
+      if (params.monId === "builtin-all" || params.monId === undefined || params.monId === null) {
+        delete params.monId;
+      }
       Object.assign(fetchDataContext, {
-        requestParams: {
-          ...queryParam
-        },
+        requestParams: params,
         current: 1,
         pageSize: 10
       });
@@ -22430,16 +22445,17 @@ dayjs_min_default().locale("zh-cn");
 
     const handleSearch = () => {
       emit("fix", true);
-      if (currentModeLabel.value === "全部设备") {
-        Object.assign(fetchDataContext, {
-          requestParams: {
-            ...queryParam,
-            monId: undefined
-          },
-          current: 1,
-          pageSize: 10
-        });
+      const params = {
+        ...queryParam
+      };
+      if (params.monId === "builtin-all" || params.monId === undefined || params.monId === null) {
+        delete params.monId;
       }
+      Object.assign(fetchDataContext, {
+        requestParams: params,
+        current: 1,
+        pageSize: 10
+      });
       getDeviceLabelListFunction();
       if (extendedAttrInfoOptions.value?.length === 0) {
         QueryExtendedAttr();
@@ -22475,10 +22491,14 @@ dayjs_min_default().locale("zh-cn");
         }));
       }
       queryParam.collectStatus = collectStatus.value;
+      const params = {
+        ...queryParam
+      };
+      if (params.monId === "builtin-all" || params.monId === undefined || params.monId === null) {
+        delete params.monId;
+      }
       Object.assign(fetchDataContext, {
-        requestParams: {
-          ...queryParam
-        },
+        requestParams: params,
         current: 1,
         pageSize: 10
       });
@@ -22876,15 +22896,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=7924f56e&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=7716f4a6&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=7924f56e&lang=less
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=7716f4a6&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=7924f56e&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=7716f4a6&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=7924f56e&lang=less&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=1&id=7716f4a6&lang=less&scoped=true
 
 ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue
 
@@ -22895,7 +22915,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_7924f56e_scoped_true_render],['__scopeId',"data-v-7924f56e"]])
+const baowu_device_tree_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_device_treevue_type_script_lang_js, [['render',baowu_device_treevue_type_template_id_7716f4a6_scoped_true_render],['__scopeId',"data-v-7716f4a6"]])
 
 /* harmony default export */ var baowu_device_tree = (baowu_device_tree_exports_);
 ;// CONCATENATED MODULE: ./src/package/index.js