bl-common-vue3 3.8.123 → 3.8.125

package/package.json

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

package/src/components/ViewPropertyList/index.vue

@@ -39,10 +39,11 @@
 <script>
 import {
   computed,
-  defineComponent, reactive, toRefs, watch,
+  defineComponent, getCurrentInstance, reactive, toRefs, watch,
 } from "vue";
 import {Modal, Table} from "ant-design-vue";
 import { SyncOutlined } from "@ant-design/icons-vue";
+import { EventCenterForMicroApp } from "kj-micro-app";
 import {t, loadLanguageAsync} from "../../locale";
 import utils from "../../common/utils/util";
 import BlModal from "../BlModal/index.vue";
@@ -84,6 +85,7 @@ export default defineComponent({
     },
   },
   setup(props, { emit }) {
+    const instance = getCurrentInstance();
 
     const state = reactive({
       dataList: [], // 数据源
@@ -157,11 +159,17 @@ export default defineComponent({
       // context.emit("addProperty");
       state.addLoading = true;
       if (props.microMessageInfo.appName && props.microMessageInfo.routeName) {
-        // 如果是在父应用中运行
+        // 共享依赖运行在主应用作用域，通过组件所属容器定位发起操作的子应用。
+        const rootElement = instance?.proxy?.$root?.$el;
+        const appElement = rootElement?.closest?.("micro-app") ||
+          rootElement?.parentElement?.closest("micro-app");
+        const appName = appElement?.getAttribute("name");
+        const microApp = typeof window.microApp?.forceDispatch === "function"
+          ? window.microApp
+          : appName ? new EventCenterForMicroApp(appName) : null;
 
-        if (window.__MICRO_APP_ENVIRONMENT__) {
-
-          window.microApp.forceDispatch({
+        if (microApp) {
+          microApp.forceDispatch({
             type: "SetChildDrawerList",
             info: {
               props: {

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){