comp-adv3210 1.1.11 → 1.1.12

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=f214fea8&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=55738124&scoped=true
 
-const _withScopeId = n => ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.pushScopeId)("data-v-f214fea8"), 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-55738124"), n = n(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.popScopeId)(), n);
 const _hoisted_1 = {
   style: {
     "display": "flex",
@@ -14100,7 +14100,7 @@ const _hoisted_60 = {
 const _hoisted_61 = /*#__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_f214fea8_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function baowu_device_treevue_type_template_id_55738124_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_filled = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("star-filled");
@@ -14636,7 +14636,7 @@ function baowu_device_treevue_type_template_id_f214fea8_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=f214fea8&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=55738124&scoped=true
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/esnext.set.difference.v2.js
 var esnext_set_difference_v2 = __webpack_require__(3375);
@@ -21397,7 +21397,7 @@ dayjs_min_default().locale("zh-cn");
       }) => {
         plainOptions.value = result.map(item => ({
           label: item.name,
-          value: item.code
+          value: item.code.toString()
         }));
       });
       await getDeviceLabelListFunction();
@@ -21429,6 +21429,25 @@ dayjs_min_default().locale("zh-cn");
       // 可选，传设备扩展属性信息
       monId: null // 当前模式ID
     });
+    const syncQueryParam = () => {
+      // 同步状态
+      queryParam.collectStatus = collectStatus.value;
+
+      // 同步扩展属性
+      if (extendedAttrInfoList.value.length > 0) {
+        queryParam.extendedAttrInfoList = extendedAttrInfoList.value.map(({
+          id,
+          valueType,
+          value
+        }) => ({
+          id,
+          valueType,
+          value
+        }));
+      } else {
+        delete queryParam.extendedAttrInfoList;
+      }
+    };
     const fetchDataContext = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.reactive)({
       tableSize: "small",
       stripe: false,
@@ -22162,13 +22181,23 @@ dayjs_min_default().locale("zh-cn");
       // 先移除还未保存的临时模式，避免重复
       mockModes.value = mockModes.value.filter(item => !String(item.id).startsWith("mode-"));
       const newId = "mode-" + Date.now();
+
+      // 同步当前UI状态到 queryParam
+      syncQueryParam();
       const saveParams = {
         ...JSON.parse(JSON.stringify(queryParam)),
         current: 1,
         pageSize: 10
       };
       const filters = filterValidParams(saveParams);
-      const desc = await mapParamsToLabels(filters);
+
+      // 获取管理域名称
+      let domainPathName = "";
+      if (filters.parentId) {
+        const opt = parentIdOptions.value.find(o => o.value === filters.parentId);
+        domainPathName = opt ? opt.label : filters.parentId;
+      }
+      const desc = await mapParamsToLabels(filters, domainPathName);
       mockModes.value.unshift({
         id: newId,
         name: "新模式",
@@ -22184,13 +22213,23 @@ dayjs_min_default().locale("zh-cn");
       // 先移除还未保存的临时条件，避免重复
       savedConditions.value = savedConditions.value.filter(item => !String(item.id).startsWith("cond-"));
       const newId = "cond-" + Date.now();
+
+      // 同步当前UI状态到 queryParam
+      syncQueryParam();
       const saveParams = {
         ...JSON.parse(JSON.stringify(queryParam)),
         current: 1,
         pageSize: 10
       };
       const filters = filterValidParams(saveParams);
-      const desc = await mapParamsToLabels(filters);
+
+      // 获取管理域名称
+      let domainPathName = "";
+      if (filters.parentId) {
+        const opt = parentIdOptions.value.find(o => o.value === filters.parentId);
+        domainPathName = opt ? opt.label : filters.parentId;
+      }
+      const desc = await mapParamsToLabels(filters, domainPathName);
       savedConditions.value.unshift({
         id: newId,
         name: "新建常用条件",
@@ -22301,7 +22340,8 @@ dayjs_min_default().locale("zh-cn");
         }
       });
     };
-    const handleItemClick = item => {
+    const handleItemClick = async item => {
+      console.log(item);
       if (item.isEditing) return;
       const filters = item.filters || {};
       // console.log(filters);
@@ -22313,8 +22353,36 @@ dayjs_min_default().locale("zh-cn");
         handleReset();
       }
 
+      // 查询管理域关键字生成选项，共queryParam.parentId使用
+      if (item.domainPathName) {
+        let params = {
+          keyword: item.domainPathName
+        };
+        let res = await getDomainListByKeyword(params);
+        let data = res.result || res.data;
+        if (res.code == 200) {
+          if (data.length == 0) {
+            message.warning("管理域数据查询为0!");
+          } else {
+            message.success("数据查询成功！");
+          }
+        } else {
+          message.warning(data.message);
+          return;
+        }
+        parentIdOptions.value = [];
+        data.map(res => {
+          parentIdOptions.value.push({
+            value: res.domainId,
+            label: res.domainNamePath
+          });
+        });
+      }
+
       // 2. 应用保存的过滤条件
       Object.assign(queryParam, JSON.parse(JSON.stringify(filters)));
+      console.log(queryParam);
+      console.log(plainOptions.value);
       const params = {
         ...queryParam
       };
@@ -22419,7 +22487,6 @@ dayjs_min_default().locale("zh-cn");
       console.log(targetOption);
       targetOption.loading = true;
       if (targetOption.valueType === 1) {
-        console.log("sss");
         let res = await getMapListByExtendedAttrId({
           id: targetOption.value
         });
@@ -22435,9 +22502,9 @@ dayjs_min_default().locale("zh-cn");
       extendedAttrInfoOptions.value = [...extendedAttrInfoOptions.value];
     };
     const handleCascaderChange = (value, selectedOptions) => {
-      console.log("Cascader Change:", value, selectedOptions);
-      if (value && value.length === 1 && value[0].length === 1) {
-        cascaderValue.value = [];
+      let targetOption = selectedOptions[selectedOptions.length - 1];
+      if (targetOption && targetOption.valueType == "1" && !targetOption.isLeaf) {
+        cascaderValue.value.pop();
         loadData(selectedOptions);
         return;
       }
@@ -22530,10 +22597,8 @@ dayjs_min_default().locale("zh-cn");
       visible.value = true;
     };
     async function handleSeniorQuery() {
-      if ("extendedAttrInfoList" in queryParam) {
-        delete queryParam.extendedAttrInfoList;
-      }
-      if (extendedAttrInfoList.value.length > 0) {
+      syncQueryParam();
+      if (queryParam.extendedAttrInfoList && queryParam.extendedAttrInfoList.length > 0) {
         // 校验是否所有选中的属性都填写了值
         const incomplete = extendedAttrInfoList.value.find(item => {
           if (Array.isArray(item.value)) return item.value.length === 0;
@@ -22543,19 +22608,7 @@ dayjs_min_default().locale("zh-cn");
           message.info(`请补充扩展属性 [${incomplete.name}] 的值！`);
           return;
         }
-
-        // 构建符合要求的列表（移除展示用的 name 字段）
-        queryParam.extendedAttrInfoList = extendedAttrInfoList.value.map(({
-          id,
-          valueType,
-          value
-        }) => ({
-          id,
-          valueType,
-          value
-        }));
       }
-      queryParam.collectStatus = collectStatus.value;
       const params = {
         ...queryParam
       };
@@ -22956,15 +23009,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=f214fea8&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=55738124&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=f214fea8&lang=less
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=55738124&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=f214fea8&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=55738124&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=f214fea8&lang=less&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=1&id=55738124&lang=less&scoped=true
 
 ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue
 
@@ -22975,7 +23028,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_f214fea8_scoped_true_render],['__scopeId',"data-v-f214fea8"]])
+const baowu_device_tree_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_device_treevue_type_script_lang_js, [['render',baowu_device_treevue_type_template_id_55738124_scoped_true_render],['__scopeId',"data-v-55738124"]])
 
 /* harmony default export */ var baowu_device_tree = (baowu_device_tree_exports_);
 ;// CONCATENATED MODULE: ./src/package/index.js