bl-common-vue3 3.8.124 → 3.8.126

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bl-common-vue3",
-  "version": "3.8.124",
+  "version": "3.8.126",
   "main": "index.js",
   "module": "index.js",
   "description": "bailing vue3 common components lib",

package/src/components/ReportLang/index.vue

@@ -1,212 +1,268 @@
-<template>
-  <div class="progress-page">
-    <div class="progress-box">
-      <template v-if="!systemToken">
-        <a-alert :message="t('ReportLang.index.603107-0')" type="warning" />
-      </template>
-      <template v-else>
-        <a-progress :percent="reportPercent" />
-        <div class="tip-box">
-          <div class="tip" v-if="successLanguages.length">{{ t('ReportLang.index.603107-1') }} {{successLanguages.join('，')}}</div>
-          <div class="tip" v-if="errorLanguages.length">{{ t('ReportLang.index.603107-2') }} {{errorLanguages.join('，')}}</div>
-        </div>
-      </template>
-    </div>
-  </div>
-
-</template>
-<script>
-
-
-import {defineComponent, onMounted, reactive, toRefs} from "vue";
-import utils from "../../common/utils/util";
-import {
-  Progress,
-  Alert,
-} from "ant-design-vue";
-import {t, loadLanguageAsync} from "../../locale";
-
-export default defineComponent({
-  name: "reportLang",
-  props: {
-    // 上报语言配置 数组
-    langConfigArr: {
-      type: Array,
-      default: () => {return []},
-    },
-  },
-  components: {
-    "a-progress": Progress,
-    "a-alert": Alert,
-  },
-  setup(props, { emit,}) {
-    const batchSize = 500;
-
-    const state = reactive({
-      successLanguages: [], // 上报成功的语言列表
-      errorLanguages: [], // 上报失败的语言列表
-      totalSteps: 0,
-      reportPercent: 0,
-      systemToken: '', // 系统后台token
-    });
-
-    const roundUpToTwoDecimalPlaces = (num) => {
-      return Math.ceil(num * 100) / 100;
-    };
-
-    const reportLang = (lang, locale, app) => {
-      return new Promise((resolve) => {
-        // 上报
-        emit("request", {
-          params: {
-            method: 'post',
-            server: '/public',
-            url: '/system/lang/report',
-            extra: {
-              app,
-              lang,
-              lang_list: locale,
-              system_token: state.systemToken,
-            },
-          },
-          success: () => {
-            resolve('success');
-          },
-          fail: () => {
-            resolve('fail');
-          },
-        })
-      })
-    };
-
-    const setOriginData = async (lang) => {
-      let isSuccess = true;
-      // 每一种语言前进的百分比
-      let oneLangPercent = roundUpToTwoDecimalPlaces(100 / state.totalSteps);
-      let sendRequestTotal = 0; // 发送请求总次数
-      props.langConfigArr.forEach((v) => {
-        let allLocale = v?.langJsonMap || {};
-        let currentLocale = allLocale?.[lang];
-        // 把语言分成 500 一条发送
-        const keys = Object.keys(currentLocale);
-        const totalBatches = Math.ceil(keys.length / batchSize);
-        sendRequestTotal = sendRequestTotal + totalBatches;
-      })
-
-      // 每一步前进的百分比
-      let batchPercent = roundUpToTwoDecimalPlaces(oneLangPercent / sendRequestTotal);
-
-      for (let i = 0; i < props.langConfigArr.length; i++) {
-        let item = props.langConfigArr[i];
-        let reportApp = item.app;
-        let allLocale = item?.langJsonMap || {};
-        let currentLocale = allLocale?.[lang];
-        // 把语言分成 500 一条发送
-        const keys = Object.keys(currentLocale);
-        const totalBatches = Math.ceil(keys.length / batchSize);
-        for (let i = 0; i < totalBatches; i++) {
-          // 获取当前批次的键
-          const batchKeys = keys.slice(i * batchSize, (i + 1) * batchSize);
-          // 构建当前批次的对象
-          const batchObject = batchKeys.reduce((acc, key) => {
-            acc[key] = currentLocale[key];
-            return acc;
-          }, {});
-          // 分批发送到后端
-          let resolveRes = await reportLang(lang, batchObject, reportApp);
-          state.reportPercent = utils.countSum([Number(state.reportPercent), Number(batchPercent)]);
-          if (resolveRes == 'fail') {
-            isSuccess = false;
-          }
-        }
-      }
-      if (isSuccess) {
-        state.successLanguages = state.successLanguages.concat([lang]);
-      } else {
-        state.errorLanguages = state.errorLanguages.concat([lang]);
-      }
-    };
-
-    // 开始上报
-    const uploadLangArr = async (langArr) => {
-      for (let i = 0; i < langArr.length; i++) {
-        await setOriginData(langArr[i])
-      }
-    };
-
-    const init = () => {
-      state.systemToken = localStorage.getItem('MICRO_systemMain_token');
-      if (!state.systemToken) {
-        return;
-      }
-      // 开始上报
-      emit("request", {
-        params: {
-          method: 'get',
-          server: '/public',
-          url: '/system/config',
-          extra: {
-            visitPort: "org",
-          },
-        },
-        success: (res) => {
-          let allLangJsonMap = props.langConfigArr.reduce((acc, obj) => {
-            return { ...acc, ...obj?.langJsonMap || {} };
-          }, {});
-          let openLanguage = res?.basic?.system_lang_map;
-          let langArr = [];
-          Object.keys(openLanguage).forEach((keys) => {
-            let lang = openLanguage[keys];
-            if (allLangJsonMap[lang]) {
-              langArr.push(lang)
-            }
-          })
-          state.totalSteps = langArr.length;
-          uploadLangArr(langArr);
-        },
-        fail: () => {},
-      })
-    };
-
-    onMounted(() => {
-      init();
-    });
-
-    loadLanguageAsync(utils.getLang());
-
-    window.addEventListener('setBLLang', (event) => {
-      const newLang = event.newValue; // 获取新的语言值
-      loadLanguageAsync(newLang);
-    });
-
-    return {
-      ...toRefs(state),
-      t,
-    };
-  },
-});
-</script>
-
-<style lang="less" scoped>
-.progress-page {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background: #fff;
-}
-.progress-box {
-  width: 50%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-.tip-box {
-  margin-top: 10px;
-  .tip {
-    padding-top: 8px;
-  }
-}
-
-</style>
+<template>
+  <div class="progress-page">
+    <div class="progress-box">
+      <template v-if="!systemToken">
+        <a-alert :message="t('ReportLang.index.603107-0')" type="warning" />
+      </template>
+      <template v-else>
+        <a-progress :percent="reportPercent" />
+        <div class="tip-box">
+          <div class="tip" v-if="successLanguages.length">
+            {{ t("ReportLang.index.603107-1") }}
+            {{ successLanguages.join("，") }}
+          </div>
+          <div class="tip" v-if="errorLanguages.length">
+            {{ t("ReportLang.index.603107-2") }} {{ errorLanguages.join("，") }}
+          </div>
+        </div>
+      </template>
+    </div>
+  </div>
+</template>
+<script>
+import { defineComponent, onMounted, reactive, toRefs } from "vue";
+import utils from "../../common/utils/util";
+import { Progress, Alert } from "ant-design-vue";
+import { t, loadLanguageAsync } from "../../locale";
+
+export default defineComponent({
+  name: "reportLang",
+  props: {
+    // 上报语言配置 数组
+    langConfigArr: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  components: {
+    "a-progress": Progress,
+    "a-alert": Alert,
+  },
+  setup(props, { emit }) {
+    const batchSize = 500;
+
+    const state = reactive({
+      successLanguages: [], // 上报成功的语言列表
+      errorLanguages: [], // 上报失败的语言列表
+      totalSteps: 0,
+      reportPercent: 0,
+      systemToken: "", // 系统后台token
+    });
+
+    const isInIframe = window.parent !== window;
+
+    // 向父窗口发送消息
+    const sendMessageToParent = (type, data = {}) => {
+      if (isInIframe) {
+        try {
+          // 通过 JSON 序列化来清理数据，避免 DataCloneError
+          const message = {
+            type,
+            data: JSON.parse(JSON.stringify(data || {})),
+          };
+          if (window.parent && window.parent !== window) {
+            window.parent.postMessage(message, window.location.origin);
+          }
+          if (
+            window.top &&
+            window.top !== window &&
+            window.top !== window.parent
+          ) {
+            window.top.postMessage(message, window.location.origin);
+          }
+        } catch (e) {
+          console.error("发送消息到父窗口失败", e);
+        }
+      }
+    };
+
+    const roundUpToTwoDecimalPlaces = (num) => {
+      return Math.ceil(num * 100) / 100;
+    };
+
+    const reportLang = (lang, locale, app) => {
+      return new Promise((resolve) => {
+        // 上报
+        emit("request", {
+          params: {
+            method: "post",
+            server: "/public",
+            url: "/system/lang/report",
+            extra: {
+              app,
+              lang,
+              lang_list: locale,
+              system_token: state.systemToken,
+            },
+          },
+          success: () => {
+            resolve("success");
+          },
+          fail: () => {
+            resolve("fail");
+          },
+        });
+      });
+    };
+
+    const setOriginData = async (lang) => {
+      let isSuccess = true;
+      // 每一种语言前进的百分比
+      let oneLangPercent = roundUpToTwoDecimalPlaces(100 / state.totalSteps);
+      let sendRequestTotal = 0; // 发送请求总次数
+      props.langConfigArr.forEach((v) => {
+        let allLocale = v?.langJsonMap || {};
+        let currentLocale = allLocale?.[lang];
+        // 把语言分成 500 一条发送
+        const keys = Object.keys(currentLocale);
+        const totalBatches = Math.ceil(keys.length / batchSize);
+        sendRequestTotal = sendRequestTotal + totalBatches;
+      });
+
+      // 每一步前进的百分比
+      let batchPercent = roundUpToTwoDecimalPlaces(
+        oneLangPercent / sendRequestTotal
+      );
+
+      for (let i = 0; i < props.langConfigArr.length; i++) {
+        let item = props.langConfigArr[i];
+        let reportApp = item.app;
+        let allLocale = item?.langJsonMap || {};
+        let currentLocale = allLocale?.[lang];
+        // 把语言分成 500 一条发送
+        const keys = Object.keys(currentLocale);
+        const totalBatches = Math.ceil(keys.length / batchSize);
+        for (let i = 0; i < totalBatches; i++) {
+          // 获取当前批次的键
+          const batchKeys = keys.slice(i * batchSize, (i + 1) * batchSize);
+          // 构建当前批次的对象
+          const batchObject = batchKeys.reduce((acc, key) => {
+            acc[key] = currentLocale[key];
+            return acc;
+          }, {});
+          // 分批发送到后端
+          let resolveRes = await reportLang(lang, batchObject, reportApp);
+          state.reportPercent = utils.countSum([
+            Number(state.reportPercent),
+            Number(batchPercent),
+          ]);
+          // 批量上报模式：发送进度消息
+          sendMessageToParent("REPORT_PROGRESS", {
+            percent: state.reportPercent,
+            successLanguages: state.successLanguages,
+            errorLanguages: state.errorLanguages,
+          });
+          if (resolveRes == "fail") {
+            isSuccess = false;
+          }
+        }
+      }
+      if (isSuccess) {
+        state.successLanguages = state.successLanguages.concat([lang]);
+      } else {
+        state.errorLanguages = state.errorLanguages.concat([lang]);
+      }
+    };
+
+    // 开始上报
+    const uploadLangArr = async (langArr) => {
+      for (let i = 0; i < langArr.length; i++) {
+        await setOriginData(langArr[i]);
+      }
+
+      // 批量上报模式：发送完成消息
+      sendMessageToParent("REPORT_COMPLETE", {
+        hasError: state.errorLanguages.length > 0,
+        successLanguages: state.successLanguages,
+        errorLanguages: state.errorLanguages,
+      });
+    };
+
+    const init = () => {
+      state.systemToken = localStorage.getItem('MICRO_systemMain_token');
+      if (!state.systemToken) {
+        // 批量上报模式：没有 token，发送错误消息
+        sendMessageToParent("REPORT_ERROR", {
+          message: "未登录或无权限",
+        });
+        return;
+      }
+      // 开始上报
+      emit("request", {
+        params: {
+          method: "get",
+          server: "/public",
+          url: "/system/config",
+          extra: {
+            visitPort: "org",
+          },
+        },
+        success: (res) => {
+          let allLangJsonMap = props.langConfigArr.reduce((acc, obj) => {
+            return { ...acc, ...(obj?.langJsonMap || {}) };
+          }, {});
+          let openLanguage = res?.basic?.system_lang_map;
+          let langArr = [];
+          Object.keys(openLanguage).forEach((keys) => {
+            let lang = openLanguage[keys];
+            if (allLangJsonMap[lang]) {
+              langArr.push(lang);
+            }
+          });
+          state.totalSteps = langArr.length;
+          uploadLangArr(langArr);
+        },
+        fail: () => {
+          // 批量上报模式：配置获取失败
+          sendMessageToParent("REPORT_ERROR", {
+            message: "获取系统配置失败",
+          });
+        },
+      });
+    };
+
+    onMounted(() => {
+      // 批量上报模式：发送就绪消息
+      sendMessageToParent("REPORT_READY");
+      init();
+    });
+
+    loadLanguageAsync(utils.getLang());
+
+    window.addEventListener("setBLLang", (event) => {
+      const newLang = event.newValue; // 获取新的语言值
+      loadLanguageAsync(newLang);
+    });
+
+    return {
+      ...toRefs(state),
+      t,
+    };
+  },
+});
+</script>
+
+<style lang="less" scoped>
+.progress-page {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: #fff;
+}
+.progress-box {
+  width: 50%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.tip-box {
+  margin-top: 10px;
+  .tip {
+    padding-top: 8px;
+  }
+}
+</style>

package/src/components/VillageTree/index.vue

@@ -473,8 +473,18 @@ export default defineComponent({
     };
 
     /** 获取树数据 */
+    // 获取部门树中的项目总数
+    const getVillageCount = (list = []) => {
+      return list.reduce((count, item) => {
+        if (item.type === 3) {
+          return count;
+        }
+        return count + (item.villageList?.length || 0) + getVillageCount(item.subcat || []);
+      }, 0);
+    };
+
     // 获取部门树列表
-    const getDeptTreeList = (list, level) => {
+    const getDeptTreeList = (list, level, totalVillageCount) => {
       let result = [];
       for (let listItem of list) {
         // 非项目管理部门
@@ -486,7 +496,11 @@ export default defineComponent({
           listItem.slotIcon = `${listItem.childType}Icon`;
           listItem.children = [];
           if (listItem.subcat && listItem.subcat.length) {
-            listItem.children = getDeptTreeList(listItem.subcat, level + 1);
+            listItem.children = getDeptTreeList(
+              listItem.subcat,
+              level + 1,
+              totalVillageCount,
+            );
           }
           if (listItem.villageList && listItem.villageList.length) {
             listItem.noVillage = 0
@@ -494,6 +508,7 @@ export default defineComponent({
               listItem.villageList,
               level,
               listItem,
+              totalVillageCount,
             );
             listItem.children = [...listItem.children, ...villageList];
           }else{
@@ -510,7 +525,12 @@ export default defineComponent({
       return result;
     };
     // 获取项目树列表
-    const getVillageTreeList = (villageList, level = 1, parentData) => {
+    const getVillageTreeList = (
+      villageList,
+      level = 1,
+      parentData = {},
+      totalVillageCount = villageList.length,
+    ) => {
       return villageList.map((village) => {
         village.childType = "village";
         village.key = `${parentData.key ? parentData.key + "-" : ""}${
@@ -607,7 +627,7 @@ export default defineComponent({
           village.isLeaf = true;
           village.disabled = props.isdisabledNumber ? ( props.isdisabledNumber == 2 ? false : true ) : false
         }
-        if (!(props.showCompany && villageList.length > 1)) {
+        if (totalVillageCount === 1) {
           state.expandedKeys.push(village.key);
         }
         if (!state.selectedKeys.length) {
@@ -671,9 +691,12 @@ export default defineComponent({
           },
         },
         success: (res) => {
+          const totalVillageCount = res.list
+            ? getVillageCount(res.list)
+            : res.villageList?.length || 0;
           state.treeList = res.list
-            ? getDeptTreeList(res.list, 1)
-            : getVillageTreeList(res.villageList);
+            ? getDeptTreeList(res.list, 1, totalVillageCount)
+            : getVillageTreeList(res.villageList, 1, {}, totalVillageCount);
           state.loadingTree = false;
           state.treeList[0].disabled = props.isdisabledNumber ? true : false
           if (props.setFirst&&state.treeList.length&&state.treeList[0].children){