@cgboiler/biz-mobile 1.18.22 → 1.18.23

package/es/index.d.ts

@@ -7,7 +7,7 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "1.18.21";
+export const version: "1.18.22";
 import MdPreview from './md-preview';
 import OrgPicker from './org-picker';
 import ProjectSelect from './project-select';

package/es/index.js

@@ -1,7 +1,7 @@
 import MdPreview from "./md-preview";
 import OrgPicker from "./org-picker";
 import ProjectSelect from "./project-select";
-const version = "1.18.21";
+const version = "1.18.22";
 function install(app) {
   const components = [
     MdPreview,

package/es/org-picker/OrgPicker.js

@@ -59,29 +59,24 @@ var stdin_default = defineComponent({
       isSearchFocus
     });
     const selectedItems = ref([]);
-    const fullySelectedDepts = ref(/* @__PURE__ */ new Set());
-    const partiallySelectedDepts = ref(/* @__PURE__ */ new Set());
-    const updateDeptSelectionStatus = () => {
+    const getDeptStatus = (deptId) => {
       if (!props.multiple)
-        return;
-      const newFullySelected = /* @__PURE__ */ new Set();
-      const newPartiallySelected = /* @__PURE__ */ new Set();
+        return {
+          fully: false,
+          partially: false
+        };
+      const deptUsers = getUsersByDeptId(deptId);
+      if (deptUsers.length === 0)
+        return {
+          fully: false,
+          partially: false
+        };
       const selectedUserIds = new Set(selectedItems.value.map((item) => item.id));
-      const checkGroupStatus = (groupId) => {
-        const groupUsers = getUsersByDeptId(groupId);
-        if (groupUsers.length === 0)
-          return;
-        const selectedCount = groupUsers.filter((user) => selectedUserIds.has(user.id)).length;
-        if (selectedCount === groupUsers.length) {
-          newFullySelected.add(groupId);
-        } else if (selectedCount > 0) {
-          newPartiallySelected.add(groupId);
-        }
+      const selectedCount = deptUsers.filter((user) => selectedUserIds.has(user.id)).length;
+      return {
+        fully: selectedCount === deptUsers.length,
+        partially: selectedCount > 0 && selectedCount < deptUsers.length
       };
-      api.deptList.value.forEach((dept) => checkGroupStatus(dept.id));
-      api.getCompanies().forEach((comp) => checkGroupStatus(comp.id));
-      fullySelectedDepts.value = newFullySelected;
-      partiallySelectedDepts.value = newPartiallySelected;
     };
     const sortOrgList = computed(() => {
       const departments = orgList.value.filter((item) => item.type === "dept");
@@ -97,17 +92,11 @@ var stdin_default = defineComponent({
       if (userList == null ? void 0 : userList.length) {
         selectedItems.value = newValue.map((id) => {
           return userList.find((item) => item.id === id);
-        });
-        updateDeptSelectionStatus();
+        }).filter(Boolean);
       }
     }), {
       immediate: true
     });
-    watch(() => selectedItems.value, () => {
-      updateDeptSelectionStatus();
-    }, {
-      deep: true
-    });
     watch(() => props.show, (newValue) => {
       const handleKeyDown = (event) => {
         if (event.key === "Escape") {
@@ -127,7 +116,9 @@ var stdin_default = defineComponent({
       if (item.type !== "dept" || !props.multiple)
         return;
       const deptUsers = getUsersByDeptId(item.id);
-      const isFullySelected = fullySelectedDepts.value.has(item.id);
+      const {
+        fully: isFullySelected
+      } = getDeptStatus(item.id);
       const deduplicateById = (arr) => {
         const seenIds = /* @__PURE__ */ new Set();
         return arr.filter((item2) => {
@@ -276,8 +267,12 @@ var stdin_default = defineComponent({
       }, null) : _createVNode(List, null, {
         default: () => [sortOrgList.value.map((item) => {
           const isDept = item.type === "dept";
-          const isFullySelected = isDept && fullySelectedDepts.value.has(item.id);
-          const isPartiallySelected = isDept && partiallySelectedDepts.value.has(item.id);
+          const status = isDept ? getDeptStatus(item.id) : {
+            fully: false,
+            partially: false
+          };
+          const isFullySelected = status.fully;
+          const isPartiallySelected = status.partially;
           const isUserSelected = !isDept && isSelected(item);
           return _createVNode("div", {
             "class": ["org-item", isUserSelected ? "selected" : "", isFullySelected ? "dept-fully-selected" : "", isPartiallySelected ? "dept-partially-selected" : ""],

package/es/org-picker/useApi.js

@@ -64,6 +64,47 @@ const deptMap = computed(() => {
   });
   return map;
 });
+const deptToUsersMap = computed(() => {
+  const map = /* @__PURE__ */ new Map();
+  userList.value.forEach((u) => {
+    if (u.status === 5)
+      return;
+    const list = map.get(u.deptId) || [];
+    list.push(u);
+    map.set(u.deptId, list);
+  });
+  userList.value.forEach((u) => {
+    if (u.status === 5)
+      return;
+    if (!u.deptId || u.deptId === "0") {
+      const cid = u.companyId;
+      if (cid) {
+        const list = map.get(`root_${cid}`) || [];
+        list.push(u);
+        map.set(`root_${cid}`, list);
+      }
+    }
+  });
+  return map;
+});
+const deptToSubDeptsMap = computed(() => {
+  const map = /* @__PURE__ */ new Map();
+  deptList.value.forEach((d) => {
+    const pid = d.parentId || "0";
+    const list = map.get(pid) || [];
+    list.push(d);
+    map.set(pid, list);
+  });
+  deptList.value.forEach((d) => {
+    if (d.parentId === "0" || !d.parentId) {
+      const cid = d.companyId;
+      const list = map.get(`root_${cid}`) || [];
+      list.push(d);
+      map.set(`root_${cid}`, list);
+    }
+  });
+  return map;
+});
 let initPromise = null;
 const fetchAllCompaniesData = () => __async(void 0, null, function* () {
   const companyIds = [COMPANY_CHUANGUO, COMPANY_HAZHOU];
@@ -408,54 +449,35 @@ const useApi = () => {
   };
   const getUsersByDeptId = (deptId, cid, visited = /* @__PURE__ */ new Set()) => {
     const effectiveCompanyId = cid || browsedCompanyId.value;
-    if (visited.has(deptId)) {
+    if (visited.has(deptId))
       return [];
-    }
     visited.add(deptId);
     const isCompany = COMPANIES.some((c) => c.id === deptId);
     if (isCompany) {
       const companyId = deptId;
-      if (!deptList.value.length || !userList.value.length)
-        return [];
-      const gatherUsers = (dId) => {
-        const result = [];
-        if (dId === companyId) {
-          result.push(
-            ...userList.value.filter(
-              (u) => u.companyId === dId && (u.deptId === "0" || !u.deptId) && u.status !== 5
-            )
-          );
-        } else {
-          result.push(
-            ...userList.value.filter(
-              (u) => u.deptId === dId && u.companyId === companyId && u.status !== 5
-            )
-          );
-        }
-        const children = dId === companyId ? deptList.value.filter((d) => d.companyId === dId && (d.parentId === "0" || !d.parentId)) : deptList.value.filter((d) => d.parentId === dId && d.companyId === companyId);
+      const result2 = [];
+      const traverse = (dId, isRoot) => {
+        const users = deptToUsersMap.value.get(isRoot ? `root_${companyId}` : dId) || [];
+        result2.push(...users);
+        const children = deptToSubDeptsMap.value.get(isRoot ? `root_${companyId}` : dId) || [];
         children.forEach((child) => {
           if (!visited.has(child.id)) {
             visited.add(child.id);
-            result.push(...gatherUsers(child.id));
+            traverse(child.id, false);
           }
         });
-        return result;
       };
-      return gatherUsers(companyId);
+      traverse(companyId, true);
+      return result2;
     }
-    const users = [];
-    const directUsers = userList.value.filter(
-      (user) => user.deptId === deptId && user.status !== 5 && (!effectiveCompanyId || user.companyId === effectiveCompanyId)
-    );
-    users.push(...directUsers);
-    const childDepts = deptList.value.filter(
-      (dept) => dept.parentId === deptId && (!effectiveCompanyId || dept.companyId === effectiveCompanyId)
-    );
+    const result = [];
+    const directUsers = deptToUsersMap.value.get(deptId) || [];
+    result.push(...directUsers);
+    const childDepts = deptToSubDeptsMap.value.get(deptId) || [];
     childDepts.forEach((childDept) => {
-      const childUsers = getUsersByDeptId(childDept.id, effectiveCompanyId, visited);
-      users.push(...childUsers);
+      result.push(...getUsersByDeptId(childDept.id, effectiveCompanyId, visited));
     });
-    return users;
+    return result;
   };
   const getDeptById = (deptId) => {
     return deptMap.value.get(deptId);

package/lib/index.d.ts

@@ -7,7 +7,7 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "1.18.21";
+export const version: "1.18.22";
 import MdPreview from './md-preview';
 import OrgPicker from './org-picker';
 import ProjectSelect from './project-select';

package/lib/index.js

@@ -42,7 +42,7 @@ var import_project_select = __toESM(require("./project-select"));
 __reExport(stdin_exports, require("./md-preview"), module.exports);
 __reExport(stdin_exports, require("./org-picker"), module.exports);
 __reExport(stdin_exports, require("./project-select"), module.exports);
-const version = "1.18.21";
+const version = "1.18.22";
 function install(app) {
   const components = [
     import_md_preview.default,

package/lib/org-picker/OrgPicker.js

@@ -91,29 +91,24 @@ var stdin_default = (0, import_vue2.defineComponent)({
       isSearchFocus
     });
     const selectedItems = (0, import_vue2.ref)([]);
-    const fullySelectedDepts = (0, import_vue2.ref)(/* @__PURE__ */ new Set());
-    const partiallySelectedDepts = (0, import_vue2.ref)(/* @__PURE__ */ new Set());
-    const updateDeptSelectionStatus = () => {
+    const getDeptStatus = (deptId) => {
       if (!props.multiple)
-        return;
-      const newFullySelected = /* @__PURE__ */ new Set();
-      const newPartiallySelected = /* @__PURE__ */ new Set();
+        return {
+          fully: false,
+          partially: false
+        };
+      const deptUsers = getUsersByDeptId(deptId);
+      if (deptUsers.length === 0)
+        return {
+          fully: false,
+          partially: false
+        };
       const selectedUserIds = new Set(selectedItems.value.map((item) => item.id));
-      const checkGroupStatus = (groupId) => {
-        const groupUsers = getUsersByDeptId(groupId);
-        if (groupUsers.length === 0)
-          return;
-        const selectedCount = groupUsers.filter((user) => selectedUserIds.has(user.id)).length;
-        if (selectedCount === groupUsers.length) {
-          newFullySelected.add(groupId);
-        } else if (selectedCount > 0) {
-          newPartiallySelected.add(groupId);
-        }
+      const selectedCount = deptUsers.filter((user) => selectedUserIds.has(user.id)).length;
+      return {
+        fully: selectedCount === deptUsers.length,
+        partially: selectedCount > 0 && selectedCount < deptUsers.length
       };
-      api.deptList.value.forEach((dept) => checkGroupStatus(dept.id));
-      api.getCompanies().forEach((comp) => checkGroupStatus(comp.id));
-      fullySelectedDepts.value = newFullySelected;
-      partiallySelectedDepts.value = newPartiallySelected;
     };
     const sortOrgList = (0, import_vue2.computed)(() => {
       const departments = orgList.value.filter((item) => item.type === "dept");
@@ -129,17 +124,11 @@ var stdin_default = (0, import_vue2.defineComponent)({
       if (userList == null ? void 0 : userList.length) {
         selectedItems.value = newValue.map((id) => {
           return userList.find((item) => item.id === id);
-        });
-        updateDeptSelectionStatus();
+        }).filter(Boolean);
       }
     }), {
       immediate: true
     });
-    (0, import_vue2.watch)(() => selectedItems.value, () => {
-      updateDeptSelectionStatus();
-    }, {
-      deep: true
-    });
     (0, import_vue2.watch)(() => props.show, (newValue) => {
       const handleKeyDown = (event) => {
         if (event.key === "Escape") {
@@ -159,7 +148,9 @@ var stdin_default = (0, import_vue2.defineComponent)({
       if (item.type !== "dept" || !props.multiple)
         return;
       const deptUsers = getUsersByDeptId(item.id);
-      const isFullySelected = fullySelectedDepts.value.has(item.id);
+      const {
+        fully: isFullySelected
+      } = getDeptStatus(item.id);
       const deduplicateById = (arr) => {
         const seenIds = /* @__PURE__ */ new Set();
         return arr.filter((item2) => {
@@ -308,8 +299,12 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }, null) : (0, import_vue.createVNode)(import_vant.List, null, {
         default: () => [sortOrgList.value.map((item) => {
           const isDept = item.type === "dept";
-          const isFullySelected = isDept && fullySelectedDepts.value.has(item.id);
-          const isPartiallySelected = isDept && partiallySelectedDepts.value.has(item.id);
+          const status = isDept ? getDeptStatus(item.id) : {
+            fully: false,
+            partially: false
+          };
+          const isFullySelected = status.fully;
+          const isPartiallySelected = status.partially;
           const isUserSelected = !isDept && isSelected(item);
           return (0, import_vue.createVNode)("div", {
             "class": ["org-item", isUserSelected ? "selected" : "", isFullySelected ? "dept-fully-selected" : "", isPartiallySelected ? "dept-partially-selected" : ""],

package/lib/org-picker/useApi.js

@@ -85,6 +85,47 @@ const deptMap = (0, import_vue.computed)(() => {
   });
   return map;
 });
+const deptToUsersMap = (0, import_vue.computed)(() => {
+  const map = /* @__PURE__ */ new Map();
+  userList.value.forEach((u) => {
+    if (u.status === 5)
+      return;
+    const list = map.get(u.deptId) || [];
+    list.push(u);
+    map.set(u.deptId, list);
+  });
+  userList.value.forEach((u) => {
+    if (u.status === 5)
+      return;
+    if (!u.deptId || u.deptId === "0") {
+      const cid = u.companyId;
+      if (cid) {
+        const list = map.get(`root_${cid}`) || [];
+        list.push(u);
+        map.set(`root_${cid}`, list);
+      }
+    }
+  });
+  return map;
+});
+const deptToSubDeptsMap = (0, import_vue.computed)(() => {
+  const map = /* @__PURE__ */ new Map();
+  deptList.value.forEach((d) => {
+    const pid = d.parentId || "0";
+    const list = map.get(pid) || [];
+    list.push(d);
+    map.set(pid, list);
+  });
+  deptList.value.forEach((d) => {
+    if (d.parentId === "0" || !d.parentId) {
+      const cid = d.companyId;
+      const list = map.get(`root_${cid}`) || [];
+      list.push(d);
+      map.set(`root_${cid}`, list);
+    }
+  });
+  return map;
+});
 let initPromise = null;
 const fetchAllCompaniesData = () => __async(void 0, null, function* () {
   const companyIds = [COMPANY_CHUANGUO, COMPANY_HAZHOU];
@@ -429,54 +470,35 @@ const useApi = () => {
   };
   const getUsersByDeptId = (deptId, cid, visited = /* @__PURE__ */ new Set()) => {
     const effectiveCompanyId = cid || browsedCompanyId.value;
-    if (visited.has(deptId)) {
+    if (visited.has(deptId))
       return [];
-    }
     visited.add(deptId);
     const isCompany = COMPANIES.some((c) => c.id === deptId);
     if (isCompany) {
       const companyId = deptId;
-      if (!deptList.value.length || !userList.value.length)
-        return [];
-      const gatherUsers = (dId) => {
-        const result = [];
-        if (dId === companyId) {
-          result.push(
-            ...userList.value.filter(
-              (u) => u.companyId === dId && (u.deptId === "0" || !u.deptId) && u.status !== 5
-            )
-          );
-        } else {
-          result.push(
-            ...userList.value.filter(
-              (u) => u.deptId === dId && u.companyId === companyId && u.status !== 5
-            )
-          );
-        }
-        const children = dId === companyId ? deptList.value.filter((d) => d.companyId === dId && (d.parentId === "0" || !d.parentId)) : deptList.value.filter((d) => d.parentId === dId && d.companyId === companyId);
+      const result2 = [];
+      const traverse = (dId, isRoot) => {
+        const users = deptToUsersMap.value.get(isRoot ? `root_${companyId}` : dId) || [];
+        result2.push(...users);
+        const children = deptToSubDeptsMap.value.get(isRoot ? `root_${companyId}` : dId) || [];
         children.forEach((child) => {
           if (!visited.has(child.id)) {
             visited.add(child.id);
-            result.push(...gatherUsers(child.id));
+            traverse(child.id, false);
           }
         });
-        return result;
       };
-      return gatherUsers(companyId);
+      traverse(companyId, true);
+      return result2;
     }
-    const users = [];
-    const directUsers = userList.value.filter(
-      (user) => user.deptId === deptId && user.status !== 5 && (!effectiveCompanyId || user.companyId === effectiveCompanyId)
-    );
-    users.push(...directUsers);
-    const childDepts = deptList.value.filter(
-      (dept) => dept.parentId === deptId && (!effectiveCompanyId || dept.companyId === effectiveCompanyId)
-    );
+    const result = [];
+    const directUsers = deptToUsersMap.value.get(deptId) || [];
+    result.push(...directUsers);
+    const childDepts = deptToSubDeptsMap.value.get(deptId) || [];
     childDepts.forEach((childDept) => {
-      const childUsers = getUsersByDeptId(childDept.id, effectiveCompanyId, visited);
-      users.push(...childUsers);
+      result.push(...getUsersByDeptId(childDept.id, effectiveCompanyId, visited));
     });
-    return users;
+    return result;
   };
   const getDeptById = (deptId) => {
     return deptMap.value.get(deptId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgboiler/biz-mobile",
-  "version": "1.18.22",
+  "version": "1.18.23",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",